Re-created the 'studio-osgi' branch from the latest trunk.
git-svn-id: https://svn.apache.org/repos/asf/directory/studio/branches/studio-osgi@1336556 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/application/application-eclipse-plugins/pom.xml b/application/application-eclipse-plugins/pom.xml
index fbd5ce8..cdc57ab 100644
--- a/application/application-eclipse-plugins/pom.xml
+++ b/application/application-eclipse-plugins/pom.xml
@@ -48,7 +48,7 @@
<goal>copy-eclipse-artifact</goal>
</goals>
<configuration>
- <destinationDirectory>${plugins-dir}</destinationDirectory>
+ <outputDirectory>${plugins-dir}</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>com.ibm</groupId>
diff --git a/application/application-features/pom.xml b/application/application-features/pom.xml
index c181812..b240b71 100644
--- a/application/application-features/pom.xml
+++ b/application/application-features/pom.xml
@@ -56,6 +56,10 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
+ <artifactId>apacheds.configuration.v2.feature</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.directory.studio</groupId>
<artifactId>ldapbrowser.feature</artifactId>
</artifactItem>
<artifactItem>
@@ -84,7 +88,7 @@
<goal>copy-eclipse-artifact</goal>
</goals>
<configuration>
- <destinationDirectory>${features-packed-dir}</destinationDirectory>
+ <outputDirectory>${features-packed-dir}</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
@@ -92,6 +96,10 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
+ <artifactId>apacheds.configuration.v2.feature</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.directory.studio</groupId>
<artifactId>ldapbrowser.feature</artifactId>
</artifactItem>
<artifactItem>
diff --git a/application/application-linux-x86/pom.xml b/application/application-linux-x86/pom.xml
index 117ae1e..aab38d6 100644
--- a/application/application-linux-x86/pom.xml
+++ b/application/application-linux-x86/pom.xml
@@ -137,7 +137,7 @@
<goal>copy-eclipse-artifact</goal>
</goals>
<configuration>
- <destinationDirectory>${plugins-dir}</destinationDirectory>
+ <outputDirectory>${plugins-dir}</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.eclipse.core.filesystem.linux</groupId>
diff --git a/application/application-linux-x86_64/pom.xml b/application/application-linux-x86_64/pom.xml
index 0ad0aee..42d78eb 100644
--- a/application/application-linux-x86_64/pom.xml
+++ b/application/application-linux-x86_64/pom.xml
@@ -137,7 +137,7 @@
<goal>copy-eclipse-artifact</goal>
</goals>
<configuration>
- <destinationDirectory>${plugins-dir}</destinationDirectory>
+ <outputDirectory>${plugins-dir}</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.eclipse.core.filesystem.linux</groupId>
diff --git a/application/application-macosx-x86-dmg/pom.xml b/application/application-macosx-x86-dmg/pom.xml
index 8775f5e..42e873a 100644
--- a/application/application-macosx-x86-dmg/pom.xml
+++ b/application/application-macosx-x86-dmg/pom.xml
@@ -31,9 +31,9 @@
<packaging>pom</packaging>
<properties>
- <dmg-dir>${project.build.directory}/ApacheDirectoryStudio-macosx-x86-${version}</dmg-dir>
- <tmp-dmg>${project.build.directory}/ApacheDirectoryStudio-macosx-x86-${version}-tmp.dmg</tmp-dmg>
- <final-dmg>${project.build.directory}/ApacheDirectoryStudio-macosx-x86-${version}.dmg</final-dmg>
+ <dmg-dir>${project.build.directory}/ApacheDirectoryStudio-macosx-x86-${project.version}</dmg-dir>
+ <tmp-dmg>${project.build.directory}/ApacheDirectoryStudio-macosx-x86-${project.version}-tmp.dmg</tmp-dmg>
+ <final-dmg>${project.build.directory}/ApacheDirectoryStudio-macosx-x86-${project.version}.dmg</final-dmg>
</properties>
<build>
diff --git a/application/application-macosx-x86/pom.xml b/application/application-macosx-x86/pom.xml
index 41093c8..66815b4 100644
--- a/application/application-macosx-x86/pom.xml
+++ b/application/application-macosx-x86/pom.xml
@@ -137,7 +137,7 @@
<goal>copy-eclipse-artifact</goal>
</goals>
<configuration>
- <destinationDirectory>${plugins-dir}</destinationDirectory>
+ <outputDirectory>${plugins-dir}</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.eclipse.core.filesystem</groupId>
@@ -155,10 +155,6 @@
<groupId>org.eclipse.swt.cocoa</groupId>
<artifactId>macosx</artifactId>
</artifactItem>
- <artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>rcp.fullscreen</artifactId>
- </artifactItem>
</artifactItems>
</configuration>
</execution>
diff --git a/application/application-macosx-x86_64-dmg/pom.xml b/application/application-macosx-x86_64-dmg/pom.xml
index b7d6cdb..d54a531 100644
--- a/application/application-macosx-x86_64-dmg/pom.xml
+++ b/application/application-macosx-x86_64-dmg/pom.xml
@@ -31,9 +31,9 @@
<packaging>pom</packaging>
<properties>
- <dmg-dir>${project.build.directory}/ApacheDirectoryStudio-macosx-x86_64-${version}</dmg-dir>
- <tmp-dmg>${project.build.directory}/ApacheDirectoryStudio-macosx-x86_64-${version}-tmp.dmg</tmp-dmg>
- <final-dmg>${project.build.directory}/ApacheDirectoryStudio-macosx-x86_64-${version}.dmg</final-dmg>
+ <dmg-dir>${project.build.directory}/ApacheDirectoryStudio-macosx-x86_64-${project.version}</dmg-dir>
+ <tmp-dmg>${project.build.directory}/ApacheDirectoryStudio-macosx-x86_64-${project.version}-tmp.dmg</tmp-dmg>
+ <final-dmg>${project.build.directory}/ApacheDirectoryStudio-macosx-x86_64-${project.version}.dmg</final-dmg>
</properties>
<build>
diff --git a/application/application-macosx-x86_64/pom.xml b/application/application-macosx-x86_64/pom.xml
index db0c302..1a44da3 100644
--- a/application/application-macosx-x86_64/pom.xml
+++ b/application/application-macosx-x86_64/pom.xml
@@ -137,7 +137,7 @@
<goal>copy-eclipse-artifact</goal>
</goals>
<configuration>
- <destinationDirectory>${plugins-dir}</destinationDirectory>
+ <outputDirectory>${plugins-dir}</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.eclipse.core.filesystem</groupId>
@@ -156,30 +156,48 @@
<artifactId>x86_64</artifactId>
</artifactItem>
<artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>rcp.fullscreen</artifactId>
+ <groupId>com.bandlem.eclipse.fullscreen</groupId>
+ <artifactId>ui</artifactId>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<!-- Unpack specific plugins for Mac OS X -->
<execution>
- <id>unpack-plugins-macosx</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>unpack-with-artifactid-prefix</goal>
- </goals>
- <configuration>
- <outputDirectory>${plugins-dir}</outputDirectory>
- <artifactItems>
- <artifactItem>
+ <id>unpack-plugins-macosx</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack-with-artifactid-prefix</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${plugins-dir}</outputDirectory>
+ <artifactItems>
+ <artifactItem>
<groupId>org.eclipse.equinox.launcher.cocoa.macosx</groupId>
<artifactId>x86_64</artifactId>
<type>zip</type>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <!-- Unpack specific features for Mac OS X -->
+ <execution>
+ <id>unpack-features-macosx</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack-with-artifactid-prefix</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${features-dir}</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>com.bandlem.eclipse.fullscreen</groupId>
+ <artifactId>feature</artifactId>
+ <type>zip</type>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
</executions>
</plugin>
diff --git a/application/application-nightly-builds/pom.xml b/application/application-nightly-builds/pom.xml
new file mode 100644
index 0000000..66203a5
--- /dev/null
+++ b/application/application-nightly-builds/pom.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!--
+ @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>application</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>ApacheDirectoryStudio-nightly-builds</artifactId>
+ <name>Apache Directory Studio Application Nightly Builds</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <nightly-builds-dir>${project.build.directory}/ApacheDirectoryStudio-nightly-builds-${project.version}</nightly-builds-dir>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>ApacheDirectoryStudio-linux-x86</artifactId>
+ <type>tar.gz</type>
+ <version>${project.version}</version>
+ <outputDirectory>${nightly-builds-dir}</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>ApacheDirectoryStudio-linux-x86_64</artifactId>
+ <type>tar.gz</type>
+ <version>${project.version}</version>
+ <outputDirectory>${nightly-builds-dir}</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>ApacheDirectoryStudio-macosx-x86</artifactId>
+ <type>zip</type>
+ <version>${project.version}</version>
+ <outputDirectory>${nightly-builds-dir}</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>ApacheDirectoryStudio-macosx-x86_64</artifactId>
+ <type>zip</type>
+ <version>${project.version}</version>
+ <outputDirectory>${nightly-builds-dir}</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>ApacheDirectoryStudio-win32-x86</artifactId>
+ <type>zip</type>
+ <version>${project.version}</version>
+ <outputDirectory>${nightly-builds-dir}</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>ApacheDirectoryStudio-win32-x86_64</artifactId>
+ <type>zip</type>
+ <version>${project.version}</version>
+ <outputDirectory>${nightly-builds-dir}</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>ApacheDirectoryStudio-updatesite</artifactId>
+ <classifier>default</classifier>
+ <type>zip</type>
+ <version>${project.version}</version>
+ <outputDirectory>${nightly-builds-dir}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/application/application-plugins/pom.xml b/application/application-plugins/pom.xml
index 307fcd3..5dae748 100644
--- a/application/application-plugins/pom.xml
+++ b/application/application-plugins/pom.xml
@@ -47,11 +47,15 @@
<goal>copy-eclipse-artifact</goal>
</goals>
<configuration>
- <destinationDirectory>${plugins-dir}</destinationDirectory>
+ <outputDirectory>${plugins-dir}</outputDirectory>
<artifactItems>
<!-- Apache Directory Studio library plugins dependencies -->
<artifactItem>
<groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-client-api</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-asn1-api</artifactId>
</artifactItem>
<artifactItem>
@@ -68,14 +72,6 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ipojo-manager</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-codec-core</artifactId>
</artifactItem>
<artifactItem>
@@ -100,11 +96,11 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-schema-converter</artifactId>
+ <artifactId>shared-ldap-schema-data</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>shared-ldap-schema-converter</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.shared</groupId>
@@ -148,6 +144,10 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.server.core</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.directory.server.core.api</artifactId>
</artifactItem>
<artifactItem>
@@ -172,14 +172,6 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.felix.ipojo</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.felix.ipojo.annotations</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.httpcomponents.httpclient</artifactId>
</artifactItem>
<artifactItem>
@@ -222,10 +214,6 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>apacheds</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.directory.studio</groupId>
<artifactId>apacheds.configuration</artifactId>
</artifactItem>
<artifactItem>
@@ -238,10 +226,6 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>apacheds.help</artifactId>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.directory.studio</groupId>
<artifactId>common.core</artifactId>
</artifactItem>
<artifactItem>
@@ -278,6 +262,22 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
+ <artifactId>ldapservers.apacheds.v153</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>ldapservers.apacheds.v154</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>ldapservers.apacheds.v155</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>ldapservers.apacheds.v156</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.directory.studio</groupId>
<artifactId>ldapservers.apacheds.v157</artifactId>
</artifactItem>
<artifactItem>
diff --git a/application/application-release/pom.xml b/application/application-release/pom.xml
index 7aefb4d..4374bc8 100644
--- a/application/application-release/pom.xml
+++ b/application/application-release/pom.xml
@@ -92,6 +92,7 @@
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
<artifactId>ApacheDirectoryStudio-updatesite</artifactId>
+ <classifier>default</classifier>
<type>zip</type>
<version>${project.version}</version>
<outputDirectory>${release-dir}</outputDirectory>
@@ -122,12 +123,12 @@
<unzip dest="${project.build.directory}">
<fileset dir="${project.build.directory}" includes="ApacheDirectoryStudio-*.zip"/>
</unzip>
- <copy file="${project.build.directory}/ApacheDirectoryStudio-macosx-x86-dmg-${version}/ApacheDirectoryStudio-macosx-x86-${version}.dmg" todir="${release-dir}" />
- <copy file="${project.build.directory}/ApacheDirectoryStudio-macosx-x86_64-dmg-${version}/ApacheDirectoryStudio-macosx-x86_64-${version}.dmg" todir="${release-dir}" />
- <copy file="${project.build.directory}/ApacheDirectoryStudio-win32-x86-exe-${version}/ApacheDirectoryStudio-win32-x86-${version}.exe" todir="${release-dir}" />
- <copy file="${project.build.directory}/ApacheDirectoryStudio-win32-x86_64-exe-${version}/ApacheDirectoryStudio-win32-x86_64-${version}.exe" todir="${release-dir}" />
+ <copy file="${project.build.directory}/ApacheDirectoryStudio-macosx-x86-dmg-${project.version}/ApacheDirectoryStudio-macosx-x86-${project.version}.dmg" todir="${release-dir}" />
+ <copy file="${project.build.directory}/ApacheDirectoryStudio-macosx-x86_64-dmg-${project.version}/ApacheDirectoryStudio-macosx-x86_64-${project.version}.dmg" todir="${release-dir}" />
+ <copy file="${project.build.directory}/ApacheDirectoryStudio-win32-x86-exe-${project.version}/ApacheDirectoryStudio-win32-x86-${project.version}.exe" todir="${release-dir}" />
+ <copy file="${project.build.directory}/ApacheDirectoryStudio-win32-x86_64-exe-${project.version}/ApacheDirectoryStudio-win32-x86_64-${project.version}.exe" todir="${release-dir}" />
<copy todir="${release-dir}/updatesite">
- <fileset dir="${project.build.directory}/ApacheDirectoryStudio-updatesite-${version}"/>
+ <fileset dir="${project.build.directory}/ApacheDirectoryStudio-updatesite-${project.version}"/>
</copy>
<copy file="src/main/resources/sign.sh" todir="${release-dir}">
<filterset>
diff --git a/application/application-updatesite/src/main/assembly/updatesite-pao.xml b/application/application-updatesite/src/main/assembly/updatesite-pao.xml
index 2ae18f8..cf28def 100644
--- a/application/application-updatesite/src/main/assembly/updatesite-pao.xml
+++ b/application/application-updatesite/src/main/assembly/updatesite-pao.xml
@@ -40,9 +40,10 @@
<include>site--xml.html</include>
</includes>
<outputDirectory>/</outputDirectory>
+ <filtered>true</filtered>
</fileSet>
- <!-- Legal files & release notes -->
+ <!-- Legal files -->
<fileSet>
<directory>../../docs</directory>
<outputDirectory>/</outputDirectory>
diff --git a/application/application-updatesite/src/main/assembly/updatesite.xml b/application/application-updatesite/src/main/assembly/updatesite.xml
index c9424a8..3ba9fa4 100644
--- a/application/application-updatesite/src/main/assembly/updatesite.xml
+++ b/application/application-updatesite/src/main/assembly/updatesite.xml
@@ -38,6 +38,7 @@
<include>site.xml</include>
</includes>
<outputDirectory>/</outputDirectory>
+ <filtered>true</filtered>
</fileSet>
<!-- Legal files & release notes -->
diff --git a/application/application-updatesite/src/main/resources/site--xml.html b/application/application-updatesite/src/main/resources/site--xml.html
index 61eb7e9..a5d6368 100755
--- a/application/application-updatesite/src/main/resources/site--xml.html
+++ b/application/application-updatesite/src/main/resources/site--xml.html
@@ -18,99 +18,241 @@
under the License.
-->
<site>
- <description url="http://directory.apache.org/studio/update/1.x">
+ <description url="http://directory.apache.org/studio/update/2.x">
The Apache Directory Studio update site.
</description>
<feature
- url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.rcp.feature_${pom.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/features/org.apache.directory.studio.rcp.feature_${pom.version}.jar"
id="org.apache.directory.studio.rcp.feature" version="${pom.version}"
- os="linux,macosx,win32" ws="carbon,gtk,win32" arch="ppc,x86,x86_64">
+ os="linux,macosx,win32" ws="carbon,gtk,win32" arch="x86,x86_64">
<category name="Apache Directory Studio RCP"/>
</feature>
<feature
- url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.ldapbrowser.feature_${pom.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/features/org.apache.directory.studio.ldapbrowser.feature_${pom.version}.jar"
id="org.apache.directory.studio.ldapbrowser.feature" version="${pom.version}">
<category name="Apache Directory Studio LDAP Browser"/>
</feature>
<feature
- url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.schemaeditor.feature_${pom.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/features/org.apache.directory.studio.schemaeditor.feature_${pom.version}.jar"
id="org.apache.directory.studio.schemaeditor.feature" version="${pom.version}">
<category name="Apache Directory Studio Schema Editor"/>
</feature>
<feature
- url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.apacheds.configuration.feature_${pom.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/features/org.apache.directory.studio.apacheds.configuration.feature_${pom.version}.jar"
id="org.apache.directory.studio.apacheds.configuration.feature" version="${pom.version}">
- <category name="Apache Directory Studio Apache DS"/>
+ <category name="Apache Directory Studio ApacheDS Configuration"/>
</feature>
<feature
- url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.apacheds.feature_${pom.version}.jar"
- id="org.apache.directory.studio.apacheds.feature" version="${pom.version}">
- <category name="Apache Directory Studio Apache DS"/>
+ url="[preferred]/directory/studio/update/2.x/features/org.apache.directory.studio.apacheds.configuration.v2.feature_${pom.version}.jar"
+ id="org.apache.directory.studio.apacheds.configuration.v2.feature" version="${pom.version}">
+ <category name="Apache Directory Studio ApacheDS 2.0 Configuration"/>
</feature>
- <feature url="[preferred]/directory/studio/update/1.x/features/org.apache.directory.studio.ldifeditor.feature_${pom.version}.jar"
+ <feature url="[preferred]/directory/studio/update/2.x/features/org.apache.directory.studio.ldifeditor.feature_${pom.version}.jar"
id="org.apache.directory.studio.ldifeditor.feature" version="${pom.version}">
<category name="Apache Directory Studio LDIF Editor"/>
</feature>
+ <feature url="[preferred]/directory/studio/update/2.x/features/org.apache.directory.studio.ldapservers.feature_${pom.version}.jar"
+ id="org.apache.directory.studio.ldapservers.feature" version="${pom.version}">
+ <category name="Apache Directory Studio LDAP Servers"/>
+ </feature>
<archive
- path="plugins/org.apache.directory.studio.aciitemeditor_${pom.version}.jar"
- url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.aciitemeditor_${pom.version}.jar"/>
+ path="plugins/net.sf.ehcache.core_${net.sf.ehcache.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/net.sf.ehcache.core_${net.sf.ehcache.version}.jar"/>
<archive
- path="plugins/org.apache.directory.studio.apacheds.configuration.help_${pom.version}.jar"
- url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.apacheds.configuration.help_${pom.version}.jar"/>
+ path="plugins/org.antlr.antlr_${org.antlr.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.antlr.antlr_${org.antlr.version}.jar"/>
<archive
- path="plugins/org.apache.directory.studio.apacheds.configuration_${pom.version}.jar"
- url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.apacheds.configuration_${pom.version}.jar"/>
+ path="plugins/org.apache.commons.codec_${org.apache.commons.codec.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.commons.codec_${org.apache.commons.codec.version}.jar"/>
<archive
- path="plugins/org.apache.directory.studio.apacheds_${pom.version}.jar"
- url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.apacheds_${pom.version}.jar"/>
+ path="plugins/org.apache.commons.collections_${org.apache.commons.collections.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.commons.collections_${org.apache.commons.collections.version}.jar"/>
<archive
- path="plugins/org.apache.directory.studio.apacheds.help_${pom.version}.jar"
- url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.apacheds.help_${pom.version}.jar"/>
- <archive
- path="plugins/org.apache.directory.studio.common.ui_${pom.version}.jar"
- url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.common.ui_${pom.version}.jar"/>
- <archive
- path="plugins/org.apache.directory.studio.connection.core_${pom.version}.jar"
- url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.connection.core_${pom.version}.jar"/>
- <archive
- path="plugins/org.apache.directory.studio.connection.ui_${pom.version}.jar"
- url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.connection.ui_${pom.version}.jar"/>
- <archive
- path="plugins/org.apache.directory.studio.ldapbrowser.common_${pom.version}.jar"
- url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldapbrowser.common_${pom.version}.jar"/>
+ path="plugins/org.apache.commons.io_${org.apache.commons.io.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.commons.io_${org.apache.commons.io.version}.jar"/>
<archive
- path="plugins/org.apache.directory.studio.ldapbrowser.core_${pom.version}.jar"
- url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldapbrowser.core_${pom.version}.jar"/>
+ path="plugins/org.apache.commons.lang_${org.apache.commons.lang.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.commons.lang_${org.apache.commons.lang.version}.jar"/>
<archive
- path="plugins/org.apache.directory.studio.ldapbrowser.help_${pom.version}.jar"
- url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldapbrowser.help_${pom.version}.jar"/>
+ path="plugins/org.apache.commons.logging_${org.apache.commons.logging.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.commons.logging_${org.apache.commons.logging.version}.jar"/>
<archive
- path="plugins/org.apache.directory.studio.ldapbrowser.ui_${pom.version}.jar"
- url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldapbrowser.ui_${pom.version}.jar"/>
+ path="plugins/org.apache.commons.pool_${org.apache.commons.pool.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.commons.pool_${org.apache.commons.pool.version}.jar"/>
<archive
- path="plugins/org.apache.directory.studio.rcp.help_${pom.version}.jar"
- url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.rcp.help_${pom.version}.jar"/>
+ path="plugins/org.apache.directory.server.config_${org.apache.directory.server.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.server.config_${org.apache.directory.server.validversion}.jar"/>
<archive
- path="plugins/org.apache.directory.studio.ldifeditor_${pom.version}.jar"
- url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldifeditor_${pom.version}.jar"/>
+ path="plugins/org.apache.directory.server.core_${org.apache.directory.server.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.server.core_${org.apache.directory.server.validversion}.jar"/>
<archive
- path="plugins/org.apache.directory.studio.ldifeditor.help_${pom.version}.jar"
- url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldifeditor.help_${pom.version}.jar"/>
+ path="plugins/org.apache.directory.server.core.api_${org.apache.directory.server.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.server.core.api_${org.apache.directory.server.validversion}.jar"/>
<archive
- path="plugins/org.apache.directory.studio.ldifparser_${pom.version}.jar"
- url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.ldifparser_${pom.version}.jar"/>
+ path="plugins/org.apache.directory.server.core.avl_${org.apache.directory.server.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.server.core.avl_${org.apache.directory.server.validversion}.jar"/>
<archive
- path="plugins/org.apache.directory.studio.schemaeditor.help_${pom.version}.jar"
- url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.schemaeditor.help_${pom.version}.jar"/>
+ path="plugins/org.apache.directory.server.core.constants_${org.apache.directory.server.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.server.core.constants_${org.apache.directory.server.validversion}.jar"/>
<archive
- path="plugins/org.apache.directory.studio.schemaeditor_${pom.version}.jar"
- url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.schemaeditor_${pom.version}.jar"/>
+ path="plugins/org.apache.directory.server.i18n_${org.apache.directory.server.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.server.i18n_${org.apache.directory.server.validversion}.jar"/>
<archive
- path="plugins/org.apache.directory.studio.valueeditors_${pom.version}.jar"
- url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.valueeditors_${pom.version}.jar"/>
+ path="plugins/org.apache.directory.server.ldif.partition_${org.apache.directory.server.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.server.ldif.partition_${org.apache.directory.server.validversion}.jar"/>
<archive
- path="plugins/org.apache.directory.studio.rcp_${pom.version}.jar"
- url="[preferred]/directory/studio/update/1.x/plugins/org.apache.directory.studio.rcp_${pom.version}.jar"/>
+ path="plugins/org.apache.directory.server.xdbm.partition_${org.apache.directory.server.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.server.xdbm.partition_${org.apache.directory.server.validversion}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.shared.asn1.api_${org.apache.directory.shared.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.shared.asn1.api_${org.apache.directory.shared.validversion}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.shared.asn1.ber_${org.apache.directory.shared.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.shared.asn1.ber_${org.apache.directory.shared.validversion}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.shared.dsmlv2.parser_${org.apache.directory.shared.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.shared.dsmlv2.parser_${org.apache.directory.shared.validversion}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.shared.i18n_${org.apache.directory.shared.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.shared.i18n_${org.apache.directory.shared.validversion}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.shared.ldap.client.api_${org.apache.directory.shared.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.shared.ldap.client.api_${org.apache.directory.shared.validversion}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.shared.ldap.codec.core_${org.apache.directory.shared.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.shared.ldap.codec.core_${org.apache.directory.shared.validversion}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.shared.ldap.extras.aci_${org.apache.directory.shared.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.shared.ldap.extras.aci_${org.apache.directory.shared.validversion}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.shared.ldap.extras.trigger_${org.apache.directory.shared.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.shared.ldap.extras.trigger_${org.apache.directory.shared.validversion}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.shared.ldap.extras.util_${org.apache.directory.shared.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.shared.ldap.extras.util_${org.apache.directory.shared.validversion}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.shared.ldap.model_${org.apache.directory.shared.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.shared.ldap.model_${org.apache.directory.shared.validversion}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.shared.ldap.net.mina_${org.apache.directory.shared.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.shared.ldap.net.mina_${org.apache.directory.shared.validversion}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.shared.ldap.schema_${org.apache.directory.shared.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.shared.ldap.schema_${org.apache.directory.shared.validversion}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.shared.ldap.schema.converter_${org.apache.directory.shared.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.shared.ldap.schema.converter_${org.apache.directory.shared.validversion}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.shared.util_${org.apache.directory.shared.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.shared.util_${org.apache.directory.shared.validversion}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.aciitemeditor_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.aciitemeditor_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.apacheds.configuration_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.apacheds.configuration_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.apacheds.configuration.help_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.apacheds.configuration.help_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.apacheds.configuration.v2_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.apacheds.configuration.v2_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.common.core_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.common.core_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.common.ui_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.common.ui_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.connection.core_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.connection.core_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.connection.ui_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.connection.ui_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.ldapbrowser.common_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.ldapbrowser.common_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.ldapbrowser.core_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.ldapbrowser.core_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.ldapbrowser.help_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.ldapbrowser.help_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.ldapbrowser.ui_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.ldapbrowser.ui_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.ldapservers_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.ldapservers_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.ldapservers.apacheds.v153_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.ldapservers.apacheds.v153_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.ldapservers.apacheds.v154_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.ldapservers.apacheds.v154_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.ldapservers.apacheds.v155_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.ldapservers.apacheds.v155_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.ldapservers.apacheds.v156_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.ldapservers.apacheds.v156_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.ldapservers.apacheds.v157_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.ldapservers.apacheds.v157_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.ldapservers.apacheds.v200_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.ldapservers.apacheds.v200_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.ldifeditor_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.ldifeditor_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.ldifeditor.help_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.ldifeditor.help_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.ldifparser_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.ldifparser_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.rcp_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.rcp_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.rcp.help_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.rcp.help_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.schemaeditor_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.schemaeditor_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.schemaeditor.help_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.schemaeditor.help_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.directory.studio.valueeditors_${project.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.directory.studio.valueeditors_${project.version}.jar"/>
+ <archive
+ path="plugins/org.apache.httpcomponents.httpclient_${org.apache.httpcomponents.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.httpcomponents.httpclient_${org.apache.httpcomponents.version}.jar"/>
+ <archive
+ path="plugins/org.apache.httpcomponents.httpcore_${org.apache.httpcomponents.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.httpcomponents.httpcore_${org.apache.httpcomponents.version}.jar"/>
+ <archive
+ path="plugins/org.apache.logging.log4j_${org.apache.logging.log4j.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.logging.log4j_${org.apache.logging.log4j.version}.jar"/>
+ <archive
+ path="plugins/org.apache.mina.core_${org.apache.mina.core.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.apache.mina.core_${org.apache.mina.core.version}.jar"/>
+ <archive
+ path="plugins/org.bouncycastle.bcprov.jdk15_${org.bouncycastle.bcprov.jdk15.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.bouncycastle.bcprov.jdk15_${org.bouncycastle.bcprov.jdk15.version}.jar"/>
+ <archive
+ path="plugins/org.dom4j.dom4j_${org.dom4j.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.dom4j.dom4j_${org.dom4j.version}.jar"/>
+ <archive
+ path="plugins/org.slf4j.api_${org.slf4j.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.slf4j.api_${org.slf4j.version}.jar"/>
+ <archive
+ path="plugins/org.slf4j.log4j12_${org.slf4j.version}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.slf4j.log4j12_${org.slf4j.version}.jar"/>
+ <archive
+ path="plugins/org.xpp3.xpp3_${org.xpp3.validversion}.jar"
+ url="[preferred]/directory/studio/update/2.x/plugins/org.xpp3.xpp3_${org.xpp3.validversion}.jar"/>
<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.
@@ -126,9 +268,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 Studio Apache DS">
+ <category-def name="Apache Directory Studio ApacheDS Configuration" label="Apache Directory Studio ApacheDS Configuration">
<description>
- The Apache Directory Studio Apache DS category contains all features related to Apache DS.
+ The Apache Directory Studio ApacheDS Configuration category contains all features related to ApacheDS Configuration.
+ </description>
+ </category-def>
+ <category-def name="Apache Directory Studio ApacheDS 2.0 Configuration" label="Apache Directory Studio ApacheDS 2.0 Configuration">
+ <description>
+ The Apache Directory Studio ApacheDS 2.0 Configuration category contains all features related to ApacheDS 2.0 Configuration.
</description>
</category-def>
<category-def name="Apache Directory Studio LDIF Editor" label="Apache Directory Studio LDIF Editor">
@@ -136,4 +283,9 @@
The Apache Directory Studio LDIF Editor category contains all features related to the LDIF Editor.
</description>
</category-def>
+ <category-def name="Apache Directory Studio LDAP Servers" label="Apache Directory Studio LDAP Servers">
+ <description>
+ The Apache Directory Studio LDAP Servers category contains all features related to the LDAP Servers.
+ </description>
+ </category-def>
</site>
diff --git a/application/application-updatesite/src/main/resources/site.xml b/application/application-updatesite/src/main/resources/site.xml
index 2fbbf9c..58c28ee 100644
--- a/application/application-updatesite/src/main/resources/site.xml
+++ b/application/application-updatesite/src/main/resources/site.xml
@@ -18,13 +18,13 @@
under the License.
-->
<site>
- <description url="http://directory.apache.org/studio/update/1.x">
+ <description url="http://directory.apache.org/studio/update/2.x">
The Apache Directory Studio update site.
</description>
<feature
url="features/org.apache.directory.studio.rcp.feature_${pom.version}.jar"
id="org.apache.directory.studio.rcp.feature" version="${pom.version}"
- os="linux,macosx,win32" ws="carbon,gtk,win32" arch="ppc,x86,x86_64">
+ os="linux,macosx,win32" ws="carbon,gtk,win32" arch="x86,x86_64">
<category name="Apache Directory Studio RCP"/>
</feature>
<feature
@@ -38,16 +38,20 @@
</feature>
<feature url="features/org.apache.directory.studio.apacheds.configuration.feature_${pom.version}.jar"
id="org.apache.directory.studio.apacheds.configuration.feature" version="${pom.version}">
- <category name="Apache Directory Studio Apache DS"/>
+ <category name="Apache Directory Studio ApacheDS Configuration"/>
</feature>
- <feature url="features/org.apache.directory.studio.apacheds.feature_${pom.version}.jar"
- id="org.apache.directory.studio.apacheds.feature" version="${pom.version}">
- <category name="Apache Directory Studio Apache DS"/>
+ <feature url="features/org.apache.directory.studio.apacheds.configuration.v2.feature_${pom.version}.jar"
+ id="org.apache.directory.studio.apacheds.configuration.v2.feature" version="${pom.version}">
+ <category name="Apache Directory Studio ApacheDS 2.0 Configuration"/>
</feature>
<feature url="features/org.apache.directory.studio.ldifeditor.feature_${pom.version}.jar"
id="org.apache.directory.studio.ldifeditor.feature" version="${pom.version}">
<category name="Apache Directory Studio LDIF Editor"/>
</feature>
+ <feature url="features/org.apache.directory.studio.ldapservers.feature_${pom.version}.jar"
+ id="org.apache.directory.studio.ldapservers.feature" version="${pom.version}">
+ <category name="Apache Directory Studio LDAP Servers"/>
+ </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.
@@ -63,9 +67,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 Studio Apache DS">
+ <category-def name="Apache Directory Studio ApacheDS Configuration" label="Apache Directory Studio ApacheDS Configuration">
<description>
- The Apache Directory Studio Apache DS category contains all features related to Apache DS.
+ The Apache Directory Studio ApacheDS configuration category contains all features related to ApacheDS Configuration.
+ </description>
+ </category-def>
+ <category-def name="Apache Directory Studio ApacheDS 2.0 Configuration" label="Apache Directory Studio ApacheDS 2.0 Configuration">
+ <description>
+ The Apache Directory Studio ApacheDS 2.0 configuration category contains all features related to ApacheDS 2.0 Configuration.
</description>
</category-def>
<category-def name="Apache Directory Studio LDIF Editor" label="Apache Directory Studio LDIF Editor">
@@ -73,4 +82,9 @@
The Apache Directory Studio LDIF Editor category contains all features related to the LDIF Editor.
</description>
</category-def>
+ <category-def name="Apache Directory Studio LDAP Servers" label="Apache Directory Studio LDAP Servers">
+ <description>
+ The Apache Directory Studio LDAP Servers category contains all features related to the LDAP Servers.
+ </description>
+ </category-def>
</site>
diff --git a/application/application-win32-x86-exe/pom.xml b/application/application-win32-x86-exe/pom.xml
index e16f504..d567351 100644
--- a/application/application-win32-x86-exe/pom.xml
+++ b/application/application-win32-x86-exe/pom.xml
@@ -33,7 +33,7 @@
<properties>
<tmp-dir>${project.build.directory}/ApacheDirectoryStudio-win32-x86-exe-tmp</tmp-dir>
<files-dir>${tmp-dir}/files</files-dir>
- <installer-file-name>ApacheDirectoryStudio-win32-x86-${version}.exe</installer-file-name>
+ <installer-file-name>ApacheDirectoryStudio-win32-x86-${project.version}.exe</installer-file-name>
<installers.makensis>makensis</installers.makensis>
</properties>
@@ -84,6 +84,7 @@
<copy file="src/main/resources/header_studio.bmp" todir="${tmp-dir}"/>
<copy file="src/main/resources/studio-installer.ico" todir="${tmp-dir}"/>
<copy file="src/main/resources/welcome_studio.bmp" todir="${tmp-dir}"/>
+ <copy file="src/main/resources/Apache Directory Studio.ini" todir="${tmp-dir}"/>
</target>
</configuration>
<goals>
@@ -134,6 +135,47 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!-- MAVEN_DEFAULT_EXCLUDES -->
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <!-- ECLIPSE_DEFAULT_EXCLUDES -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <!-- IDEA_DEFAULT_EXCLUDES -->
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <!-- MANIFEST_MF_EXCLUDES -->
+ <exclude>**/MANIFEST.MF</exclude>
+ <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <!-- GITIGNORE_EXCLUDES -->
+ <exclude>**/.gitignore</exclude>
+ <!-- ABOUT_EXCLUDES -->
+ <exclude>**/about.ini</exclude>
+ <exclude>**/about_files/*</exclude>
+ <!-- LOG_FILES_EXCLUDES -->
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.vm</exclude>
+ <!-- NSIS_EXCLUDES -->
+ <exclude>**/src/main/resources/AdvUninstLog.nsh</exclude>
+ <!-- OTHER_EXCLUDES -->
+ <exclude>src/main/resources/Apache Directory Studio.ini</exclude>
+ <exclude>**/*.bmp</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
diff --git a/application/application-win32-x86-exe/src/main/resources/Apache Directory Studio.ini b/application/application-win32-x86-exe/src/main/resources/Apache Directory Studio.ini
new file mode 100644
index 0000000..522054f
--- /dev/null
+++ b/application/application-win32-x86-exe/src/main/resources/Apache Directory Studio.ini
@@ -0,0 +1,2 @@
+-vm
+@java.home@\bin
\ No newline at end of file
diff --git a/application/application-win32-x86-exe/src/main/resources/installer.nsi b/application/application-win32-x86-exe/src/main/resources/installer.nsi
index 160ad36..247c114 100755
--- a/application/application-win32-x86-exe/src/main/resources/installer.nsi
+++ b/application/application-win32-x86-exe/src/main/resources/installer.nsi
@@ -27,9 +27,13 @@
!define HeaderImage "header_studio.bmp"
!define OutFile "../@installer-file-name@"
!define SourceFolder "ApacheDirectoryStudio-win32-x86-${Version}"
+ !define JREVersion "1.5.0"
!define INSTDIR_REG_ROOT "HKLM"
!define INSTDIR_REG_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Application}"
+ # Variables needed for JRE detection
+ Var JREPath
+
#
# Modules inclusions
#
@@ -98,6 +102,13 @@
# Directory page
#!define MUI_DIRECTORYPAGE_VARIABLE $APPLICATION_HOME_DIR
!insertmacro MUI_PAGE_DIRECTORY
+
+ # JRE directory page
+ Var JAVA_HOME_DIR
+ !define MUI_DIRECTORYPAGE_VARIABLE $JAVA_HOME_DIR
+ !define MUI_DIRECTORYPAGE_TEXT_DESTINATION "$(javaPageTitle)"
+ !define MUI_DIRECTORYPAGE_TEXT_TOP "$(javaPageMessage)"
+ !insertmacro MUI_PAGE_DIRECTORY
# Installation page
!insertmacro MUI_PAGE_INSTFILES
@@ -116,61 +127,6 @@
!insertmacro MUI_UNPAGE_INSTFILES
#
-# Languages (the first one is the default one)
-#
- !insertmacro MUI_LANGUAGE "English"
- !insertmacro MUI_LANGUAGE "French"
- !insertmacro MUI_LANGUAGE "German"
-
-#
-# Functions
-#
- # Internationalized strings
- LangString message ${LANG_ENGLISH} "${Application} is already installed.$\n$\nClick 'OK' to remove the previous version$\nor 'Cancel' to cancel this installation."
- LangString message ${LANG_FRENCH} "${Application} est déjà installé.$\n$\nCliquez sur 'OK' pour supprimer la version précédente$\nou sur 'Annuler' pour annuler cette installation."
- LangString message ${LANG_GERMAN} "${Application} ist bereits installiert.$\n$\nKlicke 'OK' um die frühere Version zu entfernen$\noder 'Abbruch' um die Installation abzubrechen."
-
- # onInit function
- Function .onInit
- # Preventing the window to close automatically at the end of the (un)installation
- SetAutoClose false
-
- # Verifying if the application is already installed
- ReadRegStr $R0 "${INSTDIR_REG_ROOT}" "${INSTDIR_REG_KEY}" "UninstallString"
- StrCmp $R0 "" done
-
- # Getting install location
- ReadRegStr $R1 "${INSTDIR_REG_ROOT}" "SOFTWARE\${Application}" "InstallDir"
- StrCmp $R1 "" done
-
- # The application is already installed
- # Asking before running the uninstaller
- MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "$(message)" \
- IDOK uninst
- Abort
-
- # Running the uninstaller
- uninst:
- ExecWait '$R0 _?=$R1'
-
- done:
- # Preparing the uninstall log
- !insertmacro UNINSTALL.LOG_PREPARE_INSTALL
- FunctionEnd
-
- # onInstSuccess function
- Function .onInstSuccess
- # Updating the uninstall log
- !insertmacro UNINSTALL.LOG_UPDATE_INSTALL
- FunctionEnd
-
- # UN.onInit function
- Function UN.onInit
- # Begin uninstall
- !insertmacro UNINSTALL.LOG_BEGIN_UNINSTALL
- FunctionEnd
-
-#
# Sections
#
# Installer section
@@ -182,6 +138,13 @@
# Adding installer source files
File /r "${SourceFolder}\*"
+ File "Apache Directory Studio.ini"
+
+ # Replacing Java home directory in config file
+ GetFunctionAddress $R0 ReplaceJavaHome # handle to callback fn
+ Push $R0
+ Push "$INSTDIR\Apache Directory Studio.ini" # file to replace in
+ Call ReplaceInFile
# Storing install location
WriteRegStr "${INSTDIR_REG_ROOT}" "SOFTWARE\${Application}" "InstallDir" $INSTDIR
@@ -230,3 +193,322 @@
# Removing registry keys
DeleteRegKey "${INSTDIR_REG_ROOT}" "${INSTDIR_REG_KEY}"
SectionEnd
+
+#
+# Languages (the first one is the default one)
+#
+ !insertmacro MUI_LANGUAGE "English"
+ !insertmacro MUI_LANGUAGE "French"
+ !insertmacro MUI_LANGUAGE "German"
+
+#
+# Functions
+#
+ # Internationalized strings
+ LangString alreadyInstalledMessage ${LANG_ENGLISH} "${Application} is already installed.$\n$\nClick 'OK' to remove the previous version$\nor 'Cancel' to cancel this installation."
+ LangString alreadyInstalledMessage ${LANG_FRENCH} "${Application} est déjà installé.$\n$\nCliquez sur 'OK' pour supprimer la version précédente$\nou sur 'Annuler' pour annuler cette installation."
+ LangString alreadyInstalledMessage ${LANG_GERMAN} "${Application} ist bereits installiert.$\n$\nKlicke 'OK' um die frühere Version zu entfernen$\noder 'Abbruch' um die Installation abzubrechen."
+
+ LangString javaPageTitle ${LANG_ENGLISH} "Java Home Directory"
+ LangString javaPageTitle ${LANG_FRENCH} "Répertoire Java Home"
+ LangString javaPageTitle ${LANG_GERMAN} "Java Home Verzeichnis"
+
+ LangString javaPageMessage ${LANG_ENGLISH} "Select the Java Home directory you would like to use to run ${Application}."
+ LangString javaPageMessage ${LANG_FRENCH} "Sélectionnez le répertoire Java Home que vous souhaitez utiliser pour ${Application}"
+ LangString javaPageMessage ${LANG_GERMAN} "Wählen Sie das Java Home Verzeichnis, das Sie verwenden möchten, um ${Application} laufen."
+
+ #
+ # <onInit>
+ #
+
+ Function .onInit
+ # Preventing the window to close automatically at the end of the (un)installation
+ SetAutoClose false
+
+ # Verifying if the application is already installed
+ ReadRegStr $R0 "${INSTDIR_REG_ROOT}" "${INSTDIR_REG_KEY}" "UninstallString"
+ StrCmp $R0 "" done
+
+ # Getting install location
+ ReadRegStr $R1 "${INSTDIR_REG_ROOT}" "SOFTWARE\${Application}" "InstallDir"
+ StrCmp $R1 "" done
+
+ # The application is already installed
+ # Asking before running the uninstaller
+ MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "$(alreadyInstalledMessage)" \
+ IDOK uninst
+ Abort
+
+ # Running the uninstaller
+ uninst:
+ ExecWait '$R0 _?=$R1'
+
+ done:
+ # Checking installed JRE
+ Call CheckInstalledJRE
+ StrCpy $JAVA_HOME_DIR "$JREPath"
+
+ # Preparing the uninstall log
+ !insertmacro UNINSTALL.LOG_PREPARE_INSTALL
+ FunctionEnd
+
+ #
+ # </onInit>
+ #
+
+ #
+ # <onInstSuccess>
+ #
+
+ Function .onInstSuccess
+ # Updating the uninstall log
+ !insertmacro UNINSTALL.LOG_UPDATE_INSTALL
+ FunctionEnd
+
+ #
+ # </onInstSuccess>
+ #
+
+ #
+ # <UN.onInit>
+ #
+
+ Function UN.onInit
+ # Begin uninstall
+ !insertmacro UNINSTALL.LOG_BEGIN_UNINSTALL
+ FunctionEnd
+
+ #
+ # </UN.onInit>
+ #
+
+ #
+ # <CheckInstalledJRE>
+ #
+
+ Function CheckInstalledJRE
+ Push "${JREVersion}"
+ Call DetectJRE
+ Exch $0 ; Get return value from stack
+ StrCmp $0 "0" End
+ StrCmp $0 "-1" End
+ Goto JREAlreadyInstalled
+
+ JREAlreadyInstalled:
+ StrCpy $JREPath "$0"
+ Pop $0 # Restore $0
+ Return
+
+ End:
+ FunctionEnd
+
+ #
+ # </CheckInstalledJRE>
+ #
+
+ #
+ # <DetectJRE>
+ #
+
+ # DetectJRE. Version requested is on the stack.
+ # Returns (on stack): 0 - JRE not found. -1 - JRE found but too old. Otherwise - Path to JAVA EXE
+ # Stack value will be overwritten!
+ Function DetectJRE
+ Exch $0 ; Get version requested
+ ; Now the previous value of $0 is on the stack, and the asked for version of JDK is in $0
+ Push $1 ; $1 = Java version string (ie 1.5.0)
+ Push $2 ; $2 = Javahome
+ Push $3 ; $3 and $4 are used for checking the major/minor version of java
+ Push $4
+ ;MessageBox MB_OK "Detecting JRE"
+ ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
+ ;MessageBox MB_OK "Read : $1"
+ StrCmp $1 "" DetectTry2
+ ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$1" "JavaHome"
+ ;MessageBox MB_OK "Read 3: $2"
+ StrCmp $2 "" DetectTry2
+ Goto GetJRE
+
+ DetectTry2:
+ ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Development Kit" "CurrentVersion"
+ ;MessageBox MB_OK "Detect Read : $1"
+ StrCmp $1 "" NoFound
+ ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Development Kit\$1" "JavaHome"
+ ;MessageBox MB_OK "Detect Read 3: $2"
+ StrCmp $2 "" NoFound
+
+ GetJRE:
+ ; $0 = version requested. $1 = version found. $2 = javaHome
+ ;MessageBox MB_OK "Getting JRE"
+ IfFileExists "$2\bin\java.exe" 0 NoFound
+ StrCpy $3 $0 1 ; Get major version. Example: $1 = 1.5.0, now $3 = 1
+ StrCpy $4 $1 1 ; $3 = major version requested, $4 = major version found
+ ;MessageBox MB_OK "Want $3 , found $4"
+ IntCmp $4 $3 0 FoundOld FoundNew
+ StrCpy $3 $0 1 2
+ StrCpy $4 $1 1 2 ; Same as above. $3 is minor version requested, $4 is minor version installed
+ ;MessageBox MB_OK "Want $3 , found $4"
+ IntCmp $4 $3 FoundNew FoundOld FoundNew
+
+ NoFound:
+ ;MessageBox MB_OK "JRE not found"
+ Push "0"
+ Goto DetectJREEnd
+
+ FoundOld:
+ MessageBox MB_OK "JRE too old: $3 is older than $4"
+ ; Push ${TEMP2}
+ Push "-1"
+ Goto DetectJREEnd
+ FoundNew:
+ ;MessageBox MB_OK "JRE is new: $3 is newer than $4"
+
+ Push "$2"
+ ; Push "OK"
+ ; Return
+ Goto DetectJREEnd
+ DetectJREEnd:
+ ; Top of stack is return value, then r4,r3,r2,r1
+ Exch ; => r4,rv,r3,r2,r1,r0
+ Pop $4 ; => rv,r3,r2,r1r,r0
+ Exch ; => r3,rv,r2,r1,r0
+ Pop $3 ; => rv,r2,r1,r0
+ Exch ; => r2,rv,r1,r0
+ Pop $2 ; => rv,r1,r0
+ Exch ; => r1,rv,r0
+ Pop $1 ; => rv,r0
+ Exch ; => r0,rv
+ Pop $0 ; => rv
+ FunctionEnd
+
+ #
+ # </DetectJRE>
+ #
+
+ #
+ # <ReplaceInFile>
+ #
+
+ Function ReplaceInFile
+ ;
+ Exch $R0 ;file name to search in
+ Exch
+ Exch $R4 ;callback function handle
+ Push $R1 ;file handle
+ Push $R2 ;temp file name
+ Push $R3 ;temp file handle
+ Push $R5 ;line read
+
+ GetTempFileName $R2
+ FileOpen $R1 $R0 r ;file to search in
+ FileOpen $R3 $R2 w ;temp file
+
+ loop_read:
+ ClearErrors
+ FileRead $R1 $R5 ;read line
+ Push $R5 ; put line on stack
+ Call $R4
+ Pop $R5 ; read line from stack
+ IfErrors exit
+ FileWrite $R3 $R5 ;write modified line
+ Goto loop_read
+ exit:
+ FileClose $R1
+ FileClose $R3
+
+ SetDetailsPrint none
+ Delete $R0
+ Rename $R2 $R0
+ Delete $R2
+ SetDetailsPrint both
+
+ ; pop in reverse order
+ Pop $R5
+ Pop $R3
+ Pop $R2
+ Pop $R1
+ Pop $R4
+ Pop $R0
+ FunctionEnd
+
+ #
+ # </ReplaceInFile>
+ #
+
+ #
+ # <ReplaceJavaHome>
+ #
+
+ # Replaces the '@java.home@' placeholder
+ Function ReplaceJavaHome
+ Push $R1
+ Exch
+
+ Push "@java.home@" # String to find
+ Push "$JAVA_HOME_DIR" # Replacement string
+ Call StrReplace
+
+ ; restore stack
+ Exch
+ Pop $R1
+ FunctionEnd
+
+ #
+ # </ReplaceJavaHome>
+ #
+
+ #
+ # <StrReplace>
+ #
+
+ Var STR_REPLACE_VAR_0
+ Var STR_REPLACE_VAR_1
+ Var STR_REPLACE_VAR_2
+ Var STR_REPLACE_VAR_3
+ Var STR_REPLACE_VAR_4
+ Var STR_REPLACE_VAR_5
+ Var STR_REPLACE_VAR_6
+ Var STR_REPLACE_VAR_7
+ Var STR_REPLACE_VAR_8
+
+ Function StrReplace
+ Exch $STR_REPLACE_VAR_2
+ Exch 1
+ Exch $STR_REPLACE_VAR_1
+ Exch 2
+ Exch $STR_REPLACE_VAR_0
+ StrCpy $STR_REPLACE_VAR_3 -1
+ StrLen $STR_REPLACE_VAR_4 $STR_REPLACE_VAR_1
+ StrLen $STR_REPLACE_VAR_6 $STR_REPLACE_VAR_0
+ loop:
+ IntOp $STR_REPLACE_VAR_3 $STR_REPLACE_VAR_3 + 1
+ StrCpy $STR_REPLACE_VAR_5 $STR_REPLACE_VAR_0 $STR_REPLACE_VAR_4 $STR_REPLACE_VAR_3
+ StrCmp $STR_REPLACE_VAR_5 $STR_REPLACE_VAR_1 found
+ StrCmp $STR_REPLACE_VAR_3 $STR_REPLACE_VAR_6 done
+ Goto loop
+ found:
+ StrCpy $STR_REPLACE_VAR_5 $STR_REPLACE_VAR_0 $STR_REPLACE_VAR_3
+ IntOp $STR_REPLACE_VAR_8 $STR_REPLACE_VAR_3 + $STR_REPLACE_VAR_4
+ StrCpy $STR_REPLACE_VAR_7 $STR_REPLACE_VAR_0 "" $STR_REPLACE_VAR_8
+ StrCpy $STR_REPLACE_VAR_0 $STR_REPLACE_VAR_5$STR_REPLACE_VAR_2$STR_REPLACE_VAR_7
+ StrLen $STR_REPLACE_VAR_6 $STR_REPLACE_VAR_0
+ Goto loop
+ done:
+ Pop $STR_REPLACE_VAR_1 ; Prevent "invalid opcode" errors and keep the
+ Pop $STR_REPLACE_VAR_1 ; stack as it was before the function was called
+ Exch $STR_REPLACE_VAR_0
+ FunctionEnd
+
+ !macro _strReplaceConstructor OUT NEEDLE NEEDLE2 HAYSTACK
+ Push "${HAYSTACK}"
+ Push "${NEEDLE}"
+ Push "${NEEDLE2}"
+ Call StrReplace
+ Pop "${OUT}"
+ !macroend
+
+ !define StrReplace '!insertmacro "_strReplaceConstructor"'
+
+ #
+ # </StrReplace>
+ #
diff --git a/application/application-win32-x86/pom.xml b/application/application-win32-x86/pom.xml
index a7fa7e6..2f48738 100644
--- a/application/application-win32-x86/pom.xml
+++ b/application/application-win32-x86/pom.xml
@@ -137,7 +137,7 @@
<goal>copy-eclipse-artifact</goal>
</goals>
<configuration>
- <destinationDirectory>${plugins-dir}</destinationDirectory>
+ <outputDirectory>${plugins-dir}</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.eclipse.core.filesystem.win32</groupId>
diff --git a/application/application-win32-x86_64-exe/pom.xml b/application/application-win32-x86_64-exe/pom.xml
index f79c8c6..a1b579d 100644
--- a/application/application-win32-x86_64-exe/pom.xml
+++ b/application/application-win32-x86_64-exe/pom.xml
@@ -33,7 +33,7 @@
<properties>
<tmp-dir>${project.build.directory}/ApacheDirectoryStudio-win32-x86_64-exe-tmp</tmp-dir>
<files-dir>${tmp-dir}/files</files-dir>
- <installer-file-name>ApacheDirectoryStudio-win32-x86_64-${version}.exe</installer-file-name>
+ <installer-file-name>ApacheDirectoryStudio-win32-x86_64-${project.version}.exe</installer-file-name>
<installers.makensis>makensis</installers.makensis>
</properties>
@@ -84,6 +84,7 @@
<copy file="src/main/resources/header_studio.bmp" todir="${tmp-dir}"/>
<copy file="src/main/resources/studio-installer.ico" todir="${tmp-dir}"/>
<copy file="src/main/resources/welcome_studio.bmp" todir="${tmp-dir}"/>
+ <copy file="src/main/resources/Apache Directory Studio.ini" todir="${tmp-dir}"/>
</target>
</configuration>
<goals>
@@ -134,6 +135,47 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!-- MAVEN_DEFAULT_EXCLUDES -->
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <!-- ECLIPSE_DEFAULT_EXCLUDES -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <!-- IDEA_DEFAULT_EXCLUDES -->
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <!-- MANIFEST_MF_EXCLUDES -->
+ <exclude>**/MANIFEST.MF</exclude>
+ <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <!-- GITIGNORE_EXCLUDES -->
+ <exclude>**/.gitignore</exclude>
+ <!-- ABOUT_EXCLUDES -->
+ <exclude>**/about.ini</exclude>
+ <exclude>**/about_files/*</exclude>
+ <!-- LOG_FILES_EXCLUDES -->
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.vm</exclude>
+ <!-- NSIS_EXCLUDES -->
+ <exclude>**/src/main/resources/AdvUninstLog.nsh</exclude>
+ <!-- OTHER_EXCLUDES -->
+ <exclude>**/*.bmp</exclude>
+ <exclude>src/main/resources/Apache Directory Studio.ini</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
diff --git a/application/application-win32-x86_64-exe/src/main/resources/Apache Directory Studio.ini b/application/application-win32-x86_64-exe/src/main/resources/Apache Directory Studio.ini
new file mode 100644
index 0000000..522054f
--- /dev/null
+++ b/application/application-win32-x86_64-exe/src/main/resources/Apache Directory Studio.ini
@@ -0,0 +1,2 @@
+-vm
+@java.home@\bin
\ No newline at end of file
diff --git a/application/application-win32-x86_64-exe/src/main/resources/installer.nsi b/application/application-win32-x86_64-exe/src/main/resources/installer.nsi
index 3033927..193e11c 100755
--- a/application/application-win32-x86_64-exe/src/main/resources/installer.nsi
+++ b/application/application-win32-x86_64-exe/src/main/resources/installer.nsi
@@ -27,9 +27,13 @@
!define HeaderImage "header_studio.bmp"
!define OutFile "../@installer-file-name@"
!define SourceFolder "ApacheDirectoryStudio-win32-x86_64-${Version}"
+ !define JREVersion "1.5.0"
!define INSTDIR_REG_ROOT "HKLM"
!define INSTDIR_REG_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Application}"
+ # Variables needed for JRE detection
+ Var JREPath
+
#
# Modules inclusions
#
@@ -98,6 +102,13 @@
# Directory page
#!define MUI_DIRECTORYPAGE_VARIABLE $APPLICATION_HOME_DIR
!insertmacro MUI_PAGE_DIRECTORY
+
+ # JRE directory page
+ Var JAVA_HOME_DIR
+ !define MUI_DIRECTORYPAGE_VARIABLE $JAVA_HOME_DIR
+ !define MUI_DIRECTORYPAGE_TEXT_DESTINATION "$(javaPageTitle)"
+ !define MUI_DIRECTORYPAGE_TEXT_TOP "$(javaPageMessage)"
+ !insertmacro MUI_PAGE_DIRECTORY
# Installation page
!insertmacro MUI_PAGE_INSTFILES
@@ -116,61 +127,6 @@
!insertmacro MUI_UNPAGE_INSTFILES
#
-# Languages (the first one is the default one)
-#
- !insertmacro MUI_LANGUAGE "English"
- !insertmacro MUI_LANGUAGE "French"
- !insertmacro MUI_LANGUAGE "German"
-
-#
-# Functions
-#
- # Internationalized strings
- LangString message ${LANG_ENGLISH} "${Application} is already installed.$\n$\nClick 'OK' to remove the previous version$\nor 'Cancel' to cancel this installation."
- LangString message ${LANG_FRENCH} "${Application} est déjà installé.$\n$\nCliquez sur 'OK' pour supprimer la version précédente$\nou sur 'Annuler' pour annuler cette installation."
- LangString message ${LANG_GERMAN} "${Application} ist bereits installiert.$\n$\nKlicke 'OK' um die frühere Version zu entfernen$\noder 'Abbruch' um die Installation abzubrechen."
-
- # onInit function
- Function .onInit
- # Preventing the window to close automatically at the end of the (un)installation
- SetAutoClose false
-
- # Verifying if the application is already installed
- ReadRegStr $R0 "${INSTDIR_REG_ROOT}" "${INSTDIR_REG_KEY}" "UninstallString"
- StrCmp $R0 "" done
-
- # Getting install location
- ReadRegStr $R1 "${INSTDIR_REG_ROOT}" "SOFTWARE\${Application}" "InstallDir"
- StrCmp $R1 "" done
-
- # The application is already installed
- # Asking before running the uninstaller
- MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "$(message)" \
- IDOK uninst
- Abort
-
- # Running the uninstaller
- uninst:
- ExecWait '$R0 _?=$R1'
-
- done:
- # Preparing the uninstall log
- !insertmacro UNINSTALL.LOG_PREPARE_INSTALL
- FunctionEnd
-
- # onInstSuccess function
- Function .onInstSuccess
- # Updating the uninstall log
- !insertmacro UNINSTALL.LOG_UPDATE_INSTALL
- FunctionEnd
-
- # UN.onInit function
- Function UN.onInit
- # Begin uninstall
- !insertmacro UNINSTALL.LOG_BEGIN_UNINSTALL
- FunctionEnd
-
-#
# Sections
#
# Installer section
@@ -182,6 +138,13 @@
# Adding installer source files
File /r "${SourceFolder}\*"
+ File "Apache Directory Studio.ini"
+
+ # Replacing Java home directory in config file
+ GetFunctionAddress $R0 ReplaceJavaHome # handle to callback fn
+ Push $R0
+ Push "$INSTDIR\Apache Directory Studio.ini" # file to replace in
+ Call ReplaceInFile
# Storing install location
WriteRegStr "${INSTDIR_REG_ROOT}" "SOFTWARE\${Application}" "InstallDir" $INSTDIR
@@ -230,3 +193,324 @@
# Removing registry keys
DeleteRegKey "${INSTDIR_REG_ROOT}" "${INSTDIR_REG_KEY}"
SectionEnd
+
+#
+# Languages (the first one is the default one)
+#
+ !insertmacro MUI_LANGUAGE "English"
+ !insertmacro MUI_LANGUAGE "French"
+ !insertmacro MUI_LANGUAGE "German"
+
+#
+# Functions
+#
+ # Internationalized strings
+ LangString alreadyInstalledMessage ${LANG_ENGLISH} "${Application} is already installed.$\n$\nClick 'OK' to remove the previous version$\nor 'Cancel' to cancel this installation."
+ LangString alreadyInstalledMessage ${LANG_FRENCH} "${Application} est déjà installé.$\n$\nCliquez sur 'OK' pour supprimer la version précédente$\nou sur 'Annuler' pour annuler cette installation."
+ LangString alreadyInstalledMessage ${LANG_GERMAN} "${Application} ist bereits installiert.$\n$\nKlicke 'OK' um die frühere Version zu entfernen$\noder 'Abbruch' um die Installation abzubrechen."
+
+ LangString javaPageTitle ${LANG_ENGLISH} "Java Home Directory"
+ LangString javaPageTitle ${LANG_FRENCH} "Répertoire Java Home"
+ LangString javaPageTitle ${LANG_GERMAN} "Java Home Verzeichnis"
+
+ LangString javaPageMessage ${LANG_ENGLISH} "Select the Java Home directory you would like to use to run ${Application}."
+ LangString javaPageMessage ${LANG_FRENCH} "Sélectionnez le répertoire Java Home que vous souhaitez utiliser pour ${Application}"
+ LangString javaPageMessage ${LANG_GERMAN} "Wählen Sie das Java Home Verzeichnis, das Sie verwenden möchten, um ${Application} laufen."
+
+ #
+ # <onInit>
+ #
+
+ Function .onInit
+ # Preventing the window to close automatically at the end of the (un)installation
+ SetAutoClose false
+
+ # Verifying if the application is already installed
+ ReadRegStr $R0 "${INSTDIR_REG_ROOT}" "${INSTDIR_REG_KEY}" "UninstallString"
+ StrCmp $R0 "" done
+
+ # Getting install location
+ ReadRegStr $R1 "${INSTDIR_REG_ROOT}" "SOFTWARE\${Application}" "InstallDir"
+ StrCmp $R1 "" done
+
+ # The application is already installed
+ # Asking before running the uninstaller
+ MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "$(alreadyInstalledMessage)" \
+ IDOK uninst
+ Abort
+
+ # Running the uninstaller
+ uninst:
+ ExecWait '$R0 _?=$R1'
+
+ done:
+ # Checking installed JRE
+ Call CheckInstalledJRE
+ StrCpy $JAVA_HOME_DIR "$JREPath"
+
+ # Preparing the uninstall log
+ !insertmacro UNINSTALL.LOG_PREPARE_INSTALL
+ FunctionEnd
+
+ #
+ # </onInit>
+ #
+
+ #
+ # <onInstSuccess>
+ #
+
+ Function .onInstSuccess
+ # Updating the uninstall log
+ !insertmacro UNINSTALL.LOG_UPDATE_INSTALL
+ FunctionEnd
+
+ #
+ # </onInstSuccess>
+ #
+
+ #
+ # <UN.onInit>
+ #
+
+ Function UN.onInit
+ # Begin uninstall
+ !insertmacro UNINSTALL.LOG_BEGIN_UNINSTALL
+ FunctionEnd
+
+ #
+ # </UN.onInit>
+ #
+
+ #
+ # <CheckInstalledJRE>
+ #
+
+ Function CheckInstalledJRE
+ Push "${JREVersion}"
+ Call DetectJRE
+ Exch $0 ; Get return value from stack
+ StrCmp $0 "0" End
+ StrCmp $0 "-1" End
+ Goto JREAlreadyInstalled
+
+ JREAlreadyInstalled:
+ StrCpy $JREPath "$0"
+ Pop $0 # Restore $0
+ Return
+
+ End:
+ FunctionEnd
+
+ #
+ # </CheckInstalledJRE>
+ #
+
+ #
+ # <DetectJRE>
+ #
+
+ # DetectJRE. Version requested is on the stack.
+ # Returns (on stack): 0 - JRE not found. -1 - JRE found but too old. Otherwise - Path to JAVA EXE
+ # Stack value will be overwritten!
+ Function DetectJRE
+ SetRegView 64
+ Exch $0 ; Get version requested
+ ; Now the previous value of $0 is on the stack, and the asked for version of JDK is in $0
+ Push $1 ; $1 = Java version string (ie 1.5.0)
+ Push $2 ; $2 = Javahome
+ Push $3 ; $3 and $4 are used for checking the major/minor version of java
+ Push $4
+ ;MessageBox MB_OK "Detecting JRE"
+ ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
+ ;MessageBox MB_OK "Read : $1"
+ StrCmp $1 "" DetectTry2
+ ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$1" "JavaHome"
+ ;MessageBox MB_OK "Read 3: $2"
+ StrCmp $2 "" DetectTry2
+ Goto GetJRE
+
+ DetectTry2:
+ ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Development Kit" "CurrentVersion"
+ ;MessageBox MB_OK "Detect Read : $1"
+ StrCmp $1 "" NoFound
+ ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Development Kit\$1" "JavaHome"
+ ;MessageBox MB_OK "Detect Read 3: $2"
+ StrCmp $2 "" NoFound
+
+ GetJRE:
+ ; $0 = version requested. $1 = version found. $2 = javaHome
+ ;MessageBox MB_OK "Getting JRE"
+ IfFileExists "$2\bin\java.exe" 0 NoFound
+ StrCpy $3 $0 1 ; Get major version. Example: $1 = 1.5.0, now $3 = 1
+ StrCpy $4 $1 1 ; $3 = major version requested, $4 = major version found
+ ;MessageBox MB_OK "Want $3 , found $4"
+ IntCmp $4 $3 0 FoundOld FoundNew
+ StrCpy $3 $0 1 2
+ StrCpy $4 $1 1 2 ; Same as above. $3 is minor version requested, $4 is minor version installed
+ ;MessageBox MB_OK "Want $3 , found $4"
+ IntCmp $4 $3 FoundNew FoundOld FoundNew
+
+ NoFound:
+ ;MessageBox MB_OK "JRE not found"
+ Push "0"
+ Goto DetectJREEnd
+
+ FoundOld:
+ MessageBox MB_OK "JRE too old: $3 is older than $4"
+ ; Push ${TEMP2}
+ Push "-1"
+ Goto DetectJREEnd
+ FoundNew:
+ ;MessageBox MB_OK "JRE is new: $3 is newer than $4"
+
+ Push "$2"
+ ; Push "OK"
+ ; Return
+ Goto DetectJREEnd
+ DetectJREEnd:
+ SetRegView 32
+ ; Top of stack is return value, then r4,r3,r2,r1
+ Exch ; => r4,rv,r3,r2,r1,r0
+ Pop $4 ; => rv,r3,r2,r1r,r0
+ Exch ; => r3,rv,r2,r1,r0
+ Pop $3 ; => rv,r2,r1,r0
+ Exch ; => r2,rv,r1,r0
+ Pop $2 ; => rv,r1,r0
+ Exch ; => r1,rv,r0
+ Pop $1 ; => rv,r0
+ Exch ; => r0,rv
+ Pop $0 ; => rv
+ FunctionEnd
+
+ #
+ # </DetectJRE>
+ #
+
+ #
+ # <ReplaceInFile>
+ #
+
+ Function ReplaceInFile
+ ;
+ Exch $R0 ;file name to search in
+ Exch
+ Exch $R4 ;callback function handle
+ Push $R1 ;file handle
+ Push $R2 ;temp file name
+ Push $R3 ;temp file handle
+ Push $R5 ;line read
+
+ GetTempFileName $R2
+ FileOpen $R1 $R0 r ;file to search in
+ FileOpen $R3 $R2 w ;temp file
+
+ loop_read:
+ ClearErrors
+ FileRead $R1 $R5 ;read line
+ Push $R5 ; put line on stack
+ Call $R4
+ Pop $R5 ; read line from stack
+ IfErrors exit
+ FileWrite $R3 $R5 ;write modified line
+ Goto loop_read
+ exit:
+ FileClose $R1
+ FileClose $R3
+
+ SetDetailsPrint none
+ Delete $R0
+ Rename $R2 $R0
+ Delete $R2
+ SetDetailsPrint both
+
+ ; pop in reverse order
+ Pop $R5
+ Pop $R3
+ Pop $R2
+ Pop $R1
+ Pop $R4
+ Pop $R0
+ FunctionEnd
+
+ #
+ # </ReplaceInFile>
+ #
+
+ #
+ # <ReplaceJavaHome>
+ #
+
+ # Replaces the '@java.home@' placeholder
+ Function ReplaceJavaHome
+ Push $R1
+ Exch
+
+ Push "@java.home@" # String to find
+ Push "$JAVA_HOME_DIR" # Replacement string
+ Call StrReplace
+
+ ; restore stack
+ Exch
+ Pop $R1
+ FunctionEnd
+
+ #
+ # </ReplaceJavaHome>
+ #
+
+ #
+ # <StrReplace>
+ #
+
+ Var STR_REPLACE_VAR_0
+ Var STR_REPLACE_VAR_1
+ Var STR_REPLACE_VAR_2
+ Var STR_REPLACE_VAR_3
+ Var STR_REPLACE_VAR_4
+ Var STR_REPLACE_VAR_5
+ Var STR_REPLACE_VAR_6
+ Var STR_REPLACE_VAR_7
+ Var STR_REPLACE_VAR_8
+
+ Function StrReplace
+ Exch $STR_REPLACE_VAR_2
+ Exch 1
+ Exch $STR_REPLACE_VAR_1
+ Exch 2
+ Exch $STR_REPLACE_VAR_0
+ StrCpy $STR_REPLACE_VAR_3 -1
+ StrLen $STR_REPLACE_VAR_4 $STR_REPLACE_VAR_1
+ StrLen $STR_REPLACE_VAR_6 $STR_REPLACE_VAR_0
+ loop:
+ IntOp $STR_REPLACE_VAR_3 $STR_REPLACE_VAR_3 + 1
+ StrCpy $STR_REPLACE_VAR_5 $STR_REPLACE_VAR_0 $STR_REPLACE_VAR_4 $STR_REPLACE_VAR_3
+ StrCmp $STR_REPLACE_VAR_5 $STR_REPLACE_VAR_1 found
+ StrCmp $STR_REPLACE_VAR_3 $STR_REPLACE_VAR_6 done
+ Goto loop
+ found:
+ StrCpy $STR_REPLACE_VAR_5 $STR_REPLACE_VAR_0 $STR_REPLACE_VAR_3
+ IntOp $STR_REPLACE_VAR_8 $STR_REPLACE_VAR_3 + $STR_REPLACE_VAR_4
+ StrCpy $STR_REPLACE_VAR_7 $STR_REPLACE_VAR_0 "" $STR_REPLACE_VAR_8
+ StrCpy $STR_REPLACE_VAR_0 $STR_REPLACE_VAR_5$STR_REPLACE_VAR_2$STR_REPLACE_VAR_7
+ StrLen $STR_REPLACE_VAR_6 $STR_REPLACE_VAR_0
+ Goto loop
+ done:
+ Pop $STR_REPLACE_VAR_1 ; Prevent "invalid opcode" errors and keep the
+ Pop $STR_REPLACE_VAR_1 ; stack as it was before the function was called
+ Exch $STR_REPLACE_VAR_0
+ FunctionEnd
+
+ !macro _strReplaceConstructor OUT NEEDLE NEEDLE2 HAYSTACK
+ Push "${HAYSTACK}"
+ Push "${NEEDLE}"
+ Push "${NEEDLE2}"
+ Call StrReplace
+ Pop "${OUT}"
+ !macroend
+
+ !define StrReplace '!insertmacro "_strReplaceConstructor"'
+
+ #
+ # </StrReplace>
+ #
diff --git a/application/application-win32-x86_64/pom.xml b/application/application-win32-x86_64/pom.xml
index 124fb12..1463ec9 100644
--- a/application/application-win32-x86_64/pom.xml
+++ b/application/application-win32-x86_64/pom.xml
@@ -152,7 +152,7 @@
<goal>copy-eclipse-artifact</goal>
</goals>
<configuration>
- <destinationDirectory>${plugins-dir}</destinationDirectory>
+ <outputDirectory>${plugins-dir}</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.eclipse.core.filesystem.win32</groupId>
diff --git a/application/docs/Release Notes.txt b/application/docs/Release Notes.txt
index a1d5248..5db2106 100644
--- a/application/docs/Release Notes.txt
+++ b/application/docs/Release Notes.txt
@@ -1,5 +1,110 @@
Release Notes
+Apache Directory Studio 2.0.0-M3
+
+Bug
+ * [DIRSTUDIO-764] - Image Editor does not work correctly
+ * [DIRSTUDIO-765] - Can not export DSML
+ * [DIRSTUDIO-767] - All attribute names are lowercase when using Apache Directory LDAP Client API
+ * [DIRSTUDIO-768] - Error while searching using a filter on a binary attribute
+ * [DIRSTUDIO-769] - Alt-S shortkey does not work in Search Dialog
+ * [DIRSTUDIO-770] - Typos in french translation
+ * [DIRSTUDIO-771] - Searches are not saved when closing Studio 2.0 M1/M2
+ * [DIRSTUDIO-772] - Entry UUID Editor can't display eDirectory GUID
+ * [DIRSTUDIO-773] - IllegalArgumentException thrown when copying the RootDSE
+ * [DIRSTUDIO-776] - Misleading title for action "Open 'Search Result'/'Bookmark'/'Entry' in DIT" in LDAP Browser view context menu
+ * [DIRSTUDIO-777] - Renaming entry fails when using Apache Directory LDAP API
+ * [DIRSTUDIO-778] - NullPointerException when refreshing a TableEntryEditor
+ * [DIRSTUDIO-779] - Label for folded attributes in TableEntryEditor is not updated when quick filter is used
+ * [DIRSTUDIO-783] - The 'Rename Entry' dialog doesn't resize automatically when adding or removing RDN parts
+
+Improvement
+ * [DIRSTUDIO-713] - Improve the 'Show in' sub-menu of the TableEntryEditor
+ * [DIRSTUDIO-780] - Allow Apache Directory Studio to be pinned to Windows 7's taskbar
+ * [DIRSTUDIO-782] - Improve Windows installer with JRE detection and creation of 'Apache Directory Studio.ini' file
+ * [DIRSTUDIO-784] - Add the ability to sort searches in the LDAP Browser view
+ * [DIRSTUDIO-785] - Add the ability to sort bookmarks in the LDAP Browser view
+
+--------------------------------------------------------------------------------
+
+Apache Directory Studio 2.0.0-M2
+
+Bug
+ * [DIRSTUDIO-630] - Importing a Schema project twice shouldn't be possible
+ * [DIRSTUDIO-733] - Error while reading RootDSE on Sun One directory server
+ * [DIRSTUDIO-739] - Using 'Quick Search' in the DN editor while editing some object cancels editing and jumps to 'Quick Search' in the main window
+ * [DIRSTUDIO-759] - Exit confirmation dialog is showed twice when quitting the application by closing the window on Linux and Windows
+ * [DIRSTUDIO-760] - Unable to bind on an Active Directory server using 'domain\userid'
+ * [DIRSTUDIO-763] - Typo in some English error messages ('occured' instead of 'occurred')
+
+--------------------------------------------------------------------------------
+
+Apache Directory Studio 2.0.0-M1
+
+Bug
+ * [DIRSTUDIO-301] - Intermittant ClassCastException from dom4j.DocumentFactory.getInstance()
+ * [DIRSTUDIO-428] - Same Name for attribute type and objectclass
+ * [DIRSTUDIO-454] - Colliding attributeType and objectClass names not supported
+ * [DIRSTUDIO-564] - Update ApacheDS core schema files to the latest version
+ * [DIRSTUDIO-651] - Typo in french translation
+ * [DIRSTUDIO-653] - The 'Choose' text for buttons on the AT and OC selection dialog has not been extracted for localization
+ * [DIRSTUDIO-658] - Exiting Directory Studio consumes CPU for couple of minutes
+ * [DIRSTUDIO-659] - Studio prompts for password even when "No Authentication" is selected
+ * [DIRSTUDIO-663] - can't import openldap schema having an attribute and an objectclass with the same alias
+ * [DIRSTUDIO-673] - Typo in the "check authentication" error message in the french translation
+ * [DIRSTUDIO-696] - ApacheDS Configuration plugin fails to open configuration file version 1.5.5 and 1.5.4 when NTP is enabled
+ * [DIRSTUDIO-698] - KeyDerivation interceptor missing in the ApacheDS Configuration Editor
+ * [DIRSTUDIO-699] - Interceptors order is not read/saved correctly in the ApacheDS Configuration Editor
+ * [DIRSTUDIO-703] - DSML Export fails to export when the size limit is hit
+ * [DIRSTUDIO-704] - NullPointerException creating new online schema editor project
+ * [DIRSTUDIO-708] - NPE when renaming a referral in 'Automatic' or 'Manual' Referral Handling mode
+ * [DIRSTUDIO-710] - SearchResultEntryDsml not setting attribute name correctly
+ * [DIRSTUDIO-716] - Error while opening connection : NPE
+ * [DIRSTUDIO-724] - Too many events: Outline and Modifications Logs views are refreshed multiple times
+ * [DIRSTUDIO-726] - Added a binary attributes in preference is not stored correctly
+ * [DIRSTUDIO-727] - It is possible to add empty Binary Attributes and Binary Syntax Definitions in the preferences
+ * [DIRSTUDIO-728] - Wrong attribute name in entry editor
+ * [DIRSTUDIO-731] - Editing RDN attribute should open rename dialog
+ * [DIRSTUDIO-734] - Schema error: Alias NAME is already used by another item: object class with OID
+ * [DIRSTUDIO-740] - Potential bug when using String.toLowerCase() method with a Turkish locale
+ * [DIRSTUDIO-742] - Directory Studio will not start if its installation directory is not writeable
+ * [DIRSTUDIO-748] - Entry attribute name not displayed correctly in Table Entry Editor.
+ * [DIRSTUDIO-749] - Syntaxes shouldn't have/use 'names' (or 'aliases') but 'description' instead
+ * [DIRSTUDIO-754] - Some values in the 'Text Formats' preference page are not saved between launches
+
+Improvement
+ * [DIRSTUDIO-413] - Add possibility to make connections read-only
+ * [DIRSTUDIO-432] - Better error message for invalid LDIF records on import
+ * [DIRSTUDIO-445] - Allow the user to rename a schema in the editor
+ * [DIRSTUDIO-446] - Allow the user to rename any item using the F2 shortcut
+ * [DIRSTUDIO-447] - Add the ability to use wildcards (?, *) in the ATs or OCs selection dialog to ease the search
+ * [DIRSTUDIO-649] - The 'Installed JREs' preference page should mention Apache DS plugin and not Java projects
+ * [DIRSTUDIO-655] - Switch usage of SWT MessageBox to JFace MessageDialog for info, warning and error dialogs
+ * [DIRSTUDIO-685] - Move duplicated 'ViewFormWidget' class to the 'common.ui' plugin
+ * [DIRSTUDIO-717] - Add application for Windows 64 Bit
+ * [DIRSTUDIO-722] - LDIF parser should allow attribute names with underscore ("_")
+ * [DIRSTUDIO-746] - Add support for the Full Screen feature of OS X Lion
+ * [DIRSTUDIO-752] - Improve fault tolerance when reading an online schema from a connection
+
+New Feature
+ * [DIRSTUDIO-112] - Export schema
+ * [DIRSTUDIO-320] - Studio exits without showing a confirmation dialog
+ * [DIRSTUDIO-692] - User should be able to supress the version line in exported LDIF files
+ * [DIRSTUDIO-694] - Add ability to export certificates in the 'Certificate Validation' preference page
+ * [DIRSTUDIO-712] - Add a 'Go to DN...' action to the Navigate menu in Eclipse
+ * [DIRSTUDIO-755] - Implement the 'Add...' button in the 'Certificate Validation' preference page
+
+Task
+ * [DIRSTUDIO-683] - Add a generic way to run Eclipse Jobs and Studio runnables in the 'common.core' plugin and extend this in other plugins
+ * [DIRSTUDIO-684] - Convert remaining Eclipse Jobs in LDAP Browser to Studio runnable API
+ * [DIRSTUDIO-688] - Remove the 'jars' plugins and create one specific plugin per external library dependency
+ * [DIRSTUDIO-697] - Add support for ApacheDS 1.5.7 'server.xml' configuration file
+ * [DIRSTUDIO-718] - Update Eclipse dependencies to version 3.6.1
+ * [DIRSTUDIO-737] - Update Eclipse dependencies to version 3.7.0
+ * [DIRSTUDIO-751] - Update Eclipse dependencies to version 3.7.1
+
+--------------------------------------------------------------------------------
+
Apache Directory Studio 1.5.3
Bug
diff --git a/application/pom.xml b/application/pom.xml
index 347f1fa..b12b9c8 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -192,6 +192,20 @@
<module>application-win32-x86_64-exe</module>
</modules>
</profile>
+ <!-- Nightly Builds -->
+ <profile>
+ <id>nightly-builds</id>
+ <modules>
+ <module>application-linux-x86</module>
+ <module>application-linux-x86_64</module>
+ <module>application-macosx-x86</module>
+ <module>application-macosx-x86_64</module>
+ <module>application-win32-x86</module>
+ <module>application-win32-x86_64</module>
+ <module>application-updatesite</module>
+ <module>application-nightly-builds</module>
+ </modules>
+ </profile>
</profiles>
<build>
@@ -257,6 +271,9 @@
<!-- OTHER_EXCLUDES -->
<exclude>docs/**/*</exclude>
<exclude>application-updatesite/src/main/resources/*</exclude>
+ <exclude>application-win32-x86-exe/src/main/resources/Apache Directory Studio.ini</exclude>
+ <exclude>application-win32-x86_64-exe/src/main/resources/Apache Directory Studio.ini</exclude>
+ <exclude>**/*.bmp</exclude>
</excludes>
</configuration>
</plugin>
diff --git a/doap_dirstudio.rdf b/doap_dirstudio.rdf
index 9c8f14c..442f1b8 100644
--- a/doap_dirstudio.rdf
+++ b/doap_dirstudio.rdf
@@ -36,9 +36,16 @@
<category rdf:resource="http://projects.apache.org/category/network-client" />
<release>
<Version>
- <name>Stable release</name>
+ <name>Latest stable 1.x release</name>
<created>2010-04-05</created>
- <revision>1.5.3</revision>
+ <revision>1.5.3 (1.5.3.v20100330)</revision>
+ </Version>
+ </release>
+ <release>
+ <Version>
+ <name>Latest 2.x milestone release</name>
+ <created>2012-02-29</created>
+ <revision>2.0 M3 (2.0.0.v20120224)</revision>
</Version>
</release>
<repository>
diff --git a/features/apacheds.configuration.feature/feature.xml b/features/apacheds.configuration.feature/feature.xml
index c898aca..37c8af8 100644
--- a/features/apacheds.configuration.feature/feature.xml
+++ b/features/apacheds.configuration.feature/feature.xml
@@ -8,218 +8,272 @@
image="studio.png">
<description>
- The Apache Directory Studio Apache DS Feature contains all plugins related to Apache DS.
+ The Apache Directory Studio ApacheDS Configuration Feature contains all plugins related to ApacheDS Configuration.
</description>
<copyright>
- © 2006-2011 Apache Software Foundation - All right reserved.
+ © 2006-2012 Apache Software Foundation - All right reserved.
This product includes software developed by the
Apache Software Foundation http://www.apache.org/
Some icons from FAMFAMFAM http://www.famfamfam.com/lab/icons/silk/
</copyright>
<license url="http://www.apache.org/licenses/LICENSE-2.0.html">
- Apache License
+Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-1. Definitions.
-"License" shall mean the terms and conditions for use, reproduction,
-and distribution as defined by Sections 1 through 9 of this document.
-"Licensor" shall mean the copyright owner or entity authorized
-by
-the copyright owner that is granting the License.
-"Legal Entity" shall mean the union of the acting entity and
-all
-other entities that control, are controlled by, or are under
-common
-control with that entity. For the purposes of this definition,
-"control" means (i) the power, direct or indirect, to cause the
-direction or management of such entity, whether by contract or
-otherwise, or (ii) ownership of fifty percent (50%) or more of
-the
-outstanding shares, or (iii) beneficial ownership of such entity.
-"You" (or "Your") shall mean an individual or Legal Entity
-exercising permissions granted by this License.
-"Source" form shall mean the preferred form for making modifications,
-including but not limited to software source code, documentation
-source, and configuration files.
-"Object" form shall mean any form resulting from mechanical
-transformation or translation of a Source form, including but
-not limited to compiled object code, generated documentation,
-and conversions to other media types.
-"Work" shall mean the work of authorship, whether in Source or
-Object form, made available under the License, as indicated by
-a
-copyright notice that is included in or attached to the work
-(an example is provided in the Appendix below).
-"Derivative Works" shall mean any work, whether in Source or
-Object
-form, that is based on (or derived from) the Work and for which
-the
-editorial revisions, annotations, elaborations, or other modifications
-represent, as a whole, an original work of authorship. For the
-purposes
-of this License, Derivative Works shall not include works that
-remain
-separable from, or merely link (or bind by name) to the interfaces
-of,
-the Work and Derivative Works thereof.
-"Contribution" shall mean any work of authorship, including
-the original version of the Work and any modifications or additions
-to that Work or Derivative Works thereof, that is intentionally
-submitted to Licensor for inclusion in the Work by the copyright
-owner
-or by an individual or Legal Entity authorized to submit on behalf
-of
-the copyright owner. For the purposes of this definition, "submitted"
-means any form of electronic, verbal, or written communication
-sent
-to the Licensor or its representatives, including but not limited
-to
-communication on electronic mailing lists, source code control
-systems,
-and issue tracking systems that are managed by, or on behalf
-of, the
-Licensor for the purpose of discussing and improving the Work,
-but
-excluding communication that is conspicuously marked or otherwise
-designated in writing by the copyright owner as "Not a Contribution."
-"Contributor" shall mean Licensor and any individual or Legal
-Entity
-on behalf of whom a Contribution has been received by Licensor
-and
-subsequently incorporated within the Work.
-2. Grant of Copyright License. Subject to the terms and conditions
-of
-this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute
-the
-Work and such Derivative Works in Source or Object form.
-3. Grant of Patent License. Subject to the terms and conditions
-of
-this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-(except as stated in this section) patent license to make, have
-made,
-use, offer to sell, sell, import, and otherwise transfer the
-Work,
-where such license applies only to those patent claims licensable
-by such Contributor that are necessarily infringed by their
-Contribution(s) alone or by combination of their Contribution(s)
-with the Work to which such Contribution(s) was submitted. If
-You
-institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work
-or a Contribution incorporated within the Work constitutes direct
-or contributory patent infringement, then any patent licenses
-granted to You under this License for that Work shall terminate
-as of the date such litigation is filed.
-4. Redistribution. You may reproduce and distribute copies of
-the
-Work or Derivative Works thereof in any medium, with or without
-modifications, and in Source or Object form, provided that You
-meet the following conditions:
-(a) You must give any other recipients of the Work or
-Derivative Works a copy of this License; and
-(b) You must cause any modified files to carry prominent notices
-stating that You changed the files; and
-(c) You must retain, in the Source form of any Derivative Works
-that You distribute, all copyright, patent, trademark, and
-attribution notices from the Source form of the Work,
-excluding those notices that do not pertain to any part of
-the Derivative Works; and
-(d) If the Work includes a "NOTICE" text file as part of its
-distribution, then any Derivative Works that You distribute must
-include a readable copy of the attribution notices contained
-within such NOTICE file, excluding those notices that do not
-pertain to any part of the Derivative Works, in at least one
-of the following places: within a NOTICE text file distributed
-as part of the Derivative Works; within the Source form or
-documentation, if provided along with the Derivative Works; or,
-within a display generated by the Derivative Works, if and
-wherever such third-party notices normally appear. The contents
-of the NOTICE file are for informational purposes only and
-do not modify the License. You may add Your own attribution
-notices within Derivative Works that You distribute, alongside
-or as an addendum to the NOTICE text from the Work, provided
-that such additional attribution notices cannot be construed
-as modifying the License.
-You may add Your own copyright statement to Your modifications
-and
-may provide additional or different license terms and conditions
-for use, reproduction, or distribution of Your modifications,
-or
-for any such Derivative Works as a whole, provided Your use,
-reproduction, and distribution of the Work otherwise complies
-with
-the conditions stated in this License.
-5. Submission of Contributions. Unless You explicitly state otherwise,
-any Contribution intentionally submitted for inclusion in the
-Work
-by You to the Licensor shall be under the terms and conditions
-of
-this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or
-modify
-the terms of any separate license agreement you may have executed
-with Licensor regarding such Contributions.
-6. Trademarks. This License does not grant permission to use
-the trade
-names, trademarks, service marks, or product names of the Licensor,
-except as required for reasonable and customary use in describing
-the
-origin of the Work and reproducing the content of the NOTICE
-file.
-7. Disclaimer of Warranty. Unless required by applicable law
-or
-agreed to in writing, Licensor provides the Work (and each
-Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-or
-implied, including, without limitation, any warranties or conditions
-of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-PARTICULAR PURPOSE. You are solely responsible for determining
-the
-appropriateness of using or redistributing the Work and assume
-any
-risks associated with Your exercise of permissions under this
-License.
-8. Limitation of Liability. In no event and under no legal theory,
-whether in tort (including negligence), contract, or otherwise,
-unless required by applicable law (such as deliberate and grossly
-negligent acts) or agreed to in writing, shall any Contributor
-be
-liable to You for damages, including any direct, indirect, special,
-incidental, or consequential damages of any character arising
-as a
-result of this License or out of the use or inability to use
-the
-Work (including but not limited to damages for loss of goodwill,
-work stoppage, computer failure or malfunction, or any and all
-other commercial damages or losses), even if such Contributor
-has been advised of the possibility of such damages.
-9. Accepting Warranty or Additional Liability. While redistributing
-the Work or Derivative Works thereof, You may choose to offer,
-and charge a fee for, acceptance of support, warranty, indemnity,
-or other liability obligations and/or rights consistent with
-this
-License. However, in accepting such obligations, You may act
-only
-on Your own behalf and on Your sole responsibility, not on behalf
-of any other Contributor, and only if You agree to indemnify,
-defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by
-reason
-of your accepting any such warranty or additional liability.
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
</license>
<url>
- <update label="Apache Directory Studio" url="http://directory.apache.org/studio/update/1.x"/>
+ <update label="Apache Directory Studio" url="http://directory.apache.org/studio/update/2.x"/>
</url>
+ <requires>
+ <import plugin="org.eclipse.core.resources"/>
+ <import plugin="org.eclipse.core.runtime"/>
+ <import plugin="org.eclipse.jface.text"/>
+ <import plugin="org.eclipse.search"/>
+ <import plugin="org.eclipse.ui"/>
+ <import plugin="org.eclipse.ui.editors"/>
+ <import plugin="org.eclipse.ui.forms"/>
+ <import plugin="org.eclipse.ui.ide"/>
+ <import plugin="org.eclipse.ui.workbench.texteditor"/>
+ </requires>
+
+ <plugin
+ id="org.antlr.antlr"
+ download-size="0"
+ install-size="0"
+ version="${org.antlr.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.collections"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.collections.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.lang"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.lang.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.asn1.api"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.asn1.ber"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.i18n"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.model"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.util"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.common.ui"
+ download-size="0"
+ install-size="0"
+ version="${pom.version}"
+ unpack="false"/>
+
<plugin
id="org.apache.directory.studio.apacheds.configuration"
download-size="0"
@@ -233,12 +287,19 @@
install-size="0"
version="${pom.version}"
unpack="false"/>
-
+
<plugin
- id="org.apache.directory.studio.common.ui"
+ id="org.dom4j.dom4j"
download-size="0"
install-size="0"
- version="${pom.version}"
+ version="${org.dom4j.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.slf4j.api"
+ download-size="0"
+ install-size="0"
+ version="${org.slf4j.version}"
unpack="false"/>
</feature>
diff --git a/features/apacheds.configuration.feature/pom.xml b/features/apacheds.configuration.feature/pom.xml
index b007fc4..d319e65 100644
--- a/features/apacheds.configuration.feature/pom.xml
+++ b/features/apacheds.configuration.feature/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>apacheds.configuration.feature</artifactId>
- <name>Apache Directory Studio Apache DS Configuration Feature</name>
+ <name>Apache Directory Studio ApacheDS Configuration Feature</name>
<packaging>jar</packaging>
<description />
diff --git a/features/apacheds.configuration.v2.feature/feature.xml b/features/apacheds.configuration.v2.feature/feature.xml
new file mode 100644
index 0000000..936e914
--- /dev/null
+++ b/features/apacheds.configuration.v2.feature/feature.xml
@@ -0,0 +1,522 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.apache.directory.studio.apacheds.configuration.v2.feature"
+ label="Apache Directory Studio ApacheDS 2.0 Configuration"
+ version="${pom.version}"
+ provider-name="Apache Software Foundation"
+ plugin="org.apache.directory.studio.apacheds.configuration.v2"
+ image="studio.png">
+
+ <description>
+ The Apache Directory Studio ApacheDS 2.0 Configuration Feature contains all plugins related to ApacheDS 2.0 Configuration.
+ </description>
+
+ <copyright>
+ © 2006-2012 Apache Software Foundation - All right reserved.
+This product includes software developed by the
+Apache Software Foundation http://www.apache.org/
+Some icons from FAMFAMFAM http://www.famfamfam.com/lab/icons/silk/
+ </copyright>
+
+ <license url="http://www.apache.org/licenses/LICENSE-2.0.html">
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+ </license>
+
+ <url>
+ <update label="Apache Directory Studio" url="http://directory.apache.org/studio/update/2.x"/>
+ </url>
+
+ <requires>
+ <import plugin="org.eclipse.core.contenttype"/>
+ <import plugin="org.eclipse.core.resources"/>
+ <import plugin="org.eclipse.core.runtime"/>
+ <import plugin="org.eclipse.jface.text"/>
+ <import plugin="org.eclipse.ui"/>
+ <import plugin="org.eclipse.ui.editors"/>
+ <import plugin="org.eclipse.ui.forms"/>
+ <import plugin="org.eclipse.ui.ide"/>
+ <import plugin="org.eclipse.ui.workbench.texteditor"/>
+ </requires>
+
+ <plugin
+ id="net.sf.ehcache.core"
+ download-size="0"
+ install-size="0"
+ version="${net.sf.ehcache.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.antlr.antlr"
+ download-size="0"
+ install-size="0"
+ version="${org.antlr.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.codec"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.codec.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.collections"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.collections.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.io"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.io.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.lang"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.lang.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.logging"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.logging.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.pool"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.pool.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.server.config"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.server.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.server.core"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.server.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.server.core.api"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.server.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.server.core.avl"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.server.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.server.core.constants"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.server.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.server.i18n"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.server.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.server.ldif.partition"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.server.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.server.xdbm.partition"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.server.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.asn1.api"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.asn1.ber"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.dsmlv2.parser"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.i18n"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.client.api"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.codec.core"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.extras.aci"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.extras.trigger"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.extras.util"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.model"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.net.mina"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.schema"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.util"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.apacheds.configuration.v2"
+ download-size="0"
+ install-size="0"
+ version="${pom.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.common.core"
+ download-size="0"
+ install-size="0"
+ version="${pom.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.common.ui"
+ download-size="0"
+ install-size="0"
+ version="${pom.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.connection.core"
+ download-size="0"
+ install-size="0"
+ version="${pom.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.connection.ui"
+ download-size="0"
+ install-size="0"
+ version="${pom.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.ldapbrowser.core"
+ download-size="0"
+ install-size="0"
+ version="${pom.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.ldifparser"
+ download-size="0"
+ install-size="0"
+ version="${pom.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.httpcomponents.httpclient"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.httpcomponents.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.httpcomponents.httpcore"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.httpcomponents.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.logging.log4j"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.logging.log4j.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.mina.core"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.mina.core.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.bouncycastle.bcprov.jdk15"
+ download-size="0"
+ install-size="0"
+ version="${org.bouncycastle.bcprov.jdk15.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.dom4j.dom4j"
+ download-size="0"
+ install-size="0"
+ version="${org.dom4j.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.slf4j.api"
+ download-size="0"
+ install-size="0"
+ version="${org.slf4j.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.xpp3.xpp3"
+ download-size="0"
+ install-size="0"
+ version="${org.xpp3.validversion}"
+ unpack="false"/>
+
+</feature>
diff --git a/features/apacheds.configuration.v2.feature/pom.xml b/features/apacheds.configuration.v2.feature/pom.xml
new file mode 100644
index 0000000..00885d3
--- /dev/null
+++ b/features/apacheds.configuration.v2.feature/pom.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!--
+ @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>parent-features</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>apacheds.configuration.v2.feature</artifactId>
+ <name>Apache Directory Studio ApacheDS 2.0 Configuration Feature</name>
+ <packaging>jar</packaging>
+
+ <description />
+
+ <build>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>feature.xml</include>
+ <include>studio.png</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ <projectnatures>
+ <projectnature>org.eclipse.pde.FeatureNature</projectnature>
+ </projectnatures>
+ <buildcommands>
+ <buildcommand>org.eclipse.pde.FeatureBuilder</buildcommand>
+ </buildcommands>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ </plugin>
+ <!-- MANIFEST.MF Generation -->
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton:=true</Bundle-SymbolicName>
+ <Bundle-Localization>plugin</Bundle-Localization>
+ <Eclipse-LazyStart>true</Eclipse-LazyStart>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>studio-maven-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <createManifest>true</createManifest>
+ </configuration>
+ </plugin>
+ <!-- No tests to run -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/features/apacheds.configuration.v2.feature/src/site/site.xml b/features/apacheds.configuration.v2.feature/src/site/site.xml
new file mode 100644
index 0000000..8f27351
--- /dev/null
+++ b/features/apacheds.configuration.v2.feature/src/site/site.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!--
+ @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
+<project name="${project.name}">
+ <body>
+ <menu ref="parent" />
+ <menu ref="reports" />
+ </body>
+</project>
diff --git a/features/apacheds.configuration.v2.feature/studio.png b/features/apacheds.configuration.v2.feature/studio.png
new file mode 100644
index 0000000..7a04ef4
--- /dev/null
+++ b/features/apacheds.configuration.v2.feature/studio.png
Binary files differ
diff --git a/features/apacheds.feature/feature.xml b/features/apacheds.feature/feature.xml
index c66fccb..c5b07f8 100644
--- a/features/apacheds.feature/feature.xml
+++ b/features/apacheds.feature/feature.xml
@@ -1,223 +1,202 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.apache.directory.studio.apacheds.feature"
- label="Apache Directory Studio Apache DS"
+ label="Apache Directory Studio ApacheDS"
version="${pom.version}"
provider-name="Apache Software Foundation"
plugin="org.apache.directory.studio.apacheds"
image="studio.png">
<description>
- The Apache Directory Studio Apache DS Feature contains all plugins related to Apache DS.
+ The Apache Directory Studio ApacheDS Feature contains all plugins related to ApacheDS.
</description>
<copyright>
- © 2006-2011 Apache Software Foundation - All right reserved.
+ © 2006-2012 Apache Software Foundation - All right reserved.
This product includes software developed by the
Apache Software Foundation http://www.apache.org/
Some icons from FAMFAMFAM http://www.famfamfam.com/lab/icons/silk/
</copyright>
<license url="http://www.apache.org/licenses/LICENSE-2.0.html">
- Apache License
+Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-1. Definitions.
-"License" shall mean the terms and conditions for use, reproduction,
-and distribution as defined by Sections 1 through 9 of this document.
-"Licensor" shall mean the copyright owner or entity authorized
-by
-the copyright owner that is granting the License.
-"Legal Entity" shall mean the union of the acting entity and
-all
-other entities that control, are controlled by, or are under
-common
-control with that entity. For the purposes of this definition,
-"control" means (i) the power, direct or indirect, to cause the
-direction or management of such entity, whether by contract or
-otherwise, or (ii) ownership of fifty percent (50%) or more of
-the
-outstanding shares, or (iii) beneficial ownership of such entity.
-"You" (or "Your") shall mean an individual or Legal Entity
-exercising permissions granted by this License.
-"Source" form shall mean the preferred form for making modifications,
-including but not limited to software source code, documentation
-source, and configuration files.
-"Object" form shall mean any form resulting from mechanical
-transformation or translation of a Source form, including but
-not limited to compiled object code, generated documentation,
-and conversions to other media types.
-"Work" shall mean the work of authorship, whether in Source or
-Object form, made available under the License, as indicated by
-a
-copyright notice that is included in or attached to the work
-(an example is provided in the Appendix below).
-"Derivative Works" shall mean any work, whether in Source or
-Object
-form, that is based on (or derived from) the Work and for which
-the
-editorial revisions, annotations, elaborations, or other modifications
-represent, as a whole, an original work of authorship. For the
-purposes
-of this License, Derivative Works shall not include works that
-remain
-separable from, or merely link (or bind by name) to the interfaces
-of,
-the Work and Derivative Works thereof.
-"Contribution" shall mean any work of authorship, including
-the original version of the Work and any modifications or additions
-to that Work or Derivative Works thereof, that is intentionally
-submitted to Licensor for inclusion in the Work by the copyright
-owner
-or by an individual or Legal Entity authorized to submit on behalf
-of
-the copyright owner. For the purposes of this definition, "submitted"
-means any form of electronic, verbal, or written communication
-sent
-to the Licensor or its representatives, including but not limited
-to
-communication on electronic mailing lists, source code control
-systems,
-and issue tracking systems that are managed by, or on behalf
-of, the
-Licensor for the purpose of discussing and improving the Work,
-but
-excluding communication that is conspicuously marked or otherwise
-designated in writing by the copyright owner as "Not a Contribution."
-"Contributor" shall mean Licensor and any individual or Legal
-Entity
-on behalf of whom a Contribution has been received by Licensor
-and
-subsequently incorporated within the Work.
-2. Grant of Copyright License. Subject to the terms and conditions
-of
-this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute
-the
-Work and such Derivative Works in Source or Object form.
-3. Grant of Patent License. Subject to the terms and conditions
-of
-this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-(except as stated in this section) patent license to make, have
-made,
-use, offer to sell, sell, import, and otherwise transfer the
-Work,
-where such license applies only to those patent claims licensable
-by such Contributor that are necessarily infringed by their
-Contribution(s) alone or by combination of their Contribution(s)
-with the Work to which such Contribution(s) was submitted. If
-You
-institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work
-or a Contribution incorporated within the Work constitutes direct
-or contributory patent infringement, then any patent licenses
-granted to You under this License for that Work shall terminate
-as of the date such litigation is filed.
-4. Redistribution. You may reproduce and distribute copies of
-the
-Work or Derivative Works thereof in any medium, with or without
-modifications, and in Source or Object form, provided that You
-meet the following conditions:
-(a) You must give any other recipients of the Work or
-Derivative Works a copy of this License; and
-(b) You must cause any modified files to carry prominent notices
-stating that You changed the files; and
-(c) You must retain, in the Source form of any Derivative Works
-that You distribute, all copyright, patent, trademark, and
-attribution notices from the Source form of the Work,
-excluding those notices that do not pertain to any part of
-the Derivative Works; and
-(d) If the Work includes a "NOTICE" text file as part of its
-distribution, then any Derivative Works that You distribute must
-include a readable copy of the attribution notices contained
-within such NOTICE file, excluding those notices that do not
-pertain to any part of the Derivative Works, in at least one
-of the following places: within a NOTICE text file distributed
-as part of the Derivative Works; within the Source form or
-documentation, if provided along with the Derivative Works; or,
-within a display generated by the Derivative Works, if and
-wherever such third-party notices normally appear. The contents
-of the NOTICE file are for informational purposes only and
-do not modify the License. You may add Your own attribution
-notices within Derivative Works that You distribute, alongside
-or as an addendum to the NOTICE text from the Work, provided
-that such additional attribution notices cannot be construed
-as modifying the License.
-You may add Your own copyright statement to Your modifications
-and
-may provide additional or different license terms and conditions
-for use, reproduction, or distribution of Your modifications,
-or
-for any such Derivative Works as a whole, provided Your use,
-reproduction, and distribution of the Work otherwise complies
-with
-the conditions stated in this License.
-5. Submission of Contributions. Unless You explicitly state otherwise,
-any Contribution intentionally submitted for inclusion in the
-Work
-by You to the Licensor shall be under the terms and conditions
-of
-this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or
-modify
-the terms of any separate license agreement you may have executed
-with Licensor regarding such Contributions.
-6. Trademarks. This License does not grant permission to use
-the trade
-names, trademarks, service marks, or product names of the Licensor,
-except as required for reasonable and customary use in describing
-the
-origin of the Work and reproducing the content of the NOTICE
-file.
-7. Disclaimer of Warranty. Unless required by applicable law
-or
-agreed to in writing, Licensor provides the Work (and each
-Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-or
-implied, including, without limitation, any warranties or conditions
-of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-PARTICULAR PURPOSE. You are solely responsible for determining
-the
-appropriateness of using or redistributing the Work and assume
-any
-risks associated with Your exercise of permissions under this
-License.
-8. Limitation of Liability. In no event and under no legal theory,
-whether in tort (including negligence), contract, or otherwise,
-unless required by applicable law (such as deliberate and grossly
-negligent acts) or agreed to in writing, shall any Contributor
-be
-liable to You for damages, including any direct, indirect, special,
-incidental, or consequential damages of any character arising
-as a
-result of this License or out of the use or inability to use
-the
-Work (including but not limited to damages for loss of goodwill,
-work stoppage, computer failure or malfunction, or any and all
-other commercial damages or losses), even if such Contributor
-has been advised of the possibility of such damages.
-9. Accepting Warranty or Additional Liability. While redistributing
-the Work or Derivative Works thereof, You may choose to offer,
-and charge a fee for, acceptance of support, warranty, indemnity,
-or other liability obligations and/or rights consistent with
-this
-License. However, in accepting such obligations, You may act
-only
-on Your own behalf and on Your sole responsibility, not on behalf
-of any other Contributor, and only if You agree to indemnify,
-defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by
-reason
-of your accepting any such warranty or additional liability.
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
</license>
<url>
- <update label="Apache Directory Studio" url="http://directory.apache.org/studio/update/1.x"/>
+ <update label="Apache Directory Studio" url="http://directory.apache.org/studio/update/2.x"/>
</url>
<plugin
diff --git a/features/apacheds.feature/pom.xml b/features/apacheds.feature/pom.xml
index c6e5787..8b97577 100644
--- a/features/apacheds.feature/pom.xml
+++ b/features/apacheds.feature/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>apacheds.feature</artifactId>
- <name>Apache Directory Studio Apache DS Feature</name>
+ <name>Apache Directory Studio ApacheDS Feature</name>
<packaging>jar</packaging>
<description />
diff --git a/features/ldapbrowser.feature/feature.xml b/features/ldapbrowser.feature/feature.xml
index f03c8c5..ab631d7 100644
--- a/features/ldapbrowser.feature/feature.xml
+++ b/features/ldapbrowser.feature/feature.xml
@@ -12,227 +12,333 @@
</description>
<copyright>
- © 2006-2011 Apache Software Foundation - All right reserved.
+ © 2006-2012 Apache Software Foundation - All right reserved.
This product includes software developed by the
Apache Software Foundation http://www.apache.org/
</copyright>
<license url="http://www.apache.org/licenses/LICENSE-2.0.html">
- Apache License
+Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-1. Definitions.
-"License" shall mean the terms and conditions for use, reproduction,
-and distribution as defined by Sections 1 through 9 of this document.
-"Licensor" shall mean the copyright owner or entity authorized
-by
-the copyright owner that is granting the License.
-"Legal Entity" shall mean the union of the acting entity and
-all
-other entities that control, are controlled by, or are under
-common
-control with that entity. For the purposes of this definition,
-"control" means (i) the power, direct or indirect, to cause the
-direction or management of such entity, whether by contract or
-otherwise, or (ii) ownership of fifty percent (50%) or more of
-the
-outstanding shares, or (iii) beneficial ownership of such entity.
-"You" (or "Your") shall mean an individual or Legal Entity
-exercising permissions granted by this License.
-"Source" form shall mean the preferred form for making modifications,
-including but not limited to software source code, documentation
-source, and configuration files.
-"Object" form shall mean any form resulting from mechanical
-transformation or translation of a Source form, including but
-not limited to compiled object code, generated documentation,
-and conversions to other media types.
-"Work" shall mean the work of authorship, whether in Source or
-Object form, made available under the License, as indicated by
-a
-copyright notice that is included in or attached to the work
-(an example is provided in the Appendix below).
-"Derivative Works" shall mean any work, whether in Source or
-Object
-form, that is based on (or derived from) the Work and for which
-the
-editorial revisions, annotations, elaborations, or other modifications
-represent, as a whole, an original work of authorship. For the
-purposes
-of this License, Derivative Works shall not include works that
-remain
-separable from, or merely link (or bind by name) to the interfaces
-of,
-the Work and Derivative Works thereof.
-"Contribution" shall mean any work of authorship, including
-the original version of the Work and any modifications or additions
-to that Work or Derivative Works thereof, that is intentionally
-submitted to Licensor for inclusion in the Work by the copyright
-owner
-or by an individual or Legal Entity authorized to submit on behalf
-of
-the copyright owner. For the purposes of this definition, "submitted"
-means any form of electronic, verbal, or written communication
-sent
-to the Licensor or its representatives, including but not limited
-to
-communication on electronic mailing lists, source code control
-systems,
-and issue tracking systems that are managed by, or on behalf
-of, the
-Licensor for the purpose of discussing and improving the Work,
-but
-excluding communication that is conspicuously marked or otherwise
-designated in writing by the copyright owner as "Not a Contribution."
-"Contributor" shall mean Licensor and any individual or Legal
-Entity
-on behalf of whom a Contribution has been received by Licensor
-and
-subsequently incorporated within the Work.
-2. Grant of Copyright License. Subject to the terms and conditions
-of
-this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute
-the
-Work and such Derivative Works in Source or Object form.
-3. Grant of Patent License. Subject to the terms and conditions
-of
-this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-(except as stated in this section) patent license to make, have
-made,
-use, offer to sell, sell, import, and otherwise transfer the
-Work,
-where such license applies only to those patent claims licensable
-by such Contributor that are necessarily infringed by their
-Contribution(s) alone or by combination of their Contribution(s)
-with the Work to which such Contribution(s) was submitted. If
-You
-institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work
-or a Contribution incorporated within the Work constitutes direct
-or contributory patent infringement, then any patent licenses
-granted to You under this License for that Work shall terminate
-as of the date such litigation is filed.
-4. Redistribution. You may reproduce and distribute copies of
-the
-Work or Derivative Works thereof in any medium, with or without
-modifications, and in Source or Object form, provided that You
-meet the following conditions:
-(a) You must give any other recipients of the Work or
-Derivative Works a copy of this License; and
-(b) You must cause any modified files to carry prominent notices
-stating that You changed the files; and
-(c) You must retain, in the Source form of any Derivative Works
-that You distribute, all copyright, patent, trademark, and
-attribution notices from the Source form of the Work,
-excluding those notices that do not pertain to any part of
-the Derivative Works; and
-(d) If the Work includes a "NOTICE" text file as part of its
-distribution, then any Derivative Works that You distribute must
-include a readable copy of the attribution notices contained
-within such NOTICE file, excluding those notices that do not
-pertain to any part of the Derivative Works, in at least one
-of the following places: within a NOTICE text file distributed
-as part of the Derivative Works; within the Source form or
-documentation, if provided along with the Derivative Works; or,
-within a display generated by the Derivative Works, if and
-wherever such third-party notices normally appear. The contents
-of the NOTICE file are for informational purposes only and
-do not modify the License. You may add Your own attribution
-notices within Derivative Works that You distribute, alongside
-or as an addendum to the NOTICE text from the Work, provided
-that such additional attribution notices cannot be construed
-as modifying the License.
-You may add Your own copyright statement to Your modifications
-and
-may provide additional or different license terms and conditions
-for use, reproduction, or distribution of Your modifications,
-or
-for any such Derivative Works as a whole, provided Your use,
-reproduction, and distribution of the Work otherwise complies
-with
-the conditions stated in this License.
-5. Submission of Contributions. Unless You explicitly state otherwise,
-any Contribution intentionally submitted for inclusion in the
-Work
-by You to the Licensor shall be under the terms and conditions
-of
-this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or
-modify
-the terms of any separate license agreement you may have executed
-with Licensor regarding such Contributions.
-6. Trademarks. This License does not grant permission to use
-the trade
-names, trademarks, service marks, or product names of the Licensor,
-except as required for reasonable and customary use in describing
-the
-origin of the Work and reproducing the content of the NOTICE
-file.
-7. Disclaimer of Warranty. Unless required by applicable law
-or
-agreed to in writing, Licensor provides the Work (and each
-Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-or
-implied, including, without limitation, any warranties or conditions
-of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-PARTICULAR PURPOSE. You are solely responsible for determining
-the
-appropriateness of using or redistributing the Work and assume
-any
-risks associated with Your exercise of permissions under this
-License.
-8. Limitation of Liability. In no event and under no legal theory,
-whether in tort (including negligence), contract, or otherwise,
-unless required by applicable law (such as deliberate and grossly
-negligent acts) or agreed to in writing, shall any Contributor
-be
-liable to You for damages, including any direct, indirect, special,
-incidental, or consequential damages of any character arising
-as a
-result of this License or out of the use or inability to use
-the
-Work (including but not limited to damages for loss of goodwill,
-work stoppage, computer failure or malfunction, or any and all
-other commercial damages or losses), even if such Contributor
-has been advised of the possibility of such damages.
-9. Accepting Warranty or Additional Liability. While redistributing
-the Work or Derivative Works thereof, You may choose to offer,
-and charge a fee for, acceptance of support, warranty, indemnity,
-or other liability obligations and/or rights consistent with
-this
-License. However, in accepting such obligations, You may act
-only
-on Your own behalf and on Your sole responsibility, not on behalf
-of any other Contributor, and only if You agree to indemnify,
-defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by
-reason
-of your accepting any such warranty or additional liability.
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
</license>
<url>
- <update label="Apache Directory Studio" url="http://directory.apache.org/studio/update/1.x"/>
+ <update label="Apache Directory Studio" url="http://directory.apache.org/studio/update/2.x"/>
</url>
<requires>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.search"/>
+ <import plugin="org.eclipse.core.expressions"/>
<import plugin="org.eclipse.core.filesystem"/>
+ <import plugin="org.eclipse.core.resources"/>
+ <import plugin="org.eclipse.core.runtime"/>
+ <import plugin="org.eclipse.jface.text"/>
+ <import plugin="org.eclipse.search"/>
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.ui.editors"/>
- <import plugin="org.eclipse.ui.workbench.texteditor"/>
- <import plugin="org.eclipse.ui.views"/>
<import plugin="org.eclipse.ui.forms"/>
- <import plugin="org.eclipse.jface.text"/>
- <import plugin="org.eclipse.core.resources"/>
+ <import plugin="org.eclipse.ui.views"/>
+ <import plugin="org.eclipse.ui.workbench.texteditor"/>
</requires>
<plugin
+ id="org.antlr.antlr"
+ download-size="0"
+ install-size="0"
+ version="${org.antlr.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.codec"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.codec.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.collections"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.collections.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.io"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.io.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.lang"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.lang.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.logging"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.logging.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.pool"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.pool.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.asn1.api"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.asn1.ber"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.dsmlv2.parser"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.i18n"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.client.api"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.codec.core"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.extras.aci"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.model"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.net.mina"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.schema"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.util"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
id="org.apache.directory.studio.aciitemeditor"
download-size="0"
install-size="0"
@@ -240,6 +346,13 @@
unpack="false"/>
<plugin
+ id="org.apache.directory.studio.common.core"
+ download-size="0"
+ install-size="0"
+ version="${pom.version}"
+ unpack="false"/>
+
+ <plugin
id="org.apache.directory.studio.common.ui"
download-size="0"
install-size="0"
@@ -309,4 +422,60 @@
version="${pom.version}"
unpack="false"/>
+ <plugin
+ id="org.apache.httpcomponents.httpclient"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.httpcomponents.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.httpcomponents.httpcore"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.httpcomponents.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.logging.log4j"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.logging.log4j.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.mina.core"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.mina.core.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.bouncycastle.bcprov.jdk15"
+ download-size="0"
+ install-size="0"
+ version="${org.bouncycastle.bcprov.jdk15.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.dom4j.dom4j"
+ download-size="0"
+ install-size="0"
+ version="${org.dom4j.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.slf4j.api"
+ download-size="0"
+ install-size="0"
+ version="${org.slf4j.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.xpp3.xpp3"
+ download-size="0"
+ install-size="0"
+ version="${org.xpp3.validversion}"
+ unpack="false"/>
+
</feature>
diff --git a/features/ldapservers.feature/feature.xml b/features/ldapservers.feature/feature.xml
index c3a119c..89883a2 100644
--- a/features/ldapservers.feature/feature.xml
+++ b/features/ldapservers.feature/feature.xml
@@ -12,227 +12,470 @@
</description>
<copyright>
- © 2006-2011 Apache Software Foundation - All right reserved.
+ © 2006-2012 Apache Software Foundation - All right reserved.
This product includes software developed by the
Apache Software Foundation http://www.apache.org/
</copyright>
<license url="http://www.apache.org/licenses/LICENSE-2.0.html">
- Apache License
+Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-1. Definitions.
-"License" shall mean the terms and conditions for use, reproduction,
-and distribution as defined by Sections 1 through 9 of this document.
-"Licensor" shall mean the copyright owner or entity authorized
-by
-the copyright owner that is granting the License.
-"Legal Entity" shall mean the union of the acting entity and
-all
-other entities that control, are controlled by, or are under
-common
-control with that entity. For the purposes of this definition,
-"control" means (i) the power, direct or indirect, to cause the
-direction or management of such entity, whether by contract or
-otherwise, or (ii) ownership of fifty percent (50%) or more of
-the
-outstanding shares, or (iii) beneficial ownership of such entity.
-"You" (or "Your") shall mean an individual or Legal Entity
-exercising permissions granted by this License.
-"Source" form shall mean the preferred form for making modifications,
-including but not limited to software source code, documentation
-source, and configuration files.
-"Object" form shall mean any form resulting from mechanical
-transformation or translation of a Source form, including but
-not limited to compiled object code, generated documentation,
-and conversions to other media types.
-"Work" shall mean the work of authorship, whether in Source or
-Object form, made available under the License, as indicated by
-a
-copyright notice that is included in or attached to the work
-(an example is provided in the Appendix below).
-"Derivative Works" shall mean any work, whether in Source or
-Object
-form, that is based on (or derived from) the Work and for which
-the
-editorial revisions, annotations, elaborations, or other modifications
-represent, as a whole, an original work of authorship. For the
-purposes
-of this License, Derivative Works shall not include works that
-remain
-separable from, or merely link (or bind by name) to the interfaces
-of,
-the Work and Derivative Works thereof.
-"Contribution" shall mean any work of authorship, including
-the original version of the Work and any modifications or additions
-to that Work or Derivative Works thereof, that is intentionally
-submitted to Licensor for inclusion in the Work by the copyright
-owner
-or by an individual or Legal Entity authorized to submit on behalf
-of
-the copyright owner. For the purposes of this definition, "submitted"
-means any form of electronic, verbal, or written communication
-sent
-to the Licensor or its representatives, including but not limited
-to
-communication on electronic mailing lists, source code control
-systems,
-and issue tracking systems that are managed by, or on behalf
-of, the
-Licensor for the purpose of discussing and improving the Work,
-but
-excluding communication that is conspicuously marked or otherwise
-designated in writing by the copyright owner as "Not a Contribution."
-"Contributor" shall mean Licensor and any individual or Legal
-Entity
-on behalf of whom a Contribution has been received by Licensor
-and
-subsequently incorporated within the Work.
-2. Grant of Copyright License. Subject to the terms and conditions
-of
-this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute
-the
-Work and such Derivative Works in Source or Object form.
-3. Grant of Patent License. Subject to the terms and conditions
-of
-this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-(except as stated in this section) patent license to make, have
-made,
-use, offer to sell, sell, import, and otherwise transfer the
-Work,
-where such license applies only to those patent claims licensable
-by such Contributor that are necessarily infringed by their
-Contribution(s) alone or by combination of their Contribution(s)
-with the Work to which such Contribution(s) was submitted. If
-You
-institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work
-or a Contribution incorporated within the Work constitutes direct
-or contributory patent infringement, then any patent licenses
-granted to You under this License for that Work shall terminate
-as of the date such litigation is filed.
-4. Redistribution. You may reproduce and distribute copies of
-the
-Work or Derivative Works thereof in any medium, with or without
-modifications, and in Source or Object form, provided that You
-meet the following conditions:
-(a) You must give any other recipients of the Work or
-Derivative Works a copy of this License; and
-(b) You must cause any modified files to carry prominent notices
-stating that You changed the files; and
-(c) You must retain, in the Source form of any Derivative Works
-that You distribute, all copyright, patent, trademark, and
-attribution notices from the Source form of the Work,
-excluding those notices that do not pertain to any part of
-the Derivative Works; and
-(d) If the Work includes a "NOTICE" text file as part of its
-distribution, then any Derivative Works that You distribute must
-include a readable copy of the attribution notices contained
-within such NOTICE file, excluding those notices that do not
-pertain to any part of the Derivative Works, in at least one
-of the following places: within a NOTICE text file distributed
-as part of the Derivative Works; within the Source form or
-documentation, if provided along with the Derivative Works; or,
-within a display generated by the Derivative Works, if and
-wherever such third-party notices normally appear. The contents
-of the NOTICE file are for informational purposes only and
-do not modify the License. You may add Your own attribution
-notices within Derivative Works that You distribute, alongside
-or as an addendum to the NOTICE text from the Work, provided
-that such additional attribution notices cannot be construed
-as modifying the License.
-You may add Your own copyright statement to Your modifications
-and
-may provide additional or different license terms and conditions
-for use, reproduction, or distribution of Your modifications,
-or
-for any such Derivative Works as a whole, provided Your use,
-reproduction, and distribution of the Work otherwise complies
-with
-the conditions stated in this License.
-5. Submission of Contributions. Unless You explicitly state otherwise,
-any Contribution intentionally submitted for inclusion in the
-Work
-by You to the Licensor shall be under the terms and conditions
-of
-this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or
-modify
-the terms of any separate license agreement you may have executed
-with Licensor regarding such Contributions.
-6. Trademarks. This License does not grant permission to use
-the trade
-names, trademarks, service marks, or product names of the Licensor,
-except as required for reasonable and customary use in describing
-the
-origin of the Work and reproducing the content of the NOTICE
-file.
-7. Disclaimer of Warranty. Unless required by applicable law
-or
-agreed to in writing, Licensor provides the Work (and each
-Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-or
-implied, including, without limitation, any warranties or conditions
-of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-PARTICULAR PURPOSE. You are solely responsible for determining
-the
-appropriateness of using or redistributing the Work and assume
-any
-risks associated with Your exercise of permissions under this
-License.
-8. Limitation of Liability. In no event and under no legal theory,
-whether in tort (including negligence), contract, or otherwise,
-unless required by applicable law (such as deliberate and grossly
-negligent acts) or agreed to in writing, shall any Contributor
-be
-liable to You for damages, including any direct, indirect, special,
-incidental, or consequential damages of any character arising
-as a
-result of this License or out of the use or inability to use
-the
-Work (including but not limited to damages for loss of goodwill,
-work stoppage, computer failure or malfunction, or any and all
-other commercial damages or losses), even if such Contributor
-has been advised of the possibility of such damages.
-9. Accepting Warranty or Additional Liability. While redistributing
-the Work or Derivative Works thereof, You may choose to offer,
-and charge a fee for, acceptance of support, warranty, indemnity,
-or other liability obligations and/or rights consistent with
-this
-License. However, in accepting such obligations, You may act
-only
-on Your own behalf and on Your sole responsibility, not on behalf
-of any other Contributor, and only if You agree to indemnify,
-defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by
-reason
-of your accepting any such warranty or additional liability.
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
</license>
<url>
- <update label="Apache Directory Studio" url="http://directory.apache.org/studio/update/1.x"/>
+ <update label="Apache Directory Studio" url="http://directory.apache.org/studio/update/2.x"/>
</url>
<requires>
+ <import plugin="org.eclipse.core.expressions"/>
<import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.search"/>
- <import plugin="org.eclipse.core.filesystem"/>
+ <import plugin="org.eclipse.jface.text"/>
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.ui.editors"/>
- <import plugin="org.eclipse.ui.workbench.texteditor"/>
- <import plugin="org.eclipse.ui.views"/>
<import plugin="org.eclipse.ui.forms"/>
- <import plugin="org.eclipse.jface.text"/>
- <import plugin="org.eclipse.core.resources"/>
+ <import plugin="org.eclipse.ui.views"/>
+ <import plugin="org.eclipse.ui.workbench.texteditor"/>
</requires>
<plugin
+ id="net.sf.ehcache.core"
+ download-size="0"
+ install-size="0"
+ version="${net.sf.ehcache.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.antlr.antlr"
+ download-size="0"
+ install-size="0"
+ version="${org.antlr.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.codec"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.codec.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.collections"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.collections.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.io"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.io.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.lang"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.lang.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.logging"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.logging.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.pool"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.pool.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.server.config"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.server.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.server.core"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.server.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.server.core.api"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.server.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.server.core.avl"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.server.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.server.core.constants"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.server.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.server.i18n"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.server.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.server.ldif.partition"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.server.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.server.xdbm.partition"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.server.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.asn1.api"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.asn1.ber"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.dsmlv2.parser"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.i18n"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.client.api"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.codec.core"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.extras.aci"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.extras.trigger"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.extras.util"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.model"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.net.mina"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.schema"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.schema.converter"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.util"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.apacheds.configuration"
+ download-size="0"
+ install-size="0"
+ version="${pom.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.apacheds.configuration.help"
+ download-size="0"
+ install-size="0"
+ version="${pom.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.apacheds.configuration.v2"
+ download-size="0"
+ install-size="0"
+ version="${pom.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.common.core"
+ download-size="0"
+ install-size="0"
+ version="${pom.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.common.ui"
+ download-size="0"
+ install-size="0"
+ version="${pom.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.connection.core"
+ download-size="0"
+ install-size="0"
+ version="${pom.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.connection.ui"
+ download-size="0"
+ install-size="0"
+ version="${pom.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.ldapbrowser.core"
+ download-size="0"
+ install-size="0"
+ version="${pom.version}"
+ unpack="false"/>
+
+ <plugin
id="org.apache.directory.studio.ldapservers"
download-size="0"
install-size="0"
@@ -281,4 +524,67 @@
version="${pom.version}"
unpack="false"/>
+ <plugin
+ id="org.apache.directory.studio.ldifparser"
+ download-size="0"
+ install-size="0"
+ version="${pom.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.httpcomponents.httpclient"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.httpcomponents.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.httpcomponents.httpcore"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.httpcomponents.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.logging.log4j"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.logging.log4j.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.mina.core"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.mina.core.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.bouncycastle.bcprov.jdk15"
+ download-size="0"
+ install-size="0"
+ version="${org.bouncycastle.bcprov.jdk15.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.dom4j.dom4j"
+ download-size="0"
+ install-size="0"
+ version="${org.dom4j.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.slf4j.api"
+ download-size="0"
+ install-size="0"
+ version="${org.slf4j.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.xpp3.xpp3"
+ download-size="0"
+ install-size="0"
+ version="${org.xpp3.validversion}"
+ unpack="false"/>
+
</feature>
diff --git a/features/ldifeditor.feature/feature.xml b/features/ldifeditor.feature/feature.xml
index 176bce9..3128b0b 100644
--- a/features/ldifeditor.feature/feature.xml
+++ b/features/ldifeditor.feature/feature.xml
@@ -12,213 +12,332 @@
</description>
<copyright>
- © 2006-2011 Apache Software Foundation - All right reserved.
+ © 2006-2012 Apache Software Foundation - All right reserved.
This product includes software developed by the
Apache Software Foundation http://www.apache.org/
</copyright>
<license url="http://www.apache.org/licenses/LICENSE-2.0.html">
- Apache License
+Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-1. Definitions.
-"License" shall mean the terms and conditions for use, reproduction,
-and distribution as defined by Sections 1 through 9 of this document.
-"Licensor" shall mean the copyright owner or entity authorized
-by
-the copyright owner that is granting the License.
-"Legal Entity" shall mean the union of the acting entity and
-all
-other entities that control, are controlled by, or are under
-common
-control with that entity. For the purposes of this definition,
-"control" means (i) the power, direct or indirect, to cause the
-direction or management of such entity, whether by contract or
-otherwise, or (ii) ownership of fifty percent (50%) or more of
-the
-outstanding shares, or (iii) beneficial ownership of such entity.
-"You" (or "Your") shall mean an individual or Legal Entity
-exercising permissions granted by this License.
-"Source" form shall mean the preferred form for making modifications,
-including but not limited to software source code, documentation
-source, and configuration files.
-"Object" form shall mean any form resulting from mechanical
-transformation or translation of a Source form, including but
-not limited to compiled object code, generated documentation,
-and conversions to other media types.
-"Work" shall mean the work of authorship, whether in Source or
-Object form, made available under the License, as indicated by
-a
-copyright notice that is included in or attached to the work
-(an example is provided in the Appendix below).
-"Derivative Works" shall mean any work, whether in Source or
-Object
-form, that is based on (or derived from) the Work and for which
-the
-editorial revisions, annotations, elaborations, or other modifications
-represent, as a whole, an original work of authorship. For the
-purposes
-of this License, Derivative Works shall not include works that
-remain
-separable from, or merely link (or bind by name) to the interfaces
-of,
-the Work and Derivative Works thereof.
-"Contribution" shall mean any work of authorship, including
-the original version of the Work and any modifications or additions
-to that Work or Derivative Works thereof, that is intentionally
-submitted to Licensor for inclusion in the Work by the copyright
-owner
-or by an individual or Legal Entity authorized to submit on behalf
-of
-the copyright owner. For the purposes of this definition, "submitted"
-means any form of electronic, verbal, or written communication
-sent
-to the Licensor or its representatives, including but not limited
-to
-communication on electronic mailing lists, source code control
-systems,
-and issue tracking systems that are managed by, or on behalf
-of, the
-Licensor for the purpose of discussing and improving the Work,
-but
-excluding communication that is conspicuously marked or otherwise
-designated in writing by the copyright owner as "Not a Contribution."
-"Contributor" shall mean Licensor and any individual or Legal
-Entity
-on behalf of whom a Contribution has been received by Licensor
-and
-subsequently incorporated within the Work.
-2. Grant of Copyright License. Subject to the terms and conditions
-of
-this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute
-the
-Work and such Derivative Works in Source or Object form.
-3. Grant of Patent License. Subject to the terms and conditions
-of
-this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-(except as stated in this section) patent license to make, have
-made,
-use, offer to sell, sell, import, and otherwise transfer the
-Work,
-where such license applies only to those patent claims licensable
-by such Contributor that are necessarily infringed by their
-Contribution(s) alone or by combination of their Contribution(s)
-with the Work to which such Contribution(s) was submitted. If
-You
-institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work
-or a Contribution incorporated within the Work constitutes direct
-or contributory patent infringement, then any patent licenses
-granted to You under this License for that Work shall terminate
-as of the date such litigation is filed.
-4. Redistribution. You may reproduce and distribute copies of
-the
-Work or Derivative Works thereof in any medium, with or without
-modifications, and in Source or Object form, provided that You
-meet the following conditions:
-(a) You must give any other recipients of the Work or
-Derivative Works a copy of this License; and
-(b) You must cause any modified files to carry prominent notices
-stating that You changed the files; and
-(c) You must retain, in the Source form of any Derivative Works
-that You distribute, all copyright, patent, trademark, and
-attribution notices from the Source form of the Work,
-excluding those notices that do not pertain to any part of
-the Derivative Works; and
-(d) If the Work includes a "NOTICE" text file as part of its
-distribution, then any Derivative Works that You distribute must
-include a readable copy of the attribution notices contained
-within such NOTICE file, excluding those notices that do not
-pertain to any part of the Derivative Works, in at least one
-of the following places: within a NOTICE text file distributed
-as part of the Derivative Works; within the Source form or
-documentation, if provided along with the Derivative Works; or,
-within a display generated by the Derivative Works, if and
-wherever such third-party notices normally appear. The contents
-of the NOTICE file are for informational purposes only and
-do not modify the License. You may add Your own attribution
-notices within Derivative Works that You distribute, alongside
-or as an addendum to the NOTICE text from the Work, provided
-that such additional attribution notices cannot be construed
-as modifying the License.
-You may add Your own copyright statement to Your modifications
-and
-may provide additional or different license terms and conditions
-for use, reproduction, or distribution of Your modifications,
-or
-for any such Derivative Works as a whole, provided Your use,
-reproduction, and distribution of the Work otherwise complies
-with
-the conditions stated in this License.
-5. Submission of Contributions. Unless You explicitly state otherwise,
-any Contribution intentionally submitted for inclusion in the
-Work
-by You to the Licensor shall be under the terms and conditions
-of
-this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or
-modify
-the terms of any separate license agreement you may have executed
-with Licensor regarding such Contributions.
-6. Trademarks. This License does not grant permission to use
-the trade
-names, trademarks, service marks, or product names of the Licensor,
-except as required for reasonable and customary use in describing
-the
-origin of the Work and reproducing the content of the NOTICE
-file.
-7. Disclaimer of Warranty. Unless required by applicable law
-or
-agreed to in writing, Licensor provides the Work (and each
-Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-or
-implied, including, without limitation, any warranties or conditions
-of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-PARTICULAR PURPOSE. You are solely responsible for determining
-the
-appropriateness of using or redistributing the Work and assume
-any
-risks associated with Your exercise of permissions under this
-License.
-8. Limitation of Liability. In no event and under no legal theory,
-whether in tort (including negligence), contract, or otherwise,
-unless required by applicable law (such as deliberate and grossly
-negligent acts) or agreed to in writing, shall any Contributor
-be
-liable to You for damages, including any direct, indirect, special,
-incidental, or consequential damages of any character arising
-as a
-result of this License or out of the use or inability to use
-the
-Work (including but not limited to damages for loss of goodwill,
-work stoppage, computer failure or malfunction, or any and all
-other commercial damages or losses), even if such Contributor
-has been advised of the possibility of such damages.
-9. Accepting Warranty or Additional Liability. While redistributing
-the Work or Derivative Works thereof, You may choose to offer,
-and charge a fee for, acceptance of support, warranty, indemnity,
-or other liability obligations and/or rights consistent with
-this
-License. However, in accepting such obligations, You may act
-only
-on Your own behalf and on Your sole responsibility, not on behalf
-of any other Contributor, and only if You agree to indemnify,
-defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by
-reason
-of your accepting any such warranty or additional liability.
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
</license>
<url>
- <update label="Apache Directory Studio" url="http://directory.apache.org/studio/update/1.x"/>
+ <update label="Apache Directory Studio" url="http://directory.apache.org/studio/update/2.x"/>
</url>
+ <requires>
+ <import plugin="org.eclipse.core.expressions"/>
+ <import plugin="org.eclipse.core.filesystem"/>
+ <import plugin="org.eclipse.core.resources"/>
+ <import plugin="org.eclipse.core.runtime"/>
+ <import plugin="org.eclipse.jface.text"/>
+ <import plugin="org.eclipse.search"/>
+ <import plugin="org.eclipse.ui"/>
+ <import plugin="org.eclipse.ui.editors"/>
+ <import plugin="org.eclipse.ui.forms"/>
+ <import plugin="org.eclipse.ui.views"/>
+ <import plugin="org.eclipse.ui.workbench.texteditor"/>
+ </requires>
+
+ <plugin
+ id="org.antlr.antlr"
+ download-size="0"
+ install-size="0"
+ version="${org.antlr.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.codec"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.codec.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.collections"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.collections.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.io"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.io.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.lang"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.lang.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.logging"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.logging.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.pool"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.pool.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.asn1.api"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.asn1.ber"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.dsmlv2.parser"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.i18n"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.client.api"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.codec.core"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.extras.aci"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.model"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.net.mina"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.schema"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.util"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
<plugin
id="org.apache.directory.studio.aciitemeditor"
download-size="0"
@@ -227,6 +346,13 @@
unpack="false"/>
<plugin
+ id="org.apache.directory.studio.common.core"
+ download-size="0"
+ install-size="0"
+ version="${pom.version}"
+ unpack="false"/>
+
+ <plugin
id="org.apache.directory.studio.common.ui"
download-size="0"
install-size="0"
@@ -288,4 +414,60 @@
version="${pom.version}"
unpack="false"/>
+ <plugin
+ id="org.apache.httpcomponents.httpclient"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.httpcomponents.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.httpcomponents.httpcore"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.httpcomponents.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.logging.log4j"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.logging.log4j.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.mina.core"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.mina.core.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.bouncycastle.bcprov.jdk15"
+ download-size="0"
+ install-size="0"
+ version="${org.bouncycastle.bcprov.jdk15.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.dom4j.dom4j"
+ download-size="0"
+ install-size="0"
+ version="${org.dom4j.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.slf4j.api"
+ download-size="0"
+ install-size="0"
+ version="${org.slf4j.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.xpp3.xpp3"
+ download-size="0"
+ install-size="0"
+ version="${org.xpp3.validversion}"
+ unpack="false"/>
+
</feature>
diff --git a/features/pom.xml b/features/pom.xml
index db19c1e..23dbd2c 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -32,6 +32,7 @@
<modules>
<module>apacheds.configuration.feature</module>
+ <module>apacheds.configuration.v2.feature</module>
<module>apacheds.feature</module>
<module>ldapbrowser.feature</module>
<module>ldapservers.feature</module>
diff --git a/features/rcp.feature/feature.xml b/features/rcp.feature/feature.xml
index 659f39d..bda183c 100644
--- a/features/rcp.feature/feature.xml
+++ b/features/rcp.feature/feature.xml
@@ -7,7 +7,7 @@
plugin="org.apache.directory.studio.rcp"
os="linux,macosx,win32"
ws="carbon,gtk,win32"
- arch="ppc,x86,x86_64"
+ arch="x86,x86_64"
image="studio.png">
<description>
@@ -16,212 +16,191 @@
</description>
<copyright>
- © 2006-2011 Apache Software Foundation - All right reserved.
+ © 2006-2012 Apache Software Foundation - All right reserved.
This product includes software developed by the
Apache Software Foundation http://www.apache.org/
Some icons from FAMFAMFAM http://www.famfamfam.com/lab/icons/silk/
</copyright>
<license url="http://www.apache.org/licenses/LICENSE-2.0.html">
- Apache License
+Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-1. Definitions.
-"License" shall mean the terms and conditions for use, reproduction,
-and distribution as defined by Sections 1 through 9 of this document.
-"Licensor" shall mean the copyright owner or entity authorized
-by
-the copyright owner that is granting the License.
-"Legal Entity" shall mean the union of the acting entity and
-all
-other entities that control, are controlled by, or are under
-common
-control with that entity. For the purposes of this definition,
-"control" means (i) the power, direct or indirect, to cause the
-direction or management of such entity, whether by contract or
-otherwise, or (ii) ownership of fifty percent (50%) or more of
-the
-outstanding shares, or (iii) beneficial ownership of such entity.
-"You" (or "Your") shall mean an individual or Legal Entity
-exercising permissions granted by this License.
-"Source" form shall mean the preferred form for making modifications,
-including but not limited to software source code, documentation
-source, and configuration files.
-"Object" form shall mean any form resulting from mechanical
-transformation or translation of a Source form, including but
-not limited to compiled object code, generated documentation,
-and conversions to other media types.
-"Work" shall mean the work of authorship, whether in Source or
-Object form, made available under the License, as indicated by
-a
-copyright notice that is included in or attached to the work
-(an example is provided in the Appendix below).
-"Derivative Works" shall mean any work, whether in Source or
-Object
-form, that is based on (or derived from) the Work and for which
-the
-editorial revisions, annotations, elaborations, or other modifications
-represent, as a whole, an original work of authorship. For the
-purposes
-of this License, Derivative Works shall not include works that
-remain
-separable from, or merely link (or bind by name) to the interfaces
-of,
-the Work and Derivative Works thereof.
-"Contribution" shall mean any work of authorship, including
-the original version of the Work and any modifications or additions
-to that Work or Derivative Works thereof, that is intentionally
-submitted to Licensor for inclusion in the Work by the copyright
-owner
-or by an individual or Legal Entity authorized to submit on behalf
-of
-the copyright owner. For the purposes of this definition, "submitted"
-means any form of electronic, verbal, or written communication
-sent
-to the Licensor or its representatives, including but not limited
-to
-communication on electronic mailing lists, source code control
-systems,
-and issue tracking systems that are managed by, or on behalf
-of, the
-Licensor for the purpose of discussing and improving the Work,
-but
-excluding communication that is conspicuously marked or otherwise
-designated in writing by the copyright owner as "Not a Contribution."
-"Contributor" shall mean Licensor and any individual or Legal
-Entity
-on behalf of whom a Contribution has been received by Licensor
-and
-subsequently incorporated within the Work.
-2. Grant of Copyright License. Subject to the terms and conditions
-of
-this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute
-the
-Work and such Derivative Works in Source or Object form.
-3. Grant of Patent License. Subject to the terms and conditions
-of
-this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-(except as stated in this section) patent license to make, have
-made,
-use, offer to sell, sell, import, and otherwise transfer the
-Work,
-where such license applies only to those patent claims licensable
-by such Contributor that are necessarily infringed by their
-Contribution(s) alone or by combination of their Contribution(s)
-with the Work to which such Contribution(s) was submitted. If
-You
-institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work
-or a Contribution incorporated within the Work constitutes direct
-or contributory patent infringement, then any patent licenses
-granted to You under this License for that Work shall terminate
-as of the date such litigation is filed.
-4. Redistribution. You may reproduce and distribute copies of
-the
-Work or Derivative Works thereof in any medium, with or without
-modifications, and in Source or Object form, provided that You
-meet the following conditions:
-(a) You must give any other recipients of the Work or
-Derivative Works a copy of this License; and
-(b) You must cause any modified files to carry prominent notices
-stating that You changed the files; and
-(c) You must retain, in the Source form of any Derivative Works
-that You distribute, all copyright, patent, trademark, and
-attribution notices from the Source form of the Work,
-excluding those notices that do not pertain to any part of
-the Derivative Works; and
-(d) If the Work includes a "NOTICE" text file as part of its
-distribution, then any Derivative Works that You distribute must
-include a readable copy of the attribution notices contained
-within such NOTICE file, excluding those notices that do not
-pertain to any part of the Derivative Works, in at least one
-of the following places: within a NOTICE text file distributed
-as part of the Derivative Works; within the Source form or
-documentation, if provided along with the Derivative Works; or,
-within a display generated by the Derivative Works, if and
-wherever such third-party notices normally appear. The contents
-of the NOTICE file are for informational purposes only and
-do not modify the License. You may add Your own attribution
-notices within Derivative Works that You distribute, alongside
-or as an addendum to the NOTICE text from the Work, provided
-that such additional attribution notices cannot be construed
-as modifying the License.
-You may add Your own copyright statement to Your modifications
-and
-may provide additional or different license terms and conditions
-for use, reproduction, or distribution of Your modifications,
-or
-for any such Derivative Works as a whole, provided Your use,
-reproduction, and distribution of the Work otherwise complies
-with
-the conditions stated in this License.
-5. Submission of Contributions. Unless You explicitly state otherwise,
-any Contribution intentionally submitted for inclusion in the
-Work
-by You to the Licensor shall be under the terms and conditions
-of
-this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or
-modify
-the terms of any separate license agreement you may have executed
-with Licensor regarding such Contributions.
-6. Trademarks. This License does not grant permission to use
-the trade
-names, trademarks, service marks, or product names of the Licensor,
-except as required for reasonable and customary use in describing
-the
-origin of the Work and reproducing the content of the NOTICE
-file.
-7. Disclaimer of Warranty. Unless required by applicable law
-or
-agreed to in writing, Licensor provides the Work (and each
-Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-or
-implied, including, without limitation, any warranties or conditions
-of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-PARTICULAR PURPOSE. You are solely responsible for determining
-the
-appropriateness of using or redistributing the Work and assume
-any
-risks associated with Your exercise of permissions under this
-License.
-8. Limitation of Liability. In no event and under no legal theory,
-whether in tort (including negligence), contract, or otherwise,
-unless required by applicable law (such as deliberate and grossly
-negligent acts) or agreed to in writing, shall any Contributor
-be
-liable to You for damages, including any direct, indirect, special,
-incidental, or consequential damages of any character arising
-as a
-result of this License or out of the use or inability to use
-the
-Work (including but not limited to damages for loss of goodwill,
-work stoppage, computer failure or malfunction, or any and all
-other commercial damages or losses), even if such Contributor
-has been advised of the possibility of such damages.
-9. Accepting Warranty or Additional Liability. While redistributing
-the Work or Derivative Works thereof, You may choose to offer,
-and charge a fee for, acceptance of support, warranty, indemnity,
-or other liability obligations and/or rights consistent with
-this
-License. However, in accepting such obligations, You may act
-only
-on Your own behalf and on Your sole responsibility, not on behalf
-of any other Contributor, and only if You agree to indemnify,
-defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by
-reason
-of your accepting any such warranty or additional liability.
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
</license>
<url>
- <update label="Apache Directory Studio" url="http://directory.apache.org/studio/update/1.x"/>
+ <update label="Apache Directory Studio" url="http://directory.apache.org/studio/update/2.x"/>
</url>
<plugin
diff --git a/features/schemaeditor.feature/feature.xml b/features/schemaeditor.feature/feature.xml
index ea43b1e..14b1b4a 100644
--- a/features/schemaeditor.feature/feature.xml
+++ b/features/schemaeditor.feature/feature.xml
@@ -12,214 +12,337 @@
</description>
<copyright>
- © 2006-2011 Apache Software Foundation - All right reserved.
+ © 2006-2012 Apache Software Foundation - All right reserved.
This product includes software developed by the
Apache Software Foundation http://www.apache.org/
Some icons from FAMFAMFAM http://www.famfamfam.com/lab/icons/silk/
</copyright>
<license url="http://www.apache.org/licenses/LICENSE-2.0.html">
- Apache License
+Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-1. Definitions.
-"License" shall mean the terms and conditions for use, reproduction,
-and distribution as defined by Sections 1 through 9 of this document.
-"Licensor" shall mean the copyright owner or entity authorized
-by
-the copyright owner that is granting the License.
-"Legal Entity" shall mean the union of the acting entity and
-all
-other entities that control, are controlled by, or are under
-common
-control with that entity. For the purposes of this definition,
-"control" means (i) the power, direct or indirect, to cause the
-direction or management of such entity, whether by contract or
-otherwise, or (ii) ownership of fifty percent (50%) or more of
-the
-outstanding shares, or (iii) beneficial ownership of such entity.
-"You" (or "Your") shall mean an individual or Legal Entity
-exercising permissions granted by this License.
-"Source" form shall mean the preferred form for making modifications,
-including but not limited to software source code, documentation
-source, and configuration files.
-"Object" form shall mean any form resulting from mechanical
-transformation or translation of a Source form, including but
-not limited to compiled object code, generated documentation,
-and conversions to other media types.
-"Work" shall mean the work of authorship, whether in Source or
-Object form, made available under the License, as indicated by
-a
-copyright notice that is included in or attached to the work
-(an example is provided in the Appendix below).
-"Derivative Works" shall mean any work, whether in Source or
-Object
-form, that is based on (or derived from) the Work and for which
-the
-editorial revisions, annotations, elaborations, or other modifications
-represent, as a whole, an original work of authorship. For the
-purposes
-of this License, Derivative Works shall not include works that
-remain
-separable from, or merely link (or bind by name) to the interfaces
-of,
-the Work and Derivative Works thereof.
-"Contribution" shall mean any work of authorship, including
-the original version of the Work and any modifications or additions
-to that Work or Derivative Works thereof, that is intentionally
-submitted to Licensor for inclusion in the Work by the copyright
-owner
-or by an individual or Legal Entity authorized to submit on behalf
-of
-the copyright owner. For the purposes of this definition, "submitted"
-means any form of electronic, verbal, or written communication
-sent
-to the Licensor or its representatives, including but not limited
-to
-communication on electronic mailing lists, source code control
-systems,
-and issue tracking systems that are managed by, or on behalf
-of, the
-Licensor for the purpose of discussing and improving the Work,
-but
-excluding communication that is conspicuously marked or otherwise
-designated in writing by the copyright owner as "Not a Contribution."
-"Contributor" shall mean Licensor and any individual or Legal
-Entity
-on behalf of whom a Contribution has been received by Licensor
-and
-subsequently incorporated within the Work.
-2. Grant of Copyright License. Subject to the terms and conditions
-of
-this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute
-the
-Work and such Derivative Works in Source or Object form.
-3. Grant of Patent License. Subject to the terms and conditions
-of
-this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-(except as stated in this section) patent license to make, have
-made,
-use, offer to sell, sell, import, and otherwise transfer the
-Work,
-where such license applies only to those patent claims licensable
-by such Contributor that are necessarily infringed by their
-Contribution(s) alone or by combination of their Contribution(s)
-with the Work to which such Contribution(s) was submitted. If
-You
-institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work
-or a Contribution incorporated within the Work constitutes direct
-or contributory patent infringement, then any patent licenses
-granted to You under this License for that Work shall terminate
-as of the date such litigation is filed.
-4. Redistribution. You may reproduce and distribute copies of
-the
-Work or Derivative Works thereof in any medium, with or without
-modifications, and in Source or Object form, provided that You
-meet the following conditions:
-(a) You must give any other recipients of the Work or
-Derivative Works a copy of this License; and
-(b) You must cause any modified files to carry prominent notices
-stating that You changed the files; and
-(c) You must retain, in the Source form of any Derivative Works
-that You distribute, all copyright, patent, trademark, and
-attribution notices from the Source form of the Work,
-excluding those notices that do not pertain to any part of
-the Derivative Works; and
-(d) If the Work includes a "NOTICE" text file as part of its
-distribution, then any Derivative Works that You distribute must
-include a readable copy of the attribution notices contained
-within such NOTICE file, excluding those notices that do not
-pertain to any part of the Derivative Works, in at least one
-of the following places: within a NOTICE text file distributed
-as part of the Derivative Works; within the Source form or
-documentation, if provided along with the Derivative Works; or,
-within a display generated by the Derivative Works, if and
-wherever such third-party notices normally appear. The contents
-of the NOTICE file are for informational purposes only and
-do not modify the License. You may add Your own attribution
-notices within Derivative Works that You distribute, alongside
-or as an addendum to the NOTICE text from the Work, provided
-that such additional attribution notices cannot be construed
-as modifying the License.
-You may add Your own copyright statement to Your modifications
-and
-may provide additional or different license terms and conditions
-for use, reproduction, or distribution of Your modifications,
-or
-for any such Derivative Works as a whole, provided Your use,
-reproduction, and distribution of the Work otherwise complies
-with
-the conditions stated in this License.
-5. Submission of Contributions. Unless You explicitly state otherwise,
-any Contribution intentionally submitted for inclusion in the
-Work
-by You to the Licensor shall be under the terms and conditions
-of
-this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or
-modify
-the terms of any separate license agreement you may have executed
-with Licensor regarding such Contributions.
-6. Trademarks. This License does not grant permission to use
-the trade
-names, trademarks, service marks, or product names of the Licensor,
-except as required for reasonable and customary use in describing
-the
-origin of the Work and reproducing the content of the NOTICE
-file.
-7. Disclaimer of Warranty. Unless required by applicable law
-or
-agreed to in writing, Licensor provides the Work (and each
-Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-or
-implied, including, without limitation, any warranties or conditions
-of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-PARTICULAR PURPOSE. You are solely responsible for determining
-the
-appropriateness of using or redistributing the Work and assume
-any
-risks associated with Your exercise of permissions under this
-License.
-8. Limitation of Liability. In no event and under no legal theory,
-whether in tort (including negligence), contract, or otherwise,
-unless required by applicable law (such as deliberate and grossly
-negligent acts) or agreed to in writing, shall any Contributor
-be
-liable to You for damages, including any direct, indirect, special,
-incidental, or consequential damages of any character arising
-as a
-result of this License or out of the use or inability to use
-the
-Work (including but not limited to damages for loss of goodwill,
-work stoppage, computer failure or malfunction, or any and all
-other commercial damages or losses), even if such Contributor
-has been advised of the possibility of such damages.
-9. Accepting Warranty or Additional Liability. While redistributing
-the Work or Derivative Works thereof, You may choose to offer,
-and charge a fee for, acceptance of support, warranty, indemnity,
-or other liability obligations and/or rights consistent with
-this
-License. However, in accepting such obligations, You may act
-only
-on Your own behalf and on Your sole responsibility, not on behalf
-of any other Contributor, and only if You agree to indemnify,
-defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by
-reason
-of your accepting any such warranty or additional liability.
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
</license>
<url>
- <update label="Apache Directory Studio" url="http://directory.apache.org/studio/update/1.x"/>
+ <update label="Apache Directory Studio" url="http://directory.apache.org/studio/update/2.x"/>
</url>
+ <requires>
+ <import plugin="org.eclipse.core.expressions"/>
+ <import plugin="org.eclipse.core.runtime"/>
+ <import plugin="org.eclipse.jface.text"/>
+ <import plugin="org.eclipse.search"/>
+ <import plugin="org.eclipse.ui"/>
+ <import plugin="org.eclipse.ui.editors"/>
+ <import plugin="org.eclipse.ui.forms"/>
+ <import plugin="org.eclipse.ui.workbench.texteditor"/>
+ </requires>
+
+ <plugin
+ id="org.antlr.antlr"
+ download-size="0"
+ install-size="0"
+ version="${org.antlr.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.collections"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.collections.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.io"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.io.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.lang"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.lang.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.logging"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.logging.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.commons.pool"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.commons.pool.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.logging.log4j"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.logging.log4j.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.asn1.api"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.asn1.ber"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.i18n"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.client.api"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.codec.core"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.extras.aci"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.model"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.net.mina"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.schema"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.ldap.schema.converter"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.shared.util"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.directory.shared.validversion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.directory.studio.common.core"
+ download-size="0"
+ install-size="0"
+ version="${pom.version}"
+ unpack="false"/>
+
<plugin
id="org.apache.directory.studio.common.ui"
download-size="0"
@@ -262,4 +385,46 @@
version="${pom.version}"
unpack="false"/>
+ <plugin
+ id="org.apache.httpcomponents.httpclient"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.httpcomponents.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.httpcomponents.httpcore"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.httpcomponents.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.mina.core"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.mina.core.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.bouncycastle.bcprov.jdk15"
+ download-size="0"
+ install-size="0"
+ version="${org.bouncycastle.bcprov.jdk15.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.dom4j.dom4j"
+ download-size="0"
+ install-size="0"
+ version="${org.dom4j.version}"
+ unpack="false"/>
+
+ <plugin
+ id="org.slf4j.api"
+ download-size="0"
+ install-size="0"
+ version="${org.slf4j.version}"
+ unpack="false"/>
+
</feature>
diff --git a/helps/apacheds.configuration.help/pom.xml b/helps/apacheds.configuration.help/pom.xml
index 5e02a0d..1313ec6 100644
--- a/helps/apacheds.configuration.help/pom.xml
+++ b/helps/apacheds.configuration.help/pom.xml
@@ -22,9 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>help-plugin</artifactId>
+ <artifactId>parent-helps</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../help-plugin-pom.xml</relativePath>
</parent>
<artifactId>apacheds.configuration.help</artifactId>
diff --git a/helps/apacheds.help/pom.xml b/helps/apacheds.help/pom.xml
index 3d49959..ee6529d 100644
--- a/helps/apacheds.help/pom.xml
+++ b/helps/apacheds.help/pom.xml
@@ -22,9 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>help-plugin</artifactId>
+ <artifactId>parent-helps</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../help-plugin-pom.xml</relativePath>
</parent>
<artifactId>apacheds.help</artifactId>
diff --git a/helps/help-plugin-pom.xml b/helps/help-plugin-pom.xml
deleted file mode 100644
index 28e70e1..0000000
--- a/helps/help-plugin-pom.xml
+++ /dev/null
@@ -1,362 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!--
- @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>parent-helps</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>./pom.xml</relativePath>
- </parent>
-
- <artifactId>help-plugin</artifactId>
- <name>Apache Directory Studio Help Plugin Template</name>
- <packaging>pom</packaging>
-
- <profiles>
- <!-- UserGuides -->
- <profile>
- <id>userguides</id>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources/html</directory>
- <targetPath>../pdf</targetPath>
- </resource>
- <resource>
- <directory>src/main/resources/html</directory>
- <targetPath>../html</targetPath>
- </resource>
- <resource>
- <directory>src/main/docbook</directory>
- <targetPath>../docbook/documents</targetPath>
- <filtering>true</filtering>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <dependencies>
- <!--
- Putting this dependency in the core pom produces following error (?):
- Embedded error: java.lang.ClassCastException: org.apache.fop.render.pdf.PDFRendererMaker cannot be cast to org.apache.fop.render.AbstractRendererMaker
- -->
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>xmlgraphics-commons</artifactId>
- <version>1.1</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>build-pdf-html-help</id>
- <phase>compile</phase>
- <configuration>
- <target>
- <taskdef name="fop" classname="org.apache.fop.tools.anttasks.Fop">
- <classpath>
- <path refid="maven.compile.classpath" />
- <pathelement location="${project.build.outputDirectory}" />
- </classpath>
- </taskdef>
-
- <!-- Prepare docbook -->
- <property name="fromregexpxml" value="^(docbook-xml-[^/]+)/(.*)" />
- <property name="toregexpxml" value="docbook-xml/\2" />
- <move todir="target/docbook">
- <fileset dir="target/docbook">
- <include name="docbook-xml-*/**" />
- </fileset>
- <regexpmapper from="${fromregexpxml}" to="${toregexpxml}" handledirsep="true" />
- </move>
-
- <property name="fromregexpxsl" value="^(docbook-xsl-[^/]+)/(.*)" />
- <property name="toregexpxsl" value="docbook-xsl/\2" />
- <move todir="target/docbook">
- <fileset dir="target/docbook">
- <include name="docbook-xsl-*/**" />
- </fileset>
- <regexpmapper from="${fromregexpxsl}" to="${toregexpxsl}" handledirsep="true" />
- </move>
-
- <!-- Create PDF -->
- <xslt basedir="target/docbook" in="target/docbook/documents/0_index.xml" out="target/pdf/${project.artifactId}.fo" style="target/docbook/docbook-xsl/fo/docbook.xsl">
- <param name="manifest.in.base.dir" expression="0" />
- <param name="generate.section.toc.level" expression="5" />
- <param name="toc.max.depth" expression="3" />
- <param name="ulink.target" expression="_self" />
- <param name="suppress.navigation" expression="0" />
- <param name="use.id.as.filename" expression="1" />
- <param name="chapter.autolabel" expression="I" />
- <param name="section.autolabel" expression="1" />
- <outputproperty name="method" value="xml" />
- <outputproperty name="standalone" value="yes" />
- <outputproperty name="encoding" value="iso8859_1" />
- <outputproperty name="indent" value="es" />
- </xslt>
- <fop format="application/pdf" basedir="target/pdf" fofile="target/pdf/${project.artifactId}.fo" outfile="target/pdf/${name}.pdf" />
-
- <!-- Create HTML -->
- <xslt in="target/docbook/documents/0_index.xml" out="target/html/index.html" style="target/docbook/docbook-xsl/html/chunk.xsl">
- <param name="ignore.image.scaling" expression="1" />
- <param name="manifest.in.base.dir" expression="0" />
- <!-- <param name="base.dir" expression="html/" /> -->
- <param name="html.stylesheet" expression="css/book.css" />
- <param name="table.cell.borders.thickness" expression="1" />
- <!-- <param name="table.borders.with.css" expression="1" /> -->
- <param name="generate.section.toc.level" expression="5" />
- <param name="toc.max.depth" expression="3" />
- <param name="chunk.first.sections" expression="1" />
- <param name="chunk.section.depth" expression="5" />
- <param name="chunk.fast" expression="1" />
- <param name="chunk.separate.lots" expression="1" />
- <!--<param name="chunk.tocs.and.lots" expression="1" />-->
- <param name="ulink.target" expression="_self" />
- <param name="suppress.navigation" expression="0" />
- <param name="html.cleanup" expression="1" />
- <param name="html.cellpadding" expression="3" />
- <param name="use.id.as.filename" expression="1" />
- <param name="chapter.autolabel" expression="0" />
- <param name="section.autolabel" expression="0" />
- <outputproperty name="method" value="xml" />
- <outputproperty name="standalone" value="yes" />
- <outputproperty name="encoding" value="iso8859_1" />
- <outputproperty name="indent" value="es" />
- </xslt>
-
- <!-- Copy PDF/HTML to ../target -->
- <mkdir dir="../target/userguides" />
- <copy todir="../target/userguides">
- <fileset dir="target/pdf" />
- </copy>
- <mkdir dir="../target/userguides/${name}" />
- <copy todir="../target/userguides/${name}">
- <fileset dir="target/html" />
- </copy>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <build>
- <resources>
- <resource>
- <directory>.</directory>
- <includes>
- <include>plugin.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/docbook</directory>
- <targetPath>../docbook/documents</targetPath>
- <filtering>true</filtering>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <buildcommands>
- <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
- <buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
- </buildcommands>
- <projectnatures>
- <projectnature>org.eclipse.pde.PluginNature</projectnature>
- </projectnatures>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>studio-maven-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- <createManifest>true</createManifest>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>prepare-jar-package</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>META-INF/MANIFEST.MF</manifestFile>
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
- </configuration>
- </plugin>
-
- <!-- MANIFEST.MF Generation -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton:=true</Bundle-SymbolicName>
- <Bundle-Localization>plugin</Bundle-Localization>
- <Eclipse-LazyStart>true</Eclipse-LazyStart>
- <Export-Package>!</Export-Package>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>generate-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-docbook-dependencies</id>
- <phase>process-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <overWrite>true</overWrite>
- <artifactItems>
- <artifactItem>
- <groupId>docbook</groupId>
- <artifactId>docbook-xml</artifactId>
- <type>zip</type>
- <outputDirectory>target/docbook/docbook-xml</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>docbook</groupId>
- <artifactId>docbook-xsl</artifactId>
- <type>zip</type>
- <outputDirectory>target/docbook</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>build-eclipse-help</id>
- <phase>process-classes</phase>
- <configuration>
- <target>
- <!-- Prepare docbook -->
- <property name="fromregexpxml" value="^(docbook-xml-[^/]+)/(.*)" />
- <property name="toregexpxml" value="docbook-xml/\2" />
- <move todir="target/docbook">
- <fileset dir="target/docbook">
- <include name="docbook-xml-*/**" />
- </fileset>
- <regexpmapper from="${fromregexpxml}" to="${toregexpxml}" handledirsep="true" />
- </move>
-
- <property name="fromregexpxsl" value="^(docbook-xsl-[^/]+)/(.*)" />
- <property name="toregexpxsl" value="docbook-xsl/\2" />
- <move todir="target/docbook">
- <fileset dir="target/docbook">
- <include name="docbook-xsl-*/**" />
- </fileset>
- <regexpmapper from="${fromregexpxsl}" to="${toregexpxsl}" handledirsep="true" />
- </move>
-
- <!-- Create HTML -->
- <xslt basedir="target/docbook/" in="target/docbook/documents/0_index.xml" out="target/classes/index.html" style="target/docbook/docbook-xsl/eclipse/eclipse.xsl">
- <param name="ignore.image.scaling" expression="1" />
- <param name="manifest.in.base.dir" expression="0" />
- <param name="base.dir" expression="html/" />
- <param name="html.stylesheet" expression="css/book.css" />
- <param name="table.cell.borders.thickness" expression="1" />
- <!-- <param name="table.borders.with.css" expression="1" /> -->
- <param name="generate.section.toc.level" expression="5" />
- <param name="toc.max.depth" expression="1" />
- <param name="chunk.first.sections" expression="1" />
- <param name="chunk.section.depth" expression="5" />
- <param name="chunk.fast" expression="1" />
- <param name="chunk.separate.lots" expression="1" />
- <!--<param name="chunk.tocs.and.lots" expression="1" />-->
- <param name="ulink.target" expression="_self" />
- <param name="suppress.navigation" expression="1" />
- <param name="html.cleanup" expression="1" />
- <param name="html.cellpadding" expression="3" />
- <param name="use.id.as.filename" expression="1" />
- <param name="chapter.autolabel" expression="0" />
- <param name="section.autolabel" expression="0" />
- <outputproperty name="method" value="xml" />
- <outputproperty name="standalone" value="yes" />
- <outputproperty name="encoding" value="iso8859_1" />
- <outputproperty name="indent" value="es" />
- </xslt>
-
- <!-- Copy the good plugin.xml.
- The eclipse.xsl creates its own plugin.xml but we want
- to use our own.
- -->
- <copy todir="target/classes" file="plugin.xml" overwrite="true" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- No tests to run -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/helps/ldapbrowser.help/pom.xml b/helps/ldapbrowser.help/pom.xml
index 5fd3282..e59b261 100644
--- a/helps/ldapbrowser.help/pom.xml
+++ b/helps/ldapbrowser.help/pom.xml
@@ -22,9 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>help-plugin</artifactId>
+ <artifactId>parent-helps</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../help-plugin-pom.xml</relativePath>
</parent>
<artifactId>ldapbrowser.help</artifactId>
diff --git a/helps/ldifeditor.help/pom.xml b/helps/ldifeditor.help/pom.xml
index 153c01b..47478f2 100644
--- a/helps/ldifeditor.help/pom.xml
+++ b/helps/ldifeditor.help/pom.xml
@@ -22,9 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>help-plugin</artifactId>
+ <artifactId>parent-helps</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../help-plugin-pom.xml</relativePath>
</parent>
<artifactId>ldifeditor.help</artifactId>
diff --git a/helps/pom.xml b/helps/pom.xml
index f4d674c..61101ac 100644
--- a/helps/pom.xml
+++ b/helps/pom.xml
@@ -39,48 +39,424 @@
<module>schemaeditor.help</module>
</modules>
+ <profiles>
+ <!-- UserGuides -->
+ <profile>
+ <id>userguides</id>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources/html</directory>
+ <targetPath>../pdf</targetPath>
+ </resource>
+ <resource>
+ <directory>src/main/resources/html</directory>
+ <targetPath>../html</targetPath>
+ </resource>
+ <resource>
+ <directory>src/main/docbook</directory>
+ <targetPath>../docbook/documents</targetPath>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <!--
+ Putting this dependency in the core pom produces following error (?):
+ Embedded error: java.lang.ClassCastException: org.apache.fop.render.pdf.PDFRendererMaker cannot be cast to org.apache.fop.render.AbstractRendererMaker
+ -->
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>xmlgraphics-commons</artifactId>
+ <version>1.1</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>build-pdf-html-help</id>
+ <phase>compile</phase>
+ <configuration>
+ <target>
+ <taskdef name="fop" classname="org.apache.fop.tools.anttasks.Fop">
+ <classpath>
+ <path refid="maven.compile.classpath" />
+ <pathelement location="${project.build.outputDirectory}" />
+ </classpath>
+ </taskdef>
+
+ <!-- Prepare docbook -->
+ <property name="fromregexpxml" value="^(docbook-xml-[^/]+)/(.*)" />
+ <property name="toregexpxml" value="docbook-xml/\2" />
+ <move todir="target/docbook">
+ <fileset dir="target/docbook">
+ <include name="docbook-xml-*/**" />
+ </fileset>
+ <regexpmapper from="${fromregexpxml}" to="${toregexpxml}" handledirsep="true" />
+ </move>
+
+ <property name="fromregexpxsl" value="^(docbook-xsl-[^/]+)/(.*)" />
+ <property name="toregexpxsl" value="docbook-xsl/\2" />
+ <move todir="target/docbook">
+ <fileset dir="target/docbook">
+ <include name="docbook-xsl-*/**" />
+ </fileset>
+ <regexpmapper from="${fromregexpxsl}" to="${toregexpxsl}" handledirsep="true" />
+ </move>
+
+ <!-- Create PDF -->
+ <xslt basedir="target/docbook" in="target/docbook/documents/0_index.xml" out="target/pdf/${project.artifactId}.fo" style="target/docbook/docbook-xsl/fo/docbook.xsl">
+ <param name="manifest.in.base.dir" expression="0" />
+ <param name="generate.section.toc.level" expression="5" />
+ <param name="toc.max.depth" expression="3" />
+ <param name="ulink.target" expression="_self" />
+ <param name="suppress.navigation" expression="0" />
+ <param name="use.id.as.filename" expression="1" />
+ <param name="chapter.autolabel" expression="I" />
+ <param name="section.autolabel" expression="1" />
+ <outputproperty name="method" value="xml" />
+ <outputproperty name="standalone" value="yes" />
+ <outputproperty name="encoding" value="iso8859_1" />
+ <outputproperty name="indent" value="es" />
+ </xslt>
+ <fop format="application/pdf" basedir="target/pdf" fofile="target/pdf/${project.artifactId}.fo" outfile="target/pdf/${project.name}.pdf" />
+
+ <!-- Create HTML -->
+ <xslt in="target/docbook/documents/0_index.xml" out="target/html/index.html" style="target/docbook/docbook-xsl/html/chunk.xsl">
+ <param name="ignore.image.scaling" expression="1" />
+ <param name="manifest.in.base.dir" expression="0" />
+ <!-- <param name="base.dir" expression="html/" /> -->
+ <param name="html.stylesheet" expression="css/book.css" />
+ <param name="table.cell.borders.thickness" expression="1" />
+ <!-- <param name="table.borders.with.css" expression="1" /> -->
+ <param name="generate.section.toc.level" expression="5" />
+ <param name="toc.max.depth" expression="3" />
+ <param name="chunk.first.sections" expression="1" />
+ <param name="chunk.section.depth" expression="5" />
+ <param name="chunk.fast" expression="1" />
+ <param name="chunk.separate.lots" expression="1" />
+ <!--<param name="chunk.tocs.and.lots" expression="1" />-->
+ <param name="ulink.target" expression="_self" />
+ <param name="suppress.navigation" expression="0" />
+ <param name="html.cleanup" expression="1" />
+ <param name="html.cellpadding" expression="3" />
+ <param name="use.id.as.filename" expression="1" />
+ <param name="chapter.autolabel" expression="0" />
+ <param name="section.autolabel" expression="0" />
+ <outputproperty name="method" value="xml" />
+ <outputproperty name="standalone" value="yes" />
+ <outputproperty name="encoding" value="iso8859_1" />
+ <outputproperty name="indent" value="es" />
+ </xslt>
+
+ <!-- Copy PDF/HTML to ../target -->
+ <mkdir dir="../target/userguides" />
+ <copy todir="../target/userguides">
+ <fileset dir="target/pdf" />
+ </copy>
+ <mkdir dir="../target/userguides/${project.name}" />
+ <copy todir="../target/userguides/${project.name}">
+ <fileset dir="target/html" />
+ </copy>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>help-plugin</id>
+ <activation>
+ <file><exists>src/main/docbook/0_index.xml</exists></file>
+ </activation>
+ <build>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>plugin.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/docbook</directory>
+ <targetPath>../docbook/documents</targetPath>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ <buildcommands>
+ <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
+ <buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
+ </buildcommands>
+ <projectnatures>
+ <projectnature>org.eclipse.pde.PluginNature</projectnature>
+ </projectnatures>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>studio-maven-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ <createManifest>true</createManifest>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>prepare-jar-package</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <!-- MANIFEST.MF Generation -->
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton:=true</Bundle-SymbolicName>
+ <Bundle-Localization>plugin</Bundle-Localization>
+ <Eclipse-LazyStart>true</Eclipse-LazyStart>
+ <Export-Package>!</Export-Package>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-docbook-dependencies</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <overWrite>true</overWrite>
+ <artifactItems>
+ <artifactItem>
+ <groupId>docbook</groupId>
+ <artifactId>docbook-xml</artifactId>
+ <type>zip</type>
+ <outputDirectory>target/docbook/docbook-xml</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>docbook</groupId>
+ <artifactId>docbook-xsl</artifactId>
+ <type>zip</type>
+ <outputDirectory>target/docbook</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-eclipse-help</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <target>
+ <!-- Prepare docbook -->
+ <property name="fromregexpxml" value="^(docbook-xml-[^/]+)/(.*)" />
+ <property name="toregexpxml" value="docbook-xml/\2" />
+ <move todir="target/docbook">
+ <fileset dir="target/docbook">
+ <include name="docbook-xml-*/**" />
+ </fileset>
+ <regexpmapper from="${fromregexpxml}" to="${toregexpxml}" handledirsep="true" />
+ </move>
+
+ <property name="fromregexpxsl" value="^(docbook-xsl-[^/]+)/(.*)" />
+ <property name="toregexpxsl" value="docbook-xsl/\2" />
+ <move todir="target/docbook">
+ <fileset dir="target/docbook">
+ <include name="docbook-xsl-*/**" />
+ </fileset>
+ <regexpmapper from="${fromregexpxsl}" to="${toregexpxsl}" handledirsep="true" />
+ </move>
+
+ <!-- Create HTML -->
+ <xslt basedir="target/docbook/" in="target/docbook/documents/0_index.xml" out="target/classes/index.html" style="target/docbook/docbook-xsl/eclipse/eclipse.xsl">
+ <param name="ignore.image.scaling" expression="1" />
+ <param name="manifest.in.base.dir" expression="0" />
+ <param name="base.dir" expression="html/" />
+ <param name="html.stylesheet" expression="css/book.css" />
+ <param name="table.cell.borders.thickness" expression="1" />
+ <!-- <param name="table.borders.with.css" expression="1" /> -->
+ <param name="generate.section.toc.level" expression="5" />
+ <param name="toc.max.depth" expression="1" />
+ <param name="chunk.first.sections" expression="1" />
+ <param name="chunk.section.depth" expression="5" />
+ <param name="chunk.fast" expression="1" />
+ <param name="chunk.separate.lots" expression="1" />
+ <!--<param name="chunk.tocs.and.lots" expression="1" />-->
+ <param name="ulink.target" expression="_self" />
+ <param name="suppress.navigation" expression="1" />
+ <param name="html.cleanup" expression="1" />
+ <param name="html.cellpadding" expression="3" />
+ <param name="use.id.as.filename" expression="1" />
+ <param name="chapter.autolabel" expression="0" />
+ <param name="section.autolabel" expression="0" />
+ <outputproperty name="method" value="xml" />
+ <outputproperty name="standalone" value="yes" />
+ <outputproperty name="encoding" value="iso8859_1" />
+ <outputproperty name="indent" value="es" />
+ </xslt>
+
+ <!-- Copy the good plugin.xml.
+ The eclipse.xsl creates its own plugin.xml but we want
+ to use our own.
+ -->
+ <copy todir="target/classes" file="plugin.xml" overwrite="true" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- No tests to run -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!-- MAVEN_DEFAULT_EXCLUDES -->
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <!-- ECLIPSE_DEFAULT_EXCLUDES -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <!-- IDEA_DEFAULT_EXCLUDES -->
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <!-- MANIFEST_MF_EXCLUDES -->
+ <exclude>**/MANIFEST.MF</exclude>
+ <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <!-- GITIGNORE_EXCLUDES -->
+ <exclude>**/.gitignore</exclude>
+ <!-- ABOUT_EXCLUDES -->
+ <exclude>**/about.ini</exclude>
+ <exclude>**/about_files/*</exclude>
+ <!-- LOG_FILES_EXCLUDES -->
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.vm</exclude>
+ <!-- NSIS_EXCLUDES -->
+ <exclude>**/src/main/resources/AdvUninstLog.nsh</exclude>
+ <!-- OTHER_EXCLUDES -->
+ <exclude>ldapbrowser.help/src/main/resources/sevenseas.ldif</exclude>
+ <exclude>**/src/main/resources/html/rfc/*.txt</exclude>
+ <exclude>**/src/main/resources/html/rfcs/*.txt</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
+
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludeSubProjects>false</excludeSubProjects>
- <excludes>
- <!-- MAVEN_DEFAULT_EXCLUDES -->
- <exclude>**/target/**/*</exclude>
- <exclude>**/cobertura.ser</exclude>
- <!-- ECLIPSE_DEFAULT_EXCLUDES -->
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings/**/*</exclude>
- <!-- IDEA_DEFAULT_EXCLUDES -->
- <exclude>**/*.iml</exclude>
- <exclude>**/*.ipr</exclude>
- <exclude>**/*.iws</exclude>
- <!-- MANIFEST_MF_EXCLUDES -->
- <exclude>**/MANIFEST.MF</exclude>
- <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
- <exclude>**/dependency-reduced-pom.xml</exclude>
- <!-- GITIGNORE_EXCLUDES -->
- <exclude>**/.gitignore</exclude>
- <!-- ABOUT_EXCLUDES -->
- <exclude>**/about.ini</exclude>
- <exclude>**/about_files/*</exclude>
- <!-- LOG_FILES_EXCLUDES -->
- <exclude>**/*.log</exclude>
- <exclude>**/*.vm</exclude>
- <!-- NSIS_EXCLUDES -->
- <exclude>**/src/main/resources/AdvUninstLog.nsh</exclude>
- <!-- OTHER_EXCLUDES -->
- <exclude>ldapbrowser.help/src/main/resources/sevenseas.ldif</exclude>
- <exclude>**/src/main/resources/html/rfc/*.txt</exclude>
- <exclude>**/src/main/resources/html/rfcs/*.txt</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!-- MAVEN_DEFAULT_EXCLUDES -->
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <!-- ECLIPSE_DEFAULT_EXCLUDES -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <!-- IDEA_DEFAULT_EXCLUDES -->
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <!-- MANIFEST_MF_EXCLUDES -->
+ <exclude>**/MANIFEST.MF</exclude>
+ <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <!-- GITIGNORE_EXCLUDES -->
+ <exclude>**/.gitignore</exclude>
+ <!-- ABOUT_EXCLUDES -->
+ <exclude>**/about.ini</exclude>
+ <exclude>**/about_files/*</exclude>
+ <!-- LOG_FILES_EXCLUDES -->
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.vm</exclude>
+ <!-- NSIS_EXCLUDES -->
+ <exclude>**/src/main/resources/AdvUninstLog.nsh</exclude>
+ <!-- OTHER_EXCLUDES -->
+ <exclude>ldapbrowser.help/src/main/resources/sevenseas.ldif</exclude>
+ <exclude>**/src/main/resources/html/rfc/*.txt</exclude>
+ <exclude>**/src/main/resources/html/rfcs/*.txt</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
diff --git a/helps/rcp.help/pom.xml b/helps/rcp.help/pom.xml
index 474ebf2..f2295f9 100644
--- a/helps/rcp.help/pom.xml
+++ b/helps/rcp.help/pom.xml
@@ -22,9 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>help-plugin</artifactId>
+ <artifactId>parent-helps</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../help-plugin-pom.xml</relativePath>
</parent>
<artifactId>rcp.help</artifactId>
diff --git a/helps/schemaeditor.help/pom.xml b/helps/schemaeditor.help/pom.xml
index 0c6649c..7fd1644 100644
--- a/helps/schemaeditor.help/pom.xml
+++ b/helps/schemaeditor.help/pom.xml
@@ -22,9 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>help-plugin</artifactId>
+ <artifactId>parent-helps</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../help-plugin-pom.xml</relativePath>
</parent>
<artifactId>schemaeditor.help</artifactId>
diff --git a/libraries/org.apache.directory.server.config/pom.xml b/libraries/org.apache.directory.server.config/pom.xml
index 309498a..1bb1b2e 100644
--- a/libraries/org.apache.directory.server.config/pom.xml
+++ b/libraries/org.apache.directory.server.config/pom.xml
@@ -86,14 +86,20 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Require-Bundle>org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
+ org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.server.ldif.partition;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.server.xdbm.partition;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
- <Bundle-Localization>plugin</Bundle-Localization>
- <Eclipse-LazyStart>true</Eclipse-LazyStart>
- <Export-Package>
- org.apache.directory.server.config.*;version=${project.version};-noimport:=true
- </Export-Package>
+ <_exportcontents>!lib,*</_exportcontents>
+ <Import-Package>!</Import-Package>
</instructions>
</configuration>
<executions>
@@ -186,11 +192,6 @@
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.directory.server.ldif.partition</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.directory.server.xdbm.partition</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/libraries/org.apache.directory.server.core.api/pom.xml b/libraries/org.apache.directory.server.core.api/pom.xml
index bc3d289..7ef2f29 100644
--- a/libraries/org.apache.directory.server.core.api/pom.xml
+++ b/libraries/org.apache.directory.server.core.api/pom.xml
@@ -86,14 +86,29 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Require-Bundle>net.sf.ehcache.core;bundle-version="${net.sf.ehcache.version}",
+ org.antlr.antlr;bundle-version="${org.antlr.version}",
+ org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
+ org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
+ org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
+ org.apache.directory.server.core.constants;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.client.api;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.asn1.api;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.codec.core;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.extras.aci;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.extras.util;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.mina.core;bundle-version="${org.apache.mina.core.version}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
- <Bundle-Localization>plugin</Bundle-Localization>
- <Eclipse-LazyStart>true</Eclipse-LazyStart>
- <Export-Package>
- org.apache.directory.server.core.api.*;version=${project.version};-noimport:=true
- </Export-Package>
+ <_exportcontents>!lib,*</_exportcontents>
+ <Import-Package>!</Import-Package>
</instructions>
</configuration>
<executions>
@@ -122,8 +137,8 @@
<artifactId>apacheds-core-api</artifactId>
<exclusions>
<exclusion>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.directory.server</groupId>
@@ -134,6 +149,22 @@
<artifactId>apacheds-i18n</artifactId>
</exclusion>
<exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-client-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-asn1-api</artifactId>
</exclusion>
@@ -143,7 +174,7 @@
</exclusion>
<exclusion>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
+ <artifactId>shared-ldap-codec-standalone</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.directory.shared</groupId>
@@ -151,10 +182,6 @@
</exclusion>
<exclusion>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-model</artifactId>
</exclusion>
<exclusion>
@@ -166,6 +193,14 @@
<artifactId>shared-util</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-extras-aci</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-extras-util</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
</exclusion>
@@ -186,6 +221,16 @@
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.commons.collections</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.commons.io</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.commons.lang</artifactId>
<scope>provided</scope>
</dependency>
@@ -200,38 +245,28 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.mina.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.slf4j.api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-asn1-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-i18n</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-client-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
+ <artifactId>shared-i18n</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
+ <artifactId>shared-ldap-codec-standalone</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-codec-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -249,6 +284,16 @@
<artifactId>shared-util</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-extras-util</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.slf4j.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/libraries/org.apache.directory.server.core.avl/pom.xml b/libraries/org.apache.directory.server.core.avl/pom.xml
index 71b3ace..b5e79ba 100644
--- a/libraries/org.apache.directory.server.core.avl/pom.xml
+++ b/libraries/org.apache.directory.server.core.avl/pom.xml
@@ -86,14 +86,16 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Require-Bundle>org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
+ org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
- <Bundle-Localization>plugin</Bundle-Localization>
- <Eclipse-LazyStart>true</Eclipse-LazyStart>
- <Export-Package>
- org.apache.directory.server.core.avltree.*;version=${project.version};-noimport:=true
- </Export-Package>
+ <_exportcontents>!lib,*</_exportcontents>
+ <Import-Package>!</Import-Package>
</instructions>
</configuration>
<executions>
diff --git a/libraries/org.apache.directory.server.core.constants/pom.xml b/libraries/org.apache.directory.server.core.constants/pom.xml
index 72d9d79..5d0b881 100644
--- a/libraries/org.apache.directory.server.core.constants/pom.xml
+++ b/libraries/org.apache.directory.server.core.constants/pom.xml
@@ -86,14 +86,12 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Require-Bundle>org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
- <Bundle-Localization>plugin</Bundle-Localization>
- <Eclipse-LazyStart>true</Eclipse-LazyStart>
- <Export-Package>
- org.apache.directory.server.constants.*;version=${project.version};-noimport:=true
- </Export-Package>
+ <_exportcontents>!lib,*</_exportcontents>
+ <Import-Package>!</Import-Package>
</instructions>
</configuration>
<executions>
diff --git a/libraries/org.apache.directory.server.core/pom.xml b/libraries/org.apache.directory.server.core/pom.xml
index 3ccaf92..52bfc0f 100644
--- a/libraries/org.apache.directory.server.core/pom.xml
+++ b/libraries/org.apache.directory.server.core/pom.xml
@@ -86,14 +86,27 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Require-Bundle>net.sf.ehcache.core;bundle-version="${net.sf.ehcache.version}",
+ org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
+ org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
+ org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.client.api;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.codec.core;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.extras.aci;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.extras.trigger;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.extras.util;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
+ org.bouncycastle.bcprov.jdk15;bundle-version="${org.bouncycastle.bcprov.jdk15.version}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
- <Bundle-Localization>plugin</Bundle-Localization>
- <Eclipse-LazyStart>true</Eclipse-LazyStart>
- <Export-Package>
- org.apache.directory.server.core.*;version=${project.version};-noimport:=true
- </Export-Package>
+ <_exportcontents>!lib,*</_exportcontents>
+ <Import-Package>!</Import-Package>
</instructions>
</configuration>
<executions>
@@ -143,9 +156,69 @@
</exclusion>
<exclusion>
<groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-shared</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-i18n</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-interceptors-admin</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-interceptors-authn</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-interceptors-authz</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-interceptors-changelog</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-interceptors-collective</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-interceptors-event</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-interceptors-exception</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-interceptors-journal</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-interceptors-normalization</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-interceptors-operational</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-interceptors-referral</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-interceptors-schema</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-interceptors-subtree</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-interceptors-trigger</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-client-api</artifactId>
</exclusion>
@@ -228,11 +301,6 @@
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-extras-aci</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/libraries/org.apache.directory.server.i18n/pom.xml b/libraries/org.apache.directory.server.i18n/pom.xml
index a293361..3383154 100644
--- a/libraries/org.apache.directory.server.i18n/pom.xml
+++ b/libraries/org.apache.directory.server.i18n/pom.xml
@@ -86,14 +86,12 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Require-Bundle>org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
- <Bundle-Localization>plugin</Bundle-Localization>
- <Eclipse-LazyStart>true</Eclipse-LazyStart>
- <Export-Package>
- org.apache.directory.server.i18n.*;version=${project.version};-noimport:=true
- </Export-Package>
+ <_exportcontents>!lib,*</_exportcontents>
+ <Import-Package>!</Import-Package>
</instructions>
</configuration>
<executions>
diff --git a/libraries/org.apache.directory.server.ldif.partition/pom.xml b/libraries/org.apache.directory.server.ldif.partition/pom.xml
index d5f1ce6..f44ed6d 100644
--- a/libraries/org.apache.directory.server.ldif.partition/pom.xml
+++ b/libraries/org.apache.directory.server.ldif.partition/pom.xml
@@ -86,14 +86,22 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Require-Bundle>org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
+ org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
+ org.apache.directory.server.core;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.server.xdbm.partition;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
- <Bundle-Localization>plugin</Bundle-Localization>
- <Eclipse-LazyStart>true</Eclipse-LazyStart>
- <Export-Package>
- org.apache.directory.server.core.partition.ldif.*;version=${project.version};-noimport:=true
- </Export-Package>
+ <_exportcontents>!lib,*</_exportcontents>
+ <Import-Package>!</Import-Package>
</instructions>
</configuration>
<executions>
@@ -131,6 +139,10 @@
</exclusion>
<exclusion>
<groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-api</artifactId>
</exclusion>
<exclusion>
@@ -195,6 +207,11 @@
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.server.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.directory.server.core.api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/libraries/org.apache.directory.server.xdbm.partition/pom.xml b/libraries/org.apache.directory.server.xdbm.partition/pom.xml
index f10e11a..c349b5c 100644
--- a/libraries/org.apache.directory.server.xdbm.partition/pom.xml
+++ b/libraries/org.apache.directory.server.xdbm.partition/pom.xml
@@ -86,17 +86,20 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Require-Bundle>org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
+ org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.server.core.avl;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.shared.asn1.api;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
- <Bundle-Localization>plugin</Bundle-Localization>
- <Eclipse-LazyStart>true</Eclipse-LazyStart>
- <Export-Package>
- org.apache.directory.server.core.partition.impl.avl.*;version=${project.version};-noimport:=true,
- org.apache.directory.server.core.partition.impl.btree.*;version=${project.version};-noimport:=true,
- org.apache.directory.server.log.*;version=${project.version};-noimport:=true,
- org.apache.directory.server.xdbm.*;version=${project.version};-noimport:=true
- </Export-Package>
+ <_exportcontents>!lib,*</_exportcontents>
+ <Import-Package>!</Import-Package>
</instructions>
</configuration>
<executions>
@@ -161,10 +164,6 @@
<artifactId>shared-util</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.annotations</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
@@ -186,11 +185,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.felix.ipojo.annotations</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-asn1-api</artifactId>
<scope>provided</scope>
diff --git a/libraries/pom.xml b/libraries/pom.xml
index d9d4a42..02decb1 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -40,6 +40,7 @@
<module>org.apache.commons.logging</module>
<module>org.apache.commons.pool</module>
<module>org.apache.directory.server.config</module>
+ <module>org.apache.directory.server.core</module>
<module>org.apache.directory.server.core.api</module>
<module>org.apache.directory.server.core.avl</module>
<module>org.apache.directory.server.core.constants</module>
@@ -56,7 +57,7 @@
<module>org.slf4j.log4j12</module>
<module>org.xpp3.xpp3</module>
</modules>
-
+
<build>
<plugins>
<!-- Skip deployment of 3rd party plugins. This causes problems when
diff --git a/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java b/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java
index 062c2cd..07dce57 100644
--- a/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java
+++ b/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java
@@ -28,7 +28,7 @@
public interface ACIITemConstants
{
/** The plug-in ID */
- public static final String PLUGIN_ID = Activator.getDefault().getPluginProperties().getString( "Plugin_id" );
+ public static final String PLUGIN_ID = Activator.getDefault().getPluginProperties().getString( "Plugin_id" ); //$NON-NLS-1$
/** The ID for ACI Item Template */
public static final String ACI_ITEM_TEMPLATE_ID = Activator.getDefault().getPluginProperties().getString(
diff --git a/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/Activator.java b/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/Activator.java
index 412e7bd..779e30b 100644
--- a/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/Activator.java
+++ b/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/Activator.java
@@ -279,15 +279,15 @@
try
{
properties = new PropertyResourceBundle( FileLocator.openStream( this.getBundle(), new Path(
- "plugin.properties" ), false ) );
+ "plugin.properties" ), false ) ); //$NON-NLS-1$
}
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, "org.apache.directory.studio.aciitemeditor", Status.OK,
- "Unable to get the plugin properties.", e ) );
+ new Status( Status.ERROR, "org.apache.directory.studio.aciitemeditor", Status.OK, //$NON-NLS-1$
+ "Unable to get the plugin properties.", e ) ); //$NON-NLS-1$
}
}
diff --git a/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeSpecificationDialog.java b/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeSpecificationDialog.java
index ee02b1d..1bf0296 100644
--- a/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeSpecificationDialog.java
+++ b/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeSpecificationDialog.java
@@ -439,7 +439,7 @@
.getString( "SubtreeValueEditor.SubtreeValueEditor.label.filter" ), 2 ); //$NON-NLS-1$
// filter widget
- String filter = "";
+ String filter = ""; //$NON-NLS-1$
if ( subtreeSpecification.getRefinement() != null )
{
filter = subtreeSpecification.getRefinement().toString();
diff --git a/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemSourceEditorComposite.java b/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemSourceEditorComposite.java
index c3c40c4..25c8de2 100644
--- a/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemSourceEditorComposite.java
+++ b/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemSourceEditorComposite.java
@@ -145,7 +145,7 @@
ACIItemParser parser = Activator.getDefault().getACIItemParser();
ACIItem aciItem = parser.parse( input );
- String aci = "";
+ String aci = ""; //$NON-NLS-1$
if ( aciItem != null )
{
aci = aciItem.toString();
diff --git a/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemVisualEditorComposite.java b/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemVisualEditorComposite.java
index e98a0ac..50edbfb 100644
--- a/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemVisualEditorComposite.java
+++ b/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemVisualEditorComposite.java
@@ -240,7 +240,7 @@
aciItem = null;
}
- String aci = "";
+ String aci = ""; //$NON-NLS-1$
if ( aciItem != null )
{
aci = aciItem.toString();
diff --git a/plugins/apacheds.configuration.v2/about.ini b/plugins/apacheds.configuration.v2/about.ini
new file mode 100644
index 0000000..2ab7ecc
--- /dev/null
+++ b/plugins/apacheds.configuration.v2/about.ini
@@ -0,0 +1 @@
+featureImage=studio.png
\ No newline at end of file
diff --git a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.java b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.java
index e83b96c..c42ad4d 100644
--- a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.java
+++ b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.java
@@ -59,8 +59,8 @@
// Initializing DNs
try
{
- configEntryDn = new Dn( "ou=config" );
- directoryServiceDn = new Dn( "ads-directoryServiceId=default,ou=config" );
+ configEntryDn = new Dn( "ou=config" ); //$NON-NLS-1$
+ directoryServiceDn = new Dn( "ads-directoryServiceId=default,ou=config" ); //$NON-NLS-1$
}
catch ( LdapInvalidDnException e )
{
diff --git a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java
index e67e20a..4a6b19c 100644
--- a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java
+++ b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java
@@ -99,7 +99,7 @@
schemaManager = new DefaultSchemaManager( loader );
// Loading only the 'adsconfig' schema with its dependencies
- schemaManager.loadWithDeps( "adsconfig" );
+ schemaManager.loadWithDeps( "adsconfig" ); //$NON-NLS-1$
// Checking if no error occurred when loading the schemas
if ( schemaManager.getErrors().size() != 0 )
diff --git a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorImportConfigurationAction.java b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorImportConfigurationAction.java
index b475621..14b6eef 100644
--- a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorImportConfigurationAction.java
+++ b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorImportConfigurationAction.java
@@ -216,11 +216,11 @@
{
/** The validated status */
private Status validated = new Status( IStatus.OK, ApacheDS2ConfigurationPluginConstants.PLUGIN_ID,
- IStatus.OK, "", null );
+ IStatus.OK, "", null ); //$NON-NLS-1$
/** The not validated status */
private Status notValidated = new Status( IStatus.ERROR, ApacheDS2ConfigurationPluginConstants.PLUGIN_ID,
- IStatus.ERROR, "", null );
+ IStatus.ERROR, "", null ); //$NON-NLS-1$
public IStatus validate( Object[] selection )
diff --git a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/OpenConfigurationAction.java b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/OpenConfigurationAction.java
index 0ab5254..6f77d06 100644
--- a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/OpenConfigurationAction.java
+++ b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/OpenConfigurationAction.java
@@ -35,7 +35,7 @@
/**
- * This class implements the create connection action for an ApacheDS 1.5.7 server.
+ * This class implements the action which opens the configuration.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
diff --git a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ErrorPage.java b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ErrorPage.java
index dde87df..ac820c8 100644
--- a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ErrorPage.java
+++ b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ErrorPage.java
@@ -54,8 +54,8 @@
/** The Page Title */
private static final String TITLE = "Error opening the editor";
- private static final String DETAILS_CLOSED = NLS.bind( "{0} >>", "Details" );
- private static final String DETAILS_OPEN = NLS.bind( "<< {0}", "Details" );
+ private static final String DETAILS_CLOSED = NLS.bind( "{0} >>", "Details" ); //$NON-NLS-1$
+ private static final String DETAILS_OPEN = NLS.bind( "<< {0}", "Details" ); //$NON-NLS-1$
/** The exception */
private Exception exception;
@@ -105,7 +105,7 @@
// Error Label
Label errorLabel = toolkit.createLabel( parent,
- NLS.bind( "Could not open the editor: {0}", exception.getMessage() ) );
+ NLS.bind( "Could not open the editor: {0}", exception.getMessage() ) ); //$NON-NLS-1$
errorLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Details Button
diff --git a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java
index 130268b..dfbdbd5 100644
--- a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java
+++ b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java
@@ -286,7 +286,7 @@
toolkit.createLabel( composite, TABULATION );
toolkit.createLabel( composite, "Port:" );
kerberosPortText = createPortText( toolkit, composite );
- createDefaultValueLabel( toolkit, composite, "60088" );
+ createDefaultValueLabel( toolkit, composite, "60088" ); //$NON-NLS-1$
// Enable Change Password Server Checkbox
enableChangePasswordCheckbox = toolkit.createButton( composite, "Enable Kerberos Change Password Server",
@@ -298,7 +298,7 @@
toolkit.createLabel( composite, TABULATION );
toolkit.createLabel( composite, "Port:" );
changePasswordPortText = createPortText( toolkit, composite );
- createDefaultValueLabel( toolkit, composite, "60464" );
+ createDefaultValueLabel( toolkit, composite, "60464" ); //$NON-NLS-1$
}
@@ -322,9 +322,9 @@
// KDC Principal Text
toolkit.createLabel( composite, "KDC Principal:" );
- kdcPrincipalText = toolkit.createText( composite, "" );
+ kdcPrincipalText = toolkit.createText( composite, "" ); //$NON-NLS-1$
setGridDataWithDefaultWidth( kdcPrincipalText, new GridData( SWT.FILL, SWT.NONE, true, false ) );
- Label defaultSaslHostLabel = createDefaultValueLabel( toolkit, composite, "krbtgt/EXAMPLE.COM@EXAMPLE.COM" );
+ Label defaultSaslHostLabel = createDefaultValueLabel( toolkit, composite, "krbtgt/EXAMPLE.COM@EXAMPLE.COM" ); //$NON-NLS-1$
defaultSaslHostLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
// SASL Principal Text
@@ -332,21 +332,21 @@
primaryKdcRealmText = toolkit.createText( composite, "" ); //$NON-NLS-1$
setGridDataWithDefaultWidth( primaryKdcRealmText, new GridData( SWT.FILL, SWT.NONE, true, false ) );
Label defaultSaslPrincipalLabel = createDefaultValueLabel( toolkit, composite,
- "EXAMPLE.COM" );
+ "EXAMPLE.COM" ); //$NON-NLS-1$
defaultSaslPrincipalLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
// Search Base Dn Text
toolkit.createLabel( composite, "Search Base Dn:" );
kdcSearchBaseDnText = toolkit.createText( composite, "" ); //$NON-NLS-1$
setGridDataWithDefaultWidth( kdcSearchBaseDnText, new GridData( SWT.FILL, SWT.NONE, true, false ) );
- Label defaultSaslSearchBaseDnLabel = createDefaultValueLabel( toolkit, composite, "ou=users,dc=example,dc=com" );
+ Label defaultSaslSearchBaseDnLabel = createDefaultValueLabel( toolkit, composite, "ou=users,dc=example,dc=com" ); //$NON-NLS-1$
defaultSaslSearchBaseDnLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
// Encryption Types Text
toolkit.createLabel( composite, "Encryption Types:" );
encryptionTypesText = toolkit.createText( composite, "" ); //$NON-NLS-1$
setGridDataWithDefaultWidth( encryptionTypesText, new GridData( SWT.FILL, SWT.NONE, true, false ) );
- Label defaultEncryptionTypesLabel = createDefaultValueLabel( toolkit, composite, "[des-cbc-md5]" );
+ Label defaultEncryptionTypesLabel = createDefaultValueLabel( toolkit, composite, "[des-cbc-md5]" ); //$NON-NLS-1$
defaultEncryptionTypesLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
}
@@ -430,13 +430,13 @@
KdcServerBean kdcServerBean = getKdcServerBean();
setSelection( enableKerberosCheckbox, kdcServerBean.isEnabled() );
setEnabled( kerberosPortText, enableKerberosCheckbox.getSelection() );
- setText( kerberosPortText, "" + getKdcServerTransportBean().getSystemPort() );
+ setText( kerberosPortText, "" + getKdcServerTransportBean().getSystemPort() ); //$NON-NLS-1$
// Change Password Checkbox
ChangePasswordServerBean changePasswordServerBean = getChangePasswordServerBean();
setSelection( enableChangePasswordCheckbox, changePasswordServerBean.isEnabled() );
setEnabled( changePasswordPortText, enableChangePasswordCheckbox.getSelection() );
- setText( changePasswordPortText, "" + getChangePasswordServerTransportBean().getSystemPort() );
+ setText( changePasswordPortText, "" + getChangePasswordServerTransportBean().getSystemPort() ); //$NON-NLS-1$
// Kerberos Settings
setText( kdcPrincipalText, kdcServerBean.getKrbKdcPrincipal().toString() );
@@ -451,9 +451,9 @@
setSelection( requirePreAuthByEncryptedTimestampCheckbox, kdcServerBean.isKrbPaEncTimestampRequired() );
setSelection( allowPostdatedTicketsCheckbox, kdcServerBean.isKrbPostdatedAllowed() );
setSelection( allowRenewableTicketsCheckbox, kdcServerBean.isKrbRenewableAllowed() );
- setText( maximumRenewableLifetimeText, kdcServerBean.getKrbMaximumRenewableLifetime() + "" );
- setText( maximumTicketLifetimeText, kdcServerBean.getKrbMaximumTicketLifetime() + "" );
- setText( allowableClockSkewText, kdcServerBean.getKrbAllowableClockSkew() + "" );
+ setText( maximumRenewableLifetimeText, kdcServerBean.getKrbMaximumRenewableLifetime() + "" ); //$NON-NLS-1$
+ setText( maximumTicketLifetimeText, kdcServerBean.getKrbMaximumTicketLifetime() + "" ); //$NON-NLS-1$
+ setText( allowableClockSkewText, kdcServerBean.getKrbAllowableClockSkew() + "" ); //$NON-NLS-1$
addListeners();
}
@@ -697,8 +697,8 @@
{
for ( TransportBean kdcServerTransportBean : kdcServerTransportBeans )
{
- if ( ( "tcp".equals( kdcServerTransportBean.getTransportId() ) )
- || ( "udp".equals( kdcServerTransportBean.getTransportId() ) ) )
+ if ( ( "tcp".equals( kdcServerTransportBean.getTransportId() ) ) //$NON-NLS-1$
+ || ( "udp".equals( kdcServerTransportBean.getTransportId() ) ) ) //$NON-NLS-1$
{
transportBean = kdcServerTransportBean;
break;
@@ -710,7 +710,7 @@
if ( transportBean == null )
{
transportBean = new TransportBean();
- transportBean.setTransportId( "tcp" ); // TODO can either 'tcp' or 'udp'
+ transportBean.setTransportId( "tcp" ); // TODO can either 'tcp' or 'udp' //$NON-NLS-1$
kdcServerBean.addTransports( transportBean );
}
@@ -736,7 +736,7 @@
{
for ( TransportBean changePasswordServerTransportBean : changePasswordServerTransportBeans )
{
- if ( "tcp".equals( changePasswordServerTransportBean.getTransportId() ) ) // TODO can either 'tcp' or 'udp'
+ if ( "tcp".equals( changePasswordServerTransportBean.getTransportId() ) ) // TODO can either 'tcp' or 'udp' //$NON-NLS-1$
{
transportBean = changePasswordServerTransportBean;
break;
@@ -748,7 +748,7 @@
if ( transportBean == null )
{
transportBean = new TransportBean();
- transportBean.setTransportId( "tcp" ); // TODO can either 'tcp' or 'udp'
+ transportBean.setTransportId( "tcp" ); // TODO can either 'tcp' or 'udp' //$NON-NLS-1$
changePasswordServerBean.addTransports( transportBean );
}
diff --git a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java
index 18b2f53..711d717 100644
--- a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java
+++ b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java
@@ -63,25 +63,25 @@
*/
public class LdapLdapsServersPage extends ServerConfigurationEditorPage
{
- private static final String DEFAULT_ADDRESS = "0.0.0.0";
+ private static final String DEFAULT_ADDRESS = "0.0.0.0"; //$NON-NLS-1$
private static final int DEFAULT_PORT_LDAPS = 10636;
private static final int DEFAULT_PORT_LDAP = 10389;
- private static final String TRANSPORT_ID_LDAP = "ldap";
- private static final String TRANSPORT_ID_LDAPS = "ldaps";
- private static final String SASL_MECHANISMS_SIMPLE = "SIMPLE";
- private static final String START_TLS_HANDLER_ID = "starttlshandler";
- private static final String START_TLS_HANDLER_CLASS = "org.apache.directory.server.ldap.handlers.extended.StartTlsHandler";
- private static final String FQCN_HASHING_INTERCEPTOR_SSHA512 = "org.apache.directory.server.core.hash.Ssha512PasswordHashingInterceptor";
- private static final String FQCN_HASHING_INTERCEPTOR_SHA512 = "org.apache.directory.server.core.hash.Sha512PasswordHashingInterceptor";
- private static final String FQCN_HASHING_INTERCEPTOR_SSHA384 = "org.apache.directory.server.core.hash.Ssha384PasswordHashingInterceptor";
- private static final String FQCN_HASHING_INTERCEPTOR_SHA384 = "org.apache.directory.server.core.hash.Sha384PasswordHashingInterceptor";
- private static final String FQCN_HASHING_INTERCEPTOR_SSHA256 = "org.apache.directory.server.core.hash.Ssha256PasswordHashingInterceptor";
- private static final String FQCN_HASHING_INTERCEPTOR_SHA256 = "org.apache.directory.server.core.hash.Sha256PasswordHashingInterceptor";
- private static final String FQCN_HASHING_INTERCEPTOR_CRYPT = "org.apache.directory.server.core.hash.CryptPasswordHashingInterceptor";
- private static final String FQCN_HASHING_INTERCEPTOR_SMD5 = "org.apache.directory.server.core.hash.Smd5PasswordHashingInterceptor";
- private static final String FQCN_HASHING_INTERCEPTOR_MD5 = "org.apache.directory.server.core.hash.Md5PasswordHashingInterceptor";
- private static final String FQCN_HASHING_INTERCEPTOR_SSHA = "org.apache.directory.server.core.hash.SshaPasswordHashingInterceptor";
- private static final String FQCN_HASHING_INTERCEPTOR_SHA = "org.apache.directory.server.core.hash.ShaPasswordHashingInterceptor";
+ private static final String TRANSPORT_ID_LDAP = "ldap"; //$NON-NLS-1$
+ private static final String TRANSPORT_ID_LDAPS = "ldaps"; //$NON-NLS-1$
+ private static final String SASL_MECHANISMS_SIMPLE = "SIMPLE"; //$NON-NLS-1$
+ private static final String START_TLS_HANDLER_ID = "starttlshandler"; //$NON-NLS-1$
+ private static final String START_TLS_HANDLER_CLASS = "org.apache.directory.server.ldap.handlers.extended.StartTlsHandler"; //$NON-NLS-1$
+ private static final String FQCN_HASHING_INTERCEPTOR_SSHA512 = "org.apache.directory.server.core.hash.Ssha512PasswordHashingInterceptor"; //$NON-NLS-1$
+ private static final String FQCN_HASHING_INTERCEPTOR_SHA512 = "org.apache.directory.server.core.hash.Sha512PasswordHashingInterceptor"; //$NON-NLS-1$
+ private static final String FQCN_HASHING_INTERCEPTOR_SSHA384 = "org.apache.directory.server.core.hash.Ssha384PasswordHashingInterceptor"; //$NON-NLS-1$
+ private static final String FQCN_HASHING_INTERCEPTOR_SHA384 = "org.apache.directory.server.core.hash.Sha384PasswordHashingInterceptor"; //$NON-NLS-1$
+ private static final String FQCN_HASHING_INTERCEPTOR_SSHA256 = "org.apache.directory.server.core.hash.Ssha256PasswordHashingInterceptor"; //$NON-NLS-1$
+ private static final String FQCN_HASHING_INTERCEPTOR_SHA256 = "org.apache.directory.server.core.hash.Sha256PasswordHashingInterceptor"; //$NON-NLS-1$
+ private static final String FQCN_HASHING_INTERCEPTOR_CRYPT = "org.apache.directory.server.core.hash.CryptPasswordHashingInterceptor"; //$NON-NLS-1$
+ private static final String FQCN_HASHING_INTERCEPTOR_SMD5 = "org.apache.directory.server.core.hash.Smd5PasswordHashingInterceptor"; //$NON-NLS-1$
+ private static final String FQCN_HASHING_INTERCEPTOR_MD5 = "org.apache.directory.server.core.hash.Md5PasswordHashingInterceptor"; //$NON-NLS-1$
+ private static final String FQCN_HASHING_INTERCEPTOR_SSHA = "org.apache.directory.server.core.hash.SshaPasswordHashingInterceptor"; //$NON-NLS-1$
+ private static final String FQCN_HASHING_INTERCEPTOR_SHA = "org.apache.directory.server.core.hash.ShaPasswordHashingInterceptor"; //$NON-NLS-1$
/** The Page ID*/
public static final String ID = LdapLdapsServersPage.class.getName(); //$NON-NLS-1$
@@ -354,22 +354,22 @@
// Enable LDAP Server Checkbox
enableLdapCheckbox = toolkit.createButton( composite, "Enable LDAP Server", SWT.CHECK );
enableLdapCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, gridLayout.numColumns, 1 ) );
-
+
// LDAP Server Port Text
toolkit.createLabel( composite, TABULATION );
toolkit.createLabel( composite, "Port:" );
ldapPortText = createPortText( toolkit, composite );
- createDefaultValueLabel( toolkit, composite, "10389" );
+ createDefaultValueLabel( toolkit, composite, "10389" ); //$NON-NLS-1$
// Enable LDAPS Server Checkbox
enableLdapsCheckbox = toolkit.createButton( composite, "Enable LDAPS Server", SWT.CHECK );
enableLdapsCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, gridLayout.numColumns, 1 ) );
-
+
// LDAPS Server Port Text
toolkit.createLabel( composite, TABULATION );
toolkit.createLabel( composite, "Port:" );
ldapsPortText = createPortText( toolkit, composite );
- createDefaultValueLabel( toolkit, composite, "10636" );
+ createDefaultValueLabel( toolkit, composite, "10636" ); //$NON-NLS-1$
}
@@ -436,7 +436,7 @@
enableServerSidePasswordHashingCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 3, 1 ) );
// Server-side Password Hashing Combo
- toolkit.createLabel( composite, " " );
+ toolkit.createLabel( composite, " " ); //$NON-NLS-1$
toolkit.createLabel( composite, "Hashing Method:" );
Combo hashingMethodCombo = new Combo( composite, SWT.READ_ONLY | SWT.SINGLE );
hashingMethodCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
@@ -454,27 +454,27 @@
switch ( hashingMethod )
{
case HASH_METHOD_SHA:
- return "SHA";
+ return "SHA"; //$NON-NLS-1$
case HASH_METHOD_SSHA:
- return "SSHA";
+ return "SSHA"; //$NON-NLS-1$
case HASH_METHOD_MD5:
- return "MD5";
+ return "MD5"; //$NON-NLS-1$
case HASH_METHOD_SMD5:
- return "SMD5";
+ return "SMD5"; //$NON-NLS-1$
case HASH_METHOD_CRYPT:
- return "CRYPT";
+ return "CRYPT"; //$NON-NLS-1$
case HASH_METHOD_SHA256:
- return "SHA-256";
+ return "SHA-256"; //$NON-NLS-1$
case HASH_METHOD_SSHA256:
- return "SSHA-256";
+ return "SSHA-256"; //$NON-NLS-1$
case HASH_METHOD_SHA384:
- return "SHA-384";
+ return "SHA-384"; //$NON-NLS-1$
case HASH_METHOD_SSHA384:
- return "SSHA-384";
+ return "SSHA-384"; //$NON-NLS-1$
case HASH_METHOD_SHA512:
- return "SHA-512";
+ return "SHA-512"; //$NON-NLS-1$
case HASH_METHOD_SSHA512:
- return "SSHA-512";
+ return "SSHA-512"; //$NON-NLS-1$
}
}
@@ -497,8 +497,8 @@
};
hashingMethodComboViewer.setInput( hashingMethods );
setSelection( hashingMethodComboViewer, LdapSecurityConstants.HASH_METHOD_SSHA );
- toolkit.createLabel( composite, " " );
- Label defaultLabel = createDefaultValueLabel( toolkit, composite, "SSHA" );
+ toolkit.createLabel( composite, " " ); //$NON-NLS-1$
+ Label defaultLabel = createDefaultValueLabel( toolkit, composite, "SSHA" ); //$NON-NLS-1$
defaultLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
}
@@ -524,28 +524,28 @@
section.setClient( composite );
// Simple Checkbox
- authMechSimpleCheckbox = toolkit.createButton( composite, "Simple", SWT.CHECK );
+ authMechSimpleCheckbox = toolkit.createButton( composite, "Simple", SWT.CHECK ); //$NON-NLS-1$
authMechSimpleCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false ) );
// GSSAPI Checkbox
- authMechGssapiCheckbox = toolkit.createButton( composite, "GSSAPI", SWT.CHECK );
+ authMechGssapiCheckbox = toolkit.createButton( composite, "GSSAPI", SWT.CHECK ); //$NON-NLS-1$
authMechGssapiCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false ) );
// CRAM-MD5 Checkbox
- authMechCramMd5Checkbox = toolkit.createButton( composite, "CRAM-MD5", SWT.CHECK );
+ authMechCramMd5Checkbox = toolkit.createButton( composite, "CRAM-MD5", SWT.CHECK ); //$NON-NLS-1$
authMechCramMd5Checkbox.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false ) );
// DIGEST-MD5 Checkbox
- authMechDigestMd5Checkbox = toolkit.createButton( composite, "DIGEST-MD5", SWT.CHECK );
+ authMechDigestMd5Checkbox = toolkit.createButton( composite, "DIGEST-MD5", SWT.CHECK ); //$NON-NLS-1$
authMechDigestMd5Checkbox.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false ) );
// NTLM Checkbox and Text
- authMechNtlmCheckbox = toolkit.createButton( composite, "NTLM", SWT.CHECK );
+ authMechNtlmCheckbox = toolkit.createButton( composite, "NTLM", SWT.CHECK ); //$NON-NLS-1$
authMechNtlmCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false ) );
Composite authMechNtlmComposite = toolkit.createComposite( composite );
authMechNtlmComposite.setLayout( new GridLayout( 2, false ) );
toolkit.createLabel( authMechNtlmComposite, "Provider:" );
- authMechNtlmText = toolkit.createText( authMechNtlmComposite, "" );
+ authMechNtlmText = toolkit.createText( authMechNtlmComposite, "" ); //$NON-NLS-1$
authMechNtlmText.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false ) );
authMechNtlmComposite.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, false, false, 3, 1 ) );
@@ -555,7 +555,7 @@
Composite authMechGssSpnegoComposite = toolkit.createComposite( composite );
authMechGssSpnegoComposite.setLayout( new GridLayout( 2, false ) );
toolkit.createLabel( authMechGssSpnegoComposite, "Provider:" );
- authMechGssSpnegoText = toolkit.createText( authMechGssSpnegoComposite, "" );
+ authMechGssSpnegoText = toolkit.createText( authMechGssSpnegoComposite, "" ); //$NON-NLS-1$
authMechGssSpnegoText.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false ) );
authMechGssSpnegoComposite.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false, 3, 1 ) );
}
@@ -583,9 +583,9 @@
// SASL Host Text
toolkit.createLabel( composite, "SASL Host:" );
- saslHostText = toolkit.createText( composite, "" );
+ saslHostText = toolkit.createText( composite, "" ); //$NON-NLS-1$
setGridDataWithDefaultWidth( saslHostText, new GridData( SWT.FILL, SWT.NONE, true, false ) );
- Label defaultSaslHostLabel = createDefaultValueLabel( toolkit, composite, "ldap.example.com" );
+ Label defaultSaslHostLabel = createDefaultValueLabel( toolkit, composite, "ldap.example.com" ); //$NON-NLS-1$
defaultSaslHostLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
// SASL Principal Text
@@ -593,14 +593,14 @@
saslPrincipalText = toolkit.createText( composite, "" ); //$NON-NLS-1$
setGridDataWithDefaultWidth( saslPrincipalText, new GridData( SWT.FILL, SWT.NONE, true, false ) );
Label defaultSaslPrincipalLabel = createDefaultValueLabel( toolkit, composite,
- "ldap/ldap.example.com@EXAMPLE.COM" );
+ "ldap/ldap.example.com@EXAMPLE.COM" ); //$NON-NLS-1$
defaultSaslPrincipalLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
// Search Base Dn Text
toolkit.createLabel( composite, "Search Base Dn:" );
saslSearchBaseDnText = toolkit.createText( composite, "" ); //$NON-NLS-1$
setGridDataWithDefaultWidth( saslSearchBaseDnText, new GridData( SWT.FILL, SWT.NONE, true, false ) );
- Label defaultSaslSearchBaseDnLabel = createDefaultValueLabel( toolkit, composite, "ou=users,dc=example,dc=com" );
+ Label defaultSaslSearchBaseDnLabel = createDefaultValueLabel( toolkit, composite, "ou=users,dc=example,dc=com" ); //$NON-NLS-1$
defaultSaslSearchBaseDnLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
}
@@ -790,13 +790,13 @@
TransportBean ldapServerTransportBean = getLdapServerTransportBean();
setSelection( enableLdapCheckbox, ldapServerTransportBean.isEnabled() );
setEnabled( ldapPortText, enableLdapCheckbox.getSelection() );
- setText( ldapPortText, ldapServerTransportBean.getSystemPort() + "" );
+ setText( ldapPortText, ldapServerTransportBean.getSystemPort() + "" ); //$NON-NLS-1$
// LDAPS Server
TransportBean ldapsServerTransportBean = getLdapsServerTransportBean();
setSelection( enableLdapsCheckbox, ldapsServerTransportBean.isEnabled() );
setEnabled( enableLdapsCheckbox, enableLdapsCheckbox.getSelection() );
- setText( ldapsPortText, ldapsServerTransportBean.getSystemPort() + "" );
+ setText( ldapsPortText, ldapsServerTransportBean.getSystemPort() + "" ); //$NON-NLS-1$
// SASL Properties
LdapServerBean ldapServerBean = getLdapServerBean();
@@ -840,8 +840,8 @@
}
// Limits
- setText( maxTimeLimitText, "" + ldapServerBean.getLdapServerMaxTimeLimit() );
- setText( maxSizeLimitText, "" + ldapServerBean.getLdapServerMaxSizeLimit() );
+ setText( maxTimeLimitText, "" + ldapServerBean.getLdapServerMaxTimeLimit() ); //$NON-NLS-1$
+ setText( maxSizeLimitText, "" + ldapServerBean.getLdapServerMaxSizeLimit() ); //$NON-NLS-1$
// Enable TLS Checkbox
setSelection( enableTlsCheckbox, getTlsExtendedOpHandlerBean().isEnabled() );
@@ -1208,7 +1208,7 @@
{
if ( fqcn != null )
{
- String id = fqcn.replace( "org.apache.directory.server.core.hash.", "" );
+ String id = fqcn.replace( "org.apache.directory.server.core.hash.", "" ); //$NON-NLS-1$ //$NON-NLS-2$
if ( id.length() > 0 )
{
@@ -1333,11 +1333,30 @@
LdapSecurityConstants hashingMethod = ( LdapSecurityConstants ) selection.getFirstElement();
if ( hashingMethod != null )
{
+ // Creating the hashing method interceptor
InterceptorBean hashingMethodInterceptor = createHashingMethodInterceptor( hashingMethod );
- DirectoryServiceBean directoryServiceBean = getDirectoryServiceBean();
+ // Getting the order of the authentication interceptor
+ int authenticationInterceptorOrder = getAuthenticationInterceptorOrder();
- directoryServiceBean.getInterceptors().add( hashingMethodInterceptor );
+ // Assigning the order of the hashing method interceptor
+ // It's order is: authenticationInterceptorOrder + 1
+ hashingMethodInterceptor.setInterceptorOrder( authenticationInterceptorOrder + 1 );
+
+ // Getting the interceptors list
+ List<InterceptorBean> interceptors = getDirectoryServiceBean().getInterceptors();
+
+ // Updating the order of the interceptors after the authentication interceptor
+ for ( InterceptorBean interceptor : interceptors )
+ {
+ if ( interceptor.getInterceptorOrder() > authenticationInterceptorOrder )
+ {
+ interceptor.setInterceptorOrder( interceptor.getInterceptorOrder() + 1 );
+ }
+ }
+
+ // Adding the hashing interceptor to the list
+ interceptors.add( hashingMethodInterceptor );
}
}
}
@@ -1348,11 +1367,53 @@
*/
private void deleteHashingMethodInterceptor()
{
+ // Getting the hashing method interceptor
InterceptorBean hashingMethodInterceptor = getHashingMethodInterceptor();
- DirectoryServiceBean directoryServiceBean = getDirectoryServiceBean();
- directoryServiceBean.getInterceptors().remove( hashingMethodInterceptor );
- // TODO Do something better for the removal (edit other interceptors orderid)
+ if ( hashingMethodInterceptor != null )
+ {
+ // Getting the order of the hashing method interceptor
+ int hashingMethodInterceptorOrder = hashingMethodInterceptor.getInterceptorOrder();
+
+ // Getting the interceptors list
+ List<InterceptorBean> interceptors = getDirectoryServiceBean().getInterceptors();
+
+ // Updating the order of the interceptors after the hashing method interceptor
+ for ( InterceptorBean interceptor : interceptors )
+ {
+ if ( interceptor.getInterceptorOrder() > hashingMethodInterceptorOrder )
+ {
+ interceptor.setInterceptorOrder( interceptor.getInterceptorOrder() - 1 );
+ }
+ }
+
+ // Removing the hashing interceptor to the list
+ interceptors.remove( hashingMethodInterceptor );
+ }
}
+
+ /**
+ * Gets the authentication interceptor order.
+ *
+ * @return the authentication interceptor order
+ */
+ private int getAuthenticationInterceptorOrder()
+ {
+ // Getting the list of interceptors
+ List<InterceptorBean> interceptors = getDirectoryServiceBean().getInterceptors();
+ for ( InterceptorBean interceptor : interceptors )
+ {
+ // Looking for the authentication interceptor
+ if ( "org.apache.directory.server.core.authn.AuthenticationInterceptor".equalsIgnoreCase( interceptor //$NON-NLS-1$
+ .getInterceptorClassName() ) )
+ {
+ // We found the authentication interceptor
+ return interceptor.getInterceptorOrder();
+ }
+ }
+
+ // No authentication interceptor was found
+ return 0;
+ }
}
diff --git a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/OverviewPage.java b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/OverviewPage.java
index 35716cb..5c01d4d 100644
--- a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/OverviewPage.java
+++ b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/OverviewPage.java
@@ -268,22 +268,22 @@
// Enable LDAP Server Checkbox
enableLdapCheckbox = toolkit.createButton( composite, "Enable LDAP Server", SWT.CHECK );
enableLdapCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, gridLayout.numColumns, 1 ) );
-
+
// LDAP Server Port Text
toolkit.createLabel( composite, TABULATION );
toolkit.createLabel( composite, "Port:" );
ldapPortText = createPortText( toolkit, composite );
- createDefaultValueLabel( toolkit, composite, "10389" );
+ createDefaultValueLabel( toolkit, composite, "10389" ); //$NON-NLS-1$
// Enable LDAPS Server Checkbox
enableLdapsCheckbox = toolkit.createButton( composite, "Enable LDAPS Server", SWT.CHECK );
enableLdapsCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, gridLayout.numColumns, 1 ) );
-
+
// LDAPS Server Port Text
toolkit.createLabel( composite, TABULATION );
toolkit.createLabel( composite, "Port:" );
ldapsPortText = createPortText( toolkit, composite );
- createDefaultValueLabel( toolkit, composite, "10636" );
+ createDefaultValueLabel( toolkit, composite, "10636" ); //$NON-NLS-1$
// LDAP Configuration Link
openLdapConfigurationLink = toolkit.createHyperlink( composite,
@@ -317,24 +317,24 @@
enableKerberosCheckbox = toolkit.createButton( composite, "Enable Kerberos Server", SWT.CHECK );
enableKerberosCheckbox
.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, gridLayout.numColumns, 1 ) );
-
+
// Kerberos Server Port Text
toolkit.createLabel( composite, TABULATION );
toolkit.createLabel( composite, "Port:" );
kerberosPortText = createPortText( toolkit, composite );
- createDefaultValueLabel( toolkit, composite, "60088" );
+ createDefaultValueLabel( toolkit, composite, "60088" ); //$NON-NLS-1$
// Enable Change Password Server Checkbox
enableChangePasswordCheckbox = toolkit.createButton( composite, "Enable Kerberos Change Password Server",
SWT.CHECK );
enableChangePasswordCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false,
gridLayout.numColumns, 1 ) );
-
+
// Change Password Server Port Text
toolkit.createLabel( composite, TABULATION );
toolkit.createLabel( composite, "Port:" );
changePasswordPortText = createPortText( toolkit, composite );
- createDefaultValueLabel( toolkit, composite, "60464" );
+ createDefaultValueLabel( toolkit, composite, "60464" ); //$NON-NLS-1$
// Kerberos Configuration Link
openKerberosConfigurationLink = toolkit.createHyperlink( composite,
@@ -365,9 +365,9 @@
section.setClient( composite );
// Partitions Label
- partitionsLabel = toolkit.createLabel( composite, "" );
+ partitionsLabel = toolkit.createLabel( composite, "" ); //$NON-NLS-1$
partitionsLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
-
+
// Partitions Table Viewer
Table partitionsTable = toolkit.createTable( composite, SWT.NULL );
GridData gd = new GridData( SWT.FILL, SWT.NONE, true, false );
@@ -523,32 +523,33 @@
{
removeListeners();
- DirectoryServiceBean directoryServiceBean = getConfigBean().getDirectoryServiceBean();
+ DirectoryServiceBean directoryServiceBean = getDirectoryServiceBean();
// LDAP Server
TransportBean ldapServerTransportBean = LdapLdapsServersPage.getLdapServerTransportBean( directoryServiceBean );
setSelection( enableLdapCheckbox, ldapServerTransportBean.isEnabled() );
setEnabled( ldapPortText, enableLdapCheckbox.getSelection() );
- setText( ldapPortText, ldapServerTransportBean.getSystemPort() + "" );
+ setText( ldapPortText, ldapServerTransportBean.getSystemPort() + "" ); //$NON-NLS-1$
// LDAPS Server
TransportBean ldapsServerTransportBean = LdapLdapsServersPage
.getLdapsServerTransportBean( directoryServiceBean );
setSelection( enableLdapsCheckbox, ldapsServerTransportBean.isEnabled() );
setEnabled( ldapsPortText, enableLdapsCheckbox.getSelection() );
- setText( ldapsPortText, ldapsServerTransportBean.getSystemPort() + "" );
+ setText( ldapsPortText, ldapsServerTransportBean.getSystemPort() + "" ); //$NON-NLS-1$
// Kerberos Server
- KdcServerBean kdcServerBean = directoryServiceBean.getKdcServerBean();
+ KdcServerBean kdcServerBean = KerberosServerPage.getKdcServerBean( directoryServiceBean );
setSelection( enableKerberosCheckbox, kdcServerBean.isEnabled() );
setEnabled( kerberosPortText, enableKerberosCheckbox.getSelection() );
- setText( kerberosPortText, "" + kdcServerBean.getTransports()[0].getSystemPort() );
+ setText( kerberosPortText, "" + kdcServerBean.getTransports()[0].getSystemPort() ); //$NON-NLS-1$
// Change Password Server
- ChangePasswordServerBean changePasswordServerBean = directoryServiceBean.getChangePasswordServerBean();
+ ChangePasswordServerBean changePasswordServerBean = KerberosServerPage
+ .getChangePasswordServerBean( directoryServiceBean );
setSelection( enableChangePasswordCheckbox, changePasswordServerBean.isEnabled() );
setEnabled( changePasswordPortText, enableChangePasswordCheckbox.getSelection() );
- setText( changePasswordPortText, "" + changePasswordServerBean.getTransports()[0].getSystemPort() );
+ setText( changePasswordPortText, "" + changePasswordServerBean.getTransports()[0].getSystemPort() ); //$NON-NLS-1$
// Partitions
List<PartitionBean> partitions = directoryServiceBean.getPartitions();
diff --git a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsMasterDetailsBlock.java b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsMasterDetailsBlock.java
index a07b5a3..7ca005b 100644
--- a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsMasterDetailsBlock.java
+++ b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsMasterDetailsBlock.java
@@ -207,7 +207,7 @@
newPartitionBean.setPartitionId( newId );
try
{
- newPartitionBean.setPartitionSuffix( new Dn( "dc=" + newId + ",dc=com" ) );
+ newPartitionBean.setPartitionSuffix( new Dn( "dc=" + newId + ",dc=com" ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
catch ( LdapInvalidDnException e1 )
{
@@ -219,20 +219,20 @@
newPartitionBean.setJdbmPartitionOptimizerEnabled( true );
newPartitionBean.setPartitionSyncOnWrite( true );
List<IndexBean> indexes = new ArrayList<IndexBean>();
- indexes.add( createJdbmIndex( "apacheAlias", 100 ) );
- indexes.add( createJdbmIndex( "apacheOneAlias", 100 ) );
- indexes.add( createJdbmIndex( "apacheOneLevel", 100 ) );
- indexes.add( createJdbmIndex( "apachePresence", 100 ) );
- indexes.add( createJdbmIndex( "apacheRdn", 100 ) );
- indexes.add( createJdbmIndex( "apacheSubAlias", 100 ) );
- indexes.add( createJdbmIndex( "apacheSubLevel", 100 ) );
- indexes.add( createJdbmIndex( "dc", 100 ) );
- indexes.add( createJdbmIndex( "entryCSN", 100 ) );
- indexes.add( createJdbmIndex( "entryUUID", 100 ) );
- indexes.add( createJdbmIndex( "krbPrincipalName", 100 ) );
- indexes.add( createJdbmIndex( "objectClass", 100 ) );
- indexes.add( createJdbmIndex( "ou", 100 ) );
- indexes.add( createJdbmIndex( "uid", 100 ) );
+ indexes.add( createJdbmIndex( "apacheAlias", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "apacheOneAlias", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "apacheOneLevel", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "apachePresence", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "apacheRdn", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "apacheSubAlias", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "apacheSubLevel", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "dc", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "entryCSN", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "entryUUID", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "krbPrincipalName", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "objectClass", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "ou", 100 ) ); //$NON-NLS-1$
+ indexes.add( createJdbmIndex( "uid", 100 ) ); //$NON-NLS-1$
newPartitionBean.setIndexes( indexes );
page.getConfigBean().getDirectoryServiceBean().addPartitions( newPartitionBean );
diff --git a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsPage.java b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsPage.java
index 1ece7b2..b2dd8b5 100644
--- a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsPage.java
+++ b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/PartitionsPage.java
@@ -52,7 +52,7 @@
{
PartitionBean partition = ( PartitionBean ) element;
- return NLS.bind( "{0} ({1})", partition.getPartitionId(), partition.getPartitionSuffix() );
+ return NLS.bind( "{0} ({1})", partition.getPartitionId(), partition.getPartitionSuffix() ); //$NON-NLS-1$
}
return super.getText( element );
@@ -122,6 +122,6 @@
*/
public static boolean isSystemPartition( PartitionBean partition )
{
- return "system".equalsIgnoreCase( partition.getPartitionId() );
+ return "system".equalsIgnoreCase( partition.getPartitionId() ); //$NON-NLS-1$
}
}
diff --git a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java
index 1e8e82f..f499603 100644
--- a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java
+++ b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java
@@ -61,7 +61,7 @@
public abstract class ServerConfigurationEditorPage extends FormPage
{
protected static final Color GRAY_COLOR = new Color( null, 120, 120, 120 );
- protected static final String TABULATION = " ";
+ protected static final String TABULATION = " "; //$NON-NLS-1$
// Dirty listeners
private ModifyListener dirtyModifyListener = new ModifyListener()
diff --git a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java
index 12f92ad..505ce13 100644
--- a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java
+++ b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java
@@ -116,7 +116,7 @@
}
else
{
- dialog.setOriginalName( "config.ldif" );
+ dialog.setOriginalName( "config.ldif" ); //$NON-NLS-1$
}
// Open the dialog
@@ -162,8 +162,8 @@
if ( externalFile.exists() )
{
String question = NLS.bind(
- "The file \"{0}\" already exists. Do you want to replace the existing file?", path ); //$NON-NLS-1$
- MessageDialog overwriteDialog = new MessageDialog( shell, "Question", null, question, //$NON-NLS-1$
+ "The file \"{0}\" already exists. Do you want to replace the existing file?", path );
+ MessageDialog overwriteDialog = new MessageDialog( shell, "Question", null, question,
MessageDialog.QUESTION, new String[]
{ IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 0 );
int overwrite = openDialogInUIThread( overwriteDialog );
@@ -349,7 +349,7 @@
modificationsLdif.append( ldifEntry.toString() );
}
- // Getting the browser connection associated with the
+ // Getting the browser connection associated with the connection
IBrowserConnection browserConnection = BrowserCorePlugin.getDefault().getConnectionManager()
.getBrowserConnection( input.getConnection() );
diff --git a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/EntryBasedConfigurationPartition.java b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/EntryBasedConfigurationPartition.java
index 8a1cc91..ad8743c 100644
--- a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/EntryBasedConfigurationPartition.java
+++ b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/EntryBasedConfigurationPartition.java
@@ -59,8 +59,8 @@
*/
protected void doInit() throws InvalidNameException, Exception
{
- setId( "config" );
- setSuffixDn( new Dn( "ou=config" ) );
+ setId( "config" ); //$NON-NLS-1$
+ setSuffixDn( new Dn( "ou=config" ) ); //$NON-NLS-1$
super.doInit();
}
diff --git a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java
index 55ef6ed..beefc6c 100644
--- a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java
+++ b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java
@@ -172,7 +172,7 @@
// need to get the server configuration and return
if ( input instanceof NewServerConfigurationInput )
{
- InputStream is = ApacheDS2ConfigurationPlugin.class.getResourceAsStream( "config.ldif" );
+ InputStream is = ApacheDS2ConfigurationPlugin.class.getResourceAsStream( "config.ldif" ); //$NON-NLS-1$
return readConfiguration( is );
}
// If the input is a ConnectionServerConfigurationInput, then we
@@ -289,8 +289,8 @@
// Creating the search parameter
SearchParameter configSearchParameter = new SearchParameter();
- configSearchParameter.setSearchBase( new Dn( "ou=config" ) );
- configSearchParameter.setFilter( "(objectClass=*)" );
+ configSearchParameter.setSearchBase( new Dn( "ou=config" ) ); //$NON-NLS-1$
+ configSearchParameter.setFilter( "(objectClass=*)" ); //$NON-NLS-1$
configSearchParameter.setScope( SearchScope.OBJECT );
configSearchParameter.setReturningAttributes( SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY );
@@ -337,7 +337,7 @@
SearchParameter searchParameter = new SearchParameter();
searchParameter.setSearchBase( entry.getDn() );
- searchParameter.setFilter( "(objectClass=*)" );
+ searchParameter.setFilter( "(objectClass=*)" ); //$NON-NLS-1$
searchParameter.setScope( SearchScope.ONELEVEL );
searchParameter.setReturningAttributes( SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY );
diff --git a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java
index 0172675..c63075e 100644
--- a/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java
+++ b/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java
@@ -80,7 +80,7 @@
// Using the original partition suffix as base
// '*' for all user attributes, '+' for all operational attributes
return computeModifications( originalPartition.getSuffixDn(), new String[]
- { "*", "+" } );
+ { "*", "+" } ); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -109,34 +109,34 @@
// Checking the original partition
if ( originalPartition == null )
{
- throw new PartitionsDiffException( "The original partition must not be 'null'." );
+ throw new PartitionsDiffException( "The original partition must not be 'null'." ); //$NON-NLS-1$
}
else
{
if ( !originalPartition.isInitialized() )
{
- throw new PartitionsDiffException( "The original partition must be intialized." );
+ throw new PartitionsDiffException( "The original partition must be intialized." ); //$NON-NLS-1$
}
else if ( originalPartition.getSuffixDn() == null )
{
- throw new PartitionsDiffException( "The original suffix is null." );
+ throw new PartitionsDiffException( "The original suffix is null." ); //$NON-NLS-1$
}
}
// Checking the destination partition
if ( destinationPartition == null )
{
- throw new PartitionsDiffException( "The destination partition must not be 'null'." );
+ throw new PartitionsDiffException( "The destination partition must not be 'null'." ); //$NON-NLS-1$
}
else
{
if ( !destinationPartition.isInitialized() )
{
- throw new PartitionsDiffException( "The destination partition must be intialized." );
+ throw new PartitionsDiffException( "The destination partition must be intialized." ); //$NON-NLS-1$
}
else if ( destinationPartition.getSuffixDn() == null )
{
- throw new PartitionsDiffException( "The destination suffix is null." );
+ throw new PartitionsDiffException( "The destination suffix is null." ); //$NON-NLS-1$
}
}
}
@@ -165,7 +165,7 @@
.lookup( new LookupOperationContext( null, baseDn, attributeIds ) );
if ( originalBaseEntry == null )
{
- throw new PartitionsDiffException( "Unable to find the base entry in the original partition." );
+ throw new PartitionsDiffException( "Unable to find the base entry in the original partition." ); //$NON-NLS-1$
}
// Creating the list containing all the original entries to be processed
@@ -220,7 +220,7 @@
setReturningAttributes( originalPartition.getSchemaManager(), attributeIds, soc );
soc.setDn( originalEntry.getDn() );
soc.setScope( SearchScope.ONELEVEL );
- soc.setFilter( FilterParser.parse( originalPartition.getSchemaManager(), "(objectClass=*)" ) );
+ soc.setFilter( FilterParser.parse( originalPartition.getSchemaManager(), "(objectClass=*)" ) ); //$NON-NLS-1$
soc.setAliasDerefMode( AliasDerefMode.DEREF_ALWAYS );
// Looking for the children of the current entry
@@ -242,7 +242,7 @@
.lookup( new LookupOperationContext( null, baseDn, attributeIds ) );
if ( destinationBaseEntry == null )
{
- throw new PartitionsDiffException( "Unable to find the base entry in the destination partition." );
+ throw new PartitionsDiffException( "Unable to find the base entry in the destination partition." ); //$NON-NLS-1$
}
// Creating the list containing all the destination entries to be processed
@@ -285,7 +285,7 @@
setReturningAttributes( destinationPartition.getSchemaManager(), attributeIds, soc );
soc.setDn( destinationEntry.getDn() );
soc.setScope( SearchScope.ONELEVEL );
- soc.setFilter( FilterParser.parse( destinationPartition.getSchemaManager(), "(objectClass=*)" ) );
+ soc.setFilter( FilterParser.parse( destinationPartition.getSchemaManager(), "(objectClass=*)" ) ); //$NON-NLS-1$
soc.setAliasDerefMode( AliasDerefMode.DEREF_ALWAYS );
// Looking for the children of the current entry
diff --git a/plugins/apacheds.configuration.v2/src/main/resources/org/apache/directory/studio/apacheds/configuration/v2/config.ldif b/plugins/apacheds.configuration.v2/src/main/resources/org/apache/directory/studio/apacheds/configuration/v2/config.ldif
index e1484a8..c45da4d 100644
--- a/plugins/apacheds.configuration.v2/src/main/resources/org/apache/directory/studio/apacheds/configuration/v2/config.ldif
+++ b/plugins/apacheds.configuration.v2/src/main/resources/org/apache/directory/studio/apacheds/configuration/v2/config.ldif
@@ -78,6 +78,10 @@
ads-interceptorclassname: org.apache.directory.server.core.authn.AuthenticationInterceptor
ads-interceptorid: authenticationInterceptor
ads-enabled: TRUE
+ads-passwordPolicies: default
+ads-authenticators: anonymousauthenticator
+ads-authenticators: simpleauthenticator
+ads-authenticators: strongauthenticator
dn: ou=authenticators,ads-interceptorId=authenticationInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
ou: authenticators
@@ -89,27 +93,62 @@
objectclass: top
objectclass: ads-base
objectClass: ads-authenticator
-objectClass: ads-anonymousAuthenticator
+objectClass: ads-authenticatorImpl
+ads-authenticatorClass: org.apache.directory.server.core.authn.AnonymousAuthenticator
dn: ads-authenticatorid=simpleauthenticator,ou=authenticators,ads-interceptorId=authenticationInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
ads-authenticatorid: simpleauthenticator
objectclass: top
objectclass: ads-base
objectClass: ads-authenticator
-objectClass: ads-simpleAuthenticator
+objectClass: ads-authenticatorImpl
+ads-authenticatorClass: org.apache.directory.server.core.authn.SimpleAuthenticator
dn: ads-authenticatorid=strongauthenticator,ou=authenticators,ads-interceptorId=authenticationInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
ads-authenticatorid: strongauthenticator
objectclass: top
objectclass: ads-base
objectClass: ads-authenticator
-objectClass: ads-strongAuthenticator
+objectClass: ads-authenticatorImpl
+ads-authenticatorClass: org.apache.directory.server.core.authn.StrongAuthenticator
+
+dn: ou=passwordPolicies,ads-interceptorId=authenticationInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
+objectClass: organizationalUnit
+objectClass: top
+ou: passwordPolicies
+
+dn: ads-pwdId=default,ou=passwordPolicies,ads-interceptorId=authenticationInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
+objectClass: top
+objectClass: ads-base
+objectClass: ads-passwordPolicy
+ads-pwdId: default
+ads-pwdSafeModify: FALSE
+ads-pwdMaxAge: 0
+ads-pwdFailureCountInterval: 30
+ads-pwdAttribute: userPassword
+ads-pwdMaxFailure: 5
+ads-pwdLockout: TRUE
+ads-pwdMustChange: FALSE
+ads-pwdLockoutDuration: 0
+ads-pwdMinLength: 5
+ads-pwdInHistory: 5
+ads-pwdExpireWarning: 600
+ads-pwdMinAge: 0
+ads-pwdAllowUserChange: TRUE
+ads-pwdGraceAuthNLimit: 5
+ads-pwdCheckQuality: 2
+ads-pwdMaxLength: 0
+ads-pwdGraceExpire: 0
+ads-pwdMinDelay: 0
+ads-pwdMaxDelay: 0
+ads-pwdMaxIdle: 0
+ads-enabled: TRUE
dn: ads-interceptorId=collectiveAttributeInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config
objectclass: top
objectclass: ads-base
objectclass: ads-interceptor
-ads-interceptororder: 12
+ads-interceptororder: 11
ads-interceptorclassname: org.apache.directory.server.core.collective.CollectiveAttributeInterceptor
ads-interceptorid: collectiveAttributeInterceptor
ads-enabled: TRUE
@@ -146,7 +185,7 @@
objectclass: ads-base
objectclass: ads-interceptor
ads-enabled: FALSE
-ads-interceptororder: 8
+ads-interceptororder: 7
ads-interceptorclassname: org.apache.directory.server.core.kerberos.KeyDerivationInterceptor
ads-interceptorid: keyDerivationInterceptor
@@ -163,7 +202,7 @@
objectclass: top
objectclass: ads-base
objectclass: ads-interceptor
-ads-interceptororder: 7
+ads-interceptororder: 10
ads-interceptorclassname: org.apache.directory.server.core.operational.OperationalAttributeInterceptor
ads-interceptorid: operationalAttributeInterceptor
ads-enabled: TRUE
@@ -173,7 +212,7 @@
objectclass: ads-base
objectclass: ads-interceptor
ads-enabled: TRUE
-ads-interceptororder: 9
+ads-interceptororder: 8
ads-interceptorclassname: org.apache.directory.server.core.hash.SshaPasswordHashingInterceptor
ads-interceptorid: passwordHashingInterceptor
@@ -190,7 +229,7 @@
objectclass: top
objectclass: ads-base
objectclass: ads-interceptor
-ads-interceptororder: 10
+ads-interceptororder: 9
ads-interceptorclassname: org.apache.directory.server.core.schema.SchemaInterceptor
ads-interceptorid: schemaInterceptor
ads-enabled: TRUE
@@ -199,7 +238,7 @@
objectclass: top
objectclass: ads-base
objectclass: ads-interceptor
-ads-interceptororder: 11
+ads-interceptororder: 12
ads-interceptorclassname: org.apache.directory.server.core.subtree.SubentryInterceptor
ads-interceptorid: subentryInterceptor
ads-enabled: TRUE
@@ -213,28 +252,6 @@
ads-interceptorid: triggerInterceptor
ads-enabled: TRUE
-dn: ads-pwdId=pwdPolicy,ads-directoryServiceId=default,ou=config
-objectClass: top
-objectClass: ads-base
-objectClass: ads-passwordPolicy
-ads-pwdId: pwdPolicy
-ads-pwdSafeModify: FALSE
-ads-pwdMaxAge: 0
-ads-pwdFailureCountInterval: 30
-ads-pwdAttribute: userPassword
-ads-pwdMaxFailure: 5
-ads-pwdLockout: TRUE
-ads-pwdMustChange: FALSE
-ads-pwdLockoutDuration: 0
-ads-pwdMinLength: 5
-ads-pwdInHistory: 5
-ads-pwdExpireWarning: 600
-ads-pwdMinAge: 0
-ads-pwdAllowUserChange: TRUE
-ads-pwdGraceAuthNLimit: 5
-ads-pwdCheckQuality: 2
-ads-enabled: TRUE
-
dn: ou=partitions,ads-directoryServiceId=default,ou=config
ou: partitions
objectclass: organizationalUnit
@@ -245,14 +262,16 @@
objectClass: ads-base
objectclass: ads-partition
objectclass: ads-jdbmPartition
-ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.1
-ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.2
-ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.3
-ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.4
-ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.5
-ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.6
-ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.7
+ads-indexes: apacheRdn
+ads-indexes: apacheSubLevel
+ads-indexes: apachePresence
+ads-indexes: apacheOneLevel
+ads-indexes: apacheOneAlias
+ads-indexes: apacheSubAlias
+ads-indexes: apacheAlias
ads-indexes: objectClass
+ads-indexes: entryUUID
+ads-indexes: entryCSN
ads-indexes: ou
ads-indexes: uid
ads-partitionSuffix: ou=system
@@ -272,8 +291,8 @@
objectclass: organizationalUnit
objectclass: top
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.1,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
-ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.1
+dn: ads-indexAttributeId=apacheRdn,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: apacheRdn
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
@@ -281,8 +300,8 @@
objectclass: top
ads-enabled: TRUE
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.2,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
-ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.2
+dn: ads-indexAttributeId=apacheSubLevel,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: apacheSubLevel
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
@@ -290,8 +309,8 @@
objectclass: top
ads-enabled: TRUE
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.3,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
-ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.3
+dn: ads-indexAttributeId=apachePresence,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: apachePresence
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
@@ -299,8 +318,8 @@
objectclass: top
ads-enabled: TRUE
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.4,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
-ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.4
+dn: ads-indexAttributeId=apacheOneLevel,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: apacheOneLevel
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
@@ -308,8 +327,8 @@
objectclass: top
ads-enabled: TRUE
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.5,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
-ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.5
+dn: ads-indexAttributeId=apacheOneAlias,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: apacheOneAlias
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
@@ -317,8 +336,8 @@
objectclass: top
ads-enabled: TRUE
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.6,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
-ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.6
+dn: ads-indexAttributeId=apacheSubAlias,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: apacheSubAlias
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
@@ -326,8 +345,8 @@
objectclass: top
ads-enabled: TRUE
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.7,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
-ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.7
+dn: ads-indexAttributeId=apacheAlias,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: apacheAlias
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
@@ -344,6 +363,24 @@
objectclass: top
ads-enabled: TRUE
+dn: ads-indexAttributeId=entryUUID,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: entryUUID
+ads-indexcachesize: 100
+objectclass: ads-index
+objectclass: ads-jdbmIndex
+objectclass: ads-base
+objectclass: top
+ads-enabled: TRUE
+
+dn: ads-indexAttributeId=entryCSN,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: entryCSN
+ads-indexcachesize: 100
+objectclass: ads-index
+objectclass: ads-jdbmIndex
+objectclass: ads-base
+objectclass: top
+ads-enabled: TRUE
+
dn: ads-indexAttributeId=ou,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
ads-indexattributeid: ou
ads-indexcachesize: 100
@@ -367,13 +404,15 @@
objectClass: ads-base
objectclass: ads-partition
objectclass: ads-jdbmPartition
-ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.1
-ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.2
-ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.3
-ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.4
-ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.5
-ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.6
-ads-indexes: 1.3.6.1.4.1.18060.0.4.1.2.7
+ads-indexes: apacheRdn
+ads-indexes: apacheSubLevel
+ads-indexes: apachePresence
+ads-indexes: apacheOneLevel
+ads-indexes: apacheOneAlias
+ads-indexes: apacheSubAlias
+ads-indexes: apacheAlias
+ads-indexes: entryUUID
+ads-indexes: entryCSN
ads-indexes: dc
ads-indexes: krb5PrincipalName
ads-indexes: objectClass
@@ -391,8 +430,8 @@
objectclass: organizationalUnit
objectclass: top
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.1,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
-ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.1
+dn: ads-indexAttributeId=apacheRdn,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: apacheRdn
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
@@ -400,8 +439,8 @@
objectclass: top
ads-enabled: TRUE
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.2,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
-ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.2
+dn: ads-indexAttributeId=apacheSubLevel,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: apacheSubLevel
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
@@ -409,8 +448,8 @@
objectclass: top
ads-enabled: TRUE
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.3,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
-ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.3
+dn: ads-indexAttributeId=apachePresence,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: apachePresence
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
@@ -418,8 +457,8 @@
objectclass: top
ads-enabled: TRUE
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.4,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
-ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.4
+dn: ads-indexAttributeId=apacheOneLevel,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: apacheOneLevel
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
@@ -427,8 +466,8 @@
objectclass: top
ads-enabled: TRUE
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.5,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
-ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.5
+dn: ads-indexAttributeId=apacheOneAlias,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: apacheOneAlias
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
@@ -436,8 +475,8 @@
objectclass: top
ads-enabled: TRUE
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.6,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
-ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.6
+dn: ads-indexAttributeId=apacheSubAlias,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: apacheSubAlias
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
@@ -445,8 +484,8 @@
objectclass: top
ads-enabled: TRUE
-dn: ads-indexAttributeId=1.3.6.1.4.1.18060.0.4.1.2.7,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
-ads-indexattributeid: 1.3.6.1.4.1.18060.0.4.1.2.7
+dn: ads-indexAttributeId=apacheAlias,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: apacheAlias
ads-indexcachesize: 100
objectclass: ads-index
objectclass: ads-jdbmIndex
@@ -481,6 +520,24 @@
objectclass: top
ads-enabled: TRUE
+dn: ads-indexAttributeId=entryUUID,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: entryUUID
+ads-indexcachesize: 100
+objectclass: ads-index
+objectclass: ads-jdbmIndex
+objectclass: ads-base
+objectclass: top
+ads-enabled: TRUE
+
+dn: ads-indexAttributeId=entryCSN,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: entryCSN
+ads-indexcachesize: 100
+objectclass: ads-index
+objectclass: ads-jdbmIndex
+objectclass: ads-base
+objectclass: top
+ads-enabled: TRUE
+
dn: ads-indexAttributeId=ou,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
ads-indexattributeid: ou
ads-indexcachesize: 100
@@ -528,7 +585,6 @@
dn: ads-transportId=tcp,ou=transports,ads-serverId=changePasswordServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-systemport: 60464
-ads-transportbacklog: 50
ads-transportnbthreads: 2
ads-transportid: tcp
objectclass: ads-transport
@@ -539,7 +595,6 @@
dn: ads-transportId=udp,ou=transports,ads-serverId=changePasswordServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-systemport: 60464
-ads-transportbacklog: 50
ads-transportnbthreads: 2
ads-transportid: udp
objectclass: ads-transport
@@ -663,7 +718,6 @@
dn: ads-transportid=tcp,ou=transports,ads-serverId=kerberosServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-systemport: 60088
-ads-transportbacklog: 50
ads-transportnbthreads: 4
ads-transportaddress: 0.0.0.0
ads-transportid: tcp
@@ -675,7 +729,6 @@
dn: ads-transportid=udp,ou=transports,ads-serverId=kerberosServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-systemport: 60088
-ads-transportbacklog: 50
ads-transportnbthreads: 4
ads-transportaddress: 0.0.0.0
ads-transportid: udp
@@ -701,7 +754,6 @@
ads-saslRealms: apache.org
ads-searchBaseDN: ou=users,ou=system
ads-enabled: TRUE
-ads-enableReplProvider: FALSE
ads-transports: ldap
ads-transports: ldaps
ads-saslmechhandlers: CRAM-MD5
@@ -714,6 +766,11 @@
ads-extendedophandlers: starttlshandler
ads-extendedophandlers: storedprochandler
+dn: ou=replConsumers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+objectClass: organizationalUnit
+objectClass: top
+ou: replConsumers
+
dn: ou=transports,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ou: transports
objectclass: organizationalUnit
@@ -721,8 +778,6 @@
dn: ads-transportid=ldap,ou=transports,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-systemport: 10389
-ads-transportenablessl: FALSE
-ads-transportbacklog: 50
ads-transportnbthreads: 8
ads-transportaddress: 0.0.0.0
ads-transportid: ldap
diff --git a/plugins/apacheds.configuration.v2/studio.png b/plugins/apacheds.configuration.v2/studio.png
new file mode 100644
index 0000000..7aba2d3
--- /dev/null
+++ b/plugins/apacheds.configuration.v2/studio.png
Binary files differ
diff --git a/plugins/apacheds.configuration/pom.xml b/plugins/apacheds.configuration/pom.xml
index 5c37024..53fc3d8 100644
--- a/plugins/apacheds.configuration/pom.xml
+++ b/plugins/apacheds.configuration/pom.xml
@@ -63,7 +63,7 @@
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
<skip>false</skip>
- <pde>true</pde>
+ <pde>true</pde>
<additionalProjectnatures>
<projectnature>org.eclipse.pde.PluginNature</projectnature>
<projectnature>org.eclipse.jdt.core.javanature</projectnature>
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/StudioEntityResolver.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/StudioEntityResolver.java
index 4ae8b1e..fa97027 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/StudioEntityResolver.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/StudioEntityResolver.java
@@ -53,7 +53,7 @@
}
else
{
- is = new InputSource( new StringReader( "" ) );
+ is = new InputSource( new StringReader( "" ) ); //$NON-NLS-1$
}
is.setSystemId( systemId );
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/NonExistingServerConfigurationInput.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/NonExistingServerConfigurationInput.java
index 378dcbd..94002b2 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/NonExistingServerConfigurationInput.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/NonExistingServerConfigurationInput.java
@@ -90,7 +90,7 @@
switch ( serverConfiguration.getVersion() )
{
case VERSION_1_5_7:
- return Messages.getString( "NonExistingServerConfigurationInput.NewApacheDS157Configuration" );
+ return Messages.getString( "NonExistingServerConfigurationInput.NewApacheDS157Configuration" ); //$NON-NLS-1$
case VERSION_1_5_6:
return Messages.getString( "NonExistingServerConfigurationInput.NewApacheDS156Configuration" ); //$NON-NLS-1$
case VERSION_1_5_5:
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java
index 183968a..026d6a3 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java
@@ -58,7 +58,6 @@
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite;
@@ -468,12 +467,11 @@
}
catch ( Exception e )
{
- MessageBox messageBox = new MessageBox( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- SWT.OK | SWT.ICON_ERROR );
- messageBox.setText( Messages.getString( "ServerConfigurationEditor.Error" ) ); //$NON-NLS-1$
- messageBox
- .setMessage( Messages.getString( "ServerConfigurationEditor.AnErrorOccurredWhenWritingTheFileToDisk" ) + "\n" + e.getMessage() ); //$NON-NLS-1$ //$NON-NLS-2$
- messageBox.open();
+ MessageDialog.openError(
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+ Messages.getString( "ServerConfigurationEditor.Error" ), //$NON-NLS-1$
+ Messages.getString( "ServerConfigurationEditor.AnErrorOccurredWhenWritingTheFileToDisk" ) + "\n" //$NON-NLS-1$ //$NON-NLS-2$
+ + e.getMessage() );
setDirty( true );
monitor.done();
return;
@@ -608,13 +606,11 @@
}
catch ( Exception e )
{
- MessageBox messageBox = new MessageBox( PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getShell(), SWT.OK | SWT.ICON_ERROR );
- messageBox.setText( Messages.getString( "ServerConfigurationEditor.Error" ) ); //$NON-NLS-1$
- messageBox.setMessage( Messages
- .getString( "ServerConfigurationEditor.AnErrorOccurredWhenWritingTheFileToDisk" ) + "\n" //$NON-NLS-1$ //$NON-NLS-2$
- + e.getMessage() );
- messageBox.open();
+ MessageDialog.openError(
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+ Messages.getString( "ServerConfigurationEditor.Error" ), //$NON-NLS-1$
+ Messages.getString( "ServerConfigurationEditor.AnErrorOccurredWhenWritingTheFileToDisk" ) //$NON-NLS-1$
+ + "\n" + e.getMessage() ); //$NON-NLS-1$
setDirty( true );
monitor.done();
return;
@@ -624,12 +620,12 @@
}
catch ( Exception e )
{
- MessageBox messageBox = new MessageBox( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- SWT.OK | SWT.ICON_ERROR );
- messageBox.setText( Messages.getString( "ServerConfigurationEditor.Error" ) ); //$NON-NLS-1$
- messageBox
- .setMessage( Messages.getString( "ServerConfigurationEditor.AnErrorOccurredWhenWritingTheFileToDisk" ) + "\n" + e.getMessage() ); //$NON-NLS-1$ //$NON-NLS-2$
- messageBox.open();
+ MessageDialog
+ .openError(
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+ Messages.getString( "ServerConfigurationEditor.Error" ), //$NON-NLS-1$
+ Messages.getString( "ServerConfigurationEditor.AnErrorOccurredWhenWritingTheFileToDisk" ) + "\n" //$NON-NLS-1$ //$NON-NLS-2$
+ + e.getMessage() );
return;
}
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/ExtendedOperationDetailsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/ExtendedOperationDetailsPage.java
index 0385fca..7812c92 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/ExtendedOperationDetailsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/ExtendedOperationDetailsPage.java
@@ -127,7 +127,7 @@
// Class
toolkit.createLabel( client, "Class:" );
- classTypeText = toolkit.createText( client, "" );
+ classTypeText = toolkit.createText( client, "" ); //$NON-NLS-1$
classTypeText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
addListeners();
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/ExtendedOperationsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/ExtendedOperationsPage.java
index b35154e..d4261a5 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/ExtendedOperationsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/ExtendedOperationsPage.java
@@ -38,7 +38,7 @@
public class ExtendedOperationsPage extends FormPage
{
/** The Page ID*/
- public static final String ID = ServerConfigurationEditor.ID + ".V150.ExtendedOperationsPage";
+ public static final String ID = ServerConfigurationEditor.ID + ".V150.ExtendedOperationsPage"; //$NON-NLS-1$
/** The Page Title */
private static final String TITLE = "Extended Operations";
@@ -64,7 +64,7 @@
protected void createFormContent( IManagedForm managedForm )
{
PlatformUI.getWorkbench().getHelpSystem().setHelp( getPartControl(),
- ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_150" );
+ ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_150" ); //$NON-NLS-1$ //$NON-NLS-2$
final ScrolledForm form = managedForm.getForm();
form.setText( "Extended Operations" );
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/GeneralPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/GeneralPage.java
index f774e1c..dbc2974 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/GeneralPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/GeneralPage.java
@@ -71,7 +71,7 @@
public class GeneralPage extends FormPage
{
/** The Page ID*/
- public static final String ID = ServerConfigurationEditor.ID + ".BasicPage";
+ public static final String ID = ServerConfigurationEditor.ID + ".BasicPage"; //$NON-NLS-1$
/** The Page Title */
private static final String TITLE = "General";
@@ -119,7 +119,7 @@
protected void createFormContent( IManagedForm managedForm )
{
PlatformUI.getWorkbench().getHelpSystem().setHelp( getPartControl(),
- ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_150" );
+ ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_150" ); //$NON-NLS-1$ //$NON-NLS-2$
ScrolledForm form = managedForm.getForm();
form.setText( "General" );
@@ -166,7 +166,7 @@
// Port
toolkit.createLabel( client, "Port:" );
- portText = toolkit.createText( client, "" );
+ portText = toolkit.createText( client, "" ); //$NON-NLS-1$
portText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
portText.addVerifyListener( new VerifyListener()
{
@@ -190,17 +190,17 @@
// Principal
toolkit.createLabel( client, "Principal:" );
- principalText = toolkit.createText( client, "" );
+ principalText = toolkit.createText( client, "" ); //$NON-NLS-1$
principalText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Password
toolkit.createLabel( client, "Password:" );
- passwordText = toolkit.createText( client, "" );
+ passwordText = toolkit.createText( client, "" ); //$NON-NLS-1$
passwordText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
passwordText.setEchoChar( '\u2022' );
// Show Password
- toolkit.createLabel( client, "" );
+ toolkit.createLabel( client, "" ); //$NON-NLS-1$
showPasswordCheckbox = toolkit.createButton( client, "Show password", SWT.CHECK );
showPasswordCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
showPasswordCheckbox.setSelection( false );
@@ -251,7 +251,7 @@
// Max. Time Limit
toolkit.createLabel( client, "Max. Time Limit:" );
- maxTimeLimitText = toolkit.createText( client, "" );
+ maxTimeLimitText = toolkit.createText( client, "" ); //$NON-NLS-1$
maxTimeLimitText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
maxTimeLimitText.addVerifyListener( new VerifyListener()
{
@@ -266,7 +266,7 @@
// Max. Size Limit
toolkit.createLabel( client, "Max. Size Limit:" );
- maxSizeLimitText = toolkit.createText( client, "" );
+ maxSizeLimitText = toolkit.createText( client, "" ); //$NON-NLS-1$
maxSizeLimitText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
maxSizeLimitText.addVerifyListener( new VerifyListener()
{
@@ -281,7 +281,7 @@
// Synchronization Period
toolkit.createLabel( client, "Synchronization Period:" );
- synchPeriodText = toolkit.createText( client, "" );
+ synchPeriodText = toolkit.createText( client, "" ); //$NON-NLS-1$
synchPeriodText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
synchPeriodText.addVerifyListener( new VerifyListener()
{
@@ -296,7 +296,7 @@
// Max. Threads
toolkit.createLabel( client, "Max. Threads:" );
- maxThreadsText = toolkit.createText( client, "" );
+ maxThreadsText = toolkit.createText( client, "" ); //$NON-NLS-1$
maxThreadsText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
maxThreadsText.addVerifyListener( new VerifyListener()
{
@@ -420,7 +420,7 @@
binaryAttributesTableViewer.setInput( binaryAttributes );
// Port
- portText.setText( "" + configuration.getPort() );
+ portText.setText( "" + configuration.getPort() ); //$NON-NLS-1$
// Principal
String principal = configuration.getPrincipal();
@@ -440,16 +440,16 @@
allowAnonymousAccessCheckbox.setSelection( configuration.isAllowAnonymousAccess() );
// Max Time Limit
- maxTimeLimitText.setText( "" + configuration.getMaxTimeLimit() );
+ maxTimeLimitText.setText( "" + configuration.getMaxTimeLimit() ); //$NON-NLS-1$
// Max Size Limit
- maxSizeLimitText.setText( "" + configuration.getMaxSizeLimit() );
+ maxSizeLimitText.setText( "" + configuration.getMaxSizeLimit() ); //$NON-NLS-1$
// Synchronization Period
- synchPeriodText.setText( "" + configuration.getSynchronizationPeriod() );
+ synchPeriodText.setText( "" + configuration.getSynchronizationPeriod() ); //$NON-NLS-1$
// Max Threads
- maxThreadsText.setText( "" + configuration.getMaxThreads() );
+ maxThreadsText.setText( "" + configuration.getMaxThreads() ); //$NON-NLS-1$
// Enable Access Control
enableAccesControlCheckbox.setSelection( configuration.isEnableAccessControl() );
@@ -515,11 +515,11 @@
{
public void widgetSelected( SelectionEvent e )
{
- BinaryAttributeDialog dialog = new BinaryAttributeDialog( "" );
+ BinaryAttributeDialog dialog = new BinaryAttributeDialog( "" ); //$NON-NLS-1$
if ( Dialog.OK == dialog.open() && dialog.isDirty() )
{
String newAttribute = dialog.getAttribute();
- if ( newAttribute != null && !"".equals( newAttribute )
+ if ( newAttribute != null && !"".equals( newAttribute ) //$NON-NLS-1$
&& !binaryAttributes.contains( newAttribute ) )
{
binaryAttributes.add( newAttribute );
@@ -596,7 +596,7 @@
binaryAttributes.remove( oldAttribute );
String newAttribute = dialog.getAttribute();
- if ( newAttribute != null && !"".equals( newAttribute ) && !binaryAttributes.contains( newAttribute ) )
+ if ( newAttribute != null && !"".equals( newAttribute ) && !binaryAttributes.contains( newAttribute ) ) //$NON-NLS-1$
{
binaryAttributes.add( newAttribute );
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/InterceptorDetailsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/InterceptorDetailsPage.java
index c26bb56..87fb526 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/InterceptorDetailsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/InterceptorDetailsPage.java
@@ -128,12 +128,12 @@
// Name
toolkit.createLabel( client, "Name:" );
- nameText = toolkit.createText( client, "" );
+ nameText = toolkit.createText( client, "" ); //$NON-NLS-1$
nameText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
// Class
toolkit.createLabel( client, "Class:" );
- classText = toolkit.createText( client, "" );
+ classText = toolkit.createText( client, "" ); //$NON-NLS-1$
classText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
}
@@ -233,11 +233,11 @@
// Name
String name = input.getName();
- nameText.setText( ( name == null ) ? "" : name );
+ nameText.setText( ( name == null ) ? "" : name ); //$NON-NLS-1$
// Class
String classType = input.getClassType();
- classText.setText( ( classType == null ) ? "" : classType );
+ classText.setText( ( classType == null ) ? "" : classType ); //$NON-NLS-1$
addListeners();
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/InterceptorsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/InterceptorsPage.java
index c323599..e0006e2 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/InterceptorsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/InterceptorsPage.java
@@ -38,7 +38,7 @@
public class InterceptorsPage extends FormPage
{
/** The Page ID*/
- public static final String ID = ServerConfigurationEditor.ID + ".V150.InterceptorsPage";
+ public static final String ID = ServerConfigurationEditor.ID + ".V150.InterceptorsPage"; //$NON-NLS-1$
/** The Page Title */
private static final String TITLE = "Interceptors";
@@ -65,7 +65,7 @@
protected void createFormContent( IManagedForm managedForm )
{
PlatformUI.getWorkbench().getHelpSystem().setHelp( getPartControl(),
- ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_150" );
+ ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_150" ); //$NON-NLS-1$ //$NON-NLS-2$
final ScrolledForm form = managedForm.getForm();
form.setText( "Interceptors" );
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/PartitionDetailsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/PartitionDetailsPage.java
index 2ee0373..b3ea2bd 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/PartitionDetailsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/PartitionDetailsPage.java
@@ -162,7 +162,7 @@
{
public void widgetSelected( SelectionEvent e )
{
- AttributeValueDialog dialog = new AttributeValueDialog( new AttributeValueObject( "", "" ) );
+ AttributeValueDialog dialog = new AttributeValueDialog( new AttributeValueObject( "", "" ) ); //$NON-NLS-1$ //$NON-NLS-2$
if ( Dialog.OK == dialog.open() && dialog.isDirty() )
{
AttributeValueObject newAttributeValueObject = dialog.getAttributeValueObject();
@@ -256,7 +256,7 @@
{
public void widgetSelected( SelectionEvent e )
{
- IndexedAttributeDialog dialog = new IndexedAttributeDialog( new IndexedAttribute( "", 0 ) );
+ IndexedAttributeDialog dialog = new IndexedAttributeDialog( new IndexedAttribute( "", 0 ) ); //$NON-NLS-1$
if ( Dialog.OK == dialog.open() )
{
indexedAttributes.add( dialog.getIndexedAttribute() );
@@ -351,12 +351,12 @@
// Name
toolkit.createLabel( client, "Name:" );
- nameText = toolkit.createText( client, "" );
+ nameText = toolkit.createText( client, "" ); //$NON-NLS-1$
nameText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
// Cache Size
toolkit.createLabel( client, "Cache Size:" );
- cacheSizeText = toolkit.createText( client, "" );
+ cacheSizeText = toolkit.createText( client, "" ); //$NON-NLS-1$
cacheSizeText.addVerifyListener( new VerifyListener()
{
public void verifyText( VerifyEvent e )
@@ -371,7 +371,7 @@
// Suffix
toolkit.createLabel( client, "Suffix:" );
- suffixText = toolkit.createText( client, "" );
+ suffixText = toolkit.createText( client, "" ); //$NON-NLS-1$
suffixText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
// Enable Optimizer
@@ -687,14 +687,14 @@
// ID
String id = input.getId();
- nameText.setText( ( id == null ) ? "" : id );
+ nameText.setText( ( id == null ) ? "" : id ); //$NON-NLS-1$
// Cache Size
- cacheSizeText.setText( "" + input.getCacheSize() );
+ cacheSizeText.setText( "" + input.getCacheSize() ); //$NON-NLS-1$
// Suffix
String suffix = input.getSuffix();
- suffixText.setText( ( suffix == null ) ? "" : suffix );
+ suffixText.setText( ( suffix == null ) ? "" : suffix ); //$NON-NLS-1$
// Enable Optimizer
enableOptimizerCheckbox.setSelection( input.isEnableOptimizer() );
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/PartitionsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/PartitionsPage.java
index 512c172..f14c370 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/PartitionsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/PartitionsPage.java
@@ -38,7 +38,7 @@
public class PartitionsPage extends FormPage
{
/** The Page ID*/
- public static final String ID = ServerConfigurationEditor.ID + ".V150.PartitionsPage";
+ public static final String ID = ServerConfigurationEditor.ID + ".V150.PartitionsPage"; //$NON-NLS-1$
/** The Page Title */
private static final String TITLE = "Partitions";
@@ -65,7 +65,7 @@
protected void createFormContent( IManagedForm managedForm )
{
PlatformUI.getWorkbench().getHelpSystem().setHelp( getPartControl(),
- ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_150" );
+ ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_150" ); //$NON-NLS-1$ //$NON-NLS-2$
ScrolledForm form = managedForm.getForm();
form.setText( "Partitions" );
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/dialogs/AttributeValueDialog.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/dialogs/AttributeValueDialog.java
index 11787aa..c7940a0 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/dialogs/AttributeValueDialog.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/dialogs/AttributeValueDialog.java
@@ -107,10 +107,10 @@
private void initFromInput()
{
String attribute = attributeValueObject.getAttribute();
- attributeText.setText( ( attribute == null ) ? "" : attribute );
+ attributeText.setText( ( attribute == null ) ? "" : attribute ); //$NON-NLS-1$
Object value = attributeValueObject.getValue();
- valueText.setText( ( value == null ) ? "" : value.toString() );
+ valueText.setText( ( value == null ) ? "" : value.toString() ); //$NON-NLS-1$
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/dialogs/AttributeValueObject.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/dialogs/AttributeValueObject.java
index 5be0e92..85cbb4d 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/dialogs/AttributeValueObject.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/dialogs/AttributeValueObject.java
@@ -102,6 +102,6 @@
*/
public String toString()
{
- return "Attribute=\"" + attribute + "\", Value=\"" + value + "\"";
+ return "Attribute=\"" + attribute + "\", Value=\"" + value + "\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/dialogs/BinaryAttributeDialog.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/dialogs/BinaryAttributeDialog.java
index 88735e3..b38b827 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/dialogs/BinaryAttributeDialog.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/dialogs/BinaryAttributeDialog.java
@@ -102,7 +102,7 @@
*/
private void initFromInput()
{
- attributeText.setText( ( initialValue == null ) ? "" : initialValue );
+ attributeText.setText( ( initialValue == null ) ? "" : initialValue ); //$NON-NLS-1$
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/dialogs/IndexedAttributeDialog.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/dialogs/IndexedAttributeDialog.java
index 88ebc39..8faedc6 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/dialogs/IndexedAttributeDialog.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/dialogs/IndexedAttributeDialog.java
@@ -120,8 +120,8 @@
private void initFromInput()
{
String attributeId = indexedAttribute.getAttributeId();
- attributeIdText.setText( ( attributeId == null ) ? "" : attributeId );
- cacheSizeText.setText( "" + indexedAttribute.getCacheSize() );
+ attributeIdText.setText( ( attributeId == null ) ? "" : attributeId ); //$NON-NLS-1$
+ cacheSizeText.setText( "" + indexedAttribute.getCacheSize() ); //$NON-NLS-1$
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/ExtendedOperationDetailsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/ExtendedOperationDetailsPage.java
index a53fecf..f10f723 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/ExtendedOperationDetailsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/ExtendedOperationDetailsPage.java
@@ -127,7 +127,7 @@
// Class
toolkit.createLabel( client, "Class:" );
- classTypeText = toolkit.createText( client, "" );
+ classTypeText = toolkit.createText( client, "" ); //$NON-NLS-1$
classTypeText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
addListeners();
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/ExtendedOperationsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/ExtendedOperationsPage.java
index d2544c2..2e1b636 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/ExtendedOperationsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/ExtendedOperationsPage.java
@@ -38,7 +38,7 @@
public class ExtendedOperationsPage extends FormPage
{
/** The Page ID*/
- public static final String ID = ServerConfigurationEditor.ID + ".V151.ExtendedOperationsPage";
+ public static final String ID = ServerConfigurationEditor.ID + ".V151.ExtendedOperationsPage"; //$NON-NLS-1$
/** The Page Title */
private static final String TITLE = "Extended Operations";
@@ -65,7 +65,7 @@
protected void createFormContent( IManagedForm managedForm )
{
PlatformUI.getWorkbench().getHelpSystem().setHelp( getPartControl(),
- ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_151" );
+ ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_151" ); //$NON-NLS-1$ //$NON-NLS-2$
final ScrolledForm form = managedForm.getForm();
form.setText( "Extended Operations" );
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/GeneralPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/GeneralPage.java
index 359c5f5..fddb1a7 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/GeneralPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/GeneralPage.java
@@ -73,7 +73,7 @@
public class GeneralPage extends FormPage
{
/** The Page ID*/
- public static final String ID = ServerConfigurationEditor.ID + ".V151.GeneralPage";
+ public static final String ID = ServerConfigurationEditor.ID + ".V151.GeneralPage"; //$NON-NLS-1$
/** The Page Title */
private static final String TITLE = "General";
@@ -132,7 +132,7 @@
protected void createFormContent( IManagedForm managedForm )
{
PlatformUI.getWorkbench().getHelpSystem().setHelp( getPartControl(),
- ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_151" );
+ ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_151" ); //$NON-NLS-1$ //$NON-NLS-2$
ScrolledForm form = managedForm.getForm();
form.setText( "General" );
@@ -196,17 +196,17 @@
// Principal
toolkit.createLabel( client, "Principal:" );
- principalText = toolkit.createText( client, "" );
+ principalText = toolkit.createText( client, "" ); //$NON-NLS-1$
principalText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Password
toolkit.createLabel( client, "Password:" );
- passwordText = toolkit.createText( client, "" );
+ passwordText = toolkit.createText( client, "" ); //$NON-NLS-1$
passwordText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
passwordText.setEchoChar( '\u2022' );
// Show Password
- toolkit.createLabel( client, "" );
+ toolkit.createLabel( client, "" ); //$NON-NLS-1$
showPasswordCheckbox = toolkit.createButton( client, "Show password", SWT.CHECK );
showPasswordCheckbox.setLayoutData( new GridData( SWT.NONE, SWT.NONE, true, false ) );
showPasswordCheckbox.setSelection( false );
@@ -250,7 +250,7 @@
// Max. Time Limit
toolkit.createLabel( client, "Max. Time Limit:" );
- maxTimeLimitText = toolkit.createText( client, "" );
+ maxTimeLimitText = toolkit.createText( client, "" ); //$NON-NLS-1$
maxTimeLimitText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
maxTimeLimitText.addVerifyListener( new VerifyListener()
{
@@ -265,7 +265,7 @@
// Max. Size Limit
toolkit.createLabel( client, "Max. Size Limit:" );
- maxSizeLimitText = toolkit.createText( client, "" );
+ maxSizeLimitText = toolkit.createText( client, "" ); //$NON-NLS-1$
maxSizeLimitText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
maxSizeLimitText.addVerifyListener( new VerifyListener()
{
@@ -280,7 +280,7 @@
// Synchronization Period
toolkit.createLabel( client, "Synchronization Period:" );
- synchPeriodText = toolkit.createText( client, "" );
+ synchPeriodText = toolkit.createText( client, "" ); //$NON-NLS-1$
synchPeriodText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
synchPeriodText.addVerifyListener( new VerifyListener()
{
@@ -295,7 +295,7 @@
// Max. Threads
toolkit.createLabel( client, "Max. Threads:" );
- maxThreadsText = toolkit.createText( client, "" );
+ maxThreadsText = toolkit.createText( client, "" ); //$NON-NLS-1$
maxThreadsText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
maxThreadsText.addVerifyListener( new VerifyListener()
{
@@ -417,12 +417,12 @@
supportedMechanismsTableViewer = new CheckboxTableViewer( supportedMechanismsTable );
supportedMechanismsTableViewer.setContentProvider( new ArrayContentProvider() );
supportedMechanismsTableViewer.setInput( new String[]
- { "SIMPLE", "CRAM-MD5", "DIGEST-MD5", "GSSAPI" } );
+ { "SIMPLE", "CRAM-MD5", "DIGEST-MD5", "GSSAPI" } ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- selectAllSupportedMechanismsButton = toolkit.createButton( client, "Select All", SWT.PUSH );
+ selectAllSupportedMechanismsButton = toolkit.createButton( client, "Select All", SWT.PUSH ); //$NON-NLS-1$
selectAllSupportedMechanismsButton.setLayoutData( new GridData( SWT.FILL, SWT.BEGINNING, false, false ) );
- deselectAllSupportedMechanismsButton = toolkit.createButton( client, "Deselect All", SWT.PUSH );
+ deselectAllSupportedMechanismsButton = toolkit.createButton( client, "Deselect All", SWT.PUSH ); //$NON-NLS-1$
deselectAllSupportedMechanismsButton.setLayoutData( new GridData( SWT.FILL, SWT.BEGINNING, false, false ) );
}
@@ -451,7 +451,7 @@
Composite ldapProtocolComposite = createProtocolComposite( toolkit, client );
enableLdapCheckbox = toolkit.createButton( ldapProtocolComposite, "Enable LDAP", SWT.CHECK );
enableLdapCheckbox.setLayoutData( new GridData( SWT.NONE, SWT.NONE, true, false, 3, 1 ) );
- toolkit.createLabel( ldapProtocolComposite, " " );
+ toolkit.createLabel( ldapProtocolComposite, " " ); //$NON-NLS-1$
toolkit.createLabel( ldapProtocolComposite, "Port:" );
ldapPortText = createPortText( toolkit, ldapProtocolComposite );
@@ -459,7 +459,7 @@
Composite ldapsProtocolComposite = createProtocolComposite( toolkit, client );
enableLdapsCheckbox = toolkit.createButton( ldapsProtocolComposite, "Enable LDAPS", SWT.CHECK );
enableLdapsCheckbox.setLayoutData( new GridData( SWT.NONE, SWT.NONE, true, false, 3, 1 ) );
- toolkit.createLabel( ldapsProtocolComposite, " " );
+ toolkit.createLabel( ldapsProtocolComposite, " " ); //$NON-NLS-1$
toolkit.createLabel( ldapsProtocolComposite, "Port:" );
ldapsPortText = createPortText( toolkit, ldapsProtocolComposite );
@@ -467,7 +467,7 @@
Composite kerberosProtocolComposite = createProtocolComposite( toolkit, client );
enableKerberosCheckbox = toolkit.createButton( kerberosProtocolComposite, "Enable Kerberos", SWT.CHECK );
enableKerberosCheckbox.setLayoutData( new GridData( SWT.NONE, SWT.NONE, true, false, 3, 1 ) );
- toolkit.createLabel( kerberosProtocolComposite, " " );
+ toolkit.createLabel( kerberosProtocolComposite, " " ); //$NON-NLS-1$
toolkit.createLabel( kerberosProtocolComposite, "Port:" );
kerberosPortText = createPortText( toolkit, kerberosProtocolComposite );
@@ -475,7 +475,7 @@
Composite ntpProtocolComposite = createProtocolComposite( toolkit, client );
enableNtpCheckbox = toolkit.createButton( ntpProtocolComposite, "Enable NTP", SWT.CHECK );
enableNtpCheckbox.setLayoutData( new GridData( SWT.NONE, SWT.NONE, true, false, 3, 1 ) );
- toolkit.createLabel( ntpProtocolComposite, " " );
+ toolkit.createLabel( ntpProtocolComposite, " " ); //$NON-NLS-1$
toolkit.createLabel( ntpProtocolComposite, "Port:" );
ntpPortText = createPortText( toolkit, ntpProtocolComposite );
@@ -483,7 +483,7 @@
Composite dnsProtocolComposite = createProtocolComposite( toolkit, client );
enableDnsCheckbox = toolkit.createButton( dnsProtocolComposite, "Enable DNS", SWT.CHECK );
enableDnsCheckbox.setLayoutData( new GridData( SWT.NONE, SWT.NONE, true, false, 3, 1 ) );
- toolkit.createLabel( dnsProtocolComposite, " " );
+ toolkit.createLabel( dnsProtocolComposite, " " ); //$NON-NLS-1$
toolkit.createLabel( dnsProtocolComposite, "Port:" );
dnsPortText = createPortText( toolkit, dnsProtocolComposite );
@@ -492,7 +492,7 @@
enableChangePasswordCheckbox = toolkit.createButton( changePasswordProtocolComposite, "Enable Change Password",
SWT.CHECK );
enableChangePasswordCheckbox.setLayoutData( new GridData( SWT.NONE, SWT.NONE, true, false, 3, 1 ) );
- toolkit.createLabel( changePasswordProtocolComposite, " " );
+ toolkit.createLabel( changePasswordProtocolComposite, " " ); //$NON-NLS-1$
toolkit.createLabel( changePasswordProtocolComposite, "Port:" );
changePasswordPortText = createPortText( toolkit, changePasswordProtocolComposite );
}
@@ -533,7 +533,7 @@
*/
private Text createPortText( FormToolkit toolkit, Composite parent )
{
- Text portText = toolkit.createText( parent, "" );
+ Text portText = toolkit.createText( parent, "" ); //$NON-NLS-1$
GridData gd = new GridData( SWT.NONE, SWT.NONE, false, false );
gd.widthHint = 42;
portText.setLayoutData( gd );
@@ -582,44 +582,44 @@
// LDAP Protocol
enableLdapCheckbox.setSelection( configuration.isEnableLdap() );
ldapPortText.setEnabled( enableLdapCheckbox.getSelection() );
- ldapPortText.setText( "" + configuration.getLdapPort() );
+ ldapPortText.setText( "" + configuration.getLdapPort() ); //$NON-NLS-1$
// LDAPS Protocol
enableLdapsCheckbox.setSelection( configuration.isEnableLdaps() );
ldapsPortText.setEnabled( enableLdapsCheckbox.getSelection() );
- ldapsPortText.setText( "" + configuration.getLdapsPort() );
+ ldapsPortText.setText( "" + configuration.getLdapsPort() ); //$NON-NLS-1$
// Kerberos Protocol
enableKerberosCheckbox.setSelection( configuration.isEnableKerberos() );
kerberosPortText.setEnabled( enableKerberosCheckbox.getSelection() );
- kerberosPortText.setText( "" + configuration.getKerberosPort() );
+ kerberosPortText.setText( "" + configuration.getKerberosPort() ); //$NON-NLS-1$
// NTP Protocol
enableNtpCheckbox.setSelection( configuration.isEnableNtp() );
ntpPortText.setEnabled( enableNtpCheckbox.getSelection() );
- ntpPortText.setText( "" + configuration.getNtpPort() );
+ ntpPortText.setText( "" + configuration.getNtpPort() ); //$NON-NLS-1$
// DNS Protocol
enableDnsCheckbox.setSelection( configuration.isEnableDns() );
dnsPortText.setEnabled( enableDnsCheckbox.getSelection() );
- dnsPortText.setText( "" + configuration.getDnsPort() );
+ dnsPortText.setText( "" + configuration.getDnsPort() ); //$NON-NLS-1$
// Change Password Protocol
enableChangePasswordCheckbox.setSelection( configuration.isEnableChangePassword() );
changePasswordPortText.setEnabled( enableChangePasswordCheckbox.getSelection() );
- changePasswordPortText.setText( "" + configuration.getChangePasswordPort() );
+ changePasswordPortText.setText( "" + configuration.getChangePasswordPort() ); //$NON-NLS-1$
// Max Time Limit
- maxTimeLimitText.setText( "" + configuration.getMaxTimeLimit() );
+ maxTimeLimitText.setText( "" + configuration.getMaxTimeLimit() ); //$NON-NLS-1$
// Max Size Limit
- maxSizeLimitText.setText( "" + configuration.getMaxSizeLimit() );
+ maxSizeLimitText.setText( "" + configuration.getMaxSizeLimit() ); //$NON-NLS-1$
// Synchronization Period
- synchPeriodText.setText( "" + configuration.getSynchronizationPeriod() );
+ synchPeriodText.setText( "" + configuration.getSynchronizationPeriod() ); //$NON-NLS-1$
// Max Threads
- maxThreadsText.setText( "" + configuration.getMaxThreads() );
+ maxThreadsText.setText( "" + configuration.getMaxThreads() ); //$NON-NLS-1$
supportedMechanismsTableViewer.setCheckedElements( configuration.getSupportedMechanisms().toArray() );
@@ -681,11 +681,11 @@
{
public void widgetSelected( SelectionEvent e )
{
- BinaryAttributeDialog dialog = new BinaryAttributeDialog( "" );
+ BinaryAttributeDialog dialog = new BinaryAttributeDialog( "" ); //$NON-NLS-1$
if ( Dialog.OK == dialog.open() && dialog.isDirty() )
{
String newAttribute = dialog.getAttribute();
- if ( newAttribute != null && !"".equals( newAttribute )
+ if ( newAttribute != null && !"".equals( newAttribute ) //$NON-NLS-1$
&& !binaryAttributes.contains( newAttribute ) )
{
binaryAttributes.add( newAttribute );
@@ -842,7 +842,7 @@
binaryAttributes.remove( oldAttribute );
String newAttribute = dialog.getAttribute();
- if ( newAttribute != null && !"".equals( newAttribute ) && !binaryAttributes.contains( newAttribute ) )
+ if ( newAttribute != null && !"".equals( newAttribute ) && !binaryAttributes.contains( newAttribute ) ) //$NON-NLS-1$
{
binaryAttributes.add( newAttribute );
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/InterceptorDetailsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/InterceptorDetailsPage.java
index adea41c..880ed9f 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/InterceptorDetailsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/InterceptorDetailsPage.java
@@ -128,12 +128,12 @@
// Name
toolkit.createLabel( client, "Name:" );
- nameText = toolkit.createText( client, "" );
+ nameText = toolkit.createText( client, "" ); //$NON-NLS-1$
nameText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
// Class
toolkit.createLabel( client, "Class:" );
- classText = toolkit.createText( client, "" );
+ classText = toolkit.createText( client, "" ); //$NON-NLS-1$
classText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
}
@@ -233,11 +233,11 @@
// Name
String name = input.getName();
- nameText.setText( ( name == null ) ? "" : name );
+ nameText.setText( ( name == null ) ? "" : name ); //$NON-NLS-1$
// Class
String classType = input.getClassType();
- classText.setText( ( classType == null ) ? "" : classType );
+ classText.setText( ( classType == null ) ? "" : classType ); //$NON-NLS-1$
addListeners();
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/InterceptorsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/InterceptorsPage.java
index 0d1fb9c..1f0fbd0 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/InterceptorsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/InterceptorsPage.java
@@ -38,7 +38,7 @@
public class InterceptorsPage extends FormPage
{
/** The Page ID*/
- public static final String ID = ServerConfigurationEditor.ID + ".V151.InterceptorsPage";
+ public static final String ID = ServerConfigurationEditor.ID + ".V151.InterceptorsPage"; //$NON-NLS-1$
/** The Page Title */
private static final String TITLE = "Interceptors";
@@ -65,7 +65,7 @@
protected void createFormContent( IManagedForm managedForm )
{
PlatformUI.getWorkbench().getHelpSystem().setHelp( getPartControl(),
- ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_151" );
+ ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_151" ); //$NON-NLS-1$ //$NON-NLS-2$
final ScrolledForm form = managedForm.getForm();
form.setText( "Interceptors" );
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/PartitionDetailsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/PartitionDetailsPage.java
index 86d9d40..1ca88a7 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/PartitionDetailsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/PartitionDetailsPage.java
@@ -162,7 +162,7 @@
{
public void widgetSelected( SelectionEvent e )
{
- AttributeValueDialog dialog = new AttributeValueDialog( new AttributeValueObject( "", "" ) );
+ AttributeValueDialog dialog = new AttributeValueDialog( new AttributeValueObject( "", "" ) ); //$NON-NLS-1$ //$NON-NLS-2$
if ( Dialog.OK == dialog.open() && dialog.isDirty() )
{
AttributeValueObject newAttributeValueObject = dialog.getAttributeValueObject();
@@ -256,7 +256,7 @@
{
public void widgetSelected( SelectionEvent e )
{
- IndexedAttributeDialog dialog = new IndexedAttributeDialog( new IndexedAttribute( "", 0 ) );
+ IndexedAttributeDialog dialog = new IndexedAttributeDialog( new IndexedAttribute( "", 0 ) ); //$NON-NLS-1$
if ( Dialog.OK == dialog.open() )
{
indexedAttributes.add( dialog.getIndexedAttribute() );
@@ -351,12 +351,12 @@
// ID
toolkit.createLabel( client, "ID:" );
- idText = toolkit.createText( client, "" );
+ idText = toolkit.createText( client, "" ); //$NON-NLS-1$
idText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
// Cache Size
toolkit.createLabel( client, "Cache Size:" );
- cacheSizeText = toolkit.createText( client, "" );
+ cacheSizeText = toolkit.createText( client, "" ); //$NON-NLS-1$
cacheSizeText.addVerifyListener( new VerifyListener()
{
public void verifyText( VerifyEvent e )
@@ -371,7 +371,7 @@
// Suffix
toolkit.createLabel( client, "Suffix:" );
- suffixText = toolkit.createText( client, "" );
+ suffixText = toolkit.createText( client, "" ); //$NON-NLS-1$
suffixText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
// Enable Optimizer
@@ -687,14 +687,14 @@
// ID
String id = input.getId();
- idText.setText( ( id == null ) ? "" : id );
+ idText.setText( ( id == null ) ? "" : id ); //$NON-NLS-1$
// Cache Size
- cacheSizeText.setText( "" + input.getCacheSize() );
+ cacheSizeText.setText( "" + input.getCacheSize() ); //$NON-NLS-1$
// Suffix
String suffix = input.getSuffix();
- suffixText.setText( ( suffix == null ) ? "" : suffix );
+ suffixText.setText( ( suffix == null ) ? "" : suffix ); //$NON-NLS-1$
// Enable Optimizer
enableOptimizerCheckbox.setSelection( input.isEnableOptimizer() );
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/PartitionsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/PartitionsPage.java
index 00a2c26..7a3bb57 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/PartitionsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/PartitionsPage.java
@@ -38,7 +38,7 @@
public class PartitionsPage extends FormPage
{
/** The Page ID*/
- public static final String ID = ServerConfigurationEditor.ID + ".V151.PartitionsPage";
+ public static final String ID = ServerConfigurationEditor.ID + ".V151.PartitionsPage"; //$NON-NLS-1$
/** The Page Title */
private static final String TITLE = "Partitions";
@@ -65,7 +65,7 @@
protected void createFormContent( IManagedForm managedForm )
{
PlatformUI.getWorkbench().getHelpSystem().setHelp( getPartControl(),
- ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_151" );
+ ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_151" ); //$NON-NLS-1$ //$NON-NLS-2$
ScrolledForm form = managedForm.getForm();
form.setText( "Partitions" );
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/AttributeValueDialog.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/AttributeValueDialog.java
index e68f78f..5f4fe12 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/AttributeValueDialog.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/AttributeValueDialog.java
@@ -105,10 +105,10 @@
private void initFromInput()
{
String attribute = attributeValueObject.getAttribute();
- attributeText.setText( ( attribute == null ) ? "" : attribute );
+ attributeText.setText( ( attribute == null ) ? "" : attribute ); //$NON-NLS-1$
Object value = attributeValueObject.getValue();
- valueText.setText( ( value == null ) ? "" : value.toString() );
+ valueText.setText( ( value == null ) ? "" : value.toString() ); //$NON-NLS-1$
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/AttributeValueObject.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/AttributeValueObject.java
index 3c52eee..09a7b0b 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/AttributeValueObject.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/AttributeValueObject.java
@@ -101,6 +101,6 @@
*/
public String toString()
{
- return "Attribute=\"" + attribute + "\", Value=\"" + value + "\"";
+ return "Attribute=\"" + attribute + "\", Value=\"" + value + "\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/BinaryAttributeDialog.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/BinaryAttributeDialog.java
index fe9e201..6185b5b 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/BinaryAttributeDialog.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/BinaryAttributeDialog.java
@@ -102,7 +102,7 @@
*/
private void initFromInput()
{
- attributeText.setText( ( initialValue == null ) ? "" : initialValue );
+ attributeText.setText( ( initialValue == null ) ? "" : initialValue ); //$NON-NLS-1$
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/IndexedAttributeDialog.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/IndexedAttributeDialog.java
index 1003aeb..41cddb9 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/IndexedAttributeDialog.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/dialogs/IndexedAttributeDialog.java
@@ -120,8 +120,8 @@
private void initFromInput()
{
String attributeId = indexedAttribute.getAttributeId();
- attributeIdText.setText( ( attributeId == null ) ? "" : attributeId );
- cacheSizeText.setText( "" + indexedAttribute.getCacheSize() );
+ attributeIdText.setText( ( attributeId == null ) ? "" : attributeId ); //$NON-NLS-1$
+ cacheSizeText.setText( "" + indexedAttribute.getCacheSize() ); //$NON-NLS-1$
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/AuthenticationPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/AuthenticationPage.java
index 01fe992..9e7cef5 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/AuthenticationPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/AuthenticationPage.java
@@ -70,7 +70,7 @@
public class AuthenticationPage extends FormPage
{
/** The Page ID */
- public static final String ID = ServerConfigurationEditor.ID + ".V152.AuthenticationPage";
+ public static final String ID = ServerConfigurationEditor.ID + ".V152.AuthenticationPage"; //$NON-NLS-1$
/** The Page Title */
private static final String TITLE = "Authentication";
@@ -112,7 +112,7 @@
protected void createFormContent( IManagedForm managedForm )
{
PlatformUI.getWorkbench().getHelpSystem().setHelp( getPartControl(),
- ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_152" );
+ ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_152" ); //$NON-NLS-1$ //$NON-NLS-2$
ScrolledForm form = managedForm.getForm();
form.setText( "Authentication" );
@@ -200,17 +200,17 @@
// SASL Host
toolkit.createLabel( client, "SASL Host:" );
- saslHostText = toolkit.createText( client, "" );
+ saslHostText = toolkit.createText( client, "" ); //$NON-NLS-1$
saslHostText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// SASL Principal
toolkit.createLabel( client, "SASL Principal:" );
- saslPrincipalText = toolkit.createText( client, "" );
+ saslPrincipalText = toolkit.createText( client, "" ); //$NON-NLS-1$
saslPrincipalText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Search Base Dn
toolkit.createLabel( client, "Search Base Dn:" );
- searchBaseDnText = toolkit.createText( client, "" );
+ searchBaseDnText = toolkit.createText( client, "" ); //$NON-NLS-1$
searchBaseDnText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
}
@@ -422,11 +422,11 @@
{
public void widgetSelected( SelectionEvent e )
{
- SaslRealmDialog dialog = new SaslRealmDialog( "" );
+ SaslRealmDialog dialog = new SaslRealmDialog( "" ); //$NON-NLS-1$
if ( Dialog.OK == dialog.open() && dialog.isDirty() )
{
String newSaslRealm = dialog.getSaslRealm();
- if ( newSaslRealm != null && !"".equals( newSaslRealm ) && !saslRealms.contains( newSaslRealm ) )
+ if ( newSaslRealm != null && !"".equals( newSaslRealm ) && !saslRealms.contains( newSaslRealm ) ) //$NON-NLS-1$
{
saslRealms.add( newSaslRealm );
@@ -480,7 +480,7 @@
saslRealms.remove( oldSaslRealm );
String newSaslRealm = dialog.getSaslRealm();
- if ( newSaslRealm != null && !"".equals( newSaslRealm ) && !saslRealms.contains( newSaslRealm ) )
+ if ( newSaslRealm != null && !"".equals( newSaslRealm ) && !saslRealms.contains( newSaslRealm ) ) //$NON-NLS-1$
{
saslRealms.add( newSaslRealm );
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/ExtendedOperationDetailsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/ExtendedOperationDetailsPage.java
index ee83870..d5004dd 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/ExtendedOperationDetailsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/ExtendedOperationDetailsPage.java
@@ -99,13 +99,13 @@
// Name
toolkit.createLabel( client, "Name:" );
- nameText = toolkit.createText( client, "" );
+ nameText = toolkit.createText( client, "" ); //$NON-NLS-1$
nameText.setEditable( false );
nameText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Description
toolkit.createLabel( client, "Description:" );
- descriptionText = toolkit.createText( client, "", SWT.MULTI | SWT.WRAP | SWT.V_SCROLL );
+ descriptionText = toolkit.createText( client, "", SWT.MULTI | SWT.WRAP | SWT.V_SCROLL ); //$NON-NLS-1$
descriptionText.setEditable( false );
GridData gridData = new GridData( SWT.FILL, SWT.NONE, true, false );
gridData.widthHint = 100;
@@ -182,11 +182,11 @@
{
// Name
String name = input.getName();
- nameText.setText( ( name == null ) ? "" : name );
+ nameText.setText( ( name == null ) ? "" : name ); //$NON-NLS-1$
// Description
String description = input.getDescription();
- descriptionText.setText( ( description == null ) ? "" : description );
+ descriptionText.setText( ( description == null ) ? "" : description ); //$NON-NLS-1$
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/ExtendedOperationsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/ExtendedOperationsPage.java
index 33a6a1a..a82722e 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/ExtendedOperationsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/ExtendedOperationsPage.java
@@ -38,7 +38,7 @@
public class ExtendedOperationsPage extends FormPage
{
/** The Page ID*/
- public static final String ID = ServerConfigurationEditor.ID + ".V152.ExtendedOperationsPage";
+ public static final String ID = ServerConfigurationEditor.ID + ".V152.ExtendedOperationsPage"; //$NON-NLS-1$
/** The Page Title */
private static final String TITLE = "Extended Operations";
@@ -65,7 +65,7 @@
protected void createFormContent( IManagedForm managedForm )
{
PlatformUI.getWorkbench().getHelpSystem().setHelp( getPartControl(),
- ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_152" );
+ ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_152" ); //$NON-NLS-1$ //$NON-NLS-2$
final ScrolledForm form = managedForm.getForm();
form.setText( "Extended Operations" );
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/GeneralPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/GeneralPage.java
index dfd78df..25b5c7f 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/GeneralPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/GeneralPage.java
@@ -56,7 +56,7 @@
public class GeneralPage extends FormPage
{
/** The Page ID*/
- public static final String ID = ServerConfigurationEditor.ID + ".V152.GeneralPage";
+ public static final String ID = ServerConfigurationEditor.ID + ".V152.GeneralPage"; //$NON-NLS-1$
/** The Page Title */
private static final String TITLE = "General";
@@ -101,7 +101,7 @@
protected void createFormContent( IManagedForm managedForm )
{
PlatformUI.getWorkbench().getHelpSystem().setHelp( getPartControl(),
- ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_152" );
+ ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_152" ); //$NON-NLS-1$ //$NON-NLS-2$
ScrolledForm form = managedForm.getForm();
form.setText( "General" );
@@ -162,7 +162,7 @@
Composite ldapProtocolComposite = createProtocolComposite( toolkit, client );
enableLdapCheckbox = toolkit.createButton( ldapProtocolComposite, "Enable LDAP", SWT.CHECK );
enableLdapCheckbox.setLayoutData( new GridData( SWT.NONE, SWT.NONE, true, false, 3, 1 ) );
- toolkit.createLabel( ldapProtocolComposite, " " );
+ toolkit.createLabel( ldapProtocolComposite, " " ); //$NON-NLS-1$
toolkit.createLabel( ldapProtocolComposite, "Port:" );
ldapPortText = createPortText( toolkit, ldapProtocolComposite );
@@ -170,7 +170,7 @@
Composite ldapsProtocolComposite = createProtocolComposite( toolkit, client );
enableLdapsCheckbox = toolkit.createButton( ldapsProtocolComposite, "Enable LDAPS", SWT.CHECK );
enableLdapsCheckbox.setLayoutData( new GridData( SWT.NONE, SWT.NONE, true, false, 3, 1 ) );
- toolkit.createLabel( ldapsProtocolComposite, " " );
+ toolkit.createLabel( ldapsProtocolComposite, " " ); //$NON-NLS-1$
toolkit.createLabel( ldapsProtocolComposite, "Port:" );
ldapsPortText = createPortText( toolkit, ldapsProtocolComposite );
@@ -178,7 +178,7 @@
Composite kerberosProtocolComposite = createProtocolComposite( toolkit, client );
enableKerberosCheckbox = toolkit.createButton( kerberosProtocolComposite, "Enable Kerberos", SWT.CHECK );
enableKerberosCheckbox.setLayoutData( new GridData( SWT.NONE, SWT.NONE, true, false, 3, 1 ) );
- toolkit.createLabel( kerberosProtocolComposite, " " );
+ toolkit.createLabel( kerberosProtocolComposite, " " ); //$NON-NLS-1$
toolkit.createLabel( kerberosProtocolComposite, "Port:" );
kerberosPortText = createPortText( toolkit, kerberosProtocolComposite );
@@ -186,7 +186,7 @@
Composite ntpProtocolComposite = createProtocolComposite( toolkit, client );
enableNtpCheckbox = toolkit.createButton( ntpProtocolComposite, "Enable NTP", SWT.CHECK );
enableNtpCheckbox.setLayoutData( new GridData( SWT.NONE, SWT.NONE, true, false, 3, 1 ) );
- toolkit.createLabel( ntpProtocolComposite, " " );
+ toolkit.createLabel( ntpProtocolComposite, " " ); //$NON-NLS-1$
toolkit.createLabel( ntpProtocolComposite, "Port:" );
ntpPortText = createPortText( toolkit, ntpProtocolComposite );
@@ -194,7 +194,7 @@
Composite dnsProtocolComposite = createProtocolComposite( toolkit, client );
enableDnsCheckbox = toolkit.createButton( dnsProtocolComposite, "Enable DNS", SWT.CHECK );
enableDnsCheckbox.setLayoutData( new GridData( SWT.NONE, SWT.NONE, true, false, 3, 1 ) );
- toolkit.createLabel( dnsProtocolComposite, " " );
+ toolkit.createLabel( dnsProtocolComposite, " " ); //$NON-NLS-1$
toolkit.createLabel( dnsProtocolComposite, "Port:" );
dnsPortText = createPortText( toolkit, dnsProtocolComposite );
@@ -203,7 +203,7 @@
enableChangePasswordCheckbox = toolkit.createButton( changePasswordProtocolComposite, "Enable Change Password",
SWT.CHECK );
enableChangePasswordCheckbox.setLayoutData( new GridData( SWT.NONE, SWT.NONE, true, false, 3, 1 ) );
- toolkit.createLabel( changePasswordProtocolComposite, " " );
+ toolkit.createLabel( changePasswordProtocolComposite, " " ); //$NON-NLS-1$
toolkit.createLabel( changePasswordProtocolComposite, "Port:" );
changePasswordPortText = createPortText( toolkit, changePasswordProtocolComposite );
}
@@ -244,7 +244,7 @@
*/
private Text createPortText( FormToolkit toolkit, Composite parent )
{
- Text portText = toolkit.createText( parent, "" );
+ Text portText = toolkit.createText( parent, "" ); //$NON-NLS-1$
GridData gd = new GridData( SWT.NONE, SWT.NONE, false, false );
gd.widthHint = 42;
portText.setLayoutData( gd );
@@ -286,7 +286,7 @@
// Max. Time Limit
toolkit.createLabel( client, "Max. Time Limit:" );
- maxTimeLimitText = toolkit.createText( client, "" );
+ maxTimeLimitText = toolkit.createText( client, "" ); //$NON-NLS-1$
maxTimeLimitText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
maxTimeLimitText.addVerifyListener( new VerifyListener()
{
@@ -301,7 +301,7 @@
// Max. Size Limit
toolkit.createLabel( client, "Max. Size Limit:" );
- maxSizeLimitText = toolkit.createText( client, "" );
+ maxSizeLimitText = toolkit.createText( client, "" ); //$NON-NLS-1$
maxSizeLimitText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
maxSizeLimitText.addVerifyListener( new VerifyListener()
{
@@ -316,7 +316,7 @@
// Synchronization Period
toolkit.createLabel( client, "Synchronization Period:" );
- synchPeriodText = toolkit.createText( client, "" );
+ synchPeriodText = toolkit.createText( client, "" ); //$NON-NLS-1$
synchPeriodText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
synchPeriodText.addVerifyListener( new VerifyListener()
{
@@ -331,7 +331,7 @@
// Max. Threads
toolkit.createLabel( client, "Max. Threads:" );
- maxThreadsText = toolkit.createText( client, "" );
+ maxThreadsText = toolkit.createText( client, "" ); //$NON-NLS-1$
maxThreadsText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
maxThreadsText.addVerifyListener( new VerifyListener()
{
@@ -390,44 +390,44 @@
// LDAP Protocol
enableLdapCheckbox.setSelection( configuration.isEnableLdap() );
ldapPortText.setEnabled( enableLdapCheckbox.getSelection() );
- ldapPortText.setText( "" + configuration.getLdapPort() );
+ ldapPortText.setText( "" + configuration.getLdapPort() ); //$NON-NLS-1$
// LDAPS Protocol
enableLdapsCheckbox.setSelection( configuration.isEnableLdaps() );
ldapsPortText.setEnabled( enableLdapsCheckbox.getSelection() );
- ldapsPortText.setText( "" + configuration.getLdapsPort() );
+ ldapsPortText.setText( "" + configuration.getLdapsPort() ); //$NON-NLS-1$
// Kerberos Protocol
enableKerberosCheckbox.setSelection( configuration.isEnableKerberos() );
kerberosPortText.setEnabled( enableKerberosCheckbox.getSelection() );
- kerberosPortText.setText( "" + configuration.getKerberosPort() );
+ kerberosPortText.setText( "" + configuration.getKerberosPort() ); //$NON-NLS-1$
// NTP Protocol
enableNtpCheckbox.setSelection( configuration.isEnableNtp() );
ntpPortText.setEnabled( enableNtpCheckbox.getSelection() );
- ntpPortText.setText( "" + configuration.getNtpPort() );
+ ntpPortText.setText( "" + configuration.getNtpPort() ); //$NON-NLS-1$
// DNS Protocol
enableDnsCheckbox.setSelection( configuration.isEnableDns() );
dnsPortText.setEnabled( enableDnsCheckbox.getSelection() );
- dnsPortText.setText( "" + configuration.getDnsPort() );
+ dnsPortText.setText( "" + configuration.getDnsPort() ); //$NON-NLS-1$
// Change Password Protocol
enableChangePasswordCheckbox.setSelection( configuration.isEnableChangePassword() );
changePasswordPortText.setEnabled( enableChangePasswordCheckbox.getSelection() );
- changePasswordPortText.setText( "" + configuration.getChangePasswordPort() );
+ changePasswordPortText.setText( "" + configuration.getChangePasswordPort() ); //$NON-NLS-1$
// Max Time Limit
- maxTimeLimitText.setText( "" + configuration.getMaxTimeLimit() );
+ maxTimeLimitText.setText( "" + configuration.getMaxTimeLimit() ); //$NON-NLS-1$
// Max Size Limit
- maxSizeLimitText.setText( "" + configuration.getMaxSizeLimit() );
+ maxSizeLimitText.setText( "" + configuration.getMaxSizeLimit() ); //$NON-NLS-1$
// Synchronization Period
- synchPeriodText.setText( "" + configuration.getSynchronizationPeriod() );
+ synchPeriodText.setText( "" + configuration.getSynchronizationPeriod() ); //$NON-NLS-1$
// Max Threads
- maxThreadsText.setText( "" + configuration.getMaxThreads() );
+ maxThreadsText.setText( "" + configuration.getMaxThreads() ); //$NON-NLS-1$
// Allow Anonymous Access
allowAnonymousAccessCheckbox.setSelection( configuration.isAllowAnonymousAccess() );
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/InterceptorDetailsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/InterceptorDetailsPage.java
index f507588..f3acdbb 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/InterceptorDetailsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/InterceptorDetailsPage.java
@@ -114,13 +114,13 @@
// Name
toolkit.createLabel( client, "Name:" );
- nameText = toolkit.createText( client, "" );
+ nameText = toolkit.createText( client, "" ); //$NON-NLS-1$
nameText.setEditable( false );
nameText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Description
toolkit.createLabel( client, "Description:" );
- descriptionText = toolkit.createText( client, "", SWT.MULTI | SWT.WRAP | SWT.V_SCROLL );
+ descriptionText = toolkit.createText( client, "", SWT.MULTI | SWT.WRAP | SWT.V_SCROLL ); //$NON-NLS-1$
descriptionText.setEditable( false );
GridData gridData = new GridData( SWT.FILL, SWT.NONE, true, false );
gridData.widthHint = 100;
@@ -197,11 +197,11 @@
{
// Name
String name = input.getName();
- nameText.setText( ( name == null ) ? "" : name );
+ nameText.setText( ( name == null ) ? "" : name ); //$NON-NLS-1$
// Description
String description = input.getDescription();
- descriptionText.setText( ( description == null ) ? "" : description );
+ descriptionText.setText( ( description == null ) ? "" : description ); //$NON-NLS-1$
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/InterceptorsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/InterceptorsPage.java
index 46be328..7d085dd 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/InterceptorsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/InterceptorsPage.java
@@ -38,7 +38,7 @@
public class InterceptorsPage extends FormPage
{
/** The Page ID*/
- public static final String ID = ServerConfigurationEditor.ID + ".V152.InterceptorsPage";
+ public static final String ID = ServerConfigurationEditor.ID + ".V152.InterceptorsPage"; //$NON-NLS-1$
/** The Page Title */
private static final String TITLE = "Interceptors";
@@ -65,7 +65,7 @@
protected void createFormContent( IManagedForm managedForm )
{
PlatformUI.getWorkbench().getHelpSystem().setHelp( getPartControl(),
- ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_152" );
+ ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_152" ); //$NON-NLS-1$ //$NON-NLS-2$
final ScrolledForm form = managedForm.getForm();
form.setText( "Interceptors" );
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionDetailsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionDetailsPage.java
index 065b59d..5053090 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionDetailsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionDetailsPage.java
@@ -162,7 +162,7 @@
{
public void widgetSelected( SelectionEvent e )
{
- AttributeValueDialog dialog = new AttributeValueDialog( new AttributeValueObject( "", "" ) );
+ AttributeValueDialog dialog = new AttributeValueDialog( new AttributeValueObject( "", "" ) ); //$NON-NLS-1$ //$NON-NLS-2$
if ( Dialog.OK == dialog.open() && dialog.isDirty() )
{
AttributeValueObject newAttributeValueObject = dialog.getAttributeValueObject();
@@ -256,7 +256,7 @@
{
public void widgetSelected( SelectionEvent e )
{
- IndexedAttributeDialog dialog = new IndexedAttributeDialog( new IndexedAttribute( "", 0 ) );
+ IndexedAttributeDialog dialog = new IndexedAttributeDialog( new IndexedAttribute( "", 0 ) ); //$NON-NLS-1$
if ( Dialog.OK == dialog.open() )
{
indexedAttributes.add( dialog.getIndexedAttribute() );
@@ -351,12 +351,12 @@
// ID
toolkit.createLabel( client, "ID:" );
- idText = toolkit.createText( client, "" );
+ idText = toolkit.createText( client, "" ); //$NON-NLS-1$
idText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
// Cache Size
toolkit.createLabel( client, "Cache Size:" );
- cacheSizeText = toolkit.createText( client, "" );
+ cacheSizeText = toolkit.createText( client, "" ); //$NON-NLS-1$
cacheSizeText.addVerifyListener( new VerifyListener()
{
public void verifyText( VerifyEvent e )
@@ -371,7 +371,7 @@
// Suffix
toolkit.createLabel( client, "Suffix:" );
- suffixText = toolkit.createText( client, "" );
+ suffixText = toolkit.createText( client, "" ); //$NON-NLS-1$
suffixText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
// Enable Optimizer
@@ -687,14 +687,14 @@
// ID
String id = input.getId();
- idText.setText( ( id == null ) ? "" : id );
+ idText.setText( ( id == null ) ? "" : id ); //$NON-NLS-1$
// Cache Size
- cacheSizeText.setText( "" + input.getCacheSize() );
+ cacheSizeText.setText( "" + input.getCacheSize() ); //$NON-NLS-1$
// Suffix
String suffix = input.getSuffix();
- suffixText.setText( ( suffix == null ) ? "" : suffix );
+ suffixText.setText( ( suffix == null ) ? "" : suffix ); //$NON-NLS-1$
// Enable Optimizer
enableOptimizerCheckbox.setSelection( input.isEnableOptimizer() );
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionsPage.java
index f80115e..91d130c 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionsPage.java
@@ -38,7 +38,7 @@
public class PartitionsPage extends FormPage
{
/** The Page ID*/
- public static final String ID = ServerConfigurationEditor.ID + ".V152.PartitionsPage";
+ public static final String ID = ServerConfigurationEditor.ID + ".V152.PartitionsPage"; //$NON-NLS-1$
/** The Page Title */
private static final String TITLE = "Partitions";
@@ -65,7 +65,7 @@
protected void createFormContent( IManagedForm managedForm )
{
PlatformUI.getWorkbench().getHelpSystem().setHelp( getPartControl(),
- ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_152" );
+ ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_152" ); //$NON-NLS-1$ //$NON-NLS-2$
ScrolledForm form = managedForm.getForm();
form.setText( "Partitions" );
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/dialogs/AttributeValueDialog.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/dialogs/AttributeValueDialog.java
index 41ff961..0d60bb0 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/dialogs/AttributeValueDialog.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/dialogs/AttributeValueDialog.java
@@ -107,10 +107,10 @@
private void initFromInput()
{
String attribute = attributeValueObject.getAttribute();
- attributeText.setText( ( attribute == null ) ? "" : attribute );
+ attributeText.setText( ( attribute == null ) ? "" : attribute ); //$NON-NLS-1$
Object value = attributeValueObject.getValue();
- valueText.setText( ( value == null ) ? "" : value.toString() );
+ valueText.setText( ( value == null ) ? "" : value.toString() ); //$NON-NLS-1$
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/dialogs/AttributeValueObject.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/dialogs/AttributeValueObject.java
index 4e568bd..4f868dc 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/dialogs/AttributeValueObject.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/dialogs/AttributeValueObject.java
@@ -102,6 +102,6 @@
*/
public String toString()
{
- return "Attribute=\"" + attribute + "\", Value=\"" + value + "\"";
+ return "Attribute=\"" + attribute + "\", Value=\"" + value + "\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/dialogs/IndexedAttributeDialog.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/dialogs/IndexedAttributeDialog.java
index b99f741..d5897ae 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/dialogs/IndexedAttributeDialog.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/dialogs/IndexedAttributeDialog.java
@@ -120,8 +120,8 @@
private void initFromInput()
{
String attributeId = indexedAttribute.getAttributeId();
- attributeIdText.setText( ( attributeId == null ) ? "" : attributeId );
- cacheSizeText.setText( "" + indexedAttribute.getCacheSize() );
+ attributeIdText.setText( ( attributeId == null ) ? "" : attributeId ); //$NON-NLS-1$
+ cacheSizeText.setText( "" + indexedAttribute.getCacheSize() ); //$NON-NLS-1$
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/dialogs/SaslRealmDialog.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/dialogs/SaslRealmDialog.java
index 5a649f3..9d4a490 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/dialogs/SaslRealmDialog.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/dialogs/SaslRealmDialog.java
@@ -102,7 +102,7 @@
*/
private void initFromInput()
{
- saslRealmText.setText( ( initialValue == null ) ? "" : initialValue );
+ saslRealmText.setText( ( initialValue == null ) ? "" : initialValue ); //$NON-NLS-1$
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/AuthenticationPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/AuthenticationPage.java
index 4dca2fb..a6373bf 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/AuthenticationPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/AuthenticationPage.java
@@ -71,7 +71,7 @@
public class AuthenticationPage extends FormPage
{
/** The Page ID */
- public static final String ID = ServerConfigurationEditor.ID + ".V153.AuthenticationPage";
+ public static final String ID = ServerConfigurationEditor.ID + ".V153.AuthenticationPage"; //$NON-NLS-1$
/** The Page Title */
private static final String TITLE = "Authentication";
@@ -114,7 +114,7 @@
protected void createFormContent( IManagedForm managedForm )
{
PlatformUI.getWorkbench().getHelpSystem().setHelp( getPartControl(),
- ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_153" );
+ ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_153" ); //$NON-NLS-1$ //$NON-NLS-2$
ScrolledForm form = managedForm.getForm();
form.setText( "Authentication" );
@@ -207,17 +207,17 @@
// SASL Host
toolkit.createLabel( client, "SASL Host:" );
- saslHostText = toolkit.createText( client, "" );
+ saslHostText = toolkit.createText( client, "" ); //$NON-NLS-1$
saslHostText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// SASL Principal
toolkit.createLabel( client, "SASL Principal:" );
- saslPrincipalText = toolkit.createText( client, "" );
+ saslPrincipalText = toolkit.createText( client, "" ); //$NON-NLS-1$
saslPrincipalText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Search Base Dn
toolkit.createLabel( client, "Search Base Dn:" );
- searchBaseDnText = toolkit.createText( client, "" );
+ searchBaseDnText = toolkit.createText( client, "" ); //$NON-NLS-1$
searchBaseDnText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
}
@@ -461,11 +461,11 @@
{
public void widgetSelected( SelectionEvent e )
{
- SaslRealmDialog dialog = new SaslRealmDialog( "" );
+ SaslRealmDialog dialog = new SaslRealmDialog( "" ); //$NON-NLS-1$
if ( Dialog.OK == dialog.open() && dialog.isDirty() )
{
String newSaslRealm = dialog.getSaslRealm();
- if ( newSaslRealm != null && !"".equals( newSaslRealm ) && !saslRealms.contains( newSaslRealm ) )
+ if ( newSaslRealm != null && !"".equals( newSaslRealm ) && !saslRealms.contains( newSaslRealm ) ) //$NON-NLS-1$
{
saslRealms.add( newSaslRealm );
@@ -545,7 +545,7 @@
saslRealms.remove( oldSaslRealm );
String newSaslRealm = dialog.getSaslRealm();
- if ( newSaslRealm != null && !"".equals( newSaslRealm ) && !saslRealms.contains( newSaslRealm ) )
+ if ( newSaslRealm != null && !"".equals( newSaslRealm ) && !saslRealms.contains( newSaslRealm ) ) //$NON-NLS-1$
{
saslRealms.add( newSaslRealm );
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/ExtendedOperationDetailsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/ExtendedOperationDetailsPage.java
index 09daedd..43e25e0 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/ExtendedOperationDetailsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/ExtendedOperationDetailsPage.java
@@ -99,13 +99,13 @@
// Name
toolkit.createLabel( client, "Name:" );
- nameText = toolkit.createText( client, "" );
+ nameText = toolkit.createText( client, "" ); //$NON-NLS-1$
nameText.setEditable( false );
nameText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Description
toolkit.createLabel( client, "Description:" );
- descriptionText = toolkit.createText( client, "", SWT.MULTI | SWT.WRAP | SWT.V_SCROLL );
+ descriptionText = toolkit.createText( client, "", SWT.MULTI | SWT.WRAP | SWT.V_SCROLL ); //$NON-NLS-1$
descriptionText.setEditable( false );
GridData gridData = new GridData( SWT.FILL, SWT.NONE, true, false );
gridData.widthHint = 100;
@@ -182,11 +182,11 @@
{
// Name
String name = input.getName();
- nameText.setText( ( name == null ) ? "" : name );
+ nameText.setText( ( name == null ) ? "" : name ); //$NON-NLS-1$
// Description
String description = input.getDescription();
- descriptionText.setText( ( description == null ) ? "" : description );
+ descriptionText.setText( ( description == null ) ? "" : description ); //$NON-NLS-1$
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/ExtendedOperationsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/ExtendedOperationsPage.java
index f695f35..7123975 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/ExtendedOperationsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/ExtendedOperationsPage.java
@@ -38,7 +38,7 @@
public class ExtendedOperationsPage extends FormPage
{
/** The Page ID*/
- public static final String ID = ServerConfigurationEditor.ID + ".V153.ExtendedOperationsPage";
+ public static final String ID = ServerConfigurationEditor.ID + ".V153.ExtendedOperationsPage"; //$NON-NLS-1$
/** The Page Title */
private static final String TITLE = "Extended Operations";
@@ -65,7 +65,7 @@
protected void createFormContent( IManagedForm managedForm )
{
PlatformUI.getWorkbench().getHelpSystem().setHelp( getPartControl(),
- ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_153" );
+ ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_153" ); //$NON-NLS-1$ //$NON-NLS-2$
final ScrolledForm form = managedForm.getForm();
form.setText( "Extended Operations" );
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/GeneralPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/GeneralPage.java
index ece4873..2c4225a 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/GeneralPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/GeneralPage.java
@@ -56,7 +56,7 @@
public class GeneralPage extends FormPage
{
/** The Page ID*/
- public static final String ID = ServerConfigurationEditor.ID + ".V153.GeneralPage";
+ public static final String ID = ServerConfigurationEditor.ID + ".V153.GeneralPage"; //$NON-NLS-1$
/** The Page Title */
private static final String TITLE = "General";
@@ -101,7 +101,7 @@
protected void createFormContent( IManagedForm managedForm )
{
PlatformUI.getWorkbench().getHelpSystem().setHelp( getPartControl(),
- ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_153" );
+ ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_153" ); //$NON-NLS-1$ //$NON-NLS-2$
ScrolledForm form = managedForm.getForm();
form.setText( "General" );
@@ -160,9 +160,9 @@
// LDAP
Composite ldapProtocolComposite = createProtocolComposite( toolkit, client );
- enableLdapCheckbox = toolkit.createButton( ldapProtocolComposite, "Enable LDAP", SWT.CHECK );
+ enableLdapCheckbox = toolkit.createButton( ldapProtocolComposite, "Enable LDAP", SWT.CHECK ); //$NON-NLS-1$
enableLdapCheckbox.setLayoutData( new GridData( SWT.NONE, SWT.NONE, true, false, 3, 1 ) );
- toolkit.createLabel( ldapProtocolComposite, " " );
+ toolkit.createLabel( ldapProtocolComposite, " " ); //$NON-NLS-1$
toolkit.createLabel( ldapProtocolComposite, "Port:" );
ldapPortText = createPortText( toolkit, ldapProtocolComposite );
@@ -170,7 +170,7 @@
Composite ldapsProtocolComposite = createProtocolComposite( toolkit, client );
enableLdapsCheckbox = toolkit.createButton( ldapsProtocolComposite, "Enable LDAPS", SWT.CHECK );
enableLdapsCheckbox.setLayoutData( new GridData( SWT.NONE, SWT.NONE, true, false, 3, 1 ) );
- toolkit.createLabel( ldapsProtocolComposite, " " );
+ toolkit.createLabel( ldapsProtocolComposite, " " ); //$NON-NLS-1$
toolkit.createLabel( ldapsProtocolComposite, "Port:" );
ldapsPortText = createPortText( toolkit, ldapsProtocolComposite );
@@ -178,7 +178,7 @@
Composite kerberosProtocolComposite = createProtocolComposite( toolkit, client );
enableKerberosCheckbox = toolkit.createButton( kerberosProtocolComposite, "Enable Kerberos", SWT.CHECK );
enableKerberosCheckbox.setLayoutData( new GridData( SWT.NONE, SWT.NONE, true, false, 3, 1 ) );
- toolkit.createLabel( kerberosProtocolComposite, " " );
+ toolkit.createLabel( kerberosProtocolComposite, " " ); //$NON-NLS-1$
toolkit.createLabel( kerberosProtocolComposite, "Port:" );
kerberosPortText = createPortText( toolkit, kerberosProtocolComposite );
@@ -186,7 +186,7 @@
Composite ntpProtocolComposite = createProtocolComposite( toolkit, client );
enableNtpCheckbox = toolkit.createButton( ntpProtocolComposite, "Enable NTP", SWT.CHECK );
enableNtpCheckbox.setLayoutData( new GridData( SWT.NONE, SWT.NONE, true, false, 3, 1 ) );
- toolkit.createLabel( ntpProtocolComposite, " " );
+ toolkit.createLabel( ntpProtocolComposite, " " ); //$NON-NLS-1$
toolkit.createLabel( ntpProtocolComposite, "Port:" );
ntpPortText = createPortText( toolkit, ntpProtocolComposite );
@@ -194,7 +194,7 @@
Composite dnsProtocolComposite = createProtocolComposite( toolkit, client );
enableDnsCheckbox = toolkit.createButton( dnsProtocolComposite, "Enable DNS", SWT.CHECK );
enableDnsCheckbox.setLayoutData( new GridData( SWT.NONE, SWT.NONE, true, false, 3, 1 ) );
- toolkit.createLabel( dnsProtocolComposite, " " );
+ toolkit.createLabel( dnsProtocolComposite, " " ); //$NON-NLS-1$
toolkit.createLabel( dnsProtocolComposite, "Port:" );
dnsPortText = createPortText( toolkit, dnsProtocolComposite );
@@ -203,7 +203,7 @@
enableChangePasswordCheckbox = toolkit.createButton( changePasswordProtocolComposite, "Enable Change Password",
SWT.CHECK );
enableChangePasswordCheckbox.setLayoutData( new GridData( SWT.NONE, SWT.NONE, true, false, 3, 1 ) );
- toolkit.createLabel( changePasswordProtocolComposite, " " );
+ toolkit.createLabel( changePasswordProtocolComposite, " " ); //$NON-NLS-1$
toolkit.createLabel( changePasswordProtocolComposite, "Port:" );
changePasswordPortText = createPortText( toolkit, changePasswordProtocolComposite );
}
@@ -244,7 +244,7 @@
*/
private Text createPortText( FormToolkit toolkit, Composite parent )
{
- Text portText = toolkit.createText( parent, "" );
+ Text portText = toolkit.createText( parent, "" ); //$NON-NLS-1$
GridData gd = new GridData( SWT.NONE, SWT.NONE, false, false );
gd.widthHint = 42;
portText.setLayoutData( gd );
@@ -286,7 +286,7 @@
// Max. Time Limit
toolkit.createLabel( client, "Max. Time Limit:" );
- maxTimeLimitText = toolkit.createText( client, "" );
+ maxTimeLimitText = toolkit.createText( client, "" ); //$NON-NLS-1$
maxTimeLimitText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
maxTimeLimitText.addVerifyListener( new VerifyListener()
{
@@ -301,7 +301,7 @@
// Max. Size Limit
toolkit.createLabel( client, "Max. Size Limit:" );
- maxSizeLimitText = toolkit.createText( client, "" );
+ maxSizeLimitText = toolkit.createText( client, "" ); //$NON-NLS-1$
maxSizeLimitText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
maxSizeLimitText.addVerifyListener( new VerifyListener()
{
@@ -316,7 +316,7 @@
// Synchronization Period
toolkit.createLabel( client, "Synchronization Period:" );
- synchPeriodText = toolkit.createText( client, "" );
+ synchPeriodText = toolkit.createText( client, "" ); //$NON-NLS-1$
synchPeriodText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
synchPeriodText.addVerifyListener( new VerifyListener()
{
@@ -331,7 +331,7 @@
// Max. Threads
toolkit.createLabel( client, "Max. Threads:" );
- maxThreadsText = toolkit.createText( client, "" );
+ maxThreadsText = toolkit.createText( client, "" ); //$NON-NLS-1$
maxThreadsText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
maxThreadsText.addVerifyListener( new VerifyListener()
{
@@ -390,44 +390,44 @@
// LDAP Protocol
enableLdapCheckbox.setSelection( configuration.isEnableLdap() );
ldapPortText.setEnabled( enableLdapCheckbox.getSelection() );
- ldapPortText.setText( "" + configuration.getLdapPort() );
+ ldapPortText.setText( "" + configuration.getLdapPort() ); //$NON-NLS-1$
// LDAPS Protocol
enableLdapsCheckbox.setSelection( configuration.isEnableLdaps() );
ldapsPortText.setEnabled( enableLdapsCheckbox.getSelection() );
- ldapsPortText.setText( "" + configuration.getLdapsPort() );
+ ldapsPortText.setText( "" + configuration.getLdapsPort() ); //$NON-NLS-1$
// Kerberos Protocol
enableKerberosCheckbox.setSelection( configuration.isEnableKerberos() );
kerberosPortText.setEnabled( enableKerberosCheckbox.getSelection() );
- kerberosPortText.setText( "" + configuration.getKerberosPort() );
+ kerberosPortText.setText( "" + configuration.getKerberosPort() ); //$NON-NLS-1$
// NTP Protocol
enableNtpCheckbox.setSelection( configuration.isEnableNtp() );
ntpPortText.setEnabled( enableNtpCheckbox.getSelection() );
- ntpPortText.setText( "" + configuration.getNtpPort() );
+ ntpPortText.setText( "" + configuration.getNtpPort() ); //$NON-NLS-1$
// DNS Protocol
enableDnsCheckbox.setSelection( configuration.isEnableDns() );
dnsPortText.setEnabled( enableDnsCheckbox.getSelection() );
- dnsPortText.setText( "" + configuration.getDnsPort() );
+ dnsPortText.setText( "" + configuration.getDnsPort() ); //$NON-NLS-1$
// Change Password Protocol
enableChangePasswordCheckbox.setSelection( configuration.isEnableChangePassword() );
changePasswordPortText.setEnabled( enableChangePasswordCheckbox.getSelection() );
- changePasswordPortText.setText( "" + configuration.getChangePasswordPort() );
+ changePasswordPortText.setText( "" + configuration.getChangePasswordPort() ); //$NON-NLS-1$
// Max Time Limit
- maxTimeLimitText.setText( "" + configuration.getMaxTimeLimit() );
+ maxTimeLimitText.setText( "" + configuration.getMaxTimeLimit() ); //$NON-NLS-1$
// Max Size Limit
- maxSizeLimitText.setText( "" + configuration.getMaxSizeLimit() );
+ maxSizeLimitText.setText( "" + configuration.getMaxSizeLimit() ); //$NON-NLS-1$
// Synchronization Period
- synchPeriodText.setText( "" + configuration.getSynchronizationPeriod() );
+ synchPeriodText.setText( "" + configuration.getSynchronizationPeriod() ); //$NON-NLS-1$
// Max Threads
- maxThreadsText.setText( "" + configuration.getMaxThreads() );
+ maxThreadsText.setText( "" + configuration.getMaxThreads() ); //$NON-NLS-1$
// Allow Anonymous Access
allowAnonymousAccessCheckbox.setSelection( configuration.isAllowAnonymousAccess() );
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/InterceptorDetailsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/InterceptorDetailsPage.java
index 788c86c..824e886 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/InterceptorDetailsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/InterceptorDetailsPage.java
@@ -114,13 +114,13 @@
// Name
toolkit.createLabel( client, "Name:" );
- nameText = toolkit.createText( client, "" );
+ nameText = toolkit.createText( client, "" ); //$NON-NLS-1$
nameText.setEditable( false );
nameText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Description
toolkit.createLabel( client, "Description:" );
- descriptionText = toolkit.createText( client, "", SWT.MULTI | SWT.WRAP | SWT.V_SCROLL );
+ descriptionText = toolkit.createText( client, "", SWT.MULTI | SWT.WRAP | SWT.V_SCROLL ); //$NON-NLS-1$
descriptionText.setEditable( false );
GridData gridData = new GridData( SWT.FILL, SWT.NONE, true, false );
gridData.widthHint = 100;
@@ -197,11 +197,11 @@
{
// Name
String name = input.getName();
- nameText.setText( ( name == null ) ? "" : name );
+ nameText.setText( ( name == null ) ? "" : name ); //$NON-NLS-1$
// Description
String description = input.getDescription();
- descriptionText.setText( ( description == null ) ? "" : description );
+ descriptionText.setText( ( description == null ) ? "" : description ); //$NON-NLS-1$
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/InterceptorsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/InterceptorsPage.java
index 1a26ec9..b1d820c 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/InterceptorsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/InterceptorsPage.java
@@ -38,7 +38,7 @@
public class InterceptorsPage extends FormPage
{
/** The Page ID*/
- public static final String ID = ServerConfigurationEditor.ID + ".V153.InterceptorsPage";
+ public static final String ID = ServerConfigurationEditor.ID + ".V153.InterceptorsPage"; //$NON-NLS-1$
/** The Page Title */
private static final String TITLE = "Interceptors";
@@ -65,7 +65,7 @@
protected void createFormContent( IManagedForm managedForm )
{
PlatformUI.getWorkbench().getHelpSystem().setHelp( getPartControl(),
- ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_153" );
+ ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_153" ); //$NON-NLS-1$ //$NON-NLS-2$
final ScrolledForm form = managedForm.getForm();
form.setText( "Interceptors" );
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionDetailsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionDetailsPage.java
index 348ae7c..86c073a 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionDetailsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionDetailsPage.java
@@ -350,13 +350,13 @@
section.setClient( client );
// ID
- toolkit.createLabel( client, "ID:" );
- idText = toolkit.createText( client, "" );
+ toolkit.createLabel( client, "ID:" ); //$NON-NLS-1$
+ idText = toolkit.createText( client, "" ); //$NON-NLS-1$
idText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
// Cache Size
toolkit.createLabel( client, "Cache Size:" );
- cacheSizeText = toolkit.createText( client, "" );
+ cacheSizeText = toolkit.createText( client, "" ); //$NON-NLS-1$
cacheSizeText.addVerifyListener( new VerifyListener()
{
public void verifyText( VerifyEvent e )
@@ -371,7 +371,7 @@
// Suffix
toolkit.createLabel( client, "Suffix:" );
- suffixText = toolkit.createText( client, "" );
+ suffixText = toolkit.createText( client, "" ); //$NON-NLS-1$
suffixText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
// Enable Optimizer
@@ -685,14 +685,14 @@
// ID
String id = input.getId();
- idText.setText( ( id == null ) ? "" : id );
+ idText.setText( ( id == null ) ? "" : id ); //$NON-NLS-1$
// Cache Size
- cacheSizeText.setText( "" + input.getCacheSize() );
+ cacheSizeText.setText( "" + input.getCacheSize() ); //$NON-NLS-1$
// Suffix
String suffix = input.getSuffix();
- suffixText.setText( ( suffix == null ) ? "" : suffix );
+ suffixText.setText( ( suffix == null ) ? "" : suffix ); //$NON-NLS-1$
// Enable Optimizer
enableOptimizerCheckbox.setSelection( input.isEnableOptimizer() );
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionsPage.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionsPage.java
index 940b385..37aa256 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionsPage.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionsPage.java
@@ -38,7 +38,7 @@
public class PartitionsPage extends FormPage
{
/** The Page ID*/
- public static final String ID = ServerConfigurationEditor.ID + ".V153.PartitionsPage";
+ public static final String ID = ServerConfigurationEditor.ID + ".V153.PartitionsPage"; //$NON-NLS-1$
/** The Page Title */
private static final String TITLE = "Partitions";
@@ -65,7 +65,7 @@
protected void createFormContent( IManagedForm managedForm )
{
PlatformUI.getWorkbench().getHelpSystem().setHelp( getPartControl(),
- ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_153" );
+ ApacheDSConfigurationPluginConstants.PLUGIN_ID + "." + "configuration_editor_153" ); //$NON-NLS-1$ //$NON-NLS-2$
ScrolledForm form = managedForm.getForm();
form.setText( "Partitions" );
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/AttributeValueDialog.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/AttributeValueDialog.java
index 8e4f2c6..47da785 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/AttributeValueDialog.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/AttributeValueDialog.java
@@ -107,10 +107,10 @@
private void initFromInput()
{
String attribute = attributeValueObject.getAttribute();
- attributeText.setText( ( attribute == null ) ? "" : attribute );
+ attributeText.setText( ( attribute == null ) ? "" : attribute ); //$NON-NLS-1$
Object value = attributeValueObject.getValue();
- valueText.setText( ( value == null ) ? "" : value.toString() );
+ valueText.setText( ( value == null ) ? "" : value.toString() ); //$NON-NLS-1$
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/AttributeValueObject.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/AttributeValueObject.java
index f6eec73..a58f744 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/AttributeValueObject.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/AttributeValueObject.java
@@ -101,6 +101,6 @@
*/
public String toString()
{
- return "Attribute=\"" + attribute + "\", Value=\"" + value + "\"";
+ return "Attribute=\"" + attribute + "\", Value=\"" + value + "\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/IndexedAttributeDialog.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/IndexedAttributeDialog.java
index 5e788dd..7d4b2be 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/IndexedAttributeDialog.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/IndexedAttributeDialog.java
@@ -120,8 +120,8 @@
private void initFromInput()
{
String attributeId = indexedAttribute.getAttributeId();
- attributeIdText.setText( ( attributeId == null ) ? "" : attributeId );
- cacheSizeText.setText( "" + indexedAttribute.getCacheSize() );
+ attributeIdText.setText( ( attributeId == null ) ? "" : attributeId ); //$NON-NLS-1$
+ cacheSizeText.setText( "" + indexedAttribute.getCacheSize() ); //$NON-NLS-1$
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/NtlmProviderDialog.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/NtlmProviderDialog.java
index 68a0cf3..71de509 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/NtlmProviderDialog.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/NtlmProviderDialog.java
@@ -102,7 +102,7 @@
*/
private void initFromInput()
{
- ntlmProviderText.setText( ( initialValue == null ) ? "" : initialValue );
+ ntlmProviderText.setText( ( initialValue == null ) ? "" : initialValue ); //$NON-NLS-1$
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/SaslRealmDialog.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/SaslRealmDialog.java
index f0d846a..e1fb957 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/SaslRealmDialog.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/dialogs/SaslRealmDialog.java
@@ -102,7 +102,7 @@
*/
private void initFromInput()
{
- saslRealmText.setText( ( initialValue == null ) ? "" : initialValue );
+ saslRealmText.setText( ( initialValue == null ) ? "" : initialValue ); //$NON-NLS-1$
}
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v155/messages.properties b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v155/messages.properties
index d9d9d8a..6a05c40 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v155/messages.properties
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v155/messages.properties
@@ -22,7 +22,6 @@
AuthenticationPage.Edit=Edit...
AuthenticationPage.SaslHost=SASL Host:
AuthenticationPage.SaslPrincipal=SASL Principal:
-AuthenticationPage.SaslQualityOfProtection=SASL Quality Of Protection
AuthenticationPage.SaslRealms=SASL Realms
AuthenticationPage.SaslSettings=SASL Settings
AuthenticationPage.SearchBaseDN=Search Base DN:
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v156/messages.properties b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v156/messages.properties
index d9d9d8a..6a05c40 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v156/messages.properties
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v156/messages.properties
@@ -22,7 +22,6 @@
AuthenticationPage.Edit=Edit...
AuthenticationPage.SaslHost=SASL Host:
AuthenticationPage.SaslPrincipal=SASL Principal:
-AuthenticationPage.SaslQualityOfProtection=SASL Quality Of Protection
AuthenticationPage.SaslRealms=SASL Realms
AuthenticationPage.SaslSettings=SASL Settings
AuthenticationPage.SearchBaseDN=Search Base DN:
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v157/messages.properties b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v157/messages.properties
index d9d9d8a..6a05c40 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v157/messages.properties
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v157/messages.properties
@@ -22,7 +22,6 @@
AuthenticationPage.Edit=Edit...
AuthenticationPage.SaslHost=SASL Host:
AuthenticationPage.SaslPrincipal=SASL Principal:
-AuthenticationPage.SaslQualityOfProtection=SASL Quality Of Protection
AuthenticationPage.SaslRealms=SASL Realms
AuthenticationPage.SaslSettings=SASL Settings
AuthenticationPage.SearchBaseDN=Search Base DN:
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/messages.properties b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/messages.properties
index 795e7ba..fd87b8c 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/messages.properties
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/messages.properties
@@ -16,3 +16,11 @@
# under the License.
AbstractServerXmlIO.ErrorNotBoolean=The String "{0}" could not be parsed as a boolean.
+ServerConfigurationVersionEnum.Version150=Version 1.5.0
+ServerConfigurationVersionEnum.Version151=Version 1.5.1
+ServerConfigurationVersionEnum.Version152=Version 1.5.2
+ServerConfigurationVersionEnum.Version153=Version 1.5.3
+ServerConfigurationVersionEnum.Version154=Version 1.5.4
+ServerConfigurationVersionEnum.Version155=Version 1.5.5
+ServerConfigurationVersionEnum.Version156=Version 1.5.6
+ServerConfigurationVersionEnum.Version157=Version 1.5.7
\ No newline at end of file
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/messages_fr.properties b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/messages_fr.properties
index 6979991..1308c75 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/messages_fr.properties
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/messages_fr.properties
@@ -16,10 +16,3 @@
# under the License.
AbstractServerXmlIO.ErrorNotBoolean=La cha\u00EEne "{0}" ne correspond pas \u00E0 un bool\u00E9en
-ServerConfigurationVersionEnum.Version150=Version 1.5.0
-ServerConfigurationVersionEnum.Version151=Version 1.5.1
-ServerConfigurationVersionEnum.Version152=Version 1.5.2
-ServerConfigurationVersionEnum.Version153=Version 1.5.3
-ServerConfigurationVersionEnum.Version154=Version 1.5.4
-ServerConfigurationVersionEnum.Version155=Version 1.5.5
-ServerConfigurationVersionEnum.Version156=Version 1.5.6
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ExtendedOperationEnum.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ExtendedOperationEnum.java
index bbd522a..859175f 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ExtendedOperationEnum.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ExtendedOperationEnum.java
@@ -36,8 +36,8 @@
Messages.getString( "ExtendedOperationEnum.Shutdown" ), Messages.getString( "ExtendedOperationEnum.ShutdownDescription" )), //$NON-NLS-1$ //$NON-NLS-2$
/** The Launch Diagnostic UI Extended Operation */
- LAUNCH_DIAGNOSTIC_UI(Messages.getString( "ExtendedOperationEnum.DiagnosticUI" ), //$NON-NLS-1$
- Messages.getString( "ExtendedOperationEnum.DiagnosticUIDescription" )); //$NON-NLS-1$
+ LAUNCH_DIAGNOSTIC_UI(Messages.getString( "ExtendedOperationEnum.LaunchDiagnosticUI" ), //$NON-NLS-1$
+ Messages.getString( "ExtendedOperationEnum.LaunchDiagnosticUIDescription" )); //$NON-NLS-1$
/** The name */
private String name;
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/InterceptorEnum.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/InterceptorEnum.java
index d8cdace..12df17f 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/InterceptorEnum.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/InterceptorEnum.java
@@ -20,9 +20,6 @@
package org.apache.directory.studio.apacheds.configuration.model.v152;
-import org.apache.directory.studio.apacheds.configuration.model.v153.Messages;
-
-
/**
* This enum contains all the interceptors.
*
@@ -59,8 +56,8 @@
Messages.getString( "InterceptorEnum.OperationalAttribute" ), Messages.getString( "InterceptorEnum.OperationalAttributeDescription" )), //$NON-NLS-1$ //$NON-NLS-2$
/** The KeyDerivation Interceptor */
- KEY_DERIVATION(Messages.getString( "InterceptorEnum.KeyDerivation" ), Messages
- .getString( "InterceptorEnum.KeyDerivationDescription" )),
+ KEY_DERIVATION(Messages.getString( "InterceptorEnum.KeyDerivation" ), Messages //$NON-NLS-1$
+ .getString( "InterceptorEnum.KeyDerivationDescription" )), //$NON-NLS-1$
/** The Schema Interceptor */
SCHEMA(Messages.getString( "InterceptorEnum.Schema" ), Messages.getString( "InterceptorEnum.SchemaDescription" )), //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java
index 07b541a..26f01b9 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java
@@ -296,7 +296,7 @@
// If the 'denormalizeOpAttrsEnabled' attribute does not exists,
// we throw an exception
throw new ServerXmlIOException( Messages
- .getString( "ServerXmlIOV152.ErrorDenormalizationOpAttrsEnabled" ) ); //$NON-NLS-1$
+ .getString( "ServerXmlIOV152.ErrorDenormalizeOpAttrsEnabled" ) ); //$NON-NLS-1$
}
else
{
@@ -382,7 +382,7 @@
{
// If the 'jdbmPartition' element does not exists,
// we throw an exception
- throw new ServerXmlIOException( Messages.getString( "ServerXmlIOV152.ErrorJDBMElement" ) ); //$NON-NLS-1$
+ throw new ServerXmlIOException( Messages.getString( "ServerXmlIOV152.ErrorJDBMPartition" ) ); //$NON-NLS-1$
}
else
{
@@ -1113,7 +1113,7 @@
{
// If the 'allowAnonymousAccess' attribute does not exists,
// we throw an exception
- throw new ServerXmlIOException( Messages.getString( "ServerXmlIOV152.ErrorAllowedAnonymous" ) ); //$NON-NLS-1$
+ throw new ServerXmlIOException( Messages.getString( "ServerXmlIOV152.ErrorAllowAnonymousAccess" ) ); //$NON-NLS-1$
}
else
{
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/messages.properties b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/messages.properties
index 2500dcd..559cbba 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/messages.properties
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/messages.properties
@@ -57,8 +57,11 @@
ServerXmlIOV152.ErrorAccessControlEnabled=Unable to find the 'accessControlEnabled' attribute for the default directory service bean.
ServerXmlIOV152.ErrorAllowAnonymousAccess=Unable to find the 'allowAnonymousAccess' attribute for the 'ldapService' bean.
+ServerXmlIOV152.ErrorArguments=Unable to find the property element named 'arguments'.
+ServerXmlIOV152.ErrorBean=Unable to find the bean element named "{0}".
ServerXmlIOV152.ErrorCacheSize=Unable to find the 'cacheSize' attribute for a partition.
ServerXmlIOV152.ErrorChangePasswordServerPort=Unable to find the 'ipPort' attribute for the 'changePasswordServer' bean.
+ServerXmlIOV152.ErrorContextEntry=Unable to find the 'contextEntry' element for a partition.
ServerXmlIOV152.ErrorDefaultDirectoryService=Unable to find the 'defaultDirectoryService' tag.
ServerXmlIOV152.ErrorDenormalizeOpAttrsEnabled=Unable to find the 'denormalizeOpAttrsEnabled' attribute for the default directory service bean.
ServerXmlIOV152.ErrorDnsServerPort=Unable to find the 'ipPort' attribute for the 'dnsServer' bean.
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/InterceptorEnum.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/InterceptorEnum.java
index 7ce2b2d..277cafc 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/InterceptorEnum.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/InterceptorEnum.java
@@ -56,8 +56,8 @@
Messages.getString( "InterceptorEnum.OperationalAttribute" ), Messages.getString( "InterceptorEnum.OperationalAttributeDescription" )), //$NON-NLS-1$ //$NON-NLS-2$
/** The KeyDerivation Interceptor */
- KEY_DERIVATION(Messages.getString( "InterceptorEnum.KeyDerivation" ), Messages
- .getString( "InterceptorEnum.KeyDerivationDescription" )),
+ KEY_DERIVATION(Messages.getString( "InterceptorEnum.KeyDerivation" ), Messages //$NON-NLS-1$
+ .getString( "InterceptorEnum.KeyDerivationDescription" )), //$NON-NLS-1$
/** The Schema Interceptor */
SCHEMA(Messages.getString( "InterceptorEnum.Schema" ), Messages.getString( "InterceptorEnum.SchemaDescription" )), //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/SaslQualityOfProtectionEnum.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/SaslQualityOfProtectionEnum.java
index 7547782..c7e9a7a 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/SaslQualityOfProtectionEnum.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/SaslQualityOfProtectionEnum.java
@@ -31,10 +31,10 @@
AUTH(Messages.getString( "SaslQualityOfProtectionEnum.AuthenticationOnly" )), //$NON-NLS-1$
/** The auth-int QoP */
- AUTH_INT(Messages.getString( "SaslQualityOfProtectionEnum.AuthenticationIntegrityProtection" )), //$NON-NLS-1$
+ AUTH_INT(Messages.getString( "SaslQualityOfProtectionEnum.AuthenticationWithIntegrityProtection" )), //$NON-NLS-1$
/** The auth-conf QoP */
- AUTH_CONF(Messages.getString( "SaslQualityOfProtectionEnum.AuthenticationIntegrityAndPrivacy" )); //$NON-NLS-1$
+ AUTH_CONF(Messages.getString( "SaslQualityOfProtectionEnum.AuthenticationWithIntegrityAndPrivacyProtection" )); //$NON-NLS-1$
/** The name */
private String name;
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java
index a182c92..7c60cbf 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java
@@ -310,7 +310,7 @@
{
// If the 'denormalizeOpAttrsEnabled' attribute does not exists,
// we throw an exception
- throw new ServerXmlIOException( Messages.getString( "ServerXmlIOV153.ErrorDenormalizedOpAttrsEnabled" ) ); //$NON-NLS-1$
+ throw new ServerXmlIOException( Messages.getString( "ServerXmlIOV153.ErrorDenormalizeOpAttrsEnabled" ) ); //$NON-NLS-1$
}
else
{
@@ -1403,7 +1403,7 @@
{
// If the 'synchPeriodMillis' attribute does not exists,
// we throw an exception
- throw new ServerXmlIOException( Messages.getString( "ServerXmlIOV153.ErrorSynchPeriodMillis" ) ); //$NON-NLS-1$
+ throw new ServerXmlIOException( Messages.getString( "ServerXmlIOV153.ErrorSyncPeriodMillis" ) ); //$NON-NLS-1$
}
else
{
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/messages.properties b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/messages.properties
index a08c92f..8b92977 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/messages.properties
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/messages.properties
@@ -57,8 +57,11 @@
ServerXmlIOV153.ErrorAccessControlEnabled=Unable to find the 'accessControlEnabled' attribute for the default directory service bean.
ServerXmlIOV153.ErrorAllowAnonymousAccess=Unable to find the 'allowAnonymousAccess' attribute for the 'ldapService' bean.
+ServerXmlIOV153.ErrorArguments=Unable to find the property element named 'arguments'.
+ServerXmlIOV153.ErrorBean=Unable to find the bean element named "{0}".
ServerXmlIOV153.ErrorCacheSize=Unable to find the 'cacheSize' attribute for a partition.
-ServerXmlIOV153.ErrorChangePasswordServerPort=Unable to find the 'ipPort' attribute for the 'changePasswordServer' bean.
+ServerXmlIOV153.ErrorChangePasswordServer=Unable to find the 'ipPort' attribute for the 'changePasswordServer' bean.ServerXmlIOV153.ErrorChangePasswordServerPort=Unable to find the 'ipPort' attribute for the 'changePasswordServer' bean.
+ServerXmlIOV153.ErrorContextEntry=Unable to find the 'contextEntry' element for a partition.
ServerXmlIOV153.ErrorDefaultDirectoryService=Unable to find the 'defaultDirectoryService' tag.
ServerXmlIOV153.ErrorDenormalizeOpAttrsEnabled=Unable to find the 'denormalizeOpAttrsEnabled' attribute for the default directory service bean.
ServerXmlIOV153.ErrorDnsServerPort=Unable to find the 'ipPort' attribute for the 'dnsServer' bean.
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/InterceptorEnum.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/InterceptorEnum.java
index 36154fd..0cd90ae 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/InterceptorEnum.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/InterceptorEnum.java
@@ -52,8 +52,8 @@
Messages.getString( "InterceptorEnum.OperationalAttribute" ), Messages.getString( "InterceptorEnum.OperationalAttributeDescription" )), //$NON-NLS-1$ //$NON-NLS-2$
/** The KeyDerivation Interceptor */
- KEY_DERIVATION(Messages.getString( "InterceptorEnum.KeyDerivation" ), Messages
- .getString( "InterceptorEnum.KeyDerivationDescription" )),
+ KEY_DERIVATION(Messages.getString( "InterceptorEnum.KeyDerivation" ), Messages //$NON-NLS-1$
+ .getString( "InterceptorEnum.KeyDerivationDescription" )), //$NON-NLS-1$
/** The Schema Interceptor */
SCHEMA(Messages.getString( "InterceptorEnum.Schema" ), Messages.getString( "InterceptorEnum.SchemaDescription" )), //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/messages.properties b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/messages.properties
index efe1820..2ab49f4 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/messages.properties
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/messages.properties
@@ -40,8 +40,6 @@
InterceptorEnum.NormalizationDescription=A name normalization interceptor. This interceptor makes sure all relative and distinguished names are normalized before calls are made against the respective interface methods on PartitionNexus.
InterceptorEnum.OperationalAttribute=Operational Attribute
InterceptorEnum.OperationalAttributeDescription=An interceptor that adds or modifies the default attributes of entries. There are four default attributes for now; 'creatorsName', 'createTimestamp', 'modifiersName', 'modifyTimestamp'.
-InterceptorEnum.Referral=Referral
-InterceptorEnum.ReferralDescription=An interceptor which is responsible referral handling behaviors. It manages referral handling behavior when the Context\#REFERRAL is implicitly or explicitly set to "ignore", when set to "throw" and when set to "follow".
InterceptorEnum.Replication=Replication
InterceptorEnum.ReplicationDescription=An interceptor that intercepts LDAP operations and propagates the changes occurred by the operations into other ReplicaIds so the DIT of each ReplicaId in the cluster has the same content without any conflict.
InterceptorEnum.Schema=Schema
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/InterceptorEnum.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/InterceptorEnum.java
index 4c24fff..ada6b6b 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/InterceptorEnum.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/InterceptorEnum.java
@@ -56,8 +56,8 @@
Messages.getString( "InterceptorEnum.OperationalAttribute" ), Messages.getString( "InterceptorEnum.OperationalAttributeDescription" )), //$NON-NLS-1$ //$NON-NLS-2$
/** The KeyDerivation Interceptor */
- KEY_DERIVATION(Messages.getString( "InterceptorEnum.KeyDerivation" ), Messages
- .getString( "InterceptorEnum.KeyDerivationDescription" )),
+ KEY_DERIVATION(Messages.getString( "InterceptorEnum.KeyDerivation" ), Messages //$NON-NLS-1$
+ .getString( "InterceptorEnum.KeyDerivationDescription" )), //$NON-NLS-1$
/** The Schema Interceptor */
SCHEMA(Messages.getString( "InterceptorEnum.Schema" ), Messages.getString( "InterceptorEnum.SchemaDescription" )), //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/messages.properties b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/messages.properties
index 2366c58..0e87679 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/messages.properties
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/messages.properties
@@ -65,18 +65,14 @@
ServerXmlIOV155.ErrorId=Unable to find the 'id' attribute for a partition.
ServerXmlIOV155.ErrorJDBMPartition=Unable to find the 'jdbmPartition' element for the system partition.
ServerXmlIOV155.ErrorKdcServerPort=Unable to find the 'ipPort' attribute for the 'kdcServer' bean.
-ServerXmlIOV155.ErrorLdapServerId=Unable to find the 'id' attribute for the 'ldapService' bean.
ServerXmlIOV155.ErrorLdapServerPort=Unable to find the 'ipPort' attribute for the 'ldapService' bean.
-ServerXmlIOV155.ErrorLdapsServerPort=Unable to find the 'ipPort' attribute for the 'ldapsServer' bean.
ServerXmlIOV155.ErrorMaxSizeLimit=Unable to find the 'maxSizeLimit' attribute for the 'ldapServer' bean.
-ServerXmlIOV155.ErrorMaxThreads=Unable to find the 'maxThreads' attribute for the StandardThreadPool bean.
ServerXmlIOV155.ErrorMaxTimeLimit=Unable to find the 'maxTimeLimit' attribute for the 'ldapServer' bean.
ServerXmlIOV155.ErrorNtpServerPort=Unable to find the 'ipPort' attribute for the 'ntpServer' bean.
ServerXmlIOV155.ErrorOptimizerEnabled=Unable to find the 'OptimizerEnabled' attribute for a partition.
ServerXmlIOV155.ErrorSaslHost=Unable to find the 'saslHost' attribute for the 'ldapService' bean.
ServerXmlIOV155.ErrorSaslPrincipal=Unable to find the 'saslPrincipal' attribute for the 'ldapService' bean.
ServerXmlIOV155.ErrorSearchBaseDn=Unable to find the 'searchBaseDn' attribute for the 'ldapServer' bean.
-ServerXmlIOV155.ErrorStandardThreadPool=Unable to find the 'standardThreadPool' tag.
ServerXmlIOV155.ErrorSuffix=Unable to find the 'suffix' attribute for a partition.
ServerXmlIOV155.ErrorSyncOnWrite=Unable to find the 'syncOnWrite' attribute for a partition.
ServerXmlIOV155.ErrorSyncPeriodMillis=Unable to find the 'synchPeriodMillis' attribute for a partition.
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/InterceptorEnum.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/InterceptorEnum.java
index 7f9edd4..08755b0 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/InterceptorEnum.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/InterceptorEnum.java
@@ -56,8 +56,8 @@
Messages.getString( "InterceptorEnum.OperationalAttribute" ), Messages.getString( "InterceptorEnum.OperationalAttributeDescription" )), //$NON-NLS-1$ //$NON-NLS-2$
/** The KeyDerivation Interceptor */
- KEY_DERIVATION(Messages.getString( "InterceptorEnum.KeyDerivation" ), Messages
- .getString( "InterceptorEnum.KeyDerivationDescription" )),
+ KEY_DERIVATION(Messages.getString( "InterceptorEnum.KeyDerivation" ), Messages //$NON-NLS-1$
+ .getString( "InterceptorEnum.KeyDerivationDescription" )), //$NON-NLS-1$
/** The Schema Interceptor */
SCHEMA(Messages.getString( "InterceptorEnum.Schema" ), Messages.getString( "InterceptorEnum.SchemaDescription" )), //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/messages.properties b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/messages.properties
index ba452e6..b763bb6 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/messages.properties
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/messages.properties
@@ -65,18 +65,14 @@
ServerXmlIOV156.ErrorId=Unable to find the 'id' attribute for a partition.
ServerXmlIOV156.ErrorJDBMPartition=Unable to find the 'jdbmPartition' element for the system partition.
ServerXmlIOV156.ErrorKdcServerPort=Unable to find the 'ipPort' attribute for the 'kdcServer' bean.
-ServerXmlIOV156.ErrorLdapServerId=Unable to find the 'id' attribute for the 'ldapService' bean.
ServerXmlIOV156.ErrorLdapServerPort=Unable to find the 'ipPort' attribute for the 'ldapService' bean.
-ServerXmlIOV156.ErrorLdapsServerPort=Unable to find the 'ipPort' attribute for the 'ldapsServer' bean.
ServerXmlIOV156.ErrorMaxSizeLimit=Unable to find the 'maxSizeLimit' attribute for the 'ldapServer' bean.
-ServerXmlIOV156.ErrorMaxThreads=Unable to find the 'maxThreads' attribute for the StandardThreadPool bean.
ServerXmlIOV156.ErrorMaxTimeLimit=Unable to find the 'maxTimeLimit' attribute for the 'ldapServer' bean.
ServerXmlIOV156.ErrorNtpServerPort=Unable to find the 'ipPort' attribute for the 'ntpServer' bean.
ServerXmlIOV156.ErrorOptimizerEnabled=Unable to find the 'OptimizerEnabled' attribute for a partition.
ServerXmlIOV156.ErrorSaslHost=Unable to find the 'saslHost' attribute for the 'ldapService' bean.
ServerXmlIOV156.ErrorSaslPrincipal=Unable to find the 'saslPrincipal' attribute for the 'ldapService' bean.
ServerXmlIOV156.ErrorSearchBaseDn=Unable to find the 'searchBaseDn' attribute for the 'ldapServer' bean.
-ServerXmlIOV156.ErrorStandardThreadPool=Unable to find the 'standardThreadPool' tag.
ServerXmlIOV156.ErrorSuffix=Unable to find the 'suffix' attribute for a partition.
ServerXmlIOV156.ErrorSyncOnWrite=Unable to find the 'syncOnWrite' attribute for a partition.
ServerXmlIOV156.ErrorSyncPeriodMillis=Unable to find the 'synchPeriodMillis' attribute for a partition.
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/InterceptorEnum.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/InterceptorEnum.java
index 49fa4a7..23ba66a 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/InterceptorEnum.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/InterceptorEnum.java
@@ -56,8 +56,8 @@
Messages.getString( "InterceptorEnum.OperationalAttribute" ), Messages.getString( "InterceptorEnum.OperationalAttributeDescription" )), //$NON-NLS-1$ //$NON-NLS-2$
/** The KeyDerivation Interceptor */
- KEY_DERIVATION(Messages.getString( "InterceptorEnum.KeyDerivation" ), Messages
- .getString( "InterceptorEnum.KeyDerivationDescription" )),
+ KEY_DERIVATION(Messages.getString( "InterceptorEnum.KeyDerivation" ), Messages //$NON-NLS-1$
+ .getString( "InterceptorEnum.KeyDerivationDescription" )), //$NON-NLS-1$
/** The Schema Interceptor */
SCHEMA(Messages.getString( "InterceptorEnum.Schema" ), Messages.getString( "InterceptorEnum.SchemaDescription" )), //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/messages.properties b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/messages.properties
index 09e7b49..4c629ee 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/messages.properties
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/messages.properties
@@ -65,18 +65,14 @@
ServerXmlIOV157.ErrorId=Unable to find the 'id' attribute for a partition.
ServerXmlIOV157.ErrorJDBMPartition=Unable to find the 'jdbmPartition' element for the system partition.
ServerXmlIOV157.ErrorKdcServerPort=Unable to find the 'ipPort' attribute for the 'kdcServer' bean.
-ServerXmlIOV157.ErrorLdapServerId=Unable to find the 'id' attribute for the 'ldapService' bean.
ServerXmlIOV157.ErrorLdapServerPort=Unable to find the 'ipPort' attribute for the 'ldapService' bean.
-ServerXmlIOV157.ErrorLdapsServerPort=Unable to find the 'ipPort' attribute for the 'ldapsServer' bean.
ServerXmlIOV157.ErrorMaxSizeLimit=Unable to find the 'maxSizeLimit' attribute for the 'ldapServer' bean.
-ServerXmlIOV157.ErrorMaxThreads=Unable to find the 'maxThreads' attribute for the StandardThreadPool bean.
ServerXmlIOV157.ErrorMaxTimeLimit=Unable to find the 'maxTimeLimit' attribute for the 'ldapServer' bean.
ServerXmlIOV157.ErrorNtpServerPort=Unable to find the 'ipPort' attribute for the 'ntpServer' bean.
ServerXmlIOV157.ErrorOptimizerEnabled=Unable to find the 'OptimizerEnabled' attribute for a partition.
ServerXmlIOV157.ErrorSaslHost=Unable to find the 'saslHost' attribute for the 'ldapService' bean.
ServerXmlIOV157.ErrorSaslPrincipal=Unable to find the 'saslPrincipal' attribute for the 'ldapService' bean.
ServerXmlIOV157.ErrorSearchBaseDn=Unable to find the 'searchBaseDn' attribute for the 'ldapServer' bean.
-ServerXmlIOV157.ErrorStandardThreadPool=Unable to find the 'standardThreadPool' tag.
ServerXmlIOV157.ErrorSuffix=Unable to find the 'suffix' attribute for a partition.
ServerXmlIOV157.ErrorSyncOnWrite=Unable to find the 'syncOnWrite' attribute for a partition.
ServerXmlIOV157.ErrorSyncPeriodMillis=Unable to find the 'synchPeriodMillis' attribute for a partition.
diff --git a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/wizards/NewApacheDSConfigurationFileWizard.java b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/wizards/NewApacheDSConfigurationFileWizard.java
index 0766982..26b710c 100644
--- a/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/wizards/NewApacheDSConfigurationFileWizard.java
+++ b/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/wizards/NewApacheDSConfigurationFileWizard.java
@@ -34,10 +34,9 @@
import org.apache.directory.studio.apacheds.configuration.model.v155.ServerXmlIOV155;
import org.apache.directory.studio.apacheds.configuration.model.v156.ServerXmlIOV156;
import org.apache.directory.studio.apacheds.configuration.model.v157.ServerXmlIOV157;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPage;
@@ -139,12 +138,9 @@
}
catch ( ServerXmlIOException e )
{
- MessageBox messageBox = new MessageBox( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- SWT.OK | SWT.ICON_ERROR );
- messageBox.setText( Messages.getString( "NewApacheDSConfigurationFileWizard.Error" ) ); //$NON-NLS-1$
- messageBox
- .setMessage( Messages.getString( "NewApacheDSConfigurationFileWizard.ErrorReadingFile" ) + e.getMessage() ); //$NON-NLS-1$
- messageBox.open();
+ MessageDialog.openError( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+ Messages.getString( "NewApacheDSConfigurationFileWizard.Error" ), //$NON-NLS-1$
+ Messages.getString( "NewApacheDSConfigurationFileWizard.ErrorReadingFile" ) + e.getMessage() ); //$NON-NLS-1$
return false;
}
return true;
diff --git a/plugins/apacheds/src/main/appended-resources/META-INF/LICENSE.vm b/plugins/apacheds/src/main/appended-resources/META-INF/LICENSE.vm
index e64d094..ecae94e 100644
--- a/plugins/apacheds/src/main/appended-resources/META-INF/LICENSE.vm
+++ b/plugins/apacheds/src/main/appended-resources/META-INF/LICENSE.vm
@@ -7,7 +7,7 @@
code for the these subcomponents is subject to the terms and
conditions of the following licenses.
-For a few classes from Eclipse the Eclipse Public License applies:
+Apache Directory Studio is based and uses Eclipse libraries for which the Eclipse Public License applies:
-------------------------------------------------------------------------------
Eclipse Public License - v 1.0
diff --git a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java
index fc595da..3f23895 100644
--- a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java
+++ b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java
@@ -160,14 +160,14 @@
try
{
properties = new PropertyResourceBundle( FileLocator.openStream( this.getBundle(), new Path(
- "plugin.properties" ), false ) );
+ "plugin.properties" ), false ) ); //$NON-NLS-1$
}
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, "org.apache.directory.studio.apacheds", Status.OK,
+ new Status( Status.ERROR, "org.apache.directory.studio.apacheds", Status.OK, //$NON-NLS-1$
"Unable to get the plugin properties.", e ) );
}
}
diff --git a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java
index 4439656..d0d5902 100644
--- a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java
+++ b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java
@@ -38,103 +38,103 @@
}
/** The plug-in ID */
- public static final String PLUGIN_ID = ApacheDsPlugin.getDefault().getPluginProperties().getString( "Plugin_id" );
+ public static final String PLUGIN_ID = ApacheDsPlugin.getDefault().getPluginProperties().getString( "Plugin_id" ); //$NON-NLS-1$
// ------
// IMAGES
// ------
- public static final String IMG_SERVER_NEW = "resources/icons/server_new.gif";
- public static final String IMG_SERVER_NEW_WIZARD = "resources/icons/server_new_wizard.png";
- public static final String IMG_SERVER = "resources/icons/server.gif";
- public static final String IMG_SERVER_STARTED = "resources/icons/server_started.gif";
- public static final String IMG_SERVER_STARTING1 = "resources/icons/server_starting1.gif";
- public static final String IMG_SERVER_STARTING2 = "resources/icons/server_starting2.gif";
- public static final String IMG_SERVER_STARTING3 = "resources/icons/server_starting3.gif";
- public static final String IMG_SERVER_STOPPED = "resources/icons/server_stopped.gif";
- public static final String IMG_SERVER_STOPPING1 = "resources/icons/server_stopping1.gif";
- public static final String IMG_SERVER_STOPPING2 = "resources/icons/server_stopping2.gif";
- public static final String IMG_SERVER_STOPPING3 = "resources/icons/server_stopping3.gif";
- public static final String IMG_RUN = "resources/icons/run.gif";
- public static final String IMG_STOP = "resources/icons/stop.gif";
- public static final String IMG_CREATE_CONNECTION = "resources/icons/connection_new.gif";
+ public static final String IMG_SERVER_NEW = "resources/icons/server_new.gif"; //$NON-NLS-1$
+ public static final String IMG_SERVER_NEW_WIZARD = "resources/icons/server_new_wizard.png"; //$NON-NLS-1$
+ public static final String IMG_SERVER = "resources/icons/server.gif"; //$NON-NLS-1$
+ public static final String IMG_SERVER_STARTED = "resources/icons/server_started.gif"; //$NON-NLS-1$
+ public static final String IMG_SERVER_STARTING1 = "resources/icons/server_starting1.gif"; //$NON-NLS-1$
+ public static final String IMG_SERVER_STARTING2 = "resources/icons/server_starting2.gif"; //$NON-NLS-1$
+ public static final String IMG_SERVER_STARTING3 = "resources/icons/server_starting3.gif"; //$NON-NLS-1$
+ public static final String IMG_SERVER_STOPPED = "resources/icons/server_stopped.gif"; //$NON-NLS-1$
+ public static final String IMG_SERVER_STOPPING1 = "resources/icons/server_stopping1.gif"; //$NON-NLS-1$
+ public static final String IMG_SERVER_STOPPING2 = "resources/icons/server_stopping2.gif"; //$NON-NLS-1$
+ public static final String IMG_SERVER_STOPPING3 = "resources/icons/server_stopping3.gif"; //$NON-NLS-1$
+ public static final String IMG_RUN = "resources/icons/run.gif"; //$NON-NLS-1$
+ public static final String IMG_STOP = "resources/icons/stop.gif"; //$NON-NLS-1$
+ public static final String IMG_CREATE_CONNECTION = "resources/icons/connection_new.gif"; //$NON-NLS-1$
// --------
// COMMANDS
// --------
public static final String CMD_NEW_SERVER = ApacheDsPlugin.getDefault().getPluginProperties().getString(
- "Cmd_NewServer_id" );
- public static final String CMD_RUN = ApacheDsPlugin.getDefault().getPluginProperties().getString( "Cmd_Run_id" );
- public static final String CMD_STOP = ApacheDsPlugin.getDefault().getPluginProperties().getString( "Cmd_Stop_id" );
+ "Cmd_NewServer_id" ); //$NON-NLS-1$
+ public static final String CMD_RUN = ApacheDsPlugin.getDefault().getPluginProperties().getString( "Cmd_Run_id" ); //$NON-NLS-1$
+ public static final String CMD_STOP = ApacheDsPlugin.getDefault().getPluginProperties().getString( "Cmd_Stop_id" ); //$NON-NLS-1$
public static final String CMD_PROPERTIES = ApacheDsPlugin.getDefault().getPluginProperties().getString(
- "Cmd_Properties_id" );
+ "Cmd_Properties_id" ); //$NON-NLS-1$
public static final String CMD_OPEN_CONFIGURATION = ApacheDsPlugin.getDefault().getPluginProperties().getString(
- "Cmd_OpenConfiguration_id" );
+ "Cmd_OpenConfiguration_id" ); //$NON-NLS-1$
public static final String CMD_DELETE = ApacheDsPlugin.getDefault().getPluginProperties().getString(
- "Cmd_Delete_id" );;
+ "Cmd_Delete_id" );; //$NON-NLS-1$
public static final String CMD_RENAME = ApacheDsPlugin.getDefault().getPluginProperties().getString(
- "Cmd_Rename_id" );;
+ "Cmd_Rename_id" );; //$NON-NLS-1$
public static final String CMD_CREATE_CONNECTION = ApacheDsPlugin.getDefault().getPluginProperties().getString(
- "Cmd_CreateConnection_id" );
+ "Cmd_CreateConnection_id" ); //$NON-NLS-1$
// --------------
// PROPERTY PAGES
// --------------
public static final String PROP_SERVER_PROPERTY_PAGE = ApacheDsPlugin.getDefault().getPluginProperties().getString(
- "Prop_ServerPropertyPage_id" );
+ "Prop_ServerPropertyPage_id" ); //$NON-NLS-1$
// -----
// VIEWS
// -----
public static final String VIEW_SERVERS_VIEW = ApacheDsPlugin.getDefault().getPluginProperties().getString(
- "View_ServersView_id" );
+ "View_ServersView_id" ); //$NON-NLS-1$
// --------
// CONTEXTS
// --------
public static final String CONTEXTS_SERVERS_VIEW = ApacheDsPlugin.getDefault().getPluginProperties().getString(
- "Ctx_ServersView_id" );
+ "Ctx_ServersView_id" ); //$NON-NLS-1$
// -----------
// PREFERENCES
// -----------
/** The Preference ID for the Colors and Font Debug Font setting */
- public static final String PREFS_COLORS_AND_FONTS_DEBUG_FONT = "prefs.colorAndFonts.debugFont";
+ public static final String PREFS_COLORS_AND_FONTS_DEBUG_FONT = "prefs.colorAndFonts.debugFont"; //$NON-NLS-1$
/** The Preference ID for the Colors and Font Debug Color setting */
- public static final String PREFS_COLORS_AND_FONTS_DEBUG_COLOR = "prefs.colorAndFonts.debugColor";
+ public static final String PREFS_COLORS_AND_FONTS_DEBUG_COLOR = "prefs.colorAndFonts.debugColor"; //$NON-NLS-1$
/** The Preference ID for the Colors and Font Info Font setting */
- public static final String PREFS_COLORS_AND_FONTS_INFO_FONT = "prefs.colorAndFonts.infoFont";
+ public static final String PREFS_COLORS_AND_FONTS_INFO_FONT = "prefs.colorAndFonts.infoFont"; //$NON-NLS-1$
/** The Preference ID for the Colors and Font Info Color setting */
- public static final String PREFS_COLORS_AND_FONTS_INFO_COLOR = "prefs.colorAndFonts.infoColor";
+ public static final String PREFS_COLORS_AND_FONTS_INFO_COLOR = "prefs.colorAndFonts.infoColor"; //$NON-NLS-1$
/** The Preference ID for the Colors and Font Warn Font setting */
- public static final String PREFS_COLORS_AND_FONTS_WARN_FONT = "prefs.colorAndFonts.warnFont";
+ public static final String PREFS_COLORS_AND_FONTS_WARN_FONT = "prefs.colorAndFonts.warnFont"; //$NON-NLS-1$
/** The Preference ID for the Colors and Font Warn Color setting */
- public static final String PREFS_COLORS_AND_FONTS_WARN_COLOR = "prefs.colorAndFonts.warnColor";
+ public static final String PREFS_COLORS_AND_FONTS_WARN_COLOR = "prefs.colorAndFonts.warnColor"; //$NON-NLS-1$
/** The Preference ID for the Colors and Font Error Font settings */
- public static final String PREFS_COLORS_AND_FONTS_ERROR_FONT = "prefs.colorAndFonts.errorFont";
+ public static final String PREFS_COLORS_AND_FONTS_ERROR_FONT = "prefs.colorAndFonts.errorFont"; //$NON-NLS-1$
/** The Preference ID for the Colors and Font Error Color setting */
- public static final String PREFS_COLORS_AND_FONTS_ERROR_COLOR = "prefs.colorAndFonts.errorColor";
+ public static final String PREFS_COLORS_AND_FONTS_ERROR_COLOR = "prefs.colorAndFonts.errorColor"; //$NON-NLS-1$
/** The Preference ID for the Colors and Font Fatal Font setting */
- public static final String PREFS_COLORS_AND_FONTS_FATAL_FONT = "prefs.colorAndFonts.fatalFont";
+ public static final String PREFS_COLORS_AND_FONTS_FATAL_FONT = "prefs.colorAndFonts.fatalFont"; //$NON-NLS-1$
/** The Preference ID for the Colors and Font Fatal Color setting */
- public static final String PREFS_COLORS_AND_FONTS_FATAL_COLOR = "prefs.colorAndFonts.fatalColor";
+ public static final String PREFS_COLORS_AND_FONTS_FATAL_COLOR = "prefs.colorAndFonts.fatalColor"; //$NON-NLS-1$
/** The Preference ID for the Servers Logs Level setting */
- public static final String PREFS_SERVER_LOGS_LEVEL = "prefs.serverLogs.level";
+ public static final String PREFS_SERVER_LOGS_LEVEL = "prefs.serverLogs.level"; //$NON-NLS-1$
/** The Preference ID for the Servers Logs Level Debug value */
- public static final String PREFS_SERVER_LOGS_LEVEL_DEBUG = "debug";
+ public static final String PREFS_SERVER_LOGS_LEVEL_DEBUG = "debug"; //$NON-NLS-1$
/** The Preference ID for the Servers Logs Level Info value */
- public static final String PREFS_SERVER_LOGS_LEVEL_INFO = "info";
+ public static final String PREFS_SERVER_LOGS_LEVEL_INFO = "info"; //$NON-NLS-1$
/** The Preference ID for the Servers Logs Level Warn value */
- public static final String PREFS_SERVER_LOGS_LEVEL_WARN = "warning";
+ public static final String PREFS_SERVER_LOGS_LEVEL_WARN = "warning"; //$NON-NLS-1$
/** The Preference ID for the Servers Logs Level Error value */
- public static final String PREFS_SERVER_LOGS_LEVEL_ERROR = "error";
+ public static final String PREFS_SERVER_LOGS_LEVEL_ERROR = "error"; //$NON-NLS-1$
/** The Preference ID for the Servers Logs Level Fatal value */
- public static final String PREFS_SERVER_LOGS_LEVEL_FATAL = "fatal";
+ public static final String PREFS_SERVER_LOGS_LEVEL_FATAL = "fatal"; //$NON-NLS-1$
/** The Preference ID for the Servers Logs Pattern setting */
- public static final String PREFS_SERVER_LOGS_PATTERN = "prefs.serverLogs.pattern";
+ public static final String PREFS_SERVER_LOGS_PATTERN = "prefs.serverLogs.pattern"; //$NON-NLS-1$
}
diff --git a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java
index 705098e..ef2cf57 100644
--- a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java
+++ b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java
@@ -49,15 +49,15 @@
*/
public class ApacheDsPluginUtils
{
- private static final String RESOURCES = "resources";
- private static final String LIBS = "libs";
- private static final String SERVERS = "servers";
+ private static final String RESOURCES = "resources"; //$NON-NLS-1$
+ private static final String LIBS = "libs"; //$NON-NLS-1$
+ private static final String SERVERS = "servers"; //$NON-NLS-1$
/** The name of the libraries folder */
- private static final String LIBRARIES_FOLDER_NAME = "libs";
- private static final String APACHEDS = "apacheds";
+ private static final String LIBRARIES_FOLDER_NAME = "libs"; //$NON-NLS-1$
+ private static final String APACHEDS = "apacheds"; //$NON-NLS-1$
/** The line separator */
- public static final String LINE_SEPARATOR = System.getProperty( "line.separator" );
+ public static final String LINE_SEPARATOR = System.getProperty( "line.separator" ); //$NON-NLS-1$
/**
@@ -80,7 +80,7 @@
}
// Specific ApacheDS folder
- IPath apacheDsFolderPath = librariesFolderPath.append( APACHEDS + "-" + server.getVersion() );
+ IPath apacheDsFolderPath = librariesFolderPath.append( APACHEDS + "-" + server.getVersion() ); //$NON-NLS-1$
File apacheDsFolder = new File( apacheDsFolderPath.toOSString() );
if ( !apacheDsFolder.exists() )
{
@@ -100,7 +100,7 @@
}
catch ( IOException e )
{
- ApacheDsPluginUtils.reportError( "An error occurred when copying the library '"
+ ApacheDsPluginUtils.reportError( "An error occurred when copying the library '" //$NON-NLS-1$
+ apachedsLibraryFilename + "' to the location '" + apachedsLibrary.getAbsolutePath()
+ "'.\n\n" + e.getMessage() );
}
@@ -127,104 +127,104 @@
{
case VERSION_1_5_6:
return new String[]
- { "antlr-2.7.7.jar", "apacheds-avl-partition-1.5.6.jar", "apacheds-core-1.5.6.jar",
- "apacheds-core-annotations-1.5.6.jar", "apacheds-core-api-1.5.6.jar",
- "apacheds-core-avl-1.5.6.jar", "apacheds-core-constants-1.5.6.jar",
- "apacheds-core-entry-1.5.6.jar", "apacheds-core-jndi-1.5.6.jar",
- "apacheds-core-mock-1.5.6.jar", "apacheds-http-integration-1.5.6.jar",
- "apacheds-i18n-1.5.6.jar", "apacheds-interceptor-kerberos-1.5.6.jar",
- "apacheds-jdbm-1.5.6.jar", "apacheds-jdbm-partition-1.5.6.jar",
- "apacheds-jdbm-store-1.5.6.jar", "apacheds-kerberos-shared-1.5.6.jar",
- "apacheds-launcher-1.5.0.jar", "apacheds-ldif-partition-1.5.6.jar",
- "apacheds-protocol-changepw-1.5.6.jar", "apacheds-protocol-dns-1.5.6.jar",
- "apacheds-protocol-kerberos-1.5.6.jar", "apacheds-protocol-ldap-1.5.6.jar",
- "apacheds-protocol-ntp-1.5.6.jar", "apacheds-protocol-shared-1.5.6.jar",
- "apacheds-server-jndi-1.5.6.jar", "apacheds-server-xml-1.5.6.jar",
- "apacheds-utils-1.5.6.jar", "apacheds-xbean-spring-1.5.6.jar",
- "apacheds-xdbm-base-1.5.6.jar", "apacheds-xdbm-search-1.5.6.jar",
- "apacheds-xdbm-tools-1.5.6.jar", "bcprov-jdk15-140.jar", "commons-cli-1.2.jar",
- "commons-collections-3.2.1.jar", "commons-daemon-1.0.1.jar", "commons-io-1.4.jar",
- "commons-lang-2.5.jar", "daemon-bootstrappers-1.1.7.jar", "dom4j-1.6.1.jar",
- "jcl-over-slf4j-1.5.10.jar", "jetty-6.1.14.jar", "jetty-util-6.1.14.jar", "junit-4.7.jar",
- "log4j-1.2.14.jar", "mina-core-2.0.0-RC1.jar", "servlet-api-2.5-6.1.14.jar",
- "shared-asn1-0.9.18.jar", "shared-asn1-codec-0.9.18.jar", "shared-cursor-0.9.18.jar",
- "shared-dsml-parser-0.9.18.jar", "shared-i18n-0.9.18.jar", "shared-ldap-0.9.18.jar",
- "shared-ldap-constants-0.9.18.jar", "shared-ldap-converter-0.9.18.jar",
- "shared-ldap-jndi-0.9.18.jar", "shared-ldap-schema-0.9.18.jar",
- "shared-ldap-schema-dao-0.9.18.jar", "shared-ldap-schema-loader-0.9.18.jar",
- "shared-ldap-schema-manager-0.9.18.jar", "shared-ldif-0.9.18.jar", "slf4j-api-1.5.10.jar",
- "slf4j-log4j12-1.5.10.jar", "spring-beans-2.5.6.SEC01.jar",
- "spring-context-2.5.6.SEC01.jar", "spring-core-2.5.6.SEC01.jar", "xbean-spring-3.5.jar",
- "xercesImpl-2.9.1.jar", "xpp3-1.1.4c.jar" };
+ { "antlr-2.7.7.jar", "apacheds-avl-partition-1.5.6.jar", "apacheds-core-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-annotations-1.5.6.jar", "apacheds-core-api-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-core-avl-1.5.6.jar", "apacheds-core-constants-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-core-entry-1.5.6.jar", "apacheds-core-jndi-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-core-mock-1.5.6.jar", "apacheds-http-integration-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-i18n-1.5.6.jar", "apacheds-interceptor-kerberos-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-jdbm-1.5.6.jar", "apacheds-jdbm-partition-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-jdbm-store-1.5.6.jar", "apacheds-kerberos-shared-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-launcher-1.5.0.jar", "apacheds-ldif-partition-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-changepw-1.5.6.jar", "apacheds-protocol-dns-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-kerberos-1.5.6.jar", "apacheds-protocol-ldap-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-ntp-1.5.6.jar", "apacheds-protocol-shared-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-server-jndi-1.5.6.jar", "apacheds-server-xml-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-utils-1.5.6.jar", "apacheds-xbean-spring-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-xdbm-base-1.5.6.jar", "apacheds-xdbm-search-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-xdbm-tools-1.5.6.jar", "bcprov-jdk15-140.jar", "commons-cli-1.2.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "commons-collections-3.2.1.jar", "commons-daemon-1.0.1.jar", "commons-io-1.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "commons-lang-2.5.jar", "daemon-bootstrappers-1.1.7.jar", "dom4j-1.6.1.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "jcl-over-slf4j-1.5.10.jar", "jetty-6.1.14.jar", "jetty-util-6.1.14.jar", "junit-4.7.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "log4j-1.2.14.jar", "mina-core-2.0.0-RC1.jar", "servlet-api-2.5-6.1.14.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-asn1-0.9.18.jar", "shared-asn1-codec-0.9.18.jar", "shared-cursor-0.9.18.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-dsml-parser-0.9.18.jar", "shared-i18n-0.9.18.jar", "shared-ldap-0.9.18.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-ldap-constants-0.9.18.jar", "shared-ldap-converter-0.9.18.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "shared-ldap-jndi-0.9.18.jar", "shared-ldap-schema-0.9.18.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "shared-ldap-schema-dao-0.9.18.jar", "shared-ldap-schema-loader-0.9.18.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "shared-ldap-schema-manager-0.9.18.jar", "shared-ldif-0.9.18.jar", "slf4j-api-1.5.10.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "slf4j-log4j12-1.5.10.jar", "spring-beans-2.5.6.SEC01.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "spring-context-2.5.6.SEC01.jar", "spring-core-2.5.6.SEC01.jar", "xbean-spring-3.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "xercesImpl-2.9.1.jar", "xpp3-1.1.4c.jar" }; //$NON-NLS-1$ //$NON-NLS-2$
case VERSION_1_5_5:
return new String[]
- { "antlr-2.7.7.jar", "apacheds-bootstrap-extract-1.5.5.jar",
- "apacheds-bootstrap-partition-1.5.5.jar", "apacheds-core-1.5.5.jar",
- "apacheds-core-avl-1.5.5.jar", "apacheds-core-constants-1.5.5.jar",
- "apacheds-core-entry-1.5.5.jar", "apacheds-core-jndi-1.5.5.jar",
- "apacheds-core-shared-1.5.5.jar", "apacheds-interceptor-kerberos-1.5.5.jar",
- "apacheds-jdbm-1.5.5.jar", "apacheds-jdbm-store-1.5.5.jar",
- "apacheds-kerberos-shared-1.5.5.jar", "apacheds-launcher-1.5.0.jar",
- "apacheds-protocol-changepw-1.5.5.jar", "apacheds-protocol-dns-1.5.5.jar",
- "apacheds-protocol-kerberos-1.5.5.jar", "apacheds-protocol-ldap-1.5.5.jar",
- "apacheds-protocol-ntp-1.5.5.jar", "apacheds-protocol-shared-1.5.5.jar",
- "apacheds-schema-bootstrap-1.5.5.jar", "apacheds-schema-extras-1.5.5.jar",
- "apacheds-schema-registries-1.5.5.jar", "apacheds-server-jndi-1.5.5.jar",
- "apacheds-server-xml-1.5.5.jar", "apacheds-utils-1.5.5.jar",
- "apacheds-xbean-spring-1.5.5.jar", "apacheds-xdbm-base-1.5.5.jar",
- "apacheds-xdbm-search-1.5.5.jar", "apacheds-xdbm-tools-1.5.5.jar", "bcprov-jdk15-140.jar",
- "commons-cli-1.2.jar", "commons-collections-3.2.1.jar", "commons-daemon-1.0.1.jar",
- "commons-io-1.4.jar", "commons-lang-2.4.jar", "daemon-bootstrappers-1.1.6.jar",
- "jcl-over-slf4j-1.5.6.jar", "log4j-1.2.14.jar", "mina-core-2.0.0-M6.jar",
- "shared-asn1-0.9.15.jar", "shared-asn1-codec-0.9.15.jar", "shared-cursor-0.9.15.jar",
- "shared-ldap-0.9.15.jar", "shared-ldap-constants-0.9.15.jar", "slf4j-api-1.5.6.jar",
- "slf4j-log4j12-1.5.6.jar", "spring-beans-2.5.6.SEC01.jar",
- "spring-context-2.5.6.SEC01.jar", "spring-core-2.5.6.SEC01.jar", "xbean-spring-3.5.jar" };
+ { "antlr-2.7.7.jar", "apacheds-bootstrap-extract-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-bootstrap-partition-1.5.5.jar", "apacheds-core-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-core-avl-1.5.5.jar", "apacheds-core-constants-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-core-entry-1.5.5.jar", "apacheds-core-jndi-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-core-shared-1.5.5.jar", "apacheds-interceptor-kerberos-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-jdbm-1.5.5.jar", "apacheds-jdbm-store-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-kerberos-shared-1.5.5.jar", "apacheds-launcher-1.5.0.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-changepw-1.5.5.jar", "apacheds-protocol-dns-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-kerberos-1.5.5.jar", "apacheds-protocol-ldap-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-ntp-1.5.5.jar", "apacheds-protocol-shared-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-schema-bootstrap-1.5.5.jar", "apacheds-schema-extras-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-schema-registries-1.5.5.jar", "apacheds-server-jndi-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-server-xml-1.5.5.jar", "apacheds-utils-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-xbean-spring-1.5.5.jar", "apacheds-xdbm-base-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-xdbm-search-1.5.5.jar", "apacheds-xdbm-tools-1.5.5.jar", "bcprov-jdk15-140.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "commons-cli-1.2.jar", "commons-collections-3.2.1.jar", "commons-daemon-1.0.1.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "commons-io-1.4.jar", "commons-lang-2.4.jar", "daemon-bootstrappers-1.1.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "jcl-over-slf4j-1.5.6.jar", "log4j-1.2.14.jar", "mina-core-2.0.0-M6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-asn1-0.9.15.jar", "shared-asn1-codec-0.9.15.jar", "shared-cursor-0.9.15.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-ldap-0.9.15.jar", "shared-ldap-constants-0.9.15.jar", "slf4j-api-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "slf4j-log4j12-1.5.6.jar", "spring-beans-2.5.6.SEC01.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "spring-context-2.5.6.SEC01.jar", "spring-core-2.5.6.SEC01.jar", "xbean-spring-3.5.jar" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
case VERSION_1_5_4:
return new String[]
- { "antlr-2.7.7.jar", "xbean-spring-3.3.jar", "apacheds-bootstrap-extract-1.5.4.jar",
- "apacheds-bootstrap-partition-1.5.4.jar", "apacheds-core-1.5.4.jar",
- "apacheds-core-avl-1.5.4.jar", "apacheds-core-constants-1.5.4.jar",
- "apacheds-core-cursor-1.5.4.jar", "apacheds-core-entry-1.5.4.jar",
- "apacheds-core-shared-1.5.4.jar", "apacheds-jdbm-1.5.4.jar",
- "apacheds-jdbm-store-1.5.4.jar", "apacheds-kerberos-shared-1.5.4.jar",
- "apacheds-launcher-1.2.0.jar", "apacheds-protocol-changepw-1.5.4.jar",
- "apacheds-protocol-dns-1.5.4.jar", "apacheds-protocol-kerberos-1.5.4.jar",
- "apacheds-protocol-ldap-1.5.4.jar", "apacheds-protocol-ntp-1.5.4.jar",
- "apacheds-protocol-shared-1.5.4.jar", "apacheds-schema-bootstrap-1.5.4.jar",
- "apacheds-schema-extras-1.5.4.jar", "apacheds-schema-registries-1.5.4.jar",
- "apacheds-server-jndi-1.5.4.jar", "apacheds-server-xml-1.5.4.jar",
- "apacheds-utils-1.5.4.jar", "apacheds-xbean-spring-1.5.4.jar",
- "apacheds-xdbm-base-1.5.4.jar", "apacheds-xdbm-search-1.5.4.jar",
- "apacheds-xdbm-tools-1.5.4.jar", "commons-cli-1.1.jar", "commons-collections-3.2.jar",
- "commons-daemon-1.0.1.jar", "commons-lang-2.3.jar", "daemon-bootstrappers-1.1.4.jar",
- "jcl104-over-slf4j-1.4.3.jar", "log4j-1.2.14.jar", "mina-core-1.1.6.jar",
- "mina-filter-ssl-1.1.6.jar", "shared-asn1-0.9.12.jar", "shared-asn1-codec-0.9.12.jar",
- "shared-bouncycastle-reduced-0.9.12.jar", "shared-ldap-0.9.12.jar",
- "shared-ldap-constants-0.9.12.jar", "slf4j-api-1.4.3.jar", "slf4j-log4j12-1.4.3.jar",
- "spring-beans-2.0.6.jar", "spring-context-2.0.6.jar", "spring-core-2.0.6.jar" };
+ { "antlr-2.7.7.jar", "xbean-spring-3.3.jar", "apacheds-bootstrap-extract-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-bootstrap-partition-1.5.4.jar", "apacheds-core-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-core-avl-1.5.4.jar", "apacheds-core-constants-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-core-cursor-1.5.4.jar", "apacheds-core-entry-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-core-shared-1.5.4.jar", "apacheds-jdbm-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-jdbm-store-1.5.4.jar", "apacheds-kerberos-shared-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-launcher-1.2.0.jar", "apacheds-protocol-changepw-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-dns-1.5.4.jar", "apacheds-protocol-kerberos-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-ldap-1.5.4.jar", "apacheds-protocol-ntp-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-shared-1.5.4.jar", "apacheds-schema-bootstrap-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-schema-extras-1.5.4.jar", "apacheds-schema-registries-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-server-jndi-1.5.4.jar", "apacheds-server-xml-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-utils-1.5.4.jar", "apacheds-xbean-spring-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-xdbm-base-1.5.4.jar", "apacheds-xdbm-search-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-xdbm-tools-1.5.4.jar", "commons-cli-1.1.jar", "commons-collections-3.2.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "commons-daemon-1.0.1.jar", "commons-lang-2.3.jar", "daemon-bootstrappers-1.1.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "jcl104-over-slf4j-1.4.3.jar", "log4j-1.2.14.jar", "mina-core-1.1.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "mina-filter-ssl-1.1.6.jar", "shared-asn1-0.9.12.jar", "shared-asn1-codec-0.9.12.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-bouncycastle-reduced-0.9.12.jar", "shared-ldap-0.9.12.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "shared-ldap-constants-0.9.12.jar", "slf4j-api-1.4.3.jar", "slf4j-log4j12-1.4.3.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "spring-beans-2.0.6.jar", "spring-context-2.0.6.jar", "spring-core-2.0.6.jar" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
case VERSION_1_5_3:
return new String[]
- { "antlr-2.7.7.jar", "apacheds-bootstrap-extract-1.5.3.jar",
- "apacheds-bootstrap-partition-1.5.3.jar", "apacheds-btree-base-1.5.3.jar",
- "apacheds-core-1.5.3.jar", "apacheds-core-constants-1.5.3.jar",
- "apacheds-core-entry-1.5.3.jar", "apacheds-core-shared-1.5.3.jar",
- "apacheds-jdbm-1.5.3.jar", "apacheds-jdbm-store-1.5.3.jar",
- "apacheds-kerberos-shared-1.5.3.jar", "apacheds-launcher-1.2.0.jar",
- "apacheds-protocol-changepw-1.5.3.jar", "apacheds-protocol-dns-1.5.3.jar",
- "apacheds-protocol-kerberos-1.5.3.jar", "apacheds-protocol-ldap-1.5.3.jar",
- "apacheds-protocol-ntp-1.5.3.jar", "apacheds-protocol-shared-1.5.3.jar",
- "apacheds-schema-bootstrap-1.5.3.jar", "apacheds-schema-extras-1.5.3.jar",
- "apacheds-schema-registries-1.5.3.jar", "apacheds-server-jndi-1.5.3.jar",
- "apacheds-server-xml-1.5.3.jar", "apacheds-utils-1.5.3.jar",
- "apacheds-xbean-spring-1.5.3.jar", "commons-cli-1.1.jar", "commons-collections-3.2.jar",
- "commons-daemon-1.0.1.jar", "commons-lang-2.3.jar", "daemon-bootstrappers-1.1.3.jar",
- "jcl104-over-slf4j-1.4.3.jar", "log4j-1.2.14.jar", "mina-core-1.1.6.jar",
- "mina-filter-ssl-1.1.6.jar", "shared-asn1-0.9.11.jar", "shared-asn1-codec-0.9.11.jar",
- "shared-bouncycastle-reduced-0.9.11.jar", "shared-ldap-0.9.11.jar",
- "shared-ldap-constants-0.9.11.jar", "slf4j-api-1.4.3.jar", "slf4j-log4j12-1.4.3.jar",
- "spring-beans-2.0.6.jar", "spring-context-2.0.6.jar", "spring-core-2.0.6.jar",
- "xbean-spring-3.3.jar" };
+ { "antlr-2.7.7.jar", "apacheds-bootstrap-extract-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-bootstrap-partition-1.5.3.jar", "apacheds-btree-base-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-core-1.5.3.jar", "apacheds-core-constants-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-core-entry-1.5.3.jar", "apacheds-core-shared-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-jdbm-1.5.3.jar", "apacheds-jdbm-store-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-kerberos-shared-1.5.3.jar", "apacheds-launcher-1.2.0.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-changepw-1.5.3.jar", "apacheds-protocol-dns-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-kerberos-1.5.3.jar", "apacheds-protocol-ldap-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-ntp-1.5.3.jar", "apacheds-protocol-shared-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-schema-bootstrap-1.5.3.jar", "apacheds-schema-extras-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-schema-registries-1.5.3.jar", "apacheds-server-jndi-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-server-xml-1.5.3.jar", "apacheds-utils-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-xbean-spring-1.5.3.jar", "commons-cli-1.1.jar", "commons-collections-3.2.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "commons-daemon-1.0.1.jar", "commons-lang-2.3.jar", "daemon-bootstrappers-1.1.3.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "jcl104-over-slf4j-1.4.3.jar", "log4j-1.2.14.jar", "mina-core-1.1.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "mina-filter-ssl-1.1.6.jar", "shared-asn1-0.9.11.jar", "shared-asn1-codec-0.9.11.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-bouncycastle-reduced-0.9.11.jar", "shared-ldap-0.9.11.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "shared-ldap-constants-0.9.11.jar", "slf4j-api-1.4.3.jar", "slf4j-log4j12-1.4.3.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "spring-beans-2.0.6.jar", "spring-context-2.0.6.jar", "spring-core-2.0.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "xbean-spring-3.3.jar" }; //$NON-NLS-1$
};
}
@@ -248,7 +248,7 @@
{
// Getting he URL of the library within the bundle
URL libraryUrl = FileLocator.find( ApacheDsPlugin.getDefault().getBundle(), new Path( RESOURCES
- + IPath.SEPARATOR + LIBS + IPath.SEPARATOR + APACHEDS + "-" + server.getVersion().toString()
+ + IPath.SEPARATOR + LIBS + IPath.SEPARATOR + APACHEDS + "-" + server.getVersion().toString() //$NON-NLS-1$
+ IPath.SEPARATOR + library ), null );
// Creating the input and output streams
@@ -296,7 +296,7 @@
public static IPath getApacheDsLibrariesFolder( Server server )
{
return ApacheDsPlugin.getDefault().getStateLocation().append( LIBRARIES_FOLDER_NAME ).append(
- APACHEDS + "-" + server.getVersion() );
+ APACHEDS + "-" + server.getVersion() ); //$NON-NLS-1$
}
@@ -329,28 +329,28 @@
serverFolder.mkdir();
// Creating the server sub folders
- File confFolder = new File( serverFolder, "conf" );
+ File confFolder = new File( serverFolder, "conf" ); //$NON-NLS-1$
confFolder.mkdir();
- File serverSocketFolder = new File( serverFolder, "serverSocket" );
+ File serverSocketFolder = new File( serverFolder, "serverSocket" ); //$NON-NLS-1$
serverSocketFolder.mkdir();
- new File( serverFolder, "ldif" ).mkdir();
- new File( serverFolder, "log" ).mkdir();
- new File( serverFolder, "partitions" ).mkdir();
+ new File( serverFolder, "ldif" ).mkdir(); //$NON-NLS-1$
+ new File( serverFolder, "log" ).mkdir(); //$NON-NLS-1$
+ new File( serverFolder, "partitions" ).mkdir(); //$NON-NLS-1$
// Copying default configuration files
try
{
// Creating log4j.properties file
- File log4jPropertiesFile = new File( confFolder, "log4j.properties" );
+ File log4jPropertiesFile = new File( confFolder, "log4j.properties" ); //$NON-NLS-1$
createServersLog4jPropertiesFile( new FileOutputStream( log4jPropertiesFile ), 1024, getServerLogsLevel(), // Setting 1024 as default port
getServerLogsPattern() );
// Copying server.xml file
- File serverXmlFile = new File( confFolder, "server.xml" );
- copyConfigurationFile( "server-1.5.6.xml", serverXmlFile );
+ File serverXmlFile = new File( confFolder, "server.xml" ); //$NON-NLS-1$
+ copyConfigurationFile( "server-1.5.6.xml", serverXmlFile ); //$NON-NLS-1$
// Creating log4j.properties file to the serverSocket folder
- File log4jPropertiesServerSocketFile = new File( serverSocketFolder, "log4j.properties" );
+ File log4jPropertiesServerSocketFile = new File( serverSocketFolder, "log4j.properties" ); //$NON-NLS-1$
createServerSocketLog4jPropertiesFile( new FileOutputStream( log4jPropertiesServerSocketFile ), id );
}
catch ( IOException e )
@@ -381,43 +381,43 @@
{
// Creating the file content in a StringBuffer
StringBuffer sb = new StringBuffer();
- sb.append( "#############################################################################" ).append( "\n" );
- sb.append( "# Licensed to the Apache Software Foundation (ASF) under one or more" ).append( "\n" );
- sb.append( "# contributor license agreements. See the NOTICE file distributed with" ).append( "\n" );
- sb.append( "# this work for additional information regarding copyright ownership." ).append( "\n" );
- sb.append( "# The ASF licenses this file to You under the Apache License, Version 2.0" ).append( "\n" );
- sb.append( "# (the \"License\"); you may not use this file except in compliance with" ).append( "\n" );
- sb.append( "# the License. You may obtain a copy of the License at" ).append( "\n" );
- sb.append( "#" ).append( "\n" );
- sb.append( "# http://www.apache.org/licenses/LICENSE-2.0" ).append( "\n" );
- sb.append( "#" ).append( "\n" );
- sb.append( "# Unless required by applicable law or agreed to in writing, software" ).append( "\n" );
- sb.append( "# distributed under the License is distributed on an \"AS IS\" BASIS," ).append( "\n" );
- sb.append( "# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied." ).append( "\n" );
- sb.append( "# See the License for the specific language governing permissions and" ).append( "\n" );
- sb.append( "# limitations under the License." ).append( "\n" );
- sb.append( "#############################################################################" ).append( "\n" );
- sb.append( "log4j.rootCategory=" + logsLevel + ", socketAppender, rollingFileAppender" ).append( "\n" );
- sb.append( "" ).append( "\n" );
- sb.append( "# The Socket Appender (used to send the logs to Apache Directory Studio)" ).append( "\n" );
- sb.append( "log4j.appender.socketAppender=org.apache.log4j.net.SocketAppender" ).append( "\n" );
- sb.append( "log4j.appender.socketAppender.RemoteHost=localhost" ).append( "\n" );
- sb.append( "log4j.appender.socketAppender.Port=" ).append( port ).append( "\n" );
- sb.append( "" ).append( "\n" );
- sb.append( "# The Rolling File Appender" ).append( "\n" );
- sb.append( "log4j.appender.rollingFileAppender=org.apache.log4j.RollingFileAppender" ).append( "\n" );
- sb.append( "log4j.appender.rollingFileAppender.File=${apacheds.log.dir}/apacheds-rolling.log" ).append( "\n" );
- sb.append( "log4j.appender.rollingFileAppender.MaxFileSize=1024KB" ).append( "\n" );
- sb.append( "log4j.appender.rollingFileAppender.MaxBackupIndex=5" ).append( "\n" );
- sb.append( "log4j.appender.rollingFileAppender.layout=org.apache.log4j.PatternLayout" ).append( "\n" );
- sb.append( "log4j.appender.rollingFileAppender.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n" )
- .append( "\n" );
- sb.append( "" ).append( "\n" );
- sb.append( "# with these we'll not get innundated when switching to DEBUG" ).append( "\n" );
- sb.append( "log4j.logger.org.apache.directory.shared.ldap.name=WARN" ).append( "\n" );
- sb.append( "log4j.logger.org.springframework=WARN" ).append( "\n" );
- sb.append( "log4j.logger.org.apache.directory.shared.codec=WARN" ).append( "\n" );
- sb.append( "log4j.logger.org.apache.directory.shared.asn1=WARN" ).append( "\n" );
+ sb.append( "#############################################################################" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# Licensed to the Apache Software Foundation (ASF) under one or more" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# contributor license agreements. See the NOTICE file distributed with" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# this work for additional information regarding copyright ownership." ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# The ASF licenses this file to You under the Apache License, Version 2.0" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# (the \"License\"); you may not use this file except in compliance with" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# the License. You may obtain a copy of the License at" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "#" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# http://www.apache.org/licenses/LICENSE-2.0" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "#" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# Unless required by applicable law or agreed to in writing, software" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# distributed under the License is distributed on an \"AS IS\" BASIS," ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied." ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# See the License for the specific language governing permissions and" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# limitations under the License." ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "#############################################################################" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "log4j.rootCategory=" + logsLevel + ", socketAppender, rollingFileAppender" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ sb.append( "" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# The Socket Appender (used to send the logs to Apache Directory Studio)" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "log4j.appender.socketAppender=org.apache.log4j.net.SocketAppender" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "log4j.appender.socketAppender.RemoteHost=localhost" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "log4j.appender.socketAppender.Port=" ).append( port ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# The Rolling File Appender" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "log4j.appender.rollingFileAppender=org.apache.log4j.RollingFileAppender" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "log4j.appender.rollingFileAppender.File=${apacheds.log.dir}/apacheds-rolling.log" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "log4j.appender.rollingFileAppender.MaxFileSize=1024KB" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "log4j.appender.rollingFileAppender.MaxBackupIndex=5" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "log4j.appender.rollingFileAppender.layout=org.apache.log4j.PatternLayout" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "log4j.appender.rollingFileAppender.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n" ) //$NON-NLS-1$
+ .append( "\n" ); //$NON-NLS-1$
+ sb.append( "" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# with these we'll not get innundated when switching to DEBUG" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "log4j.logger.org.apache.directory.shared.ldap.name=WARN" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "log4j.logger.org.springframework=WARN" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "log4j.logger.org.apache.directory.shared.codec=WARN" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "log4j.logger.org.apache.directory.shared.asn1=WARN" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
// Writing the content to the file
os.write( sb.toString().getBytes() );
@@ -438,33 +438,33 @@
{
// Creating the file content in a StringBuffer
StringBuffer sb = new StringBuffer();
- sb.append( "#############################################################################" ).append( "\n" );
- sb.append( "# Licensed to the Apache Software Foundation (ASF) under one or more" ).append( "\n" );
- sb.append( "# contributor license agreements. See the NOTICE file distributed with" ).append( "\n" );
- sb.append( "# this work for additional information regarding copyright ownership." ).append( "\n" );
- sb.append( "# The ASF licenses this file to You under the Apache License, Version 2.0" ).append( "\n" );
- sb.append( "# (the \"License\"); you may not use this file except in compliance with" ).append( "\n" );
- sb.append( "# the License. You may obtain a copy of the License at" ).append( "\n" );
- sb.append( "#" ).append( "\n" );
- sb.append( "# http://www.apache.org/licenses/LICENSE-2.0" ).append( "\n" );
- sb.append( "#" ).append( "\n" );
- sb.append( "# Unless required by applicable law or agreed to in writing, software" ).append( "\n" );
- sb.append( "# distributed under the License is distributed on an \"AS IS\" BASIS," ).append( "\n" );
- sb.append( "# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied." ).append( "\n" );
- sb.append( "# See the License for the specific language governing permissions and" ).append( "\n" );
- sb.append( "# limitations under the License." ).append( "\n" );
- sb.append( "#############################################################################" ).append( "\n" );
- sb.append( "log4j.rootCategory=ALL, studioConsoleAppender" ).append( "\n" );
- sb.append( "" ).append( "\n" );
- sb.append( "# Studio Console Appender (identified with the server id)" ).append( "\n" );
- sb.append( "log4j.appender.studioConsoleAppender=org.apache.directory.studio.apacheds.StudioConsoleAppender" )
- .append( "\n" );
- sb.append( "log4j.appender.studioConsoleAppender.ServerId=" ).append( id ).append( "\n" );
- sb.append( "log4j.appender.studioConsoleAppender.layout=org.apache.log4j.PatternLayout" ).append( "\n" );
- sb.append( "" ).append( "\n" );
- sb.append( "# Hiding logs from log4j" ).append( "\n" );
- sb.append( "log4j.logger.org.apache.log4j.net.SocketServer=OFF" ).append( "\n" );
- sb.append( "log4j.logger.org.apache.log4j.net.SocketNode=OFF" ).append( "\n" );
+ sb.append( "#############################################################################" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# Licensed to the Apache Software Foundation (ASF) under one or more" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# contributor license agreements. See the NOTICE file distributed with" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# this work for additional information regarding copyright ownership." ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# The ASF licenses this file to You under the Apache License, Version 2.0" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# (the \"License\"); you may not use this file except in compliance with" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# the License. You may obtain a copy of the License at" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "#" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# http://www.apache.org/licenses/LICENSE-2.0" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "#" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# Unless required by applicable law or agreed to in writing, software" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# distributed under the License is distributed on an \"AS IS\" BASIS," ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied." ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# See the License for the specific language governing permissions and" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# limitations under the License." ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "#############################################################################" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "log4j.rootCategory=ALL, studioConsoleAppender" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# Studio Console Appender (identified with the server id)" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "log4j.appender.studioConsoleAppender=org.apache.directory.studio.apacheds.StudioConsoleAppender" ) //$NON-NLS-1$
+ .append( "\n" ); //$NON-NLS-1$
+ sb.append( "log4j.appender.studioConsoleAppender.ServerId=" ).append( id ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "log4j.appender.studioConsoleAppender.layout=org.apache.log4j.PatternLayout" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "# Hiding logs from log4j" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "log4j.logger.org.apache.log4j.net.SocketServer=OFF" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "log4j.logger.org.apache.log4j.net.SocketNode=OFF" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
// Writing the content to the file
os.write( sb.toString().getBytes() );
@@ -485,7 +485,7 @@
{
// Getting he URL of the file within the bundle
URL inputFilenameUrl = FileLocator.find( ApacheDsPlugin.getDefault().getBundle(), new Path( RESOURCES
- + IPath.SEPARATOR + "conf" + IPath.SEPARATOR + inputFilename ), null );
+ + IPath.SEPARATOR + "conf" + IPath.SEPARATOR + inputFilename ), null ); //$NON-NLS-1$
// Creating the input and output streams
InputStream inputStream = inputFilenameUrl.openStream();
@@ -526,26 +526,26 @@
ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL );
if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_DEBUG.equalsIgnoreCase( level ) )
{
- return "DEBUG";
+ return "DEBUG"; //$NON-NLS-1$
}
else if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_INFO.equalsIgnoreCase( level ) )
{
- return "INFO";
+ return "INFO"; //$NON-NLS-1$
}
else if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_WARN.equalsIgnoreCase( level ) )
{
- return "WARN";
+ return "WARN"; //$NON-NLS-1$
}
else if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_ERROR.equalsIgnoreCase( level ) )
{
- return "ERROR";
+ return "ERROR"; //$NON-NLS-1$
}
else if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_FATAL.equalsIgnoreCase( level ) )
{
- return "FATAL";
+ return "FATAL"; //$NON-NLS-1$
}
- return "";
+ return ""; //$NON-NLS-1$
}
@@ -592,7 +592,7 @@
public static ServerConfiguration getServerConfiguration( Server server ) throws ServerXmlIOException, IOException
{
InputStream fis = new FileInputStream( new File( ApacheDsPluginUtils.getApacheDsServersFolder().append(
- server.getId() ).append( "conf" ).append( "server.xml" ).toOSString() ) );
+ server.getId() ).append( "conf" ).append( "server.xml" ).toOSString() ) ); //$NON-NLS-1$ //$NON-NLS-2$
// Parsing and returning the server configuration
switch ( server.getVersion() )
diff --git a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ConsolesHandler.java b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ConsolesHandler.java
index fcda270..54be2ce 100644
--- a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ConsolesHandler.java
+++ b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ConsolesHandler.java
@@ -91,7 +91,7 @@
{
Server server = ServersHandler.getDefault().getServerById( serverId );
- LogMessageConsole logMessageConsole = new LogMessageConsole( "ApacheDS - " + server.getName() );
+ LogMessageConsole logMessageConsole = new LogMessageConsole( "ApacheDS - " + server.getName() ); //$NON-NLS-1$
consolesMap.put( serverId, logMessageConsole );
diff --git a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/PreferenceInitializer.java b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/PreferenceInitializer.java
index 44afe51..af1fdd6 100644
--- a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/PreferenceInitializer.java
+++ b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/PreferenceInitializer.java
@@ -79,6 +79,6 @@
// Server Logs
store.setDefault( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL,
ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_WARN );
- store.setDefault( ApacheDsPluginConstants.PREFS_SERVER_LOGS_PATTERN, "[%d{HH:mm:ss}] %p [%c] - %m%n" );
+ store.setDefault( ApacheDsPluginConstants.PREFS_SERVER_LOGS_PATTERN, "[%d{HH:mm:ss}] %p [%c] - %m%n" ); //$NON-NLS-1$
}
}
diff --git a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/CreateConnectionActionHelper.java b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/CreateConnectionActionHelper.java
index 7afda41..00304ec 100644
--- a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/CreateConnectionActionHelper.java
+++ b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/CreateConnectionActionHelper.java
@@ -134,7 +134,7 @@
connectionParameter.setName( serverName );
// Network Provider
- connectionParameter.setNetworkProvider( NetworkProvider.JNDI );
+ connectionParameter.setNetworkProvider( ConnectionCorePlugin.getDefault().getDefaultNetworkProvider() );
// Creating the connection
Connection connection = new Connection( connectionParameter );
diff --git a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RenameAction.java b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RenameAction.java
index 98ad22c..97f7b57 100644
--- a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RenameAction.java
+++ b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/RenameAction.java
@@ -17,16 +17,6 @@
* under the License.
*
*/
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
package org.apache.directory.studio.apacheds.actions;
@@ -36,24 +26,12 @@
import org.apache.directory.studio.apacheds.views.ServersView;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.dialogs.InputDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TreeEditor;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.actions.TextActionHandler;
/**
@@ -65,25 +43,6 @@
{
/** The associated view */
private ServersView view;
- private Tree tree;
- private TreeEditor treeEditor;
- protected Composite textEditorParent;
- protected Text textEditor;
- private TextActionHandler textActionHandler;
- // The server being edited if this is being done inline
- protected Server editedServer;
-
- protected boolean saving = false;
-
-
- /**
- * Creates a new instance of RenameAction.
- */
- public RenameAction()
- {
- super( Messages.getString( "RenameAction.Rename" ) ); //$NON-NLS-1$
- init();
- }
/**
@@ -94,22 +53,11 @@
*/
public RenameAction( ServersView view )
{
- super( Messages.getString( "RenameAction.Rename" ) ); //$NON-NLS-1$
this.view = view;
- this.tree = view.getViewer().getTree();
- this.treeEditor = new TreeEditor( tree );
- init();
- }
-
-
- /**
- * Initializes the action.
- */
- private void init()
- {
+ setText( Messages.getString( "RenameAction.Rename" ) ); //$NON-NLS-1$
+ setToolTipText( Messages.getString( "RenameAction.RenameToolTip" ) ); //$NON-NLS-1$
setId( ApacheDsPluginConstants.CMD_RENAME );
setActionDefinitionId( ApacheDsPluginConstants.CMD_RENAME );
- setToolTipText( Messages.getString( "RenameAction.RenameToolTip" ) ); //$NON-NLS-1$
}
@@ -120,235 +68,45 @@
{
if ( view != null )
{
- // What we get from the TableViewer is a StructuredSelection
+ // Getting the selected server
StructuredSelection selection = ( StructuredSelection ) view.getViewer().getSelection();
+ final Server server = ( Server ) selection.getFirstElement();
- // Here's the real object
- Server server = ( Server ) selection.getFirstElement();
if ( server != null )
{
- queryNewServerNameInline( server );
- }
- }
- }
-
-
- /**
- * Return the new name to be given to the target resource or
- * <code>null<code>
- * if the query was canceled. Rename the currently selected server using the table editor.
- * Continue the action when the user is done.
- *
- * @param server the server to rename
- */
- private void queryNewServerNameInline( final Server server )
- {
- // Make sure text editor is created only once. Simply reset text
- // editor when action is executed more than once. Fixes bug 22269
- if ( textEditorParent == null )
- {
- createTextEditor( server );
- }
- textEditor.setText( server.getName() );
-
- // Open text editor with initial size
- textEditorParent.setVisible( true );
- Point textSize = textEditor.computeSize( SWT.DEFAULT, SWT.DEFAULT );
- textSize.x += textSize.y; // Add extra space for new characters
- Point parentSize = textEditorParent.getSize();
- int inset = getCellEditorInset( textEditorParent );
- textEditor.setBounds( 2, inset, Math.min( textSize.x, parentSize.x - 4 ), parentSize.y - 2 * inset );
- textEditorParent.redraw();
- textEditor.selectAll();
- textEditor.setFocus();
- }
-
-
- /**
- * Create the text editor widget.
- *
- * @param server the server to rename
- */
- private void createTextEditor( final Server server )
- {
- // Create text editor parent. This draws a nice bounding rect
- textEditorParent = createParent();
- textEditorParent.setVisible( false );
- final int inset = getCellEditorInset( textEditorParent );
- if ( inset > 0 )
- {
- textEditorParent.addListener( SWT.Paint, new Listener()
- {
- public void handleEvent( Event e )
+ IInputValidator validator = new IInputValidator()
{
- Point textSize = textEditor.getSize();
- Point parentSize = textEditorParent.getSize();
- e.gc.drawRectangle( 0, 0, Math.min( textSize.x + 4, parentSize.x - 1 ), parentSize.y - 1 );
- }
- } );
- }
- // Create inner text editor
- textEditor = new Text( textEditorParent, SWT.NONE );
- textEditor.setFont( tree.getFont() );
- textEditorParent.setBackground( textEditor.getBackground() );
- textEditor.addListener( SWT.Modify, new Listener()
- {
- public void handleEvent( Event e )
- {
- Point textSize = textEditor.computeSize( SWT.DEFAULT, SWT.DEFAULT );
- textSize.x += textSize.y; // Add extra space for new
- // characters.
- Point parentSize = textEditorParent.getSize();
- textEditor.setBounds( 2, inset, Math.min( textSize.x, parentSize.x - 4 ), parentSize.y - 2 * inset );
- textEditorParent.redraw();
- }
- } );
- textEditor.addListener( SWT.Traverse, new Listener()
- {
- public void handleEvent( Event event )
- {
-
- // Workaround for Bug 20214 due to extra
- // traverse events
- switch ( event.detail )
- {
- case SWT.TRAVERSE_ESCAPE:
- // Do nothing in this case
- disposeTextWidget();
- event.doit = true;
- event.detail = SWT.TRAVERSE_NONE;
- break;
- case SWT.TRAVERSE_RETURN:
- saveChangesAndDispose( server );
- event.doit = true;
- event.detail = SWT.TRAVERSE_NONE;
- break;
- }
- }
- } );
- textEditor.addFocusListener( new FocusAdapter()
- {
- public void focusLost( FocusEvent fe )
- {
- saveChangesAndDispose( server );
- }
- } );
-
- if ( textActionHandler != null )
- {
- textActionHandler.addText( textEditor );
- }
- }
-
-
- private Composite createParent()
- {
- Tree tree2 = tree;
- Composite result = new Composite( tree2, SWT.NONE );
- TreeItem[] selectedItems = tree2.getSelection();
- treeEditor.horizontalAlignment = SWT.LEFT;
- treeEditor.grabHorizontal = true;
- treeEditor.setEditor( result, selectedItems[0] );
- return result;
- }
-
-
- /**
- * Close the text widget and reset the editorText field.
- */
- protected void disposeTextWidget()
- {
- if ( textActionHandler != null )
- textActionHandler.removeText( textEditor );
-
- if ( textEditorParent != null )
- {
- textEditorParent.dispose();
- textEditorParent = null;
- textEditor = null;
- treeEditor.setEditor( null, null );
- }
- }
-
-
- /**
- * Save the changes and dispose of the text widget.
- *
- * @param server the server to rename
- */
- protected void saveChangesAndDispose( Server server )
- {
- if ( saving == true )
- return;
-
- saving = true;
- // Cache the resource to avoid selection loss since a selection of
- // another item can trigger this method
- editedServer = server;
- final String newName = textEditor.getText();
- // Run this in an async to make sure that the operation that triggered
- // this action is completed. Otherwise this leads to problems when the
- // icon of the item being renamed is clicked (i.e., which causes the
- // rename text widget to lose focus and trigger this method)
- tree.getShell().getDisplay().asyncExec( new Runnable()
- {
- public void run()
- {
- try
- {
- if ( !newName.equals( editedServer.getName() ) )
+ public String isValid( String newName )
{
- if ( !ServersHandler.getDefault().isNameAvailable( newName ) )
+ if ( server.getName().equals( newName ) )
{
- MessageDialog.openError( tree.getShell(), Messages.getString( "RenameAction.Server" ), //$NON-NLS-1$
- Messages.getString( "RenameAction.ErrorNameInUse" ) ); //$NON-NLS-1$
+ return null;
+ }
+ else if ( !ServersHandler.getDefault().isNameAvailable( newName ) )
+ {
+ return Messages.getString( "RenameAction.ErrorNameInUse" ); //$NON-NLS-1$
}
else
{
- editedServer.setName( newName );
+ return null;
}
}
- editedServer = null;
- // Dispose the text widget regardless
- disposeTextWidget();
- // Ensure the Navigator tree has focus, which it may not if
- // the text widget previously had focus
- if ( tree != null && !tree.isDisposed() )
- {
- tree.setFocus();
- }
- }
- finally
+ };
+
+ // Opening a dialog to ask the user a new name for the server
+ InputDialog dialog = new InputDialog( view.getSite().getShell(),
+ Messages.getString( "RenameAction.RenameServer" ), //$NON-NLS-1$
+ Messages.getString( "RenameAction.NewName" ), //$NON-NLS-1$
+ server.getName(), validator );
+ dialog.open();
+
+ String newName = dialog.getValue();
+ if ( newName != null )
{
- saving = false;
+ server.setName( newName );
}
}
- } );
- }
-
-
- /**
- * On Mac the text widget already provides a border when it has focus, so
- * there is no need to draw another one. The value of returned by this
- * method is usd to control the inset we apply to the text field bound's in
- * order to get space for drawing a border. A value of 1 means a one-pixel
- * wide border around the text field. A negative value supresses the border.
- * However, in M9 the system property
- * "org.eclipse.swt.internal.carbon.noFocusRing" has been introduced as a
- * temporary workaround for bug #28842. The existence of the property turns
- * the native focus ring off if the widget is contained in a main window
- * (not dialog). The check for the property should be removed after a final
- * fix for #28842 has been provided.
- */
- private static int getCellEditorInset( Control c )
- {
- // special case for MacOS X
- if ( "carbon".equals( SWT.getPlatform() ) ) { //$NON-NLS-1$
- if ( System.getProperty( "org.eclipse.swt.internal.carbon.noFocusRing" ) == null || c.getShell().getParent() != null ) { //$NON-NLS-1$
- return -2; // native border
- }
}
- return 1; // one pixel wide black border
}
diff --git a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages.properties b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages.properties
index 70593dc..547a0da 100644
--- a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages.properties
+++ b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages.properties
@@ -36,9 +36,10 @@
PropertiesAction.PropertiesFor=Properties for "{0}"
PropertiesAction.PropertiesToolTip=Properties
RenameAction.ErrorNameInUse=The name is already in use. Specify a different name.
+RenameAction.NewName=New name:
RenameAction.Rename=R&ename...
RenameAction.RenameToolTip=Rename...
-RenameAction.Server=Server
+RenameAction.RenameServer=Rename Server
RunAction.ChangePasswordPort=ChangePassword (port {0})
RunAction.Continue=Do you wish to continue?
RunAction.DNSPort=DNS (port {0})
diff --git a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages_de.properties b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages_de.properties
index 0c1c1ef..fed7d35 100644
--- a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages_de.properties
+++ b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages_de.properties
@@ -35,8 +35,10 @@
PropertiesAction.PropertiesFor=Eigenschaften f\u00FCr "{0}"
PropertiesAction.PropertiesToolTip=Eigenschaften
RenameAction.ErrorNameInUse=Der Name wird bereits verwendet. Geben Sie einen anderen Namen an.
+RenameAction.NewName=Neuer Name\:
RenameAction.Rename=Umb&enennen...
RenameAction.RenameToolTip=Umbenennen...
+RenameAction.RenameServer=Server umbenennen
RunAction.Continue=Wollen Sie weiterfahren?
RunAction.FollowingErrorOccurred=Folgender Fehler ist aufgetreten\:
RunAction.PortInUse=Der Port wird bereits verwendet
diff --git a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages_fr.properties b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages_fr.properties
index ea606d6..73db63a 100644
--- a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages_fr.properties
+++ b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/actions/messages_fr.properties
@@ -43,9 +43,10 @@
PropertiesAction.PropertiesFor=Propri\u00E9t\u00E9s du serveur "{0}"
PropertiesAction.PropertiesToolTip=Propri\u00E9t\u00E9s
RenameAction.ErrorNameInUse=Ce nom est d\u00E9j\u00E0 utilis\u00E9. Veuillez en s\u00E9lectionner un autre.
+RenameAction.NewName=Nouveau nom:
RenameAction.Rename=&Renommer...
RenameAction.RenameToolTip=Renommer...
-RenameAction.Server=Serveur
+RenameAction.RenameServer=Renommer le serveur
RunAction.Continue=Voulez-vous poursuivre l'op\u00E9ration ?
RunAction.FollowingErrorOccurred=L'erreur suivante est survenue \:
RunAction.PortInUse=Le port est d\u00E9j\u00E0 utilis\u00E9
diff --git a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersTableViewer.java b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersTableViewer.java
index dc47be9..6bfb6ca 100644
--- a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersTableViewer.java
+++ b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersTableViewer.java
@@ -17,31 +17,23 @@
* under the License.
*
*/
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
package org.apache.directory.studio.apacheds.views;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
-import org.apache.directory.studio.apacheds.model.ServerEvent;
-import org.apache.directory.studio.apacheds.model.ServerEventEnum;
-import org.apache.directory.studio.apacheds.model.Server;
-import org.apache.directory.studio.apacheds.model.ServerListener;
-import org.apache.directory.studio.apacheds.model.ServerStateEnum;
import org.apache.directory.studio.apacheds.model.ServersHandler;
import org.apache.directory.studio.apacheds.model.ServersHandlerListener;
+import org.apache.directory.studio.apacheds.model.Server;
+import org.apache.directory.studio.apacheds.model.ServerEvent;
+import org.apache.directory.studio.apacheds.model.ServerEventEnum;
+import org.apache.directory.studio.apacheds.model.ServerListener;
+import org.apache.directory.studio.apacheds.model.ServerStateEnum;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Tree;
@@ -64,6 +56,9 @@
/** The label provider */
private ServersViewLabelProvider labelProvider;
+ /** The comparator */
+ private ServersComparator comparator;
+
/** The server handler listener */
private ServersHandlerListener serversHandlerListener;
@@ -77,6 +72,12 @@
private List<Server> serversNeedingAnimation = new ArrayList<Server>();
+ /**
+ * Creates a new instance of ServersTableViewer.
+ *
+ * @param tree
+ * the associated tree
+ */
public ServersTableViewer( Tree tree )
{
super( tree );
@@ -85,7 +86,8 @@
setLabelProvider( labelProvider );
setContentProvider( new ServersViewContentProvider() );
- setComparator( new ServersViewerComparator( labelProvider ) );
+ comparator = new ServersComparator();
+ setComparator( new ViewerComparator( comparator ) );
setInput( ROOT );
@@ -126,7 +128,7 @@
ServersHandler.getDefault().addListener( serversHandlerListener );
// The server listener
- serverListener = new ServerListener()
+ serverListener = new ServerListener()
{
public void serverChanged( ServerEvent event )
{
@@ -141,12 +143,12 @@
Server server = event.getServer();
switch ( kind )
{
- // The server state has changed
+ // The server status has changed
case STATE_CHANGED:
// First, we refresh the server
refreshServer( server );
- // Then, we get the state of the server to see if we
+ // Then, we get the status of the server to see if we
// need to start or stop the animation thread
ServerStateEnum state = server.getState();
@@ -245,16 +247,9 @@
{
public void run()
{
- try
- {
- refresh( server );
- ISelection sel = ServersTableViewer.this.getSelection();
- ServersTableViewer.this.setSelection( sel );
- }
- catch ( Exception e )
- {
- // ignore
- }
+ refresh( server );
+ ISelection sel = ServersTableViewer.this.getSelection();
+ ServersTableViewer.this.setSelection( sel );
}
} );
}
@@ -295,23 +290,16 @@
// Checking if we need to stop the animation
if ( !stopAnimation )
{
- try
- {
- // Changing the animation state on the label provider
- labelProvider.animate();
+ // Changing the animation state on the label provider
+ labelProvider.animate();
- // Looping on the currently starting servers
- for ( Server server : serversNeedingAnimation.toArray( new Server[0] ) )
- {
- if ( server != null && getTree() != null && !getTree().isDisposed() )
- {
- updateAnimation( server );
- }
- }
- }
- catch ( Exception e )
+ // Looping on the currently starting servers
+ for ( Server server : serversNeedingAnimation.toArray( new Server[0] ) )
{
- // Trace.trace( Trace.FINEST, "Error in Servers view animation", e ); TODO
+ if ( server != null && getTree() != null && !getTree().isDisposed() )
+ {
+ updateAnimation( server );
+ }
}
// Re-launching the animation
@@ -348,60 +336,84 @@
*/
private void updateAnimation( Server server )
{
- try
- {
- Widget widget = doFindItem( server );
- TreeItem item = ( TreeItem ) widget;
- item.setText( 1, labelProvider.getColumnText( server, 1 ) );
- item.setImage( 1, labelProvider.getColumnImage( server, 1 ) );
- }
- catch ( Exception e )
- {
- // Trace.trace( Trace.WARNING, "Error in optimized animation", e );
- //TODO
- }
+ Widget widget = doFindItem( server );
+ TreeItem item = ( TreeItem ) widget;
+ item.setText( 1, labelProvider.getColumnText( server, 1 ) );
+ item.setImage( 1, labelProvider.getColumnImage( server, 1 ) );
}
/**
- * Resorts the table based on field.
- *
- * @param column
- * the column being updated
- * @param col
- * the column
+ * Sorts the table.
+ *
+ * @param treeColumn the tree column
+ * @param column the column number
*/
- protected void resortTable( final TreeColumn column, int col )
+ public void sort( final TreeColumn treeColumn, int column )
{
- ServersViewerComparator sorter = ( ServersViewerComparator ) getComparator();
-
- if ( col == sorter.getTopPriority() )
- sorter.reverseTopPriority();
+ if ( column == comparator.column )
+ {
+ comparator.reverseOrder();
+ }
else
- sorter.setTopPriority( col );
+ {
+ comparator.column = column;
+ }
PlatformUI.getWorkbench().getDisplay().asyncExec( new Runnable()
{
public void run()
{
refresh();
- updateDirectionIndicator( column );
+
+ Tree tree = getTree();
+ tree.setSortColumn( treeColumn );
+ if ( comparator.order == ServersComparator.ASCENDING )
+ {
+ tree.setSortDirection( SWT.UP );
+ }
+ else
+ {
+ tree.setSortDirection( SWT.DOWN );
+ }
}
} );
}
-
/**
- * Updates the direction indicator as column is now the primary column.
- *
- * @param column
+ * This class implements a comparator for servers.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
- protected void updateDirectionIndicator( TreeColumn column )
+ private class ServersComparator implements Comparator<Object>
{
- getTree().setSortColumn( column );
- if ( ( ( ServersViewerComparator ) getComparator() ).getTopPriorityDirection() == ServersViewerComparator.ASCENDING )
- getTree().setSortDirection( SWT.UP );
- else
- getTree().setSortDirection( SWT.DOWN );
+ public static final int ASCENDING = 1;
+
+ /** The comparison order */
+ int order = ASCENDING;
+
+ /** The column used to compare objects */
+ int column = 0;
+
+
+ /**
+ * Reverses the order.
+ */
+ public void reverseOrder()
+ {
+ order = order * -1;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public int compare( Object o1, Object o2 )
+ {
+ String s1 = labelProvider.getColumnText( o1, column );
+ String s2 = labelProvider.getColumnText( o2, column );
+
+ return s1.compareToIgnoreCase( s2 ) * order;
+ }
}
}
\ No newline at end of file
diff --git a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersView.java b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersView.java
index 6cdc034..68712b8 100644
--- a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersView.java
+++ b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersView.java
@@ -149,14 +149,14 @@
TreeColumn serverColumn = new TreeColumn( tree, SWT.SINGLE );
serverColumn.setText( Messages.getString( "ServersView.server" ) ); //$NON-NLS-1$
serverColumn.setWidth( columnWidths[0] );
- serverColumn.addSelectionListener( getHeaderListener( 0 ) );
+ serverColumn.addSelectionListener( getColumnSelectionListener( 0 ) );
tree.setSortColumn( serverColumn );
tree.setSortDirection( SWT.UP );
TreeColumn stateColumn = new TreeColumn( tree, SWT.SINGLE );
stateColumn.setText( Messages.getString( "ServersView.state" ) ); //$NON-NLS-1$
stateColumn.setWidth( columnWidths[1] );
- stateColumn.addSelectionListener( getHeaderListener( 1 ) );
+ stateColumn.addSelectionListener( getColumnSelectionListener( 1 ) );
// Creating the viewer
tableViewer = new ServersTableViewer( tree );
@@ -172,27 +172,14 @@
}
- /**
- * Gets a header listener for the given column.
- *
- * @param col
- * the column
- * @return
- * a header listener for the given column
- */
- private SelectionListener getHeaderListener( final int col )
+ private SelectionListener getColumnSelectionListener( final int column )
{
return new SelectionAdapter()
{
- /**
- * Handles the case of user selecting the header area.
- */
public void widgetSelected( SelectionEvent e )
{
- if ( tableViewer == null )
- return;
- TreeColumn column = ( TreeColumn ) e.widget;
- tableViewer.resortTable( column, col );
+ TreeColumn treeColumn = ( TreeColumn ) e.widget;
+ tableViewer.sort( treeColumn, column );
}
};
}
diff --git a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersViewLabelProvider.java b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersViewLabelProvider.java
index ad68ad7..8252bf1 100644
--- a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersViewLabelProvider.java
+++ b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersViewLabelProvider.java
@@ -74,7 +74,7 @@
}
- return null;
+ return super.getText( element );
}
@@ -146,7 +146,7 @@
}
}
- return null;
+ return super.getImage( element );
}
diff --git a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersViewerComparator.java b/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersViewerComparator.java
deleted file mode 100644
index 919b816..0000000
--- a/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/views/ServersViewerComparator.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.apache.directory.studio.apacheds.views;
-
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-
-
-/**
- * This class implements the servers table viewer comparator.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public class ServersViewerComparator extends ViewerComparator
-{
- public static final int MAX_DEPTH = 3;
- public static final int ASCENDING = 1;
- public static final int DESCENDING = -1;
-
- protected ServersViewLabelProvider labelProvider;
-
- protected int[] priorities = new int[]
- { 0 };
-
- protected int[] directions = new int[]
- { ASCENDING };
-
-
- /**
- * Creates a new instance of ServersViewerComparator.
- *
- * @param labelProvider
- * the label provider
- */
- public ServersViewerComparator( ServersViewLabelProvider labelProvider )
- {
- this.labelProvider = labelProvider;
- }
-
-
- /**
- * Sets the top priority.
- *
- * @param priority
- * the priority
- */
- public void setTopPriority( int priority )
- {
- if ( priorities[0] == priority )
- {
- return;
- }
-
- int len = priorities.length + 1;
- if ( len > MAX_DEPTH )
- {
- len = MAX_DEPTH;
- }
-
- int[] temp = new int[len];
- System.arraycopy( priorities, 0, temp, 1, len - 1 );
- temp[0] = priority;
- priorities = temp;
-
- temp = new int[len];
- System.arraycopy( directions, 0, temp, 1, len - 1 );
- temp[0] = ASCENDING;
- directions = temp;
- }
-
-
- /**
- * Gets the top priority.
- *
- * @return
- * the top priority
- */
- public int getTopPriority()
- {
- return priorities[0];
- }
-
-
- /**
- * Sets the top priority direction
- *
- * @param direction
- * the direction
- */
- public void setTopPriorityDirection( int direction )
- {
- if ( direction == ASCENDING || direction == DESCENDING )
- {
- directions[0] = direction;
- }
- }
-
-
- /**
- * Gets the top priority direction
- *
- * @return
- * the top priority direction
- */
- public int getTopPriorityDirection()
- {
- return directions[0];
- }
-
-
- /**
- * Reverses the top priority
- */
- public void reverseTopPriority()
- {
- directions[0] *= -1;
- }
-
-
- /**
- * Returns a negative, zero, or positive number depending on whether
- * the first element is less than, equal to, or greater than
- * the second element.
- * <p>
- * The default implementation of this method is based on
- * comparing the elements' categories as computed by the <code>category</code>
- * framework method. Elements within the same category are further
- * subjected to a case insensitive compare of their label strings, either
- * as computed by the content viewer's label provider, or their
- * <code>toString</code> values in other cases. Subclasses may override.
- * </p>
- *
- * @param viewer the viewer
- * @param e1 the first element
- * @param e2 the second element
- * @param a the direction
- * @return a negative number if the first element is less than the
- * second element; the value <code>0</code> if the first element is
- * equal to the second element; and a positive number if the first
- * element is greater than the second element
- */
- public int compare( Viewer viewer, Object e1, Object e2, int a )
- {
- int col = priorities[a];
-
- String s1 = labelProvider.getColumnText( e1, col );
- String s2 = labelProvider.getColumnText( e2, col );
-
- int s = s1.compareToIgnoreCase( s2 ) * directions[a];
- if ( s == 0 )
- {
- if ( a == priorities.length - 1 )
- {
- return 0;
- }
- return compare( viewer, e1, e2, a + 1 );
- }
- return s;
- }
-
-
- /**
- * {@inheritDoc}
- */
- public int compare( Viewer viewer, Object e1, Object e2 )
- {
- return compare( viewer, e1, e2, 0 );
- }
-}
\ No newline at end of file
diff --git a/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/CommonCoreConstants.java b/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/CommonCoreConstants.java
index 16c387b..4ee513e 100644
--- a/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/CommonCoreConstants.java
+++ b/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/CommonCoreConstants.java
@@ -39,8 +39,8 @@
}
/** The plug-in ID */
- public static final String PLUGIN_ID = "org.apache.directory.studio.common.core";
+ public static final String PLUGIN_ID = "org.apache.directory.studio.common.core"; //$NON-NLS-1$
/** The Job family ID */
- public static final String JOB_FAMILY_ID = "org.apache.directory.studio.common.core.jobs.family";
+ public static final String JOB_FAMILY_ID = "org.apache.directory.studio.common.core.jobs.family"; //$NON-NLS-1$
}
diff --git a/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/StudioProgressMonitor.java b/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/StudioProgressMonitor.java
index 7c31de0..afe2d8d 100644
--- a/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/StudioProgressMonitor.java
+++ b/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/StudioProgressMonitor.java
@@ -47,7 +47,7 @@
{
/** The job reports progress and checks for cancellation. */
protected static Job reportProgressAndCheckCancellationJob = new Job(
- Messages.getString( "StudioProgressMonitor.CheckCancellation" ) )
+ Messages.getString( "StudioProgressMonitor.CheckCancellation" ) ) //$NON-NLS-1$
{
protected IStatus run( IProgressMonitor monitor )
{
@@ -337,18 +337,18 @@
// append explicit status message
if ( !StringUtils.isEmpty( statusMessage ) )
{
- message += "\n - " + statusMessage;
+ message += "\n - " + statusMessage; //$NON-NLS-1$
}
// append exception message if different to status message
if ( exception != null && exceptionMessage != null && !exceptionMessage.equals( statusMessage ) )
{
// strip control characters
- int indexOfAny = StringUtils.indexOfAny( exceptionMessage, "\n\r\t" );
+ int indexOfAny = StringUtils.indexOfAny( exceptionMessage, "\n\r\t" ); //$NON-NLS-1$
if ( indexOfAny > -1 )
{
exceptionMessage = exceptionMessage.substring( 0, indexOfAny - 1 );
}
- message += "\n - " + exceptionMessage;
+ message += "\n - " + exceptionMessage; //$NON-NLS-1$
}
}
diff --git a/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/StudioRunnableWithProgressAdapter.java b/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/StudioRunnableWithProgressAdapter.java
index 6f30bea..7e3ef41 100644
--- a/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/StudioRunnableWithProgressAdapter.java
+++ b/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/StudioRunnableWithProgressAdapter.java
@@ -46,6 +46,6 @@
*/
public String getErrorMessage()
{
- return "";
+ return ""; //$NON-NLS-1$
}
}
diff --git a/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/messages.properties b/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/messages.properties
index 9c96385..ed13e2b 100644
--- a/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/messages.properties
+++ b/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/messages.properties
@@ -15,6 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-AbstractStudioJob.ErrorMessage=An error occurred
-
StudioProgressMonitor.CheckCancellation=Check Cancellation
diff --git a/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/messages_de.properties b/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/messages_de.properties
index b19283d..19714b1 100644
--- a/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/messages_de.properties
+++ b/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/messages_de.properties
@@ -15,6 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-AbstractStudioJob.ErrorMessage=TODO:An error occurred
-
StudioProgressMonitor.CheckCancellation=TODO:Check Cancellation
diff --git a/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/messages_fr.properties b/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/messages_fr.properties
index e959154..221f7e4 100644
--- a/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/messages_fr.properties
+++ b/plugins/common.core/src/main/java/org/apache/directory/studio/common/core/jobs/messages_fr.properties
@@ -15,6 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-AbstractStudioJob.ErrorMessage=Une erreur est survenue
-
StudioProgressMonitor.CheckCancellation=Verifier l'annulation
diff --git a/plugins/common.ui/pom.xml b/plugins/common.ui/pom.xml
index 7f7aef1..cf773d3 100644
--- a/plugins/common.ui/pom.xml
+++ b/plugins/common.ui/pom.xml
@@ -66,9 +66,6 @@
<projectnature>org.eclipse.pde.PluginNature</projectnature>
<projectnature>org.eclipse.jdt.core.javanature</projectnature>
</additionalProjectnatures>
- <additionalProjects>
- <project>org.apache.directory.studio.connection.core</project>
- </additionalProjects>
<classpathContainers>
<classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
<classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
@@ -172,6 +169,8 @@
<exclude>**/*.vm</exclude>
<!-- OTHER_EXCLUDES -->
<exclude>src/main/java/org/apache/directory/studio/common/ui/filesystem/PathEditorInput.java</exclude>
+ <exclude>**/*.launch</exclude>
+ <exclude>**/maven-eclipse.xml</exclude>
</excludes>
</configuration>
</plugin>
diff --git a/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/HistoryUtils.java b/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/HistoryUtils.java
new file mode 100644
index 0000000..25f660e
--- /dev/null
+++ b/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/HistoryUtils.java
@@ -0,0 +1,97 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.directory.studio.common.ui;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.jface.dialogs.IDialogSettings;
+
+
+/**
+ * The HistoryUtils are used to save and load the history of input fields.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class HistoryUtils
+{
+ /**
+ * Saves the the given value under the given key in the dialog settings.
+ *
+ * @param dialogSettings the dialog settings
+ * @param key the key
+ * @param value the value
+ */
+ public static void save( IDialogSettings dialogSettings, String key, String value )
+ {
+ if ( dialogSettings != null )
+ {
+
+ // get current history
+ String[] history = load( dialogSettings, key );
+ List<String> list = new ArrayList<String>( Arrays.asList( history ) );
+
+ // add new value or move to first position
+ if ( list.contains( value ) )
+ {
+ list.remove( value );
+ }
+ list.add( 0, value );
+
+ // check history size
+ while ( list.size() > 20 )
+ {
+ list.remove( list.size() - 1 );
+ }
+
+ // save
+ history = list.toArray( new String[list.size()] );
+ dialogSettings.put( key, history );
+ }
+ }
+
+
+ /**
+ * Loads the value of the given key from the dialog settings
+ *
+ * @param dialogSettings the dialog settings
+ * @param key the key
+ * @return the value
+ */
+ public static String[] load( IDialogSettings dialogSettings, String key )
+ {
+ if ( dialogSettings != null )
+ {
+ String[] history = dialogSettings.getArray( key );
+
+ if ( history == null )
+ {
+ history = new String[0];
+ }
+
+ return history;
+ }
+
+ return new String[0];
+ }
+}
diff --git a/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/filesystem/PathEditorInput.java b/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/filesystem/PathEditorInput.java
index e95171c..7562306 100644
--- a/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/filesystem/PathEditorInput.java
+++ b/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/filesystem/PathEditorInput.java
@@ -1,13 +1,23 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
package org.apache.directory.studio.common.ui.filesystem;
@@ -21,57 +31,35 @@
/**
- * This EditorInput is used to open files that are located in the local file system.
- *
- * Inspired from org.eclipse.ui.internal.editors.text.NonExistingFileEditorInput.java
+ * This class defines an editor input based on the local file system path of a file.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class PathEditorInput implements IPathEditorInput, ILocationProvider
{
- /** The absolute path in local file system */
+ /** The path */
private IPath path;
/**
* Creates a new instance of PathEditorInput.
*
- * @param path the absolute path
+ * @param path the path
*/
public PathEditorInput( IPath path )
{
- if ( path == null )
- {
- throw new IllegalArgumentException();
- }
-
this.path = path;
}
/**
- * Returns hash code of the path.
+ * {@inheritDoc}
*/
- public int hashCode()
+ public boolean exists()
{
- return path.hashCode();
- }
-
-
- /**
- * This implemention just compares the names
- */
- public boolean equals( Object o )
- {
- if ( this == o )
+ if ( path != null )
{
- return true;
- }
-
- if ( o instanceof PathEditorInput )
- {
- PathEditorInput input = ( PathEditorInput ) o;
- return path.equals( input.path );
+ return path.toFile().exists();
}
return false;
@@ -80,53 +68,6 @@
/**
* {@inheritDoc}
- * */
- public boolean exists()
- {
- return path.toFile().exists();
- }
-
-
- /**
- * {@inheritDoc}
- * */
- public ImageDescriptor getImageDescriptor()
- {
- return PlatformUI.getWorkbench().getEditorRegistry().getImageDescriptor( path.toString() );
- }
-
-
- /**
- * Returns the file name only.
- */
- public String getName()
- {
- return path.toFile().getName();
- //return path.toString();
- }
-
-
- /**
- * Returns the complete path.
- */
- public String getToolTipText()
- {
- return path.makeRelative().toOSString();
- }
-
-
- /**
- * Returns the path.
- */
- public IPath getPath()
- {
- return path;
- }
-
-
- /**
- * An EditorInput must return a good ILocationProvider, otherwise
- * the editor is not editable.
*/
public Object getAdapter( Class adapter )
{
@@ -141,7 +82,58 @@
/**
* {@inheritDoc}
- * */
+ */
+ public ImageDescriptor getImageDescriptor()
+ {
+ return PlatformUI.getWorkbench().getEditorRegistry().getImageDescriptor( path.toString() );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getName()
+ {
+ if ( path != null )
+ {
+ return path.toFile().getName();
+ }
+
+ return "";
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public IPath getPath()
+ {
+ if ( path != null )
+ {
+ return path;
+ }
+
+ return null;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public IPath getPath( Object element )
+ {
+ if ( element instanceof PathEditorInput )
+ {
+ return ( ( PathEditorInput ) element ).getPath();
+ }
+
+ return null;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
public IPersistableElement getPersistable()
{
return null;
@@ -149,16 +141,54 @@
/**
- * Returns the path.
+ * {@inheritDoc}
*/
- public IPath getPath( Object element )
+ public String getToolTipText()
{
- if ( element instanceof PathEditorInput )
+ if ( path != null )
{
- PathEditorInput input = ( PathEditorInput ) element;
- return input.getPath();
+ return path.makeRelative().toOSString();
}
- return null;
+ return "";
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public int hashCode()
+ {
+ if ( path != null )
+ {
+ return path.hashCode();
+ }
+
+ return super.hashCode();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean equals( Object o )
+ {
+ if ( path != null )
+ {
+ // Shortcut
+ if ( this == o )
+ {
+ return true;
+ }
+
+ if ( o instanceof PathEditorInput )
+ {
+ PathEditorInput input = ( PathEditorInput ) o;
+
+ return path.equals( input.path );
+ }
+ }
+
+ return super.equals( o );
}
}
diff --git a/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/messages.properties b/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/messages.properties
index b1ac4b2..ec33b36 100644
--- a/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/messages.properties
+++ b/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/messages.properties
@@ -14,5 +14,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+
+CommonUIPlugin.UnableGetPluginProperties=Unable to get the plugin properties.
+
StudioPreferencePage.Description=Expand the tree to edit preferences for a specific feature.
StudioPreferencePage.Title=Apache Directory Studio
diff --git a/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/widgets/BaseWidgetUtils.java b/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/widgets/BaseWidgetUtils.java
index f6aeeeb..6e365e9 100644
--- a/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/widgets/BaseWidgetUtils.java
+++ b/plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/widgets/BaseWidgetUtils.java
@@ -468,6 +468,7 @@
Button button = new Button( parent, SWT.PUSH );
GridData gd = new GridData();
gd.widthHint = Dialog.convertHorizontalDLUsToPixels( fontMetrics, IDialogConstants.BUTTON_WIDTH );
+ gd.horizontalSpan = span;
button.setLayoutData( gd );
button.setText( text );
return button;
@@ -475,18 +476,20 @@
/**
- * Adds some space to indent radio buttons.
+ * Adds some space to .
*
* @param parent the parent
* @param span the horizontal span
+ * @return the create label representing the radio buttons indent
*/
- public static void createRadioIndent( Composite parent, int span )
+ public static Label createRadioIndent( Composite parent, int span )
{
Label l = new Label( parent, SWT.NONE );
GridData gd = new GridData();
gd.horizontalSpan = span;
gd.horizontalIndent = 22;
l.setLayoutData( gd );
+ return l;
}
@@ -495,31 +498,33 @@
*
* @param parent the parent
* @param span the horizontal span
+ * @return the create label representing the spacer
*/
- public static void createSpacer( Composite parent, int span )
+ public static Label createSpacer( Composite parent, int span )
{
Label l = new Label( parent, SWT.NONE );
- // GridData gd = new GridData(GridData.FILL_HORIZONTAL);
GridData gd = new GridData();
gd.horizontalSpan = span;
gd.heightHint = 1;
l.setLayoutData( gd );
+ return l;
}
/**
- * Creates a separator line.
+ * Creates a separator.
*
* @param parent the parent
* @param span the horizontal span
+ * @return the create label representing the separator
*/
- public static void createSeparator( Composite parent, int span )
+ public static Label createSeparator( Composite parent, int span )
{
Label l = new Label( parent, SWT.SEPARATOR | SWT.HORIZONTAL );
GridData gd = new GridData( GridData.FILL_HORIZONTAL );
gd.horizontalSpan = span;
- // gd.heightHint = 1;
l.setLayoutData( gd );
+ return l;
}
diff --git a/plugins/connection.core/pom.xml b/plugins/connection.core/pom.xml
index e6c5948..34ef9d2 100644
--- a/plugins/connection.core/pom.xml
+++ b/plugins/connection.core/pom.xml
@@ -196,6 +196,11 @@
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.mina.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
<artifactId>org.dom4j.dom4j</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionActionFilterAdapter.java b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionActionFilterAdapter.java
index 9a6b1f3..bbb0146 100644
--- a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionActionFilterAdapter.java
+++ b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionActionFilterAdapter.java
@@ -32,32 +32,32 @@
public class ConnectionActionFilterAdapter implements IActionFilter
{
// Identifier and value strings
- private static final String ID = "id";
- private static final String NAME = "name";
- private static final String HOST = "host";
- private static final String PORT = "port";
- private static final String ENCRYPTION_METHOD = "encryptionMethod";
- private static final String NETWORK_PROVIDER = "networkProvider";
- private static final String AUTH_METHOD = "authMethod";
- private static final String BIND_PRINCIPAL = "bindPrincipal";
- private static final String BIND_PASSWORD = "bindPassword";
- private static final String SASL_REALM = "saslRealm";
- private static final String SASL_QOP = "saslQop";
- private static final String SASL_SECURITY_STRENGTH = "saslSecurityStrength";
- private static final String SASL_MUTUAL_AUTHENTICATION = "saslMutualAuthentication";
- private static final String KRB5_CREDENTIAL_CONFIGURATION = "krb5CredentialConfiguration";
- private static final String KRB5_CONFIGURATION = "krb5Configuration";
- private static final String KRB5_CONFIGURATION_FILE = "krb5ConfigurationFile";
- private static final String KRB5_REALM = "krb5Realm";
- private static final String KRB5_KDC_HOST = "krb5KdcHost";
- private static final String KRB5_KDC_PORT = "krb5KdcPort";
- private static final String VENDOR_NAME = "vendorName";
- private static final String VENDOR_VERSION = "vendorVersion";
- private static final String SERVER_TYPE = "serverType";
- private static final String SUPPORTED_LDAP_VERSIONS = "supportedLdapVersions";
- private static final String SUPPORTED_CONTROLS = "supportedControls";
- private static final String SUPPORTED_EXTENSIONS = "supportedExtensions";
- private static final String SUPPORTED_FEATURES = "supportedFeatures";
+ private static final String ID = "id"; //$NON-NLS-1$
+ private static final String NAME = "name"; //$NON-NLS-1$
+ private static final String HOST = "host"; //$NON-NLS-1$
+ private static final String PORT = "port"; //$NON-NLS-1$
+ private static final String ENCRYPTION_METHOD = "encryptionMethod"; //$NON-NLS-1$
+ private static final String NETWORK_PROVIDER = "networkProvider"; //$NON-NLS-1$
+ private static final String AUTH_METHOD = "authMethod"; //$NON-NLS-1$
+ private static final String BIND_PRINCIPAL = "bindPrincipal"; //$NON-NLS-1$
+ private static final String BIND_PASSWORD = "bindPassword"; //$NON-NLS-1$
+ private static final String SASL_REALM = "saslRealm"; //$NON-NLS-1$
+ private static final String SASL_QOP = "saslQop"; //$NON-NLS-1$
+ private static final String SASL_SECURITY_STRENGTH = "saslSecurityStrength"; //$NON-NLS-1$
+ private static final String SASL_MUTUAL_AUTHENTICATION = "saslMutualAuthentication"; //$NON-NLS-1$
+ private static final String KRB5_CREDENTIAL_CONFIGURATION = "krb5CredentialConfiguration"; //$NON-NLS-1$
+ private static final String KRB5_CONFIGURATION = "krb5Configuration"; //$NON-NLS-1$
+ private static final String KRB5_CONFIGURATION_FILE = "krb5ConfigurationFile"; //$NON-NLS-1$
+ private static final String KRB5_REALM = "krb5Realm"; //$NON-NLS-1$
+ private static final String KRB5_KDC_HOST = "krb5KdcHost"; //$NON-NLS-1$
+ private static final String KRB5_KDC_PORT = "krb5KdcPort"; //$NON-NLS-1$
+ private static final String VENDOR_NAME = "vendorName"; //$NON-NLS-1$
+ private static final String VENDOR_VERSION = "vendorVersion"; //$NON-NLS-1$
+ private static final String SERVER_TYPE = "serverType"; //$NON-NLS-1$
+ private static final String SUPPORTED_LDAP_VERSIONS = "supportedLdapVersions"; //$NON-NLS-1$
+ private static final String SUPPORTED_CONTROLS = "supportedControls"; //$NON-NLS-1$
+ private static final String SUPPORTED_EXTENSIONS = "supportedExtensions"; //$NON-NLS-1$
+ private static final String SUPPORTED_FEATURES = "supportedFeatures"; //$NON-NLS-1$
/** The class instance */
private static ConnectionActionFilterAdapter INSTANCE = new ConnectionActionFilterAdapter();
@@ -111,7 +111,7 @@
// PORT
else if ( PORT.equals( name ) )
{
- return value.equals( "" + connection.getPort() );
+ return value.equals( "" + connection.getPort() ); //$NON-NLS-1$
}
// ENCRYPTION METHOD
else if ( ENCRYPTION_METHOD.equals( name ) )
@@ -156,7 +156,7 @@
// SASL MUTUAL AUTHENTICATION
else if ( SASL_MUTUAL_AUTHENTICATION.equals( name ) )
{
- return value.equals( connection.isSaslMutualAuthentication() ? "true" : "false" );
+ return value.equals( connection.isSaslMutualAuthentication() ? "true" : "false" ); //$NON-NLS-1$ //$NON-NLS-2$
}
// KRB5 CREDENTIAL CONFIGURATION
else if ( KRB5_CREDENTIAL_CONFIGURATION.equals( name ) )
@@ -186,12 +186,12 @@
// KRB5 KDC PORT
else if ( KRB5_KDC_PORT.equals( name ) )
{
- return value.equals( "" + connection.getKrb5KdcPort() );
+ return value.equals( "" + connection.getKrb5KdcPort() ); //$NON-NLS-1$
}
// VENDOR NAME
else if ( VENDOR_NAME.equals( name ) )
{
- return value.equals( "" + connection.getDetectedConnectionProperties().getVendorName() );
+ return value.equals( "" + connection.getDetectedConnectionProperties().getVendorName() ); //$NON-NLS-1$
}
// VENDOR VERSION
else if ( VENDOR_VERSION.equals( name ) )
@@ -204,7 +204,7 @@
// SERVER TYPE
else if ( SERVER_TYPE.equals( name ) )
{
- return value.equals( "" + connection.getDetectedConnectionProperties().getServerType().toString() );
+ return value.equals( "" + connection.getDetectedConnectionProperties().getServerType().toString() ); //$NON-NLS-1$
}
// SUPPORTED LDAP VERSIONS
else if ( SUPPORTED_LDAP_VERSIONS.equals( name ) )
diff --git a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCoreConstants.java b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCoreConstants.java
index fc1786d..4c7ac6b 100644
--- a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCoreConstants.java
+++ b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCoreConstants.java
@@ -83,4 +83,13 @@
/** The constant used to identify the KRB5 login module class name */
public static final String PREFERENCE_KRB5_LOGIN_MODULE = "krb5LoginModule"; //$NON-NLS-1$
+ /** The constant used to identify the default network provider setting */
+ public static final String PREFERENCE_DEFAULT_NETWORK_PROVIDER = "defaultNetworkProvider"; //$NON-NLS-1$
+
+ /** The constant used to identify the default network provider setting */
+ public static final int PREFERENCE_NETWORK_PROVIDER_JNDI = 0;
+
+ /** The constant used to identify the default network provider setting */
+ public static final int PREFERENCE_NETWORK_PROVIDER_APACHE_DIRECTORY_LDAP_API = 1;
+
}
diff --git a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java
index df1aa85..6e292b0 100644
--- a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java
+++ b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java
@@ -26,6 +26,7 @@
import java.util.List;
import java.util.PropertyResourceBundle;
+import org.apache.directory.studio.connection.core.ConnectionParameter.NetworkProvider;
import org.apache.directory.studio.connection.core.event.CoreEventRunner;
import org.apache.directory.studio.connection.core.event.EventRunner;
import org.apache.directory.studio.connection.core.io.jndi.LdifModificationLogger;
@@ -582,4 +583,37 @@
return defaultKrb5LoginModule;
}
+
+ /**
+ * Gets the default network provider from the preferences store.
+ *
+ * @return the default network provider
+ */
+ public NetworkProvider getDefaultNetworkProvider()
+ {
+ return getNetworkProvider( getPluginPreferences().getInt(
+ ConnectionCoreConstants.PREFERENCE_DEFAULT_NETWORK_PROVIDER ) );
+ }
+
+
+ /**
+ * Gets the network provider associated with the value.
+ *
+ * @param networkProviderValue the network provider value
+ *
+ * @return the network provider
+ */
+ public NetworkProvider getNetworkProvider( int networkProviderValue )
+ {
+ if ( networkProviderValue == ConnectionCoreConstants.PREFERENCE_NETWORK_PROVIDER_APACHE_DIRECTORY_LDAP_API )
+ {
+ return NetworkProvider.APACHE_DIRECTORY_LDAP_API;
+ }
+ else if ( networkProviderValue == ConnectionCoreConstants.PREFERENCE_NETWORK_PROVIDER_JNDI )
+ {
+ return NetworkProvider.JNDI;
+ }
+
+ return NetworkProvider.APACHE_DIRECTORY_LDAP_API;
+ }
}
diff --git a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePreferencesInitializer.java b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePreferencesInitializer.java
index 92e3a29..d513a2b 100644
--- a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePreferencesInitializer.java
+++ b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePreferencesInitializer.java
@@ -46,6 +46,8 @@
String defaultKrb5LoginModule = ConnectionCorePlugin.getDefault().getDefaultKrb5LoginModule();
preferences.setDefault( ConnectionCoreConstants.PREFERENCE_KRB5_LOGIN_MODULE, defaultKrb5LoginModule );
preferences.setDefault( ConnectionCoreConstants.PREFERENCE_USE_KRB5_SYSTEM_PROPERTIES, false );
+ preferences.setDefault( ConnectionCoreConstants.PREFERENCE_DEFAULT_NETWORK_PROVIDER,
+ ConnectionCoreConstants.PREFERENCE_NETWORK_PROVIDER_APACHE_DIRECTORY_LDAP_API );
// Modification Logs
preferences.setDefault( ConnectionCoreConstants.PREFERENCE_MODIFICATIONLOGS_ENABLE, true );
diff --git a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionParameter.java b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionParameter.java
index b3cc262..efa3a96 100644
--- a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionParameter.java
+++ b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionParameter.java
@@ -64,10 +64,10 @@
*/
public enum NetworkProvider
{
- /** No encryption. */
+ /** JNDI */
JNDI,
- /** SSL encryption. */
+ /** Apache Directory LDAP API */
APACHE_DIRECTORY_LDAP_API
}
@@ -741,7 +741,7 @@
String s = extendedProperties.get( key );
if ( s != null )
{
- String[] array = s.split( ";" );
+ String[] array = s.split( ";" ); //$NON-NLS-1$
if ( ( array != null ) && ( array.length > 0 ) )
{
return new ArrayList<String>( Arrays.asList( array ) );
diff --git a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DetectedConnectionProperties.java b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DetectedConnectionProperties.java
index d6d20c6..fee8af4 100644
--- a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DetectedConnectionProperties.java
+++ b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DetectedConnectionProperties.java
@@ -33,28 +33,28 @@
public class DetectedConnectionProperties
{
/** The key for the connection parameter "Vendor name" */
- private static final String CONNECTION_PARAMETER_VENDOR_NAME = "detectedProperties.vendorName";
+ private static final String CONNECTION_PARAMETER_VENDOR_NAME = "detectedProperties.vendorName"; //$NON-NLS-1$
/** The key for the connection parameter "Vendor version" */
- private static final String CONNECTION_PARAMETER_VENDOR_VERSION = "detectedProperties.vendorVersion";
+ private static final String CONNECTION_PARAMETER_VENDOR_VERSION = "detectedProperties.vendorVersion"; //$NON-NLS-1$
/** The key for the connection parameter "Server type" */
- private static final String CONNECTION_PARAMETER_SERVER_TYPE = "detectedProperties.serverType";
+ private static final String CONNECTION_PARAMETER_SERVER_TYPE = "detectedProperties.serverType"; //$NON-NLS-1$
/** The key for the connection parameter "Supported LDAP versions" */
- private static final String CONNECTION_PARAMETER_SUPPORTED_LDAP_VERSIONS = "detectedProperties.supportedLdapVersions";
+ private static final String CONNECTION_PARAMETER_SUPPORTED_LDAP_VERSIONS = "detectedProperties.supportedLdapVersions"; //$NON-NLS-1$
/** The key for the connection parameter "Supported SASL mechanisms" */
- private static final String CONNECTION_PARAMETER_SUPPORTED_SASL_MECHANISMS = "detectedProperties.supportedSaslMechanisms";
+ private static final String CONNECTION_PARAMETER_SUPPORTED_SASL_MECHANISMS = "detectedProperties.supportedSaslMechanisms"; //$NON-NLS-1$
/** The key for the connection parameter "Supported controls" */
- private static final String CONNECTION_PARAMETER_SUPPORTED_CONTROLS = "detectedProperties.supportedControls";
+ private static final String CONNECTION_PARAMETER_SUPPORTED_CONTROLS = "detectedProperties.supportedControls"; //$NON-NLS-1$
/** The key for the connection parameter "Supported extensions" */
- private static final String CONNECTION_PARAMETER_SUPPORTED_EXTENSIONS = "detectedProperties.supportedExtensions";
+ private static final String CONNECTION_PARAMETER_SUPPORTED_EXTENSIONS = "detectedProperties.supportedExtensions"; //$NON-NLS-1$
/** The key for the connection parameter "Supported features" */
- private static final String CONNECTION_PARAMETER_SUPPORTED_FEATURES = "detectedProperties.supportedFeatures";
+ private static final String CONNECTION_PARAMETER_SUPPORTED_FEATURES = "detectedProperties.supportedFeatures"; //$NON-NLS-1$
/** The connection */
private Connection connection;
diff --git a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Messages.java b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Messages.java
index f530684..cbe8d37 100644
--- a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Messages.java
+++ b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Messages.java
@@ -56,7 +56,6 @@
public static String error__unable_to_create_connection_listener;
public static String error__unable_to_create_jndi_logger;
public static String error__unable_to_get_plugin_properties;
- public static String error__loop_detected;
public static String error__connection_is_readonly;
public static String error__untrusted_certificate;
diff --git a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioControl.java b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioControl.java
index e2b07c4..d1812d6 100644
--- a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioControl.java
+++ b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioControl.java
@@ -46,20 +46,20 @@
/**
* The subentries control as defined in RFC 3672.
*/
- public static final StudioControl SUBENTRIES_CONTROL = new StudioControl( "Subentries", "1.3.6.1.4.1.4203.1.10.1",
+ public static final StudioControl SUBENTRIES_CONTROL = new StudioControl( "Subentries", "1.3.6.1.4.1.4203.1.10.1", //$NON-NLS-1$ //$NON-NLS-2$
false, new byte[]
{ 0x01, 0x01, ( byte ) 0xFF } );
/**
* The Manage DSA IT control as defined in RFC 3296.
*/
- public static final StudioControl MANAGEDSAIT_CONTROL = new StudioControl( "Manage DSA IT",
- "2.16.840.1.113730.3.4.2", false, null );
+ public static final StudioControl MANAGEDSAIT_CONTROL = new StudioControl( "Manage DSA IT", //$NON-NLS-1$
+ "2.16.840.1.113730.3.4.2", false, null ); //$NON-NLS-1$
/**
* The Tree Delete control as defined in draft-armijo-ldap-treedelete-02.
*/
- public static final StudioControl TREEDELETE_CONTROL = new StudioControl( "Tree Delete", "1.2.840.113556.1.4.805",
+ public static final StudioControl TREEDELETE_CONTROL = new StudioControl( "Tree Delete", "1.2.840.113556.1.4.805", //$NON-NLS-1$ //$NON-NLS-2$
false, null );
/** The symbolic name. */
@@ -94,7 +94,7 @@
public StudioControl( String name, String oid, boolean critical, byte[] controlValue )
{
super();
- this.name = name == null ? "" : name;
+ this.name = name == null ? "" : name; //$NON-NLS-1$
this.oid = oid;
this.critical = critical;
this.controlValue = controlValue;
@@ -152,7 +152,7 @@
{
if ( oid == null )
{
- return "";
+ return ""; //$NON-NLS-1$
}
LdifControlLine line = LdifControlLine.create( getOid(), isCritical(), getControlValue() );
diff --git a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioPagedResultsControl.java b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioPagedResultsControl.java
index 7930c7b..4d2c024 100644
--- a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioPagedResultsControl.java
+++ b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioPagedResultsControl.java
@@ -38,10 +38,10 @@
private static final long serialVersionUID = -6219375680879062812L;
/** The OID of Simple Paged Search Control (1.2.840.113556.1.4.319) */
- public static final String OID = "1.2.840.113556.1.4.319";
+ public static final String OID = "1.2.840.113556.1.4.319"; //$NON-NLS-1$
/** The name of Simple Paged Search Control. */
- public static final String NAME = "Simple Paged Results";
+ public static final String NAME = "Simple Paged Results"; //$NON-NLS-1$
/** The page size. */
private int size;
diff --git a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java
index 2d678af..908cb50 100644
--- a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java
+++ b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java
@@ -51,7 +51,7 @@
{
try
{
- oidDescriptions = ResourceBundle.getBundle( "org.apache.directory.studio.connection.core.OIDDescriptions" );
+ oidDescriptions = ResourceBundle.getBundle( "org.apache.directory.studio.connection.core.OIDDescriptions" ); //$NON-NLS-1$
}
catch ( Exception e )
{
@@ -66,7 +66,7 @@
try
{
resultCodeDescriptions = ResourceBundle
- .getBundle( "org.apache.directory.studio.connection.core.ResultCodeDescriptions" );
+ .getBundle( "org.apache.directory.studio.connection.core.ResultCodeDescriptions" ); //$NON-NLS-1$
}
catch ( Exception e )
{
@@ -112,7 +112,7 @@
{
try
{
- return resultCodeDescriptions.getString( "" + code );
+ return resultCodeDescriptions.getString( "" + code ); //$NON-NLS-1$
}
catch ( MissingResourceException ignored )
{
@@ -255,7 +255,7 @@
*/
public static String getSimpleNormalizedUrl( LdapUrl url )
{
- return url.getScheme() + ( url.getHost() != null ? Strings.toLowerCase( url.getHost() ) : "" ) + ":" + url.getPort();
+ return url.getScheme() + ( url.getHost() != null ? Strings.toLowerCase( url.getHost() ) : "" ) + ":" + url.getPort(); //$NON-NLS-1$ //$NON-NLS-2$
}
diff --git a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionEventRegistry.java b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionEventRegistry.java
index e6281d6..39e759b 100644
--- a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionEventRegistry.java
+++ b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/event/ConnectionEventRegistry.java
@@ -94,7 +94,7 @@
if ( fireTimeStamps.size() > 5 )
{
- String message = "Warning: More then " + fireTimeStamps.size() + " events were fired per second!";
+ String message = "Warning: More then " + fireTimeStamps.size() + " events were fired per second!"; //$NON-NLS-1$ //$NON-NLS-2$
ConnectionCorePlugin.getDefault().getLog().log(
new Status( IStatus.WARNING, ConnectionCoreConstants.PLUGIN_ID, message,
new Exception( message ) ) );
diff --git a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java
index 8a0cfe9..ec1580f 100644
--- a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java
+++ b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java
@@ -31,6 +31,7 @@
import org.apache.directory.shared.ldap.model.constants.SaslQoP;
import org.apache.directory.shared.ldap.model.constants.SaslSecurityStrength;
+import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
import org.apache.directory.studio.connection.core.ConnectionFolder;
import org.apache.directory.studio.connection.core.ConnectionParameter;
import org.apache.directory.studio.connection.core.ConnectionParameter.AuthenticationMethod;
@@ -77,6 +78,7 @@
private static final String KRB5_REALM_TAG = "krb5Realm"; //$NON-NLS-1$
private static final String KRB5_KDC_HOST_TAG = "krb5KdcHost"; //$NON-NLS-1$
private static final String KRB5_KDC_PORT_TAG = "krb5KdcPort"; //$NON-NLS-1$
+ private static final String READ_ONLY_TAG = "readOnly"; //$NON-NLS-1$
private static final String EXTENDED_PROPERTIES_TAG = "extendedProperties"; //$NON-NLS-1$
private static final String EXTENDED_PROPERTY_TAG = "extendedProperty"; //$NON-NLS-1$
@@ -214,7 +216,7 @@
}
else
{
- connection.setNetworkProvider( NetworkProvider.JNDI );
+ connection.setNetworkProvider( ConnectionCorePlugin.getDefault().getDefaultNetworkProvider() );
}
// Auth Method
@@ -258,14 +260,23 @@
Attribute saslQopAttribute = element.attribute( SASL_QOP_TAG );
if ( saslQopAttribute != null )
{
- if ( "AUTH_INT_PRIV".equals( saslQopAttribute.getValue() ) )
+ if ( "AUTH_INT_PRIV".equals( saslQopAttribute.getValue() ) ) //$NON-NLS-1$
{
// Used for legacy setting (before we used SaslQop enum from Shared)
connection.setSaslQop( SaslQoP.AUTH_CONF );
}
else
{
- connection.setSaslQop( SaslQoP.valueOf( saslQopAttribute.getValue() ) );
+ try
+ {
+ connection.setSaslQop( SaslQoP.valueOf( saslQopAttribute.getValue() ) );
+ }
+ catch ( IllegalArgumentException e )
+ {
+ throw new ConnectionIOException( "Unable to parse 'SASL Quality of Protection' of connection '" //$NON-NLS-1$
+ + connection.getName() + "' as int value. SASL Quality of Protection value :" //$NON-NLS-1$
+ + saslQopAttribute.getValue() );
+ }
}
}
@@ -273,7 +284,16 @@
Attribute saslSecStrengthAttribute = element.attribute( SASL_SEC_STRENGTH_TAG );
if ( saslSecStrengthAttribute != null )
{
- connection.setSaslSecurityStrength( SaslSecurityStrength.valueOf( saslSecStrengthAttribute.getValue() ) );
+ try
+ {
+ connection.setSaslSecurityStrength( SaslSecurityStrength.valueOf( saslSecStrengthAttribute.getValue() ) );
+ }
+ catch ( IllegalArgumentException e )
+ {
+ throw new ConnectionIOException( "Unable to parse 'SASL Security Strength' of connection '" //$NON-NLS-1$
+ + connection.getName() + "' as int value. SASL Security Strength value :" //$NON-NLS-1$
+ + saslSecStrengthAttribute.getValue() );
+ }
}
// SASL Mutual Authentication
@@ -287,15 +307,33 @@
Attribute krb5CredentialsConf = element.attribute( KRB5_CREDENTIALS_CONF_TAG );
if ( krb5CredentialsConf != null )
{
- connection.setKrb5CredentialConfiguration( Krb5CredentialConfiguration.valueOf( krb5CredentialsConf
- .getValue() ) );
+ try
+ {
+ connection.setKrb5CredentialConfiguration( Krb5CredentialConfiguration.valueOf( krb5CredentialsConf
+ .getValue() ) );
+ }
+ catch ( IllegalArgumentException e )
+ {
+ throw new ConnectionIOException( "Unable to parse 'KRB5 Credentials Conf' of connection '" //$NON-NLS-1$
+ + connection.getName() + "' as int value. KRB5 Credentials Conf value :" //$NON-NLS-1$
+ + krb5CredentialsConf.getValue() );
+ }
}
// KRB5 Configuration
Attribute krb5Config = element.attribute( KRB5_CONFIG_TAG );
if ( krb5Config != null )
{
- connection.setKrb5Configuration( Krb5Configuration.valueOf( krb5Config.getValue() ) );
+ try
+ {
+ connection.setKrb5Configuration( Krb5Configuration.valueOf( krb5Config.getValue() ) );
+ }
+ catch ( IllegalArgumentException e )
+ {
+ throw new ConnectionIOException( "Unable to parse 'KRB5 Configuration' of connection '" //$NON-NLS-1$
+ + connection.getName() + "' as int value. KRB5 Configuration value :" //$NON-NLS-1$
+ + krb5Config.getValue() );
+ }
}
// KRB5 Configuration File
@@ -323,7 +361,22 @@
Attribute krb5KdcPort = element.attribute( KRB5_KDC_PORT_TAG );
if ( krb5KdcPort != null )
{
- connection.setKrb5KdcPort( Integer.valueOf( krb5KdcPort.getValue() ) );
+ try
+ {
+ connection.setKrb5KdcPort( Integer.valueOf( krb5KdcPort.getValue() ) );
+ }
+ catch ( NumberFormatException e )
+ {
+ throw new ConnectionIOException( "Unable to parse 'KRB5 KDC Port' of connection '" + connection.getName() //$NON-NLS-1$
+ + "' as int value. KRB5 KDC Port value :" + krb5KdcPort.getValue() ); //$NON-NLS-1$
+ }
+ }
+
+ // Read Only
+ Attribute readOnly = element.attribute( READ_ONLY_TAG );
+ if ( readOnly != null )
+ {
+ connection.setReadOnly( Boolean.parseBoolean( readOnly.getValue() ) );
}
// Extended Properties
@@ -453,6 +506,9 @@
// KRB5 KDC Port
connectionElement.addAttribute( KRB5_KDC_PORT_TAG, "" + connection.getKrb5KdcPort() ); //$NON-NLS-1$
+ // Read Only
+ connectionElement.addAttribute( READ_ONLY_TAG, "" + connection.isReadOnly() ); //$NON-NLS-1$
+
// Extended Properties
Element extendedPropertiesElement = connectionElement.addElement( EXTENDED_PROPERTIES_TAG );
Map<String, String> extendedProperties = connection.getExtendedProperties();
diff --git a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java
index e585bf1..84dd88c 100644
--- a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java
+++ b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java
@@ -254,7 +254,7 @@
*/
public boolean hasMoreElements()
{
- throw new UnsupportedOperationException( "Call hasMore() instead of hasMoreElements() !" );
+ throw new UnsupportedOperationException( "Call hasMore() instead of hasMoreElements() !" ); //$NON-NLS-1$
}
@@ -317,7 +317,7 @@
*/
public StudioSearchResult nextElement()
{
- throw new UnsupportedOperationException( "Call next() instead of nextElement() !" );
+ throw new UnsupportedOperationException( "Call next() instead of nextElement() !" ); //$NON-NLS-1$
}
diff --git a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
index f8a3f04..38f3ff7 100644
--- a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
+++ b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
@@ -27,6 +27,7 @@
import java.util.List;
import javax.naming.ContextNotEmptyException;
+import javax.naming.NameAlreadyBoundException;
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
@@ -47,6 +48,7 @@
import org.apache.directory.ldap.client.api.LdapConnectionConfig;
import org.apache.directory.ldap.client.api.LdapNetworkConnection;
import org.apache.directory.ldap.client.api.exception.InvalidConnectionException;
+import org.apache.directory.shared.ldap.codec.api.DefaultConfigurableBinaryAttributeDetector;
import org.apache.directory.shared.ldap.codec.protocol.mina.LdapProtocolCodecActivator;
import org.apache.directory.shared.ldap.model.cursor.SearchCursor;
import org.apache.directory.shared.ldap.model.entry.AttributeUtils;
@@ -118,6 +120,9 @@
/** The LDAP Connection */
private LdapNetworkConnection ldapConnection;
+ /** The binary attribute detector */
+ private DefaultConfigurableBinaryAttributeDetector binaryAttributeDetector;
+
/** Indicates if the wrapper is connected */
private boolean isConnected = false;
@@ -178,8 +183,8 @@
ldapConnectionConfig = new LdapConnectionConfig();
ldapConnectionConfig.setLdapHost( connection.getHost() );
ldapConnectionConfig.setLdapPort( connection.getPort() );
- ldapConnectionConfig.setName( connection.getBindPrincipal() );
- ldapConnectionConfig.setCredentials( connection.getBindPassword() );
+ binaryAttributeDetector = new DefaultConfigurableBinaryAttributeDetector();
+ ldapConnectionConfig.setBinaryAttributeDetector( binaryAttributeDetector );
if ( ( connection.getEncryptionMethod() == EncryptionMethod.LDAPS )
|| ( connection.getEncryptionMethod() == EncryptionMethod.START_TLS ) )
{
@@ -239,7 +244,6 @@
if ( ldapConnection != null )
{
ldapConnection.close();
-
}
}
catch ( Exception exception )
@@ -249,6 +253,7 @@
finally
{
ldapConnection = null;
+ binaryAttributeDetector = null;
}
}
}
@@ -286,9 +291,9 @@
// ignore
}
ldapConnection = null;
+ binaryAttributeDetector = null;
}
isConnected = false;
- System.gc();
}
@@ -321,111 +326,125 @@
{
BindResponse bindResponse = null;
- // Setup credentials
- IAuthHandler authHandler = ConnectionCorePlugin.getDefault().getAuthHandler();
- if ( authHandler == null )
- {
- Exception exception = new Exception( Messages.model__no_auth_handler );
- monitor.setCanceled( true );
- monitor.reportError( Messages.model__no_auth_handler, exception );
- throw exception;
- }
- ICredentials credentials = authHandler.getCredentials( connection.getConnectionParameter() );
- if ( credentials == null )
- {
- Exception exception = new Exception();
- monitor.setCanceled( true );
- monitor.reportError( Messages.model__no_credentials, exception );
- throw exception;
- }
- if ( credentials.getBindPrincipal() == null || credentials.getBindPassword() == null )
- {
- Exception exception = new Exception( Messages.model__no_credentials );
- monitor.reportError( Messages.model__no_credentials, exception );
- throw exception;
- }
- bindPrincipal = credentials.getBindPrincipal();
- bindPassword = credentials.getBindPassword();
-
- // Simple Authentication
- if ( connection.getConnectionParameter().getAuthMethod() == ConnectionParameter.AuthenticationMethod.SIMPLE )
+ // No Authentication
+ if ( connection.getConnectionParameter().getAuthMethod() == ConnectionParameter.AuthenticationMethod.NONE )
{
BindRequest bindRequest = new BindRequestImpl();
- bindRequest.setName( new Dn( bindPrincipal ) );
- bindRequest.setCredentials( bindPassword );
bindResponse = ldapConnection.bind( bindRequest );
}
- // CRAM-MD5 Authentication
- else if ( connection.getConnectionParameter().getAuthMethod() == ConnectionParameter.AuthenticationMethod.SASL_CRAM_MD5 )
+ else
{
- CramMd5Request cramMd5Request = new CramMd5Request();
- cramMd5Request.setUsername( bindPrincipal );
- cramMd5Request.setCredentials( bindPassword );
- cramMd5Request.setQualityOfProtection( connection.getConnectionParameter().getSaslQop() );
- cramMd5Request.setSecurityStrength( connection.getConnectionParameter()
- .getSaslSecurityStrength() );
- cramMd5Request.setMutualAuthentication( connection.getConnectionParameter()
- .isSaslMutualAuthentication() );
-
- bindResponse = ldapConnection.bind( cramMd5Request );
- }
- // DIGEST-MD5 Authentication
- else if ( connection.getConnectionParameter().getAuthMethod() == ConnectionParameter.AuthenticationMethod.SASL_DIGEST_MD5 )
- {
- DigestMd5Request digestMd5Request = new DigestMd5Request();
- digestMd5Request.setUsername( bindPrincipal );
- digestMd5Request.setCredentials( bindPassword );
- digestMd5Request.setRealmName( connection.getConnectionParameter().getSaslRealm() );
- digestMd5Request.setQualityOfProtection( connection.getConnectionParameter().getSaslQop() );
- digestMd5Request.setSecurityStrength( connection.getConnectionParameter()
- .getSaslSecurityStrength() );
- digestMd5Request.setMutualAuthentication( connection.getConnectionParameter()
- .isSaslMutualAuthentication() );
-
- bindResponse = ldapConnection.bind( digestMd5Request );
- }
- // GSSAPI Authentication
- else if ( connection.getConnectionParameter().getAuthMethod() == ConnectionParameter.AuthenticationMethod.SASL_GSSAPI )
- {
- GssApiRequest gssApiRequest = new GssApiRequest();
-
- Preferences preferences = ConnectionCorePlugin.getDefault().getPluginPreferences();
- boolean useKrb5SystemProperties = preferences
- .getBoolean( ConnectionCoreConstants.PREFERENCE_USE_KRB5_SYSTEM_PROPERTIES );
- String krb5LoginModule = preferences
- .getString( ConnectionCoreConstants.PREFERENCE_KRB5_LOGIN_MODULE );
-
- if ( !useKrb5SystemProperties )
+ // Setup credentials
+ IAuthHandler authHandler = ConnectionCorePlugin.getDefault().getAuthHandler();
+ if ( authHandler == null )
{
- gssApiRequest.setUsername( bindPrincipal );
- gssApiRequest.setCredentials( bindPassword );
- gssApiRequest.setQualityOfProtection( connection
- .getConnectionParameter().getSaslQop() );
- gssApiRequest.setSecurityStrength( connection
- .getConnectionParameter()
- .getSaslSecurityStrength() );
- gssApiRequest.setMutualAuthentication( connection
- .getConnectionParameter()
- .isSaslMutualAuthentication() );
- gssApiRequest
- .setLoginModuleConfiguration( new InnerConfiguration(
- krb5LoginModule ) );
-
- switch ( connection.getConnectionParameter().getKrb5Configuration() )
- {
- case FILE:
- gssApiRequest.setKrb5ConfFilePath( connection.getConnectionParameter()
- .getKrb5ConfigurationFile() );
- break;
- case MANUAL:
- gssApiRequest.setRealmName( connection.getConnectionParameter().getKrb5Realm() );
- gssApiRequest.setKdcHost( connection.getConnectionParameter().getKrb5KdcHost() );
- gssApiRequest.setKdcPort( connection.getConnectionParameter().getKrb5KdcPort() );
- break;
- }
+ Exception exception = new Exception( Messages.model__no_auth_handler );
+ monitor.setCanceled( true );
+ monitor.reportError( Messages.model__no_auth_handler, exception );
+ throw exception;
}
+ ICredentials credentials = authHandler.getCredentials( connection.getConnectionParameter() );
+ if ( credentials == null )
+ {
+ Exception exception = new Exception();
+ monitor.setCanceled( true );
+ monitor.reportError( Messages.model__no_credentials, exception );
+ throw exception;
+ }
+ if ( credentials.getBindPrincipal() == null || credentials.getBindPassword() == null )
+ {
+ Exception exception = new Exception( Messages.model__no_credentials );
+ monitor.reportError( Messages.model__no_credentials, exception );
+ throw exception;
+ }
+ bindPrincipal = credentials.getBindPrincipal();
+ bindPassword = credentials.getBindPassword();
- bindResponse = ldapConnection.bind( gssApiRequest );
+ // Simple Authentication
+ if ( connection.getConnectionParameter().getAuthMethod() == ConnectionParameter.AuthenticationMethod.SIMPLE )
+ {
+ BindRequest bindRequest = new BindRequestImpl();
+ bindRequest.setName( bindPrincipal );
+ bindRequest.setCredentials( bindPassword );
+ bindResponse = ldapConnection.bind( bindRequest );
+ }
+ // CRAM-MD5 Authentication
+ else if ( connection.getConnectionParameter().getAuthMethod() == ConnectionParameter.AuthenticationMethod.SASL_CRAM_MD5 )
+ {
+ CramMd5Request cramMd5Request = new CramMd5Request();
+ cramMd5Request.setUsername( bindPrincipal );
+ cramMd5Request.setCredentials( bindPassword );
+ cramMd5Request
+ .setQualityOfProtection( connection.getConnectionParameter().getSaslQop() );
+ cramMd5Request.setSecurityStrength( connection.getConnectionParameter()
+ .getSaslSecurityStrength() );
+ cramMd5Request.setMutualAuthentication( connection.getConnectionParameter()
+ .isSaslMutualAuthentication() );
+
+ bindResponse = ldapConnection.bind( cramMd5Request );
+ }
+ // DIGEST-MD5 Authentication
+ else if ( connection.getConnectionParameter().getAuthMethod() == ConnectionParameter.AuthenticationMethod.SASL_DIGEST_MD5 )
+ {
+ DigestMd5Request digestMd5Request = new DigestMd5Request();
+ digestMd5Request.setUsername( bindPrincipal );
+ digestMd5Request.setCredentials( bindPassword );
+ digestMd5Request.setRealmName( connection.getConnectionParameter().getSaslRealm() );
+ digestMd5Request.setQualityOfProtection( connection.getConnectionParameter()
+ .getSaslQop() );
+ digestMd5Request.setSecurityStrength( connection.getConnectionParameter()
+ .getSaslSecurityStrength() );
+ digestMd5Request.setMutualAuthentication( connection.getConnectionParameter()
+ .isSaslMutualAuthentication() );
+
+ bindResponse = ldapConnection.bind( digestMd5Request );
+ }
+ // GSSAPI Authentication
+ else if ( connection.getConnectionParameter().getAuthMethod() == ConnectionParameter.AuthenticationMethod.SASL_GSSAPI )
+ {
+ GssApiRequest gssApiRequest = new GssApiRequest();
+
+ Preferences preferences = ConnectionCorePlugin.getDefault().getPluginPreferences();
+ boolean useKrb5SystemProperties = preferences
+ .getBoolean( ConnectionCoreConstants.PREFERENCE_USE_KRB5_SYSTEM_PROPERTIES );
+ String krb5LoginModule = preferences
+ .getString( ConnectionCoreConstants.PREFERENCE_KRB5_LOGIN_MODULE );
+
+ if ( !useKrb5SystemProperties )
+ {
+ gssApiRequest.setUsername( bindPrincipal );
+ gssApiRequest.setCredentials( bindPassword );
+ gssApiRequest.setQualityOfProtection( connection
+ .getConnectionParameter().getSaslQop() );
+ gssApiRequest.setSecurityStrength( connection
+ .getConnectionParameter()
+ .getSaslSecurityStrength() );
+ gssApiRequest.setMutualAuthentication( connection
+ .getConnectionParameter()
+ .isSaslMutualAuthentication() );
+ gssApiRequest
+ .setLoginModuleConfiguration( new InnerConfiguration(
+ krb5LoginModule ) );
+
+ switch ( connection.getConnectionParameter().getKrb5Configuration() )
+ {
+ case FILE:
+ gssApiRequest.setKrb5ConfFilePath( connection.getConnectionParameter()
+ .getKrb5ConfigurationFile() );
+ break;
+ case MANUAL:
+ gssApiRequest.setRealmName( connection.getConnectionParameter()
+ .getKrb5Realm() );
+ gssApiRequest.setKdcHost( connection.getConnectionParameter()
+ .getKrb5KdcHost() );
+ gssApiRequest.setKdcPort( connection.getConnectionParameter()
+ .getKrb5KdcPort() );
+ break;
+ }
+ }
+
+ bindResponse = ldapConnection.bind( gssApiRequest );
+ }
}
checkResponse( bindResponse );
@@ -474,6 +493,17 @@
*/
public void setBinaryAttributes( Collection<String> binaryAttributes )
{
+ if ( binaryAttributeDetector != null )
+ {
+ // Clear the initial list
+ binaryAttributeDetector.setBinaryAttributes( new String[0] );
+
+ // Add each binary attribute
+ for ( String binaryAttribute : binaryAttributes )
+ {
+ binaryAttributeDetector.addBinaryAttribute( binaryAttribute );
+ }
+ }
}
@@ -664,7 +694,8 @@
{
if ( connection.isReadOnly() )
{
- monitor.reportError( NLS.bind( Messages.error__connection_is_readonly, connection.getName() ) );
+ monitor
+ .reportError( new Exception( NLS.bind( Messages.error__connection_is_readonly, connection.getName() ) ) );
return;
}
@@ -738,8 +769,10 @@
* an array of modification items
* @return
* an array of converted modifications
+ * @throws LdapInvalidAttributeValueException
*/
private Modification[] convertModificationItems( ModificationItem[] modificationItems )
+ throws LdapInvalidAttributeValueException
{
if ( modificationItems != null )
{
@@ -749,15 +782,7 @@
{
Modification modification = new DefaultModification();
- try
- {
- modification.setAttribute( AttributeUtils.toApiAttribute( modificationItem.getAttribute() ) );
- }
- catch ( LdapInvalidAttributeValueException liave )
- {
- // TODO : handle the exception
- }
-
+ modification.setAttribute( AttributeUtils.toApiAttribute( modificationItem.getAttribute() ) );
modification.setOperation( convertModificationOperation( modificationItem.getModificationOp() ) );
modifications.add( modification );
}
@@ -806,7 +831,8 @@
{
if ( connection.isReadOnly() )
{
- monitor.reportError( NLS.bind( Messages.error__connection_is_readonly, connection.getName() ) );
+ monitor
+ .reportError( new Exception( NLS.bind( Messages.error__connection_is_readonly, connection.getName() ) ) );
return;
}
@@ -877,7 +903,8 @@
{
if ( connection.isReadOnly() )
{
- monitor.reportError( NLS.bind( Messages.error__connection_is_readonly, connection.getName() ) );
+ monitor
+ .reportError( new Exception( NLS.bind( Messages.error__connection_is_readonly, connection.getName() ) ) );
return;
}
@@ -945,7 +972,8 @@
{
if ( connection.isReadOnly() )
{
- monitor.reportError( NLS.bind( Messages.error__connection_is_readonly, connection.getName() ) );
+ monitor
+ .reportError( new Exception( NLS.bind( Messages.error__connection_is_readonly, connection.getName() ) ) );
return;
}
@@ -1123,7 +1151,6 @@
}
isConnected = false;
ldapConnection = null;
- System.gc();
}
isConnected = false;
}
@@ -1178,15 +1205,15 @@
HashMap<String, Object> options = new HashMap<String, Object>();
// TODO: this only works for Sun JVM
- options.put( "refreshKrb5Config", "true" );
+ options.put( "refreshKrb5Config", "true" ); //$NON-NLS-1$ //$NON-NLS-2$
switch ( connection.getConnectionParameter().getKrb5CredentialConfiguration() )
{
case USE_NATIVE:
- options.put( "useTicketCache", "true" );
- options.put( "doNotPrompt", "true" );
+ options.put( "useTicketCache", "true" ); //$NON-NLS-1$ //$NON-NLS-2$
+ options.put( "doNotPrompt", "true" ); //$NON-NLS-1$ //$NON-NLS-2$
break;
case OBTAIN_TGT:
- options.put( "doNotPrompt", "false" );
+ options.put( "doNotPrompt", "false" ); //$NON-NLS-1$ //$NON-NLS-2$
break;
}
@@ -1224,11 +1251,18 @@
LdapResult ldapResult = response.getLdapResult();
if ( ldapResult != null )
{
- // NOT_ALLOWED_ON_NON_LEAF error (thrown when deleting a entry with children
+ // NOT_ALLOWED_ON_NON_LEAF error (thrown when deleting an entry with children)
if ( ResultCodeEnum.NOT_ALLOWED_ON_NON_LEAF.equals( ldapResult.getResultCode() ) )
{
throw new ContextNotEmptyException( ldapResult.getDiagnosticMessage() );
}
+ // ENTRY_ALREADY_EXISTS error
+ // (We need this conversion in the case where this error is thrown during an LDIF
+ // import with the "Update existing entries" flag turned on)
+ else if ( ResultCodeEnum.ENTRY_ALREADY_EXISTS.equals( ldapResult.getResultCode() ) )
+ {
+ throw new NameAlreadyBoundException( ldapResult.getDiagnosticMessage() );
+ }
// Different from SUCCESS, we throw a generic exception
else if ( !ResultCodeEnum.SUCCESS.equals( ldapResult.getResultCode() ) )
{
@@ -1242,8 +1276,8 @@
message = Utils.getResultCodeDescription( code );
}
- throw new Exception( NLS.bind( "[LDAP: error code {0} - {1}]", new String[]
- { code + "", message } ) );
+ throw new Exception( NLS.bind( "[LDAP: error code {0} - {1}]", new String[] //$NON-NLS-1$
+ { code + "", message } ) ); //$NON-NLS-1$
}
}
}
diff --git a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java
index fef2340..1051d6e 100644
--- a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java
+++ b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java
@@ -240,7 +240,6 @@
context = null;
}
isConnected = false;
- System.gc();
}
@@ -434,7 +433,8 @@
{
if ( connection.isReadOnly() )
{
- monitor.reportError( NLS.bind( Messages.error__connection_is_readonly, connection.getName() ) );
+ monitor
+ .reportError( new Exception( NLS.bind( Messages.error__connection_is_readonly, connection.getName() ) ) );
return;
}
@@ -540,7 +540,8 @@
{
if ( connection.isReadOnly() )
{
- monitor.reportError( NLS.bind( Messages.error__connection_is_readonly, connection.getName() ) );
+ monitor
+ .reportError( new Exception( NLS.bind( Messages.error__connection_is_readonly, connection.getName() ) ) );
return;
}
@@ -646,7 +647,8 @@
{
if ( connection.isReadOnly() )
{
- monitor.reportError( NLS.bind( Messages.error__connection_is_readonly, connection.getName() ) );
+ monitor
+ .reportError( new Exception( NLS.bind( Messages.error__connection_is_readonly, connection.getName() ) ) );
return;
}
@@ -748,7 +750,8 @@
{
if ( connection.isReadOnly() )
{
- monitor.reportError( NLS.bind( Messages.error__connection_is_readonly, connection.getName() ) );
+ monitor
+ .reportError( new Exception( NLS.bind( Messages.error__connection_is_readonly, connection.getName() ) ) );
return;
}
@@ -975,30 +978,39 @@
authMethod = AUTHMETHOD_GSSAPI;
}
- // setup credentials
- IAuthHandler authHandler = ConnectionCorePlugin.getDefault().getAuthHandler();
- if ( authHandler == null )
+ // No Authentication
+ if ( authMethod == AUTHMETHOD_NONE )
{
- NamingException namingException = new NamingException( Messages.model__no_auth_handler );
- monitor.reportError( Messages.model__no_auth_handler, namingException );
- throw namingException;
+ bindPrincipal = ""; //$NON-NLS-1$
+ bindCredentials = ""; //$NON-NLS-1$
}
- ICredentials credentials = authHandler.getCredentials( connection.getConnectionParameter() );
- if ( credentials == null )
+ else
{
- CancelException cancelException = new CancelException();
- monitor.setCanceled( true );
- monitor.reportError( Messages.model__no_credentials, cancelException );
- throw cancelException;
+ // setup credentials
+ IAuthHandler authHandler = ConnectionCorePlugin.getDefault().getAuthHandler();
+ if ( authHandler == null )
+ {
+ NamingException namingException = new NamingException( Messages.model__no_auth_handler );
+ monitor.reportError( Messages.model__no_auth_handler, namingException );
+ throw namingException;
+ }
+ ICredentials credentials = authHandler.getCredentials( connection.getConnectionParameter() );
+ if ( credentials == null )
+ {
+ CancelException cancelException = new CancelException();
+ monitor.setCanceled( true );
+ monitor.reportError( Messages.model__no_credentials, cancelException );
+ throw cancelException;
+ }
+ if ( credentials.getBindPrincipal() == null || credentials.getBindPassword() == null )
+ {
+ NamingException namingException = new NamingException( Messages.model__no_credentials );
+ monitor.reportError( Messages.model__no_credentials, namingException );
+ throw namingException;
+ }
+ bindPrincipal = credentials.getBindPrincipal();
+ bindCredentials = credentials.getBindPassword();
}
- if ( credentials.getBindPrincipal() == null || credentials.getBindPassword() == null )
- {
- NamingException namingException = new NamingException( Messages.model__no_credentials );
- monitor.reportError( Messages.model__no_credentials, namingException );
- throw namingException;
- }
- bindPrincipal = credentials.getBindPrincipal();
- bindCredentials = credentials.getBindPassword();
InnerRunnable runnable = new InnerRunnable()
{
@@ -1035,7 +1047,7 @@
// Request mutual authentication
if ( connection.getConnectionParameter().isSaslMutualAuthentication() )
{
- context.addToEnvironment( Sasl.SERVER_AUTH, "true" );
+ context.addToEnvironment( Sasl.SERVER_AUTH, "true" ); //$NON-NLS-1$
}
else
{
@@ -1124,28 +1136,28 @@
{
case DEFAULT:
// nothing
- System.clearProperty( "java.security.krb5.conf" );
+ System.clearProperty( "java.security.krb5.conf" ); //$NON-NLS-1$
break;
case FILE:
// use specified krb5.conf
- System.setProperty( "java.security.krb5.conf", connection.getConnectionParameter()
+ System.setProperty( "java.security.krb5.conf", connection.getConnectionParameter() //$NON-NLS-1$
.getKrb5ConfigurationFile() );
break;
case MANUAL:
// write manual config parameters to connection specific krb5.conf file
- String fileName = Utils.getFilenameString( connection.getId() ) + ".krb5.conf";
+ String fileName = Utils.getFilenameString( connection.getId() ) + ".krb5.conf"; //$NON-NLS-1$
configFile = ConnectionCorePlugin.getDefault().getStateLocation().append( fileName ).toFile();
String realm = connection.getConnectionParameter().getKrb5Realm();
String host = connection.getConnectionParameter().getKrb5KdcHost();
int port = connection.getConnectionParameter().getKrb5KdcPort();
StringBuilder sb = new StringBuilder();
- sb.append( "[libdefaults]" ).append( ConnectionCoreConstants.LINE_SEPARATOR );
- sb.append( "default_realm = " ).append( realm ).append( ConnectionCoreConstants.LINE_SEPARATOR );
- sb.append( "[realms]" ).append( ConnectionCoreConstants.LINE_SEPARATOR );
- sb.append( realm ).append( " = {" ).append( ConnectionCoreConstants.LINE_SEPARATOR );
- sb.append( "kdc = " ).append( host ).append( ":" ).append( port ).append(
+ sb.append( "[libdefaults]" ).append( ConnectionCoreConstants.LINE_SEPARATOR ); //$NON-NLS-1$
+ sb.append( "default_realm = " ).append( realm ).append( ConnectionCoreConstants.LINE_SEPARATOR ); //$NON-NLS-1$
+ sb.append( "[realms]" ).append( ConnectionCoreConstants.LINE_SEPARATOR ); //$NON-NLS-1$
+ sb.append( realm ).append( " = {" ).append( ConnectionCoreConstants.LINE_SEPARATOR ); //$NON-NLS-1$
+ sb.append( "kdc = " ).append( host ).append( ":" ).append( port ).append( //$NON-NLS-1$ //$NON-NLS-2$
ConnectionCoreConstants.LINE_SEPARATOR );
- sb.append( "}" ).append( ConnectionCoreConstants.LINE_SEPARATOR );
+ sb.append( "}" ).append( ConnectionCoreConstants.LINE_SEPARATOR ); //$NON-NLS-1$
try
{
FileUtils.writeStringToFile( configFile, sb.toString() );
@@ -1156,7 +1168,7 @@
ne.setRootCause( ioe );
throw ne;
}
- System.setProperty( "java.security.krb5.conf", configFile.getAbsolutePath() );
+ System.setProperty( "java.security.krb5.conf", configFile.getAbsolutePath() ); //$NON-NLS-1$
}
// Use our custom configuration so we don't need to mess with external configuration
@@ -1270,7 +1282,6 @@
}
isConnected = false;
context = null;
- System.gc();
}
isConnected = false;
}
@@ -1325,15 +1336,15 @@
HashMap<String, Object> options = new HashMap<String, Object>();
// TODO: this only works for Sun JVM
- options.put( "refreshKrb5Config", "true" );
+ options.put( "refreshKrb5Config", "true" ); //$NON-NLS-1$ //$NON-NLS-2$
switch ( connection.getConnectionParameter().getKrb5CredentialConfiguration() )
{
case USE_NATIVE:
- options.put( "useTicketCache", "true" );
- options.put( "doNotPrompt", "true" );
+ options.put( "useTicketCache", "true" ); //$NON-NLS-1$ //$NON-NLS-2$
+ options.put( "doNotPrompt", "true" ); //$NON-NLS-1$ //$NON-NLS-2$
break;
case OBTAIN_TGT:
- options.put( "doNotPrompt", "false" );
+ options.put( "doNotPrompt", "false" ); //$NON-NLS-1$ //$NON-NLS-2$
break;
}
diff --git a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java
index ebcf4c3..353c704 100644
--- a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java
+++ b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java
@@ -180,7 +180,7 @@
*/
public boolean hasMoreElements()
{
- throw new UnsupportedOperationException( "Call hasMore() instead of hasMoreElements() !" );
+ throw new UnsupportedOperationException( "Call hasMore() instead of hasMoreElements() !" ); //$NON-NLS-1$
}
@@ -228,7 +228,7 @@
*/
public StudioSearchResult nextElement()
{
- throw new UnsupportedOperationException( "Call next() instead of nextElement() !" );
+ throw new UnsupportedOperationException( "Call next() instead of nextElement() !" ); //$NON-NLS-1$
}
@@ -298,13 +298,13 @@
public SearchResult nextElement()
{
- throw new UnsupportedOperationException( "Call next() instead of nextElement() !" );
+ throw new UnsupportedOperationException( "Call next() instead of nextElement() !" ); //$NON-NLS-1$
}
public boolean hasMoreElements()
{
- throw new UnsupportedOperationException( "Call hasMore() instead of hasMoreElements() !" );
+ throw new UnsupportedOperationException( "Call hasMore() instead of hasMoreElements() !" ); //$NON-NLS-1$
}
diff --git a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/messages.properties b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/messages.properties
index 8944d9b..876c7f2 100644
--- a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/messages.properties
+++ b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/messages.properties
@@ -16,15 +16,14 @@
# under the License.
copy_n_of_s=Copy {0}of {1}
-error__execute_connection_initializer=Exception occured while executing connection initializer.
+error__execute_connection_initializer=Exception occurred while executing connection initializer.
error__invalid_rdn=RDN is invalid
error__saving_connections=Error while saving connections.
error__loading_connections=Error while loading connections.
error__unable_to_create_connection_listener=Unable to create connection listener.
error__unable_to_create_jndi_logger=Unable to create JNDI logger.
error__unable_to_get_plugin_properties=Unable to get the plugin properties.
-error__loop_detected=Loop detected while following referral: {0}
-error__connection_is_readonly=Connection '{0}' is read only.
+error__connection_is_readonly=Connection ''{0}'' is read only.
error__untrusted_certificate=Untrusted certificate.
model__no_auth_handler=No authentification handler
diff --git a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/messages_de.properties b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/messages_de.properties
index d72db23..c9a12b7 100644
--- a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/messages_de.properties
+++ b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/messages_de.properties
@@ -23,7 +23,7 @@
error__unable_to_create_connection_listener=Connection Listener konnte nicht initialisiert werden.
error__unable_to_create_jndi_logger=JNDI Logger konnte nicht initialisiert werden
error__unable_to_get_plugin_properties=Plugin properties nicht gefunden.
-error__connection_is_readonly=Verbindung '{0}' ist schreibgesch\u00FCtzt."
+error__connection_is_readonly=Verbindung ''{0}'' ist schreibgesch\u00FCtzt."
error__untrusted_certificate=Nichtvertrauliches Zertifikat.
model__no_auth_handler=Kein Authentifizierungs-Handhaber
diff --git a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/messages_fr.properties b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/messages_fr.properties
index 2d4362d..b3f1a2c 100644
--- a/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/messages_fr.properties
+++ b/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/messages_fr.properties
@@ -23,8 +23,7 @@
error__unable_to_create_connection_listener=Impossible de cr\u00E9er l'\u00E9couteur de connexion.
error__unable_to_create_jndi_logger=Impossible de cr\u00E9er le loggueur JNDI.
error__unable_to_get_plugin_properties=Impossible de r\u00E9cup\u00E9rer les propri\u00E9t\u00E9s du plugin.
-error__loop_detected=Une boucle a \u00E9t\u00E9 d\u00E9tect\u00E9 en suivant le r\u00E9f\u00E9rent suivant: {0}
-error__connection_is_readonly=La connexion '{0}' est en lecture seule.
+error__connection_is_readonly=La connexion ''{0}'' est en lecture seule.
error__untrusted_certificate=Certificat non fiable.
model__no_auth_handler=Pas de gestionnaire d'authentification
diff --git a/plugins/connection.core/src/main/resources/org/apache/directory/studio/connection/core/OIDDescriptions.properties b/plugins/connection.core/src/main/resources/org/apache/directory/studio/connection/core/OIDDescriptions.properties
index 9985886..24cfd9a 100644
--- a/plugins/connection.core/src/main/resources/org/apache/directory/studio/connection/core/OIDDescriptions.properties
+++ b/plugins/connection.core/src/main/resources/org/apache/directory/studio/connection/core/OIDDescriptions.properties
@@ -601,8 +601,6 @@
# RFC 2307
1.3.6.1.1.1.0.1=Boot parameter
-
-
# Microsoft Active Directory: attribute types
1.2.840.113556.1.4.2=objectGUID
1.2.840.113556.1.4.146=objectSid
@@ -615,5 +613,166 @@
1.2.840.113556.1.4.906=Large Integer
1.2.840.113556.1.4.907=Object Security Descriptor
+# From ldap_enu.pdf
+2.16.840.1.113719.1.27.100.1=ndsToLdapResponse
+2.16.840.1.113719.1.27.100.2=ndsToLdapRequest
+2.16.840.1.113719.1.27.100.3=createNamingContextRequest
+2.16.840.1.113719.1.27.100.4=createNamingContextResponse
+2.16.840.1.113719.1.27.100.5=mergeNamingContextRequest
+2.16.840.1.113719.1.27.100.6=mergeNamingContextResponse
+2.16.840.1.113719.1.27.100.7=addReplicaRequest
+2.16.840.1.113719.1.27.100.8=addReplicaResponse
+2.16.840.1.113719.1.27.100.9=refreshLDAPServerRequest
+2.16.840.1.113719.1.27.100.10=refreshLDAPServerResponse
+2.16.840.1.113719.1.27.100.11=removeReplicaRequest
+2.16.840.1.113719.1.27.100.12=removeReplicaResponse
+2.16.840.1.113719.1.27.100.13=namingContextEntryCountRequest
+2.16.840.1.113719.1.27.100.14=namingContextEntryCountResponse
+2.16.840.1.113719.1.27.100.15=changeReplicaTypeRequest
+2.16.840.1.113719.1.27.100.16=changeReplicaTypeResponse
+2.16.840.1.113719.1.27.100.17=getReplicaInfoRequest
+2.16.840.1.113719.1.27.100.18=getReplicaInfoResponse
+2.16.840.1.113719.1.27.100.19=listReplicaRequest
+2.16.840.1.113719.1.27.100.20=listReplicaResponse
+2.16.840.1.113719.1.27.100.21=receiveAllUpdatesRequest
+2.16.840.1.113719.1.27.100.22=receiveAllUpdatesResponse
+2.16.840.1.113719.1.27.100.23=sendAllUpdatesRequest
+2.16.840.1.113719.1.27.100.24=sendAllUpdatesResponse
+2.16.840.1.113719.1.27.100.25=requestNamingContextSyncRequest
+2.16.840.1.113719.1.27.100.26=requestNamingContextSyncResponse
+2.16.840.1.113719.1.27.100.27=requestSchemaSyncRequest
+2.16.840.1.113719.1.27.100.28=requestSchemaSyncResponse
+2.16.840.1.113719.1.27.100.29=abortNamingContextOperationRequest
+2.16.840.1.113719.1.27.100.30=abortNamingContextOperationResponse
+2.16.840.1.113719.1.27.100.31=getContextIdentityNameRequest
+2.16.840.1.113719.1.27.100.32=getContextIdentityNameResponse
+2.16.840.1.113719.1.27.100.33=getEffectivePrivilegesRequest
+2.16.840.1.113719.1.27.100.34=getEffectivePrivilegesResponse
+2.16.840.1.113719.1.27.100.35=setReplicationFilterRequest
+2.16.840.1.113719.1.27.100.37=getReplicationFilterRequest
+2.16.840.1.113719.1.27.100.39=createOrphanPartitionrequest
+2.16.840.1.113719.1.27.100.41=removeOrphanPartitionRequest
+2.16.840.1.113719.1.27.100.43=triggerBKLinkerRequest
+2.16.840.1.113719.1.27.100.45=triggerDRLProcessRequest
+2.16.840.1.113719.1.27.100.47=triggerJanitorRequest
+2.16.840.1.113719.1.27.100.49=triggerLimberRequest
+2.16.840.1.113719.1.27.100.51=triggerSkulkerRequest
+2.16.840.1.113719.1.27.100.53=triggerSchemaSyncRequest
+2.16.840.1.113719.1.27.100.55=triggerPartitionPurgeRequest
+2.16.840.1.113719.1.27.100.79=EventMonitorRequest
+2.16.840.1.113719.1.27.100.84=filteredEventMonitorRequest
+2.16.840.1.113719.1.27.103.1=createGroupingRequest
+2.16.840.1.113719.1.27.103.2=endGroupingRequest
+2.16.840.1.113719.1.148.100.1=Put Login Configuration
+2.16.840.1.113719.1.148.100.3=Get Login Configuration
+2.16.840.1.113719.1.148.100.5=Delete Login Configuration
+2.16.840.1.113719.1.148.100.7=Put Login Secret
+2.16.840.1.113719.1.148.100.9=Delete Login Secret
+2.16.840.1.113719.1.148.100.11=Set Universal Password
+2.16.840.1.113719.1.148.100.13=Get Universal Password
+2.16.840.1.113719.1.148.100.15=Delete Universal Password
+2.16.840.1.113719.1.148.100.17=Check password against password policy
+2.16.840.1.113719.1.39.42.100.19=Get password policy information
+2.16.840.1.113719.1.39.42.100.21=Change Universal Password
+2.16.840.1.113719.1.39.42.100.23=Graded Authentication management
+2.16.840.1.113719.1.39.42.100.25=NMAS management (new with NMAS 3.1.0)
+2.16.840.1.113719.1.148.100.1=SSLDAP_GET_SERVICE_INFO_REQUEST
+2.16.840.1.113719.1.148.100.2=SSLDAP_GET_SERVICE_INFO_REPLY
+2.16.840.1.113719.1.148.100.3=SSLDAP_READ_SECRET_REQUEST
+2.16.840.1.113719.1.148.100.4=SSLDAP_READ_SECRET_REPLY
+2.16.840.1.113719.1.148.100.5=SSLDAP_WRITE_SECRET_REQUEST
+2.16.840.1.113719.1.148.100.6=SSLDAP_WRITE_SECRET_REPLY
+2.16.840.1.113719.1.148.100.7=SSLDAP_ADD_SECRET_ID_REQUEST
+2.16.840.1.113719.1.148.100.8=SSLDAP_ADD_SECRET_ID_REPLY
+2.16.840.1.113719.1.148.100.9=SSLDAP_REMOVE_SECRET_REQUEST
+2.16.840.1.113719.1.148.100.10=SSLDAP_REMOVE_SECRET_REPLY
+2.16.840.1.113719.1.148.100.11=SSLDAP_REMOVE_SECRET_STORE_REQUEST
+2.16.840.1.113719.1.148.100.12=SSLDAP_REMOVE_SECRET_STORE_REPLY
+2.16.840.1.113719.1.148.100.13=SSLDAP_ENUMERATE_SECRET_IDS_REQUEST
+2.16.840.1.113719.1.148.100.14=SSLDAP_ENUMERATE_SECRET_IDS_REPLY
+2.16.840.1.113719.1.148.100.15=SSLDAP_UNLOCK_SECRETS_REQUEST
+2.16.840.1.113719.1.148.100.16=SSLDAP_UNLOCK_SECRETS_REPLY
+2.16.840.1.113719.1.148.100.17=SSLDAP_SET_EP_MASTER_PASSWORD_REQUEST
+2.16.840.1.113719.1.148.100.18=SSLDAP_SET_EP_MASTER_PASSWORD_REPLY
+2.16.840.1.113719.1.142.100.1=startFramedProtocolRequest
+2.16.840.1.113719.1.142.100.2=startFramedProtocolResponse
+2.16.840.1.113719.1.142.100.4=endFramedProtocolRequest
+2.16.840.1.113719.1.142.100.5=endFramedProtocolResponse
+2.16.840.1.113719.1.142.100.6=lburpOperationRequest
+2.16.840.1.113719.1.142.100.7=lburpOperationResponse
+2.16.840.1.113719.1.27.100.96=LDAPBackupRequest
+2.16.840.1.113719.1.27.100.97=LDAPBackupResponse
+2.16.840.1.113719.1.27.100.98=LDAPRestoreRequest
+# From eDirectory 8.8 LDAP Transactions documentation
+2.16.840.1.113719.1.27.103.7=GroupingControl
+# Identity Manager (DirXML) from Javadocs
+2.16.840.1.113719.1.14.100.57=AbortJobRequest
+2.16.840.1.113719.1.14.100.61=CheckJobConfigRequest
+2.16.840.1.113719.1.14.100.62=CheckJobConfigResponse
+2.16.840.1.113719.1.14.100.37=CheckObjectPasswordRequest
+2.16.840.1.113719.1.14.100.38=CheckObjectPasswordResponse
+2.16.840.1.113719.1.14.100.69=ClearAppPasswordRequest
+2.16.840.1.113719.1.14.100.5=ClearDriverSetRequest
+2.16.840.1.113719.1.14.100.65=ClearLogEventsRequest
+2.16.840.1.113719.1.14.100.73=ClearRemoteLoaderPasswordRequest
+2.16.840.1.113719.1.14.100.41=DeleteCacheEntriesRequest
+2.16.840.1.113719.1.14.100.51=DiscoverJobsRequest
+2.16.840.1.113719.1.14.100.52=DiscoverJobsResponse
+2.16.840.1.113719.1.14.100.21=DriverGetSchemaRequest
+2.16.840.1.113719.1.14.100.23=DriverResyncRequest
+2.16.840.1.113719.1.14.100.33=GetChunkedResultRequest
+2.16.840.1.113719.1.14.100.34=GetChunkedResultResponse
+2.16.840.1.113719.1.14.100.1=GetDriverSetRequest
+2.16.840.1.113719.1.14.100.2=GetDriverSetResponse
+2.16.840.1.113719.1.14.100.7=GetDriverStartOptionRequest
+2.16.840.1.113719.1.14.100.8=GetDriverStartOptionResponse
+2.16.840.1.113719.1.14.100.13=GetDriverStateRequest
+2.16.840.1.113719.1.14.100.14=GetDriverStateResponse
+2.16.840.1.113719.1.14.100.19=GetDriverStatsRequest
+2.16.840.1.113719.1.14.100.20=GetDriverStatsResponse
+2.16.840.1.113719.1.14.100.59=GetJobStateRequest
+2.16.840.1.113719.1.14.100.60=GetJobStateResponse
+2.16.840.1.113719.1.14.100.45=GetPasswordsStateRequest
+2.16.840.1.113719.1.14.100.46=GetPasswordsStateResponse
+2.16.840.1.113719.1.14.100.49=GetServerCertRequest
+2.16.840.1.113719.1.14.100.50=GetServerCertResponse
+2.16.840.1.113719.1.14.100.11=GetVersionRequest
+2.16.840.1.113719.1.14.100.12=GetVersionResponse
+2.16.840.1.113719.1.14.100.39=InitDriverObjectRequest
+2.16.840.1.113719.1.14.100.81=ListNamedPasswordsRequest
+2.16.840.1.113719.1.14.100.82=ListNamedPasswordsResponse
+2.16.840.1.113719.1.14.100.25=MigrateAppRequest
+2.16.840.1.113719.1.14.100.53=NotifyJobUpdateRequest
+2.16.840.1.113719.1.14.100.27=QueueEventRequest
+2.16.840.1.113719.1.14.100.47=RegenerateKeyRequest
+2.16.840.1.113719.1.14.100.79=RemoveAllNamedPasswordsRequest
+2.16.840.1.113719.1.14.100.77=RemoveNamedPasswordRequest
+2.16.840.1.113719.1.14.100.67=SetAppPasswordRequest
+2.16.840.1.113719.1.14.100.3=SetDriverSetRequest
+2.16.840.1.113719.1.14.100.9=SetDriverStartOptionRequest
+2.16.840.1.113719.1.14.100.63=SetLogEventsRequest
+2.16.840.1.113719.1.14.100.75=SetNamedPasswordRequest
+2.16.840.1.113719.1.14.100.71=SetRemoteLoaderPasswordRequest
+2.16.840.1.113719.1.14.100.15=StartDriverRequest
+2.16.840.1.113719.1.14.100.55=StartJobRequest
+2.16.840.1.113719.1.14.100.17=StopDriverRequest
+2.16.840.1.113719.1.14.100.29=SubmitCommandRequest
+2.16.840.1.113719.1.14.100.30=SubmitCommandResponse
+2.16.840.1.113719.1.14.100.31=SubmitEventRequest
+2.16.840.1.113719.1.14.100.32=SubmitEventResponse
+2.16.840.1.113719.1.14.100.41=ViewCacheEntriesRequest
+2.16.840.1.113719.1.14.100.42=ViewCacheEntriesResponse
+2.16.840.1.113719.1.14.100.91=GetNamedPasswordRequest
+2.16.840.1.113719.1.14.100.92=GetNamedPasswordResponse
+
+# From TID
+2.16.840.1.113719.1.27.101.5=Simple Password Control
+
+# From Google
+2.16.840.1.113719.1.27.101.6=Create forward reference request
+
+# From eDirectory 8.8 documentation
+# Stored in supportedGroupingTypes attribute
+2.16.840.1.113719.1.27.103.8=transactionGroupingType
diff --git a/plugins/connection.ui/pom.xml b/plugins/connection.ui/pom.xml
index 398172e..c368340 100644
--- a/plugins/connection.ui/pom.xml
+++ b/plugins/connection.ui/pom.xml
@@ -66,9 +66,6 @@
<projectnature>org.eclipse.pde.PluginNature</projectnature>
<projectnature>org.eclipse.jdt.core.javanature</projectnature>
</additionalProjectnatures>
- <additionalProjects>
- <project>org.apache.directory.studio.connection.core</project>
- </additionalProjects>
<classpathContainers>
<classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
<classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
@@ -113,6 +110,7 @@
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.connection.ui.ConnectionUIPlugin</Bundle-Activator>
<Require-Bundle>org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
+ org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.studio.common.core,
@@ -158,12 +156,17 @@
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.commons.lang</artifactId>
+ <artifactId>org.apache.commons.codec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.commons.codec</artifactId>
+ <artifactId>org.apache.commons.io</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.commons.lang</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/plugins/connection.ui/resources/icons/certificate_export_wizard.gif b/plugins/connection.ui/resources/icons/certificate_export_wizard.gif
new file mode 100644
index 0000000..5c966c1
--- /dev/null
+++ b/plugins/connection.ui/resources/icons/certificate_export_wizard.gif
Binary files differ
diff --git a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java
index 469b5cd..e536622 100644
--- a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java
+++ b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java
@@ -93,6 +93,9 @@
/** The collapse all image */
public static final String IMG_COLLAPSEALL = "resources/icons/collapseall.gif"; //$NON-NLS-1$
+ /** The export certificate wizard image */
+ public static final String IMG_CERTIFICATE_EXPORT_WIZARD = "resources/icons/certificate_export_wizard.gif"; //$NON-NLS-1$
+
public static final String TYPENAME = ConnectionUIPlugin.getDefault().getPluginProperties()
.getString( "ConnectionTransfert_Typename" ); //$NON-NLS-1$
diff --git a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java
index 11a1c8c..6e21cb4 100644
--- a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java
+++ b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java
@@ -212,7 +212,7 @@
// 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, "org.apache.directory.studio.connection.ui", Status.OK, //$NON-NLS-1$
- Messages.getString( "CommonUIPlugin.UnableGetPluginProperties" ), e ) ); //$NON-NLS-1$
+ Messages.getString( "ConnectionUIPlugin.UnableGetPluginProperties" ), e ) ); //$NON-NLS-1$
}
}
diff --git a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/UIAuthHandler.java b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/UIAuthHandler.java
index 7fff8de..fbf7c0c 100644
--- a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/UIAuthHandler.java
+++ b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/UIAuthHandler.java
@@ -44,7 +44,6 @@
*/
public ICredentials getCredentials( final ConnectionParameter connectionParameter )
{
-
if ( connectionParameter.getBindPrincipal() == null || "".equals( connectionParameter.getBindPrincipal() ) ) //$NON-NLS-1$
{
return new Credentials( "", "", connectionParameter ); //$NON-NLS-1$ //$NON-NLS-2$
@@ -87,7 +86,5 @@
return new Credentials( connectionParameter.getBindPrincipal(), pw[0], connectionParameter );
}
}
-
}
-
}
diff --git a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateInfoDialog.java b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateInfoDialog.java
index 9558d82..afc1ab0 100644
--- a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateInfoDialog.java
+++ b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateInfoDialog.java
@@ -33,7 +33,7 @@
/**
- * Dialog to show dialog information.
+ * Dialog to show certificate information.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
diff --git a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateTrustDialog.java b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateTrustDialog.java
index e674be5..ec834e1 100644
--- a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateTrustDialog.java
+++ b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/CertificateTrustDialog.java
@@ -104,7 +104,7 @@
protected void createButtonsForButtonBar( Composite parent )
{
createButton( parent, IDialogConstants.DETAILS_ID, Messages
- .getString( "CertificateTrustDialog.ViewCertificate" ), false );
+ .getString( "CertificateTrustDialog.ViewCertificate" ), false ); //$NON-NLS-1$
createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, false );
}
diff --git a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/ConnectionsPreferencePage.java b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/ConnectionsPreferencePage.java
index 3214f0e..5bfc459 100644
--- a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/ConnectionsPreferencePage.java
+++ b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/preferences/ConnectionsPreferencePage.java
@@ -24,6 +24,7 @@
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.core.ConnectionCoreConstants;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
+import org.apache.directory.studio.connection.core.ConnectionParameter.NetworkProvider;
import org.apache.directory.studio.connection.ui.ConnectionUIPlugin;
import org.eclipse.core.runtime.Preferences;
import org.eclipse.jface.preference.PreferencePage;
@@ -31,6 +32,7 @@
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Group;
@@ -48,6 +50,7 @@
public class ConnectionsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
{
+ private Combo networkProviderCombo;
private Text ldapContextFactoryText;
private Button useKrb5SystemPropertiesButton;
private Label krb5LoginModuleNoteLabel;
@@ -84,6 +87,16 @@
BaseWidgetUtils.createSpacer( composite, 1 );
BaseWidgetUtils.createSpacer( composite, 1 );
+ Group defaultNetworkProviderGroup = BaseWidgetUtils.createGroup(
+ BaseWidgetUtils.createColumnContainer( composite, 1, 1 ), "Default Network Provider", 1 );
+ NetworkProvider defaultNetworkProvider = ConnectionCorePlugin.getDefault().getDefaultNetworkProvider();
+ String[] networkProviders = new String[]
+ { "Apache Directory LDAP Client API", "JNDI (Java Naming and Directory Interface)" };
+ networkProviderCombo = BaseWidgetUtils.createReadonlyCombo( defaultNetworkProviderGroup,
+ networkProviders, 0, 2 );
+ networkProviderCombo.select( defaultNetworkProvider == NetworkProvider.APACHE_DIRECTORY_LDAP_API ? 0
+ : 1 );
+
Group ldapContextFactoryGroup = BaseWidgetUtils.createGroup( BaseWidgetUtils.createColumnContainer( composite,
1, 1 ), Messages.getString( "ConnectionsPreferencePage.ContextFactory" ), 1 ); //$NON-NLS-1$
Preferences preferences = ConnectionCorePlugin.getDefault().getPluginPreferences();
@@ -108,7 +121,7 @@
useKrb5SystemPropertiesButton.setSelection( useKrb5SystemProperties );
krb5LoginModuleLabel = BaseWidgetUtils.createLabel( krb5SettingsGroup, Messages
- .getString( "ConnectionsPreferencePage.Krb5LoginModule" ), 1 );
+ .getString( "ConnectionsPreferencePage.Krb5LoginModule" ), 1 ); //$NON-NLS-1$
String krb5LoginModule = preferences.getString( ConnectionCoreConstants.PREFERENCE_KRB5_LOGIN_MODULE );
String defaultKrb5LoginModule = preferences
.getDefaultString( ConnectionCoreConstants.PREFERENCE_KRB5_LOGIN_MODULE );
@@ -144,12 +157,19 @@
*/
protected void performDefaults()
{
+ NetworkProvider defaultdDefaultNetworkProvider = ConnectionCorePlugin.getDefault().getNetworkProvider(
+ ConnectionCorePlugin.getDefault().getPluginPreferences()
+ .getDefaultInt( ConnectionCoreConstants.PREFERENCE_DEFAULT_NETWORK_PROVIDER ) );
+ networkProviderCombo.select( defaultdDefaultNetworkProvider == NetworkProvider.APACHE_DIRECTORY_LDAP_API ? 0
+ : 1 );
+
ldapContextFactoryText.setText( ConnectionCorePlugin.getDefault().getPluginPreferences().getDefaultString(
ConnectionCoreConstants.PREFERENCE_LDAP_CONTEXT_FACTORY ) );
krb5LoginModuleText.setText( ConnectionCorePlugin.getDefault().getPluginPreferences().getDefaultString(
ConnectionCoreConstants.PREFERENCE_KRB5_LOGIN_MODULE ) );
useKrb5SystemPropertiesButton.setSelection( ConnectionCorePlugin.getDefault().getPluginPreferences()
.getDefaultBoolean( ConnectionCoreConstants.PREFERENCE_USE_KRB5_SYSTEM_PROPERTIES ) );
+
super.performDefaults();
}
@@ -159,6 +179,9 @@
*/
public boolean performOk()
{
+ ConnectionCorePlugin.getDefault().getPluginPreferences()
+ .setValue( ConnectionCoreConstants.PREFERENCE_DEFAULT_NETWORK_PROVIDER,
+ getNetworkProviderValue() );
ConnectionCorePlugin.getDefault().getPluginPreferences().setValue(
ConnectionCoreConstants.PREFERENCE_LDAP_CONTEXT_FACTORY, ldapContextFactoryText.getText() );
ConnectionCorePlugin.getDefault().getPluginPreferences().setValue(
@@ -166,7 +189,26 @@
ConnectionCorePlugin.getDefault().getPluginPreferences()
.setValue( ConnectionCoreConstants.PREFERENCE_USE_KRB5_SYSTEM_PROPERTIES,
useKrb5SystemPropertiesButton.getSelection() );
+
+ ConnectionCorePlugin.getDefault().savePluginPreferences();
+
return true;
}
+
+ /**
+ * Gets the encyrption method.
+ *
+ * @return the encyrption method
+ */
+ private int getNetworkProviderValue()
+ {
+ switch ( networkProviderCombo.getSelectionIndex() )
+ {
+ case 1:
+ return ConnectionCoreConstants.PREFERENCE_NETWORK_PROVIDER_JNDI;
+ default:
+ return ConnectionCoreConstants.PREFERENCE_NETWORK_PROVIDER_APACHE_DIRECTORY_LDAP_API;
+ }
+ }
}
diff --git a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/AuthenticationParameterPage.java b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/AuthenticationParameterPage.java
index 3a51930..b77853a 100644
--- a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/AuthenticationParameterPage.java
+++ b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/AuthenticationParameterPage.java
@@ -26,6 +26,7 @@
import org.apache.directory.shared.ldap.model.constants.SaslSecurityStrength;
import org.apache.directory.shared.ldap.model.url.LdapUrl;
import org.apache.directory.shared.ldap.model.url.LdapUrl.Extension;
+import org.apache.directory.studio.common.ui.HistoryUtils;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCoreConstants;
@@ -37,9 +38,11 @@
import org.apache.directory.studio.connection.core.jobs.CheckBindRunnable;
import org.apache.directory.studio.connection.ui.AbstractConnectionParameterPage;
import org.apache.directory.studio.connection.ui.ConnectionUIConstants;
+import org.apache.directory.studio.connection.ui.ConnectionUIPlugin;
import org.apache.directory.studio.connection.ui.RunnableContextRunner;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Preferences;
+import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.swt.SWT;
@@ -264,7 +267,7 @@
private int getKdcPort()
{
- return !"".equals( krb5ConfigManualPortText.getText() ) ? Integer.parseInt( krb5ConfigManualPortText.getText() )
+ return !"".equals( krb5ConfigManualPortText.getText() ) ? Integer.parseInt( krb5ConfigManualPortText.getText() ) //$NON-NLS-1$
: 0;
}
@@ -326,7 +329,8 @@
Composite composite = BaseWidgetUtils.createColumnContainer( group2, 3, 1 );
BaseWidgetUtils.createLabel( composite, Messages.getString( "AuthenticationParameterPage.BindDNOrUser" ), 1 ); //$NON-NLS-1$
- String[] dnHistory = HistoryUtils.load( ConnectionUIConstants.DIALOGSETTING_KEY_PRINCIPAL_HISTORY );
+ String[] dnHistory = HistoryUtils.load( ConnectionUIPlugin.getDefault().getDialogSettings(),
+ ConnectionUIConstants.DIALOGSETTING_KEY_PRINCIPAL_HISTORY );
bindPrincipalCombo = BaseWidgetUtils.createCombo( composite, dnHistory, -1, 2 );
BaseWidgetUtils.createLabel( composite, Messages.getString( "AuthenticationParameterPage.BindPassword" ), 1 ); //$NON-NLS-1$
@@ -390,7 +394,8 @@
private void createSaslControls()
{
BaseWidgetUtils.createLabel( saslComposite, Messages.getString( "AuthenticationParameterPage.SaslRealm" ), 1 ); //$NON-NLS-1$
- String[] saslHistory = HistoryUtils.load( ConnectionUIConstants.DIALOGSETTING_KEY_REALM_HISTORY );
+ String[] saslHistory = HistoryUtils.load( ConnectionUIPlugin.getDefault().getDialogSettings(),
+ ConnectionUIConstants.DIALOGSETTING_KEY_REALM_HISTORY );
saslRealmText = BaseWidgetUtils.createCombo( saslComposite, saslHistory, -1, 1 );
BaseWidgetUtils.createLabel( saslComposite, Messages.getString( "AuthenticationParameterPage.SaslQop" ), 1 ); //$NON-NLS-1$
@@ -618,7 +623,7 @@
: "" ); //$NON-NLS-1$
krb5ConfigManualRealmText.setText( parameter.getKrb5Realm() != null ? parameter.getKrb5Realm() : "" ); //$NON-NLS-1$
krb5ConfigManualHostText.setText( parameter.getKrb5KdcHost() != null ? parameter.getKrb5KdcHost() : "" ); //$NON-NLS-1$
- krb5ConfigManualPortText.setText( parameter.getKrb5KdcPort() != 0 ? "" + parameter.getKrb5KdcPort() : "" ); //$NON-NLS-1$
+ krb5ConfigManualPortText.setText( parameter.getKrb5KdcPort() != 0 ? "" + parameter.getKrb5KdcPort() : "" ); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -655,6 +660,11 @@
{
public void widgetSelected( SelectionEvent event )
{
+ if ( !saveBindPasswordButton.getSelection() )
+ {
+ // Reseting the previously saved password (if any)
+ bindPasswordText.setText( "" ); //$NON-NLS-1$
+ }
connectionPageModified();
}
} );
@@ -820,10 +830,14 @@
*/
public void saveDialogSettings()
{
- HistoryUtils.save( ConnectionUIConstants.DIALOGSETTING_KEY_PRINCIPAL_HISTORY, bindPrincipalCombo.getText() );
+ IDialogSettings dialogSettings = ConnectionUIPlugin.getDefault().getDialogSettings();
+
+ HistoryUtils.save( dialogSettings, ConnectionUIConstants.DIALOGSETTING_KEY_PRINCIPAL_HISTORY,
+ bindPrincipalCombo.getText() );
if ( getAuthenticationMethod().equals( AuthenticationMethod.SASL_DIGEST_MD5 ) )
{
- HistoryUtils.save( ConnectionUIConstants.DIALOGSETTING_KEY_REALM_HISTORY, saslRealmText.getText() );
+ HistoryUtils.save( dialogSettings, ConnectionUIConstants.DIALOGSETTING_KEY_REALM_HISTORY,
+ saslRealmText.getText() );
}
}
@@ -984,7 +998,7 @@
ldapUrl.getExtensions().add(
new Extension( false, X_KRB5_CONFIG_MANUAL_KDC_HOST, parameter.getKrb5KdcHost() ) );
ldapUrl.getExtensions().add(
- new Extension( false, X_KRB5_CONFIG_MANUAL_KDC_PORT, "" + parameter.getKrb5KdcPort() ) );
+ new Extension( false, X_KRB5_CONFIG_MANUAL_KDC_PORT, "" + parameter.getKrb5KdcPort() ) ); //$NON-NLS-1$
break;
}
}
diff --git a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/CertificateListComposite.java b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/CertificateListComposite.java
index d0ad510..fbfdf6c 100644
--- a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/CertificateListComposite.java
+++ b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/CertificateListComposite.java
@@ -20,15 +20,22 @@
package org.apache.directory.studio.connection.ui.widgets;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.security.cert.Certificate;
import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.util.Iterator;
+import org.apache.commons.io.FileUtils;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.core.StudioKeyStoreManager;
import org.apache.directory.studio.connection.ui.ConnectionUIConstants;
import org.apache.directory.studio.connection.ui.ConnectionUIPlugin;
import org.apache.directory.studio.connection.ui.dialogs.CertificateInfoDialog;
+import org.apache.directory.studio.connection.ui.wizards.ExportCertificateWizard;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -36,8 +43,11 @@
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -46,6 +56,7 @@
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.FileDialog;
/**
@@ -56,13 +67,13 @@
*/
public class CertificateListComposite extends Composite
{
-
private StudioKeyStoreManager keyStoreManager;
private Composite container;
private TableViewer tableViewer;
private Button viewButton;
private Button addButton;
private Button removeButton;
+ private Button exportButton;
/**
@@ -103,8 +114,9 @@
{
public void selectionChanged( SelectionChangedEvent event )
{
- viewButton.setEnabled( !event.getSelection().isEmpty() );
+ viewButton.setEnabled( ( ( IStructuredSelection ) event.getSelection() ).size() == 1 );
removeButton.setEnabled( !event.getSelection().isEmpty() );
+ exportButton.setEnabled( ( ( IStructuredSelection ) event.getSelection() ).size() == 1 );
}
} );
tableViewer.addDoubleClickListener( new IDoubleClickListener()
@@ -129,7 +141,6 @@
viewButton.setEnabled( false );
viewButton.addSelectionListener( new SelectionAdapter()
{
- @Override
public void widgetSelected( SelectionEvent e )
{
IStructuredSelection selection = ( IStructuredSelection ) tableViewer.getSelection();
@@ -141,22 +152,53 @@
addButton = BaseWidgetUtils.createButton( buttonContainer, Messages
.getString( "CertificateListComposite.AddButton" ), 1 ); //$NON-NLS-1$
- addButton.setEnabled( false );
- // TODO: implement add action
+ addButton.addSelectionListener( new SelectionAdapter()
+ {
+ public void widgetSelected( SelectionEvent e )
+ {
+ // Asking the user for the certificate file
+ FileDialog dialog = new FileDialog( getShell(), SWT.OPEN );
+ dialog.setText( Messages.getString( "CertificateListComposite.LoadCertificate" ) ); //$NON-NLS-1$
+ String returnedFileName = dialog.open();
+
+ if ( returnedFileName != null )
+ {
+ try
+ {
+ // Reading the certificate
+ X509Certificate certificate = generateCertificate( FileUtils.readFileToByteArray( new File(
+ returnedFileName ) ) );
+
+ // Adding the certificate
+ keyStoreManager.addCertificate( certificate );
+
+ // Refreshing the table viewer
+ tableViewer.refresh();
+ tableViewer.setSelection( new StructuredSelection( certificate ) );
+ }
+ catch ( Exception ex )
+ {
+ MessageDialog.openError( addButton.getShell(),
+ Messages.getString( "CertificateListComposite.ErrorDialogTitle" ), //$NON-NLS-1$
+ NLS.bind( Messages.getString( "CertificateListComposite.ErrorDialogMessage" ), //$NON-NLS-1$
+ ex.getMessage() ) );
+ }
+ }
+ };
+ } );
removeButton = BaseWidgetUtils.createButton( buttonContainer, Messages
.getString( "CertificateListComposite.RemoveButton" ), 1 ); //$NON-NLS-1$
removeButton.setEnabled( false );
removeButton.addSelectionListener( new SelectionAdapter()
{
- @Override
public void widgetSelected( SelectionEvent e )
{
IStructuredSelection selection = ( IStructuredSelection ) tableViewer.getSelection();
- Iterator<X509Certificate> iterator = selection.iterator();
+ Iterator<?> iterator = selection.iterator();
while ( iterator.hasNext() )
{
- X509Certificate certificate = iterator.next();
+ X509Certificate certificate = ( X509Certificate ) iterator.next();
try
{
keyStoreManager.removeCertificate( certificate );
@@ -169,6 +211,34 @@
tableViewer.refresh();
}
} );
+
+ exportButton = BaseWidgetUtils.createButton( buttonContainer, Messages
+ .getString( "CertificateListComposite.ExportButton" ), 1 ); //$NON-NLS-1$
+ exportButton.setEnabled( false );
+ exportButton.addSelectionListener( new SelectionAdapter()
+ {
+ public void widgetSelected( SelectionEvent e )
+ {
+ X509Certificate certificate = ( X509Certificate ) ( ( IStructuredSelection ) tableViewer.getSelection() )
+ .getFirstElement();
+
+ WizardDialog dialog = new WizardDialog( getShell(), new ExportCertificateWizard( certificate ) );
+ dialog.open();
+ }
+ } );
+ }
+
+
+ private static X509Certificate generateCertificate( byte[] data ) throws CertificateException
+ {
+ CertificateFactory cf = CertificateFactory.getInstance( "X.509" ); //$NON-NLS-1$
+ Certificate certificate = cf.generateCertificate( new ByteArrayInputStream( data ) );
+ if ( certificate instanceof X509Certificate )
+ {
+ return ( X509Certificate ) certificate;
+ }
+
+ return null;
}
@@ -203,6 +273,7 @@
throw new RuntimeException( e );
}
}
+
return null;
}
@@ -226,7 +297,6 @@
class KeyStoreLabelProvider extends LabelProvider
{
- @Override
public String getText( Object element )
{
if ( element instanceof X509Certificate )
@@ -234,7 +304,7 @@
X509Certificate certificate = ( X509Certificate ) element;
String certificateName = certificate.getSubjectX500Principal().getName();
- if ( ( certificateName != null ) && ( !"".equals( certificateName ) ) )
+ if ( ( certificateName != null ) && ( !"".equals( certificateName ) ) ) //$NON-NLS-1$
{
return certificateName;
}
@@ -243,11 +313,11 @@
return Messages.getString( "CertificateListComposite.UntitledCertificate" ); //$NON-NLS-1$
}
}
+
return super.getText( element );
}
- @Override
public Image getImage( Object element )
{
if ( element instanceof X509Certificate )
@@ -255,7 +325,6 @@
return ConnectionUIPlugin.getDefault().getImage( ConnectionUIConstants.IMG_CERTIFICATE );
}
- // TODO Auto-generated method stub
return super.getImage( element );
}
}
diff --git a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/HistoryUtils.java b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/HistoryUtils.java
deleted file mode 100644
index 67b3f7b..0000000
--- a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/HistoryUtils.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.directory.studio.connection.ui.widgets;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.directory.studio.connection.ui.ConnectionUIPlugin;
-
-
-/**
- * The HistoryUtils are used to save and load the history of input fields.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public class HistoryUtils
-{
-
- /**
- * Saves the the given value under the given key in the dialog settings.
- *
- * @param key the key
- * @param value the value
- */
- public static void save( String key, String value )
- {
- // get current history
- String[] history = load( key );
- List<String> list = new ArrayList<String>( Arrays.asList( history ) );
-
- // add new value or move to first position
- if ( list.contains( value ) )
- {
- list.remove( value );
- }
- list.add( 0, value );
-
- // check history size
- while ( list.size() > 20 )
- {
- list.remove( list.size() - 1 );
- }
-
- // save
- history = list.toArray( new String[list.size()] );
- ConnectionUIPlugin.getDefault().getDialogSettings().put( key, history );
-
- }
-
-
- /**
- * Loads the value of the given key from the dialog settings
- *
- * @param key the key
- * @return the value
- */
- public static String[] load( String key )
- {
- String[] history = ConnectionUIPlugin.getDefault().getDialogSettings().getArray( key );
- if ( history == null )
- {
- history = new String[0];
- }
- return history;
- }
-
-}
diff --git a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java
index 9e64868..a110041 100644
--- a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java
+++ b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java
@@ -27,6 +27,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.directory.shared.ldap.model.url.LdapUrl;
import org.apache.directory.shared.ldap.model.url.LdapUrl.Extension;
+import org.apache.directory.studio.common.ui.HistoryUtils;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCoreConstants;
@@ -37,8 +38,10 @@
import org.apache.directory.studio.connection.core.jobs.CheckNetworkParameterRunnable;
import org.apache.directory.studio.connection.ui.AbstractConnectionParameterPage;
import org.apache.directory.studio.connection.ui.ConnectionUIConstants;
+import org.apache.directory.studio.connection.ui.ConnectionUIPlugin;
import org.apache.directory.studio.connection.ui.RunnableContextRunner;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
@@ -97,6 +100,9 @@
/** The button to check the connection parameters */
private Button checkConnectionButton;
+ /** The checkbox to make the connection read-only */
+ private Button readOnlyConnectionCheckbox;
+
/**
* Creates a new instance of NetworkParameterPage.
@@ -168,9 +174,9 @@
switch ( networkProviderCombo.getSelectionIndex() )
{
case 1:
- return ConnectionParameter.NetworkProvider.APACHE_DIRECTORY_LDAP_API;
- default:
return ConnectionParameter.NetworkProvider.JNDI;
+ default:
+ return ConnectionParameter.NetworkProvider.APACHE_DIRECTORY_LDAP_API;
}
}
@@ -191,6 +197,17 @@
/**
+ * Gets read only flag.
+ *
+ * @return the read only flag
+ */
+ private boolean isReadOnly()
+ {
+ return readOnlyConnectionCheckbox.getSelection();
+ }
+
+
+ /**
* {@inheritDoc}
*/
protected void createComposite( Composite parent )
@@ -206,13 +223,15 @@
Group group = BaseWidgetUtils.createGroup( composite, Messages
.getString( "NetworkParameterPage.NetworkParameter" ), 1 ); //$NON-NLS-1$
+ IDialogSettings dialogSettings = ConnectionUIPlugin.getDefault().getDialogSettings();
+
Composite groupComposite = BaseWidgetUtils.createColumnContainer( group, 3, 1 );
BaseWidgetUtils.createLabel( groupComposite, Messages.getString( "NetworkParameterPage.HostName" ), 1 ); //$NON-NLS-1$
- String[] hostHistory = HistoryUtils.load( ConnectionUIConstants.DIALOGSETTING_KEY_HOST_HISTORY );
+ String[] hostHistory = HistoryUtils.load( dialogSettings, ConnectionUIConstants.DIALOGSETTING_KEY_HOST_HISTORY );
hostCombo = BaseWidgetUtils.createCombo( groupComposite, hostHistory, -1, 2 );
BaseWidgetUtils.createLabel( groupComposite, Messages.getString( "NetworkParameterPage.Port" ), 1 ); //$NON-NLS-1$
- String[] portHistory = HistoryUtils.load( ConnectionUIConstants.DIALOGSETTING_KEY_PORT_HISTORY );
+ String[] portHistory = HistoryUtils.load( dialogSettings, ConnectionUIConstants.DIALOGSETTING_KEY_PORT_HISTORY );
portCombo = BaseWidgetUtils.createCombo( groupComposite, portHistory, -1, 2 );
portCombo.setTextLimit( 5 );
portCombo.setText( "389" ); //$NON-NLS-1$
@@ -221,9 +240,8 @@
{ Messages.getString( "NetworkParameterPage.NoEncryption" ), //$NON-NLS-1$
Messages.getString( "NetworkParameterPage.UseSSLEncryption" ), //$NON-NLS-1$
Messages.getString( "NetworkParameterPage.UseStartTLS" ) }; //$NON-NLS-1$
- int index = 0;
BaseWidgetUtils.createLabel( groupComposite, Messages.getString( "NetworkParameterPage.EncryptionMethod" ), 1 ); //$NON-NLS-1$
- encryptionMethodCombo = BaseWidgetUtils.createReadonlyCombo( groupComposite, encMethods, index, 2 );
+ encryptionMethodCombo = BaseWidgetUtils.createReadonlyCombo( groupComposite, encMethods, 0, 2 );
boolean validateCertificates = ConnectionCorePlugin.getDefault().getPluginPreferences().getBoolean(
ConnectionCoreConstants.PREFERENCE_VALIDATE_CERTIFICATES );
@@ -235,9 +253,12 @@
}
String[] networkProviders = new String[]
- { "JNDI (Java Naming and Directory Interface)", "Apache Directory LDAP Client API" }; //$NON-NLS-1$
- BaseWidgetUtils.createLabel( groupComposite, "Provider:", 1 ); //$NON-NLS-1$
- networkProviderCombo = BaseWidgetUtils.createReadonlyCombo( groupComposite, networkProviders, index, 2 );
+ { "Apache Directory LDAP Client API", "JNDI (Java Naming and Directory Interface)" };
+ BaseWidgetUtils.createLabel( groupComposite, "Provider:", 1 );
+ networkProviderCombo = BaseWidgetUtils.createReadonlyCombo( groupComposite, networkProviders, 0, 2 );
+ networkProviderCombo
+ .select( ConnectionCorePlugin.getDefault().getDefaultNetworkProvider() == NetworkProvider.APACHE_DIRECTORY_LDAP_API ? 0
+ : 1 );
BaseWidgetUtils.createSpacer( groupComposite, 2 );
checkConnectionButton = new Button( groupComposite, SWT.PUSH );
@@ -247,6 +268,9 @@
checkConnectionButton.setLayoutData( gd );
checkConnectionButton.setText( Messages.getString( "NetworkParameterPage.CheckNetworkParameter" ) ); //$NON-NLS-1$
+ readOnlyConnectionCheckbox = BaseWidgetUtils.createCheckbox( composite,
+ Messages.getString( "NetworkParameterPage.ReadOnly" ), 1 ); //$NON-NLS-1$
+
nameText.setFocus();
}
@@ -297,8 +321,9 @@
int encryptionMethodIndex = parameter.getEncryptionMethod() == EncryptionMethod.LDAPS ? 1
: parameter.getEncryptionMethod() == EncryptionMethod.START_TLS ? 2 : 0;
encryptionMethodCombo.select( encryptionMethodIndex );
- int networkProviderIndex = parameter.getNetworkProvider() == NetworkProvider.JNDI ? 0 : 1;
- networkProviderCombo.select( networkProviderIndex );
+ networkProviderCombo.select( parameter.getNetworkProvider() == NetworkProvider.APACHE_DIRECTORY_LDAP_API ? 0
+ : 1 );
+ readOnlyConnectionCheckbox.setSelection( parameter.isReadOnly() );
}
@@ -372,6 +397,14 @@
}
}
} );
+
+ readOnlyConnectionCheckbox.addSelectionListener( new SelectionAdapter()
+ {
+ public void widgetSelected( SelectionEvent event )
+ {
+ connectionPageModified();
+ }
+ } );
}
@@ -385,6 +418,7 @@
parameter.setPort( getPort() );
parameter.setEncryptionMethod( getEncyrptionMethod() );
parameter.setNetworkProvider( getNetworkProvider() );
+ parameter.setReadOnly( isReadOnly() );
}
@@ -393,8 +427,9 @@
*/
public void saveDialogSettings()
{
- HistoryUtils.save( ConnectionUIConstants.DIALOGSETTING_KEY_HOST_HISTORY, hostCombo.getText() );
- HistoryUtils.save( ConnectionUIConstants.DIALOGSETTING_KEY_PORT_HISTORY, portCombo.getText() );
+ IDialogSettings dialogSettings = ConnectionUIPlugin.getDefault().getDialogSettings();
+ HistoryUtils.save( dialogSettings, ConnectionUIConstants.DIALOGSETTING_KEY_HOST_HISTORY, hostCombo.getText() );
+ HistoryUtils.save( dialogSettings, ConnectionUIConstants.DIALOGSETTING_KEY_PORT_HISTORY, portCombo.getText() );
}
@@ -421,10 +456,12 @@
*/
public boolean isReconnectionRequired()
{
- return connectionParameter == null || !StringUtils.equals( connectionParameter.getHost(), getHostName() )
- || connectionParameter.getPort() != getPort()
- || connectionParameter.getEncryptionMethod() != getEncyrptionMethod()
- || connectionParameter.getNetworkProvider() != getNetworkProvider();
+ return ( connectionParameter == null )
+ || ( !StringUtils.equals( connectionParameter.getHost(), getHostName() ) )
+ || ( connectionParameter.getPort() != getPort() )
+ || ( connectionParameter.getEncryptionMethod() != getEncyrptionMethod() )
+ || ( connectionParameter.getNetworkProvider() != getNetworkProvider() )
+ || ( connectionParameter.isReadOnly() != isReadOnly() );
}
@@ -501,14 +538,19 @@
// encryption method, none if unknown or absent
String networkProvider = ldapUrl.getExtensionValue( X_NETWORK_PROVIDER );
- if ( StringUtils.isNotEmpty( encryption ) && X_NETWORK_PROVIDER_JNDI.equalsIgnoreCase( networkProvider ) )
- {
- parameter.setNetworkProvider( ConnectionParameter.NetworkProvider.JNDI );
- }
- else if ( StringUtils.isNotEmpty( encryption )
+ if ( StringUtils.isNotEmpty( networkProvider )
&& X_NETWORK_PROVIDER_APACHE_DIRECTORY_LDAP_API.equalsIgnoreCase( networkProvider ) )
{
parameter.setNetworkProvider( ConnectionParameter.NetworkProvider.APACHE_DIRECTORY_LDAP_API );
}
+ else if ( StringUtils.isNotEmpty( networkProvider )
+ && X_NETWORK_PROVIDER_JNDI.equalsIgnoreCase( networkProvider ) )
+ {
+ parameter.setNetworkProvider( ConnectionParameter.NetworkProvider.JNDI );
+ }
+ else
+ {
+ parameter.setNetworkProvider( ConnectionCorePlugin.getDefault().getDefaultNetworkProvider() );
+ }
}
}
diff --git a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages.properties b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages.properties
index fe5369f..184f320 100644
--- a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages.properties
+++ b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages.properties
@@ -104,6 +104,10 @@
CertificateListComposite.RemoveButton = Remove
CertificateListComposite.ViewButton = View...
CertificateListComposite.UntitledCertificate = <Untitled>
+CertificateListComposite.LoadCertificate = Load Certificate
+CertificateListComposite.ErrorDialogTitle = Error
+CertificateListComposite.ErrorDialogMessage = An error occurred while adding the certificate: {0}
+CertificateListComposite.ExportButton = Export...
NetworkParameterPage.CheckNetworkParameter = Check Network Parameter
NetworkParameterPage.ConnectionEstablished = The connection was established successfully.
@@ -117,6 +121,7 @@
NetworkParameterPage.PleaseEnterHostname = Please enter a hostname.
NetworkParameterPage.PleaseEnterPort = Please enter a port. The default LDAP port is 389.
NetworkParameterPage.Port = Port:
+NetworkParameterPage.ReadOnly = Read-Only (prevents any add, delete, modify or rename operation)
NetworkParameterPage.UseSSLEncryption = Use SSL encryption (ldaps://)
NetworkParameterPage.UseStartTLS = Use StartTLS extension
NetworkParameterPage.WarningCertificateValidation = Warning:\nCertificate validation is disabled, \nbe aware of invalid certificates or man-in-the-middle attacks!
diff --git a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_de.properties b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_de.properties
index a1da71a..b89b7be 100644
--- a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_de.properties
+++ b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_de.properties
@@ -103,6 +103,10 @@
CertificateListComposite.RemoveButton = Entfernen
CertificateListComposite.ViewButton = Anzeigen...
CertificateListComposite.UntitledCertificate = <Unbetitelt>
+CertificateInfoComposite.LoadCertificate = Zertifikat laden
+CertificateInfoComposite.ErrorDialogTitle = Fehler
+CertificateInfoComposite.ErrorDialogMessage = TODO:An error occurred while adding the certificate: {0}
+CertificateListComposite.ExportButton = Exportieren...
NetworkParameterPage.CheckNetworkParameter = Netzwerkparameter \u00FCberpr\u00FCfen
NetworkParameterPage.ConnectionEstablished = Die Verbindung wurde erfolgreich aufgebaut.
@@ -114,6 +118,7 @@
NetworkParameterPage.PleaseEnterConnectionName = Geben Sie bitte einen Verbindungsnamen ein.
NetworkParameterPage.PleaseEnterHostname = Geben Sie bitte einen Hostnamen ein.
NetworkParameterPage.PleaseEnterPort = Geben Sie bitte einen Port ein. LDAP Standard ist Port 389.
+NetworkParameterPage.ReadOnly = TODO:Read-Only (prevents any add, delete, modify or rename operation)
NetworkParameterPage.UseSSLEncryption = SSL Verschl\u00FCsselung (ldaps://)
NetworkParameterPage.UseStartTLS = StartTLS Erweiterung
NetworkParameterPage.WarningCertificateValidation = Warnung:\nZertifikat Validierung ist deaktiviert,\nsind Sie sich der Gefahr von ung\u00FCltigen Zertifikaten\noder 'man-in-the-middle' Angriffen bewusst!
diff --git a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_fr.properties b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_fr.properties
index 288bfe8..92bb14a 100644
--- a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_fr.properties
+++ b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_fr.properties
@@ -102,6 +102,10 @@
CertificateListComposite.RemoveButton = Supprimer
CertificateListComposite.ViewButton = Afficher...
CertificateListComposite.UntitledCertificate = <Sans titre>
+CertificateListComposite.LoadCertificate = Charger un certificat
+CertificateListComposite.ErrorDialogTitle = Erreur
+CertificateListComposite.ErrorDialogMessage = Une erreur est survenue lors de l'ajout du certificat : {0}
+CertificateListComposite.ExportButton = Exporter...
NetworkParameterPage.CheckNetworkParameter = V\u00E9rifier les param\u00E8tres r\u00E9seau
NetworkParameterPage.ConnectionEstablished = La connexion a \u00E9t\u00E9 \u00E9tablie avec succ\u00E8s
@@ -114,6 +118,7 @@
NetworkParameterPage.PleaseEnterConnectionName = Veuillez entrer un nom de connexion.
NetworkParameterPage.PleaseEnterHostname = Veuillez entrer un nom d'h\u00F4te.
NetworkParameterPage.PleaseEnterPort = Veuillez entrer un port. Le port par d\u00E9fault pour LDAP est 389.
+NetworkParameterPage.ReadOnly = Lecture seule (emp\u00E8che toute op\u00E9ration d'ajout, suppression, modification ou renommage)
NetworkParameterPage.UseSSLEncryption = Utilise l'encryption SSL (ldaps://)
NetworkParameterPage.UseStartTLS = Utilise l'extension StartTLS
NetworkParameterPage.WarningCertificateValidation = Attention :\n La validation des certificats est d\u00E9sactiv\u00E9e, \nm\u00E9fiez-vous des certificats invalides ou des attaques par interposition (man-in-the-middle)!
diff --git a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/ExportCertificateWizard.java b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/ExportCertificateWizard.java
new file mode 100644
index 0000000..727658c
--- /dev/null
+++ b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/ExportCertificateWizard.java
@@ -0,0 +1,214 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.directory.studio.connection.ui.wizards;
+
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.nio.charset.Charset;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.X509Certificate;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.io.FileUtils;
+import org.apache.directory.studio.connection.ui.wizards.ExportCertificateWizardPage.CertificateExportFormat;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.ui.IWorkbench;
+
+
+/**
+ * The ExportCertificateWizard is used to export a certificate.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class ExportCertificateWizard extends Wizard
+{
+ /** The certificate */
+ private X509Certificate certificate;
+
+ /** The wizard page */
+ private ExportCertificateWizardPage page;
+
+
+ /**
+ * Creates a new instance of ExportCertificateWizard.
+ *
+ * @param certificate the certificate
+ */
+ public ExportCertificateWizard( X509Certificate certificate )
+ {
+ this.certificate = certificate;
+ setWindowTitle( Messages.getString( "ExportCertificateWizard.ExportCertificate" ) ); //$NON-NLS-1$
+ setNeedsProgressMonitor( false );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void init( IWorkbench workbench, IStructuredSelection selection )
+ {
+ // Nothing to do
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void addPages()
+ {
+ page = new ExportCertificateWizardPage();
+ addPage( page );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean performFinish()
+ {
+ // Getting the export format
+ CertificateExportFormat format = page.getCertificateExportFormat();
+
+ try
+ {
+ switch ( format )
+ {
+ case DER:
+ return exportAsDerFormat();
+ case PEM:
+ return exportAsPemFormat();
+ }
+ }
+ catch ( Exception e )
+ {
+ MessageDialog.openError( getShell(),
+ Messages.getString( "ExportCertificateWizard.ErrorDialogTitle" ), //$NON-NLS-1$
+ NLS.bind( Messages.getString( "ExportCertificateWizard.ErrorDialogMessage" ), //$NON-NLS-1$
+ e.getMessage() ) );
+ return false;
+ }
+
+ return false;
+ }
+
+
+ /**
+ * Exports the certificate as DER format.
+ *
+ * @return <code>true</code> if the export is successful
+ * @throws CertificateEncodingException
+ * @throws IOException
+ */
+ private boolean exportAsDerFormat() throws CertificateEncodingException, IOException
+ {
+ // Getting the export file
+ File exportFile = page.getExportFile();
+
+ // Exporting the certificate
+ FileUtils.writeByteArrayToFile( exportFile, certificate.getEncoded() );
+
+ return true;
+ }
+
+
+ /**
+ * Exports the certificate as PEM format.
+ *
+ * @return <code>true</code> if the export is successful
+ * @throws CertificateEncodingException
+ * @throws IOException
+ */
+ private boolean exportAsPemFormat() throws CertificateEncodingException, IOException
+ {
+ // Getting the export file
+ File exportFile = page.getExportFile();
+
+ // Exporting the certificate
+ FileOutputStream fos = new FileOutputStream( exportFile );
+ OutputStreamWriter osw = new OutputStreamWriter( fos, Charset.forName( "UTF-8" ) ); //$NON-NLS-1$
+ osw.write( "-----BEGIN CERTIFICATE-----\n" ); //$NON-NLS-1$
+ osw.write( stripLineToNChars( new String( Base64.encodeBase64( certificate.getEncoded() ),
+ Charset.forName( "UTF-8" ) ), 64 ) ); //$NON-NLS-1$
+ osw.write( "\n-----END CERTIFICATE-----\n" ); //$NON-NLS-1$
+ osw.flush();
+ fos.close();
+
+ return true;
+ }
+
+
+ /**
+ * Strips the String every n specified characters
+ *
+ * @param str the string to strip
+ * @param nbChars the number of characters
+ * @return the stripped String
+ */
+ public static String stripLineToNChars( String str, int nbChars )
+ {
+ int strLength = str.length();
+
+ if ( strLength <= nbChars )
+ {
+ return str;
+ }
+
+ // We will first compute the new size of the result
+ // It's at least nbChars chars plus one for \n
+ int charsPerLine = nbChars;
+
+ int remaining = ( strLength - nbChars ) % charsPerLine;
+
+ int nbLines = 1 + ( ( strLength - nbChars ) / charsPerLine ) + ( remaining == 0 ? 0 : 1 );
+
+ int nbCharsTotal = strLength + nbLines + nbLines - 2;
+
+ char[] buffer = new char[nbCharsTotal];
+ char[] orig = str.toCharArray();
+
+ int posSrc = 0;
+ int posDst = 0;
+
+ System.arraycopy( orig, posSrc, buffer, posDst, nbChars );
+ posSrc += nbChars;
+ posDst += nbChars;
+
+ for ( int i = 0; i < nbLines - 2; i++ )
+ {
+ buffer[posDst++] = '\n';
+
+ System.arraycopy( orig, posSrc, buffer, posDst, charsPerLine );
+ posSrc += charsPerLine;
+ posDst += charsPerLine;
+ }
+
+ buffer[posDst++] = '\n';
+ System.arraycopy( orig, posSrc, buffer, posDst, remaining == 0 ? charsPerLine : remaining );
+
+ return new String( buffer );
+ }
+}
diff --git a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/ExportCertificateWizardPage.java b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/ExportCertificateWizardPage.java
new file mode 100644
index 0000000..854bbb8
--- /dev/null
+++ b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/ExportCertificateWizardPage.java
@@ -0,0 +1,274 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.directory.studio.connection.ui.wizards;
+
+
+import java.io.File;
+
+import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
+import org.apache.directory.studio.connection.ui.ConnectionUIConstants;
+import org.apache.directory.studio.connection.ui.ConnectionUIPlugin;
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.PlatformUI;
+
+
+/**
+ * This class implements the Export Certificate wizard page.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class ExportCertificateWizardPage extends WizardPage
+{
+ // UI widgets
+ private Text fileText;
+ private Button browseButton;
+ private Button overwriteFileButton;
+ private ComboViewer formatComboViewer;
+
+
+ /**
+ * Creates a new instance of NewConnectionWizard.
+ *
+ * @param page the page
+ * @param wizard the wizard
+ */
+ public ExportCertificateWizardPage()
+ {
+ super( "ExportCertificateWizardPage" ); //$NON-NLS-1$
+ setTitle( Messages.getString( "ExportCertificateWizardPage.ExportCertificate" ) ); //$NON-NLS-1$
+ setDescription( Messages.getString( "ExportCertificateWizardPage.PleaseSelectFileAndFormat" ) ); //$NON-NLS-1$
+ setImageDescriptor( ConnectionUIPlugin.getDefault().getImageDescriptor(
+ ConnectionUIConstants.IMG_CERTIFICATE_EXPORT_WIZARD ) );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void createControl( Composite parent )
+ {
+ // Creating the composite
+ Composite composite = BaseWidgetUtils.createColumnContainer( parent, 1, 1 );
+ composite.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
+
+ // Creating the file's group widget
+ Group fileGroup = BaseWidgetUtils.createGroup( composite,
+ Messages.getString( "ExportCertificateWizardPage.File" ), 1 ); //$NON-NLS-1$
+ fileGroup.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
+ Composite fileComposite = BaseWidgetUtils.createColumnContainer( fileGroup, 2, 1 );
+ fileComposite.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
+
+ // Creating the file's text widget
+ fileText = BaseWidgetUtils.createText( fileComposite, "", 1 ); //$NON-NLS-1$
+ fileText.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false ) );
+ fileText.addModifyListener( new ModifyListener()
+ {
+ public void modifyText( ModifyEvent e )
+ {
+ validate();
+ }
+ } );
+
+ // Creating the file's 'Browse' button widget
+ browseButton = BaseWidgetUtils.createButton( fileComposite,
+ Messages.getString( "ExportCertificateWizardPage.Browse" ), 1 ); //$NON-NLS-1$
+ browseButton.addSelectionListener( new SelectionAdapter()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void widgetSelected( SelectionEvent e )
+ {
+ chooseExportFile();
+ validate();
+ }
+ } );
+
+ // Creating the file's 'Overwrite' button widget
+ overwriteFileButton = BaseWidgetUtils.createCheckbox( fileComposite,
+ Messages.getString( "ExportCertificateWizardPage.OverwriteExistingFile" ), 2 ); //$NON-NLS-1$
+ overwriteFileButton.addSelectionListener( new SelectionAdapter()
+ {
+ public void widgetSelected( SelectionEvent event )
+ {
+ validate();
+ }
+ } );
+
+ // Creating the format's group widget
+ Group formatGroup = BaseWidgetUtils.createGroup( composite,
+ Messages.getString( "ExportCertificateWizardPage.Format" ), 1 ); //$NON-NLS-1$
+ formatGroup.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
+
+ // Creating the format's combo viewer widget
+ formatComboViewer = new ComboViewer( formatGroup );
+ formatComboViewer.setContentProvider( new ArrayContentProvider() );
+ formatComboViewer.setLabelProvider( new LabelProvider()
+ {
+ public String getText( Object element )
+ {
+ if ( element instanceof CertificateExportFormat )
+ {
+ CertificateExportFormat format = ( CertificateExportFormat ) element;
+
+ switch ( format )
+ {
+ case DER:
+ return "X509 Certificat DER";
+ case PEM:
+ return "X509 Certificat PEM";
+ }
+ }
+
+ return super.getText( element );
+ }
+ } );
+ formatComboViewer.setInput( new CertificateExportFormat[]
+ { CertificateExportFormat.DER, CertificateExportFormat.PEM } );
+ formatComboViewer.setSelection( new StructuredSelection( CertificateExportFormat.DER ) );
+ formatComboViewer.getControl().setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
+
+ displayErrorMessage( null );
+ setPageComplete( false );
+
+ setControl( composite );
+ }
+
+
+ /**
+ * Validates the page.
+ */
+ private void validate()
+ {
+ File file = new File( fileText.getText() );
+ if ( file.isDirectory() )
+ {
+ displayErrorMessage( Messages.getString( "ExportCertificateWizardPage.ErrorFileNotAFile" ) ); //$NON-NLS-1$
+ return;
+ }
+ else if ( file.exists() && !overwriteFileButton.getSelection() )
+ {
+ displayErrorMessage( Messages.getString( "ExportCertificateWizardPage.ErrorFileAlreadyExists" ) ); //$NON-NLS-1$
+ return;
+ }
+ else if ( file.exists() && !file.canWrite() )
+ {
+ displayErrorMessage( Messages.getString( "ExportCertificateWizardPage.ErrorFileNotWritable" ) ); //$NON-NLS-1$
+ return;
+ }
+ else if ( file.getParentFile() == null )
+ {
+ displayErrorMessage( Messages.getString( "ExportCertificateWizardPage.ErrorFileDirectoryNotWritable" ) ); //$NON-NLS-1$
+ return;
+ }
+
+ displayErrorMessage( null );
+ }
+
+
+ /**
+ * Displays an error message and set the page status as incomplete
+ * if the message is not null.
+ *
+ * @param message the message to display
+ */
+ protected void displayErrorMessage( String message )
+ {
+ setMessage( null, DialogPage.NONE );
+ setErrorMessage( message );
+ setPageComplete( message == null );
+ }
+
+
+ /**
+ * This method is called when the 'browse' button is selected.
+ */
+ private void chooseExportFile()
+ {
+ FileDialog dialog = new FileDialog( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), SWT.SAVE );
+ dialog.setText( Messages.getString( "ExportCertificateWizardPage.ChooseFile" ) ); //$NON-NLS-1$
+ if ( !"".equals( fileText.getText() ) ) //$NON-NLS-1$
+ {
+ dialog.setFilterPath( fileText.getText() );
+ }
+
+ String selectedFile = dialog.open();
+ if ( selectedFile != null )
+ {
+ fileText.setText( selectedFile );
+ }
+ }
+
+
+ /**
+ * Returns the export file.
+ *
+ * @return the export file
+ */
+ public File getExportFile()
+ {
+ return new File( fileText.getText() );
+ }
+
+
+ /**
+ * Gets the certificate export format.
+ *
+ * @return the certificate export format
+ */
+ public CertificateExportFormat getCertificateExportFormat()
+ {
+ StructuredSelection selection = ( StructuredSelection ) formatComboViewer.getSelection();
+ if ( !selection.isEmpty() )
+ {
+ return ( CertificateExportFormat ) selection.getFirstElement();
+ }
+
+ // Default format
+ return CertificateExportFormat.DER;
+ }
+
+ /**
+ * This enum represents the various certificate export formats.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+ enum CertificateExportFormat
+ {
+ DER, PEM
+ }
+}
\ No newline at end of file
diff --git a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/messages.properties b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/messages.properties
index 68797c5..bea2850 100644
--- a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/messages.properties
+++ b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/messages.properties
@@ -16,3 +16,19 @@
# under the License.
NewConnectionWizard.NewLdapConnection=New LDAP Connection
+
+ExportCertificateWizard.ErrorDialogTitle=Error
+ExportCertificateWizard.ErrorDialogMessage=An error occurred while exporting the certificate: {0}
+ExportCertificateWizard.ExportCertificate=Export Certificate
+
+ExportCertificateWizardPage.Browse=Bro&wse...
+ExportCertificateWizardPage.ChooseFile=Choose a file
+ExportCertificateWizardPage.ErrorFileAlreadyExists=Selected file already exists. Select option 'Overwrite existing file' if you want to overwrite the file.
+ExportCertificateWizardPage.ErrorFileDirectoryNotWritable=Selected file directory is not writeable.
+ExportCertificateWizardPage.ErrorFileNotAFile=Selected file is not a file.
+ExportCertificateWizardPage.ErrorFileNotWritable=Selected file is not writeable.
+ExportCertificateWizardPage.ExportCertificate=Export Certificate
+ExportCertificateWizardPage.File=File
+ExportCertificateWizardPage.Format=Format
+ExportCertificateWizardPage.OverwriteExistingFile=O&verwrite existing file
+ExportCertificateWizardPage.PleaseSelectFileAndFormat=Please select the file and format you want to export the certificate to.
\ No newline at end of file
diff --git a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/messages_de.properties b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/messages_de.properties
index 3cf3ca4..b8c34ba 100644
--- a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/messages_de.properties
+++ b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/messages_de.properties
@@ -16,3 +16,19 @@
# under the License.
NewConnectionWizard.NewLdapConnection=Neue LDAP Verbindung
+
+ExportCertificateWizard.ErrorDialogTitle=Fehler
+ExportCertificateWizard.ErrorDialogMessage=TODO:An error occurred while exporting the certificate: {0}
+ExportCertificateWizard.ExportCertificate=Zertifikat exportieren
+
+ExportCertificateWizardPage.Browse=Bro&wsen...
+ExportCertificateWizardPage.ChooseFile=Datei ausw\u00E4hlen
+ExportCertificateWizardPage.ErrorFileAlreadyExists=Die Datei existiert bereits. W\u00E4hle Option 'Bestehende Datei \u00FCberschreiben', wenn die Datei \u00FCberschrieben werden soll.
+ExportCertificateWizardPage.ErrorFileDirectoryNotWritable=Verzeichnis der ausgew\u00E4hlten Datei ist nicht beschreibbar.
+ExportCertificateWizardPage.ErrorFileNotAFile=Ausgew\u00E4hlte Datei ist keine Datei.
+ExportCertificateWizardPage.ErrorFileNotWritable=Ausgew\u00E4hlte Datei ist nicht beschreibbar.
+ExportCertificateWizardPage.ExportCertificate=TODO:Export Certificate
+ExportCertificateWizardPage.File=Datei
+ExportCertificateWizardPage.Format=Format
+ExportCertificateWizardPage.OverwriteExistingFile=Bestehende Datei &\u00FCberschreiben
+ExportCertificateWizardPage.PleaseSelectFileAndFormat=TODO:Please select the file and format you want to export the certificate to.
diff --git a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/messages_fr.properties b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/messages_fr.properties
index c8375ed..df6f686 100644
--- a/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/messages_fr.properties
+++ b/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/wizards/messages_fr.properties
@@ -16,3 +16,19 @@
# under the License.
NewConnectionWizard.NewLdapConnection=Nouvelle connexion LDAP
+
+ExportCertificateWizard.ErrorDialogTitle=Erreur
+ExportCertificateWizard.ErrorDialogMessage=Une erreur est survenue lors de l'export du certificat : {0}
+ExportCertificateWizard.ExportCertificate=Exporter le certificat
+
+ExportCertificateWizardPage.Browse=Parco&urir...
+ExportCertificateWizardPage.ChooseFile=Choisir un fichier
+ExportCertificateWizardPage.ErrorFileAlreadyExists=Le fichier s\u00E9lectionn\u00E9 existe d\u00E9j\u00E0. Choisissez l'option 'Ecraser le fichier existant' si vous voulez remplacer ce fichier.
+ExportCertificateWizardPage.ErrorFileDirectoryNotWritable=Le r\u00E9pertoire s\u00E9lectionn\u00E9 n'est pas accessible en \u00E9criture.
+ExportCertificateWizardPage.ErrorFileNotAFile=L'\u00E9l\u00E9ment s\u00E9lectionn\u00E9 n'est pas un fichier.
+ExportCertificateWizardPage.ErrorFileNotWritable=Le fichier s\u00E9lectionn\u00E9 n'est pas accessible en \u00E9criture.
+ExportCertificateWizardPage.ExportCertificate=Exporter le certificat
+ExportCertificateWizardPage.File=Fichier
+ExportCertificateWizardPage.Format=Format
+ExportCertificateWizardPage.OverwriteExistingFile=Ecraser le fichier existant
+ExportCertificateWizardPage.PleaseSelectFileAndFormat=Veuillez s\u00E9lectionner le fichier et le format dans lequel vous souhaitez exporter le certificat.
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java
index 9de1b55..f2d5757 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.studio.ldapbrowser.common;
+
/**
*
* Final reference -> class shouldn't be extended
@@ -37,15 +38,13 @@
}
/** The plug-in ID */
- public static final String PLUGIN_ID = BrowserCommonActivator.getDefault().getPluginProperties().getString(
- "Plugin_id" ); //$NON-NLS-1$
+ public static final String PLUGIN_ID = BrowserCommonActivator.getDefault().getPluginProperties()
+ .getString( "Plugin_id" ); //$NON-NLS-1$
- public static final int HISTORYSIZE = 20;
-
- public static final String CONTEXT_WINDOWS = BrowserCommonActivator.getDefault().getPluginProperties().getString(
- "Ctx_LdapBrowserWindows_id" ); //$NON-NLS-1$
- public static final String CONTEXT_DIALOGS = BrowserCommonActivator.getDefault().getPluginProperties().getString(
- "Ctx_LdapBrowserDialogs_id" ); //$NON-NLS-1$
+ public static final String CONTEXT_WINDOWS = BrowserCommonActivator.getDefault().getPluginProperties()
+ .getString( "Ctx_LdapBrowserWindows_id" ); //$NON-NLS-1$
+ public static final String CONTEXT_DIALOGS = BrowserCommonActivator.getDefault().getPluginProperties()
+ .getString( "Ctx_LdapBrowserDialogs_id" ); //$NON-NLS-1$
public static final String ACTION_ID_EDIT_VALUE = BrowserCommonActivator.getDefault().getPluginProperties()
.getString( "Cmd_EditValue_id" ); //$NON-NLS-1$
@@ -81,6 +80,8 @@
public static final String PREFERENCE_BROWSER_SORT_BY = "browserSortBy"; //$NON-NLS-1$
public static final String PREFERENCE_BROWSER_SORT_ORDER = "browserSortOrder"; //$NON-NLS-1$
public static final String PREFERENCE_BROWSER_SORT_LIMIT = "browserSortLimit"; //$NON-NLS-1$
+ public static final String PREFERENCE_BROWSER_SORT_SEARCHES_ORDER = "browserSortSearchesOrder"; //$NON-NLS-1$
+ public static final String PREFERENCE_BROWSER_SORT_BOOKMARKS_ORDER = "browserSortBookmarksOrder"; //$NON-NLS-1$
public static final String PREFERENCE_BROWSER_LEAF_ENTRIES_FIRST = "browserLeafEntriesFirst"; //$NON-NLS-1$
public static final String PREFERENCE_BROWSER_CONTAINER_ENTRIES_FIRST = "browserContainerEntriesFirst"; //$NON-NLS-1$
public static final String PREFERENCE_BROWSER_META_ENTRIES_LAST = "browserMetaEntriesLast"; //$NON-NLS-1$
@@ -186,33 +187,33 @@
public static final String IMG_DIT_STRUCTURE_RULE = "resources/icons/dit_structure_rule.png"; //$NON-NLS-1$
public static final String IMG_NAME_FORM = "resources/icons/name_form.png"; //$NON-NLS-1$
- public static final String CMD_ADD_ATTRIBUTE = BrowserCommonActivator.getDefault().getPluginProperties().getString(
- "Cmd_AddAttribute_id" ); //$NON-NLS-1$
- public static final String CMD_ADD_VALUE = BrowserCommonActivator.getDefault().getPluginProperties().getString(
- "Cmd_AddValue_id" ); //$NON-NLS-1$
+ public static final String CMD_ADD_ATTRIBUTE = BrowserCommonActivator.getDefault().getPluginProperties()
+ .getString( "Cmd_AddAttribute_id" ); //$NON-NLS-1$
+ public static final String CMD_ADD_VALUE = BrowserCommonActivator.getDefault().getPluginProperties()
+ .getString( "Cmd_AddValue_id" ); //$NON-NLS-1$
public static final String CMD_OPEN_SEARCH_RESULT = BrowserCommonActivator.getDefault().getPluginProperties()
.getString( "Cmd_OpenSearchResult_id" ); //$NON-NLS-1$
- public static final String CMD_COPY = BrowserCommonActivator.getDefault().getPluginProperties().getString(
- "Cmd_Copy_id" ); //$NON-NLS-1$
- public static final String CMD_PASTE = BrowserCommonActivator.getDefault().getPluginProperties().getString(
- "Cmd_Paste_id" ); //$NON-NLS-1$
- public static final String CMD_DELETE = BrowserCommonActivator.getDefault().getPluginProperties().getString(
- "Cmd_Delete_id" ); //$NON-NLS-1$
- public static final String CMD_PROPERTIES = BrowserCommonActivator.getDefault().getPluginProperties().getString(
- "Cmd_Properties_id" ); //$NON-NLS-1$
- public static final String CMD_FIND = BrowserCommonActivator.getDefault().getPluginProperties().getString(
- "Cmd_Find_id" ); //$NON-NLS-1$
+ public static final String CMD_COPY = BrowserCommonActivator.getDefault().getPluginProperties()
+ .getString( "Cmd_Copy_id" ); //$NON-NLS-1$
+ public static final String CMD_PASTE = BrowserCommonActivator.getDefault().getPluginProperties()
+ .getString( "Cmd_Paste_id" ); //$NON-NLS-1$
+ public static final String CMD_DELETE = BrowserCommonActivator.getDefault().getPluginProperties()
+ .getString( "Cmd_Delete_id" ); //$NON-NLS-1$
+ public static final String CMD_PROPERTIES = BrowserCommonActivator.getDefault().getPluginProperties()
+ .getString( "Cmd_Properties_id" ); //$NON-NLS-1$
+ public static final String CMD_FIND = BrowserCommonActivator.getDefault().getPluginProperties()
+ .getString( "Cmd_Find_id" ); //$NON-NLS-1$
- public static final String PROP_VALUE = BrowserCommonActivator.getDefault().getPluginProperties().getString(
- "PropPage_Value_id" ); //$NON-NLS-1$
- public static final String PROP_ATTRIBUTE = BrowserCommonActivator.getDefault().getPluginProperties().getString(
- "PropPage_Attribute_id" ); //$NON-NLS-1$
- public static final String PROP_SEARCH = BrowserCommonActivator.getDefault().getPluginProperties().getString(
- "PropPage_Search_id" ); //$NON-NLS-1$
- public static final String PROP_BOOKMARK = BrowserCommonActivator.getDefault().getPluginProperties().getString(
- "PropPage_Bookmark_id" ); //$NON-NLS-1$
- public static final String PROP_ENTRY = BrowserCommonActivator.getDefault().getPluginProperties().getString(
- "PropPage_Entry_id" ); //$NON-NLS-1$
+ public static final String PROP_VALUE = BrowserCommonActivator.getDefault().getPluginProperties()
+ .getString( "PropPage_Value_id" ); //$NON-NLS-1$
+ public static final String PROP_ATTRIBUTE = BrowserCommonActivator.getDefault().getPluginProperties()
+ .getString( "PropPage_Attribute_id" ); //$NON-NLS-1$
+ public static final String PROP_SEARCH = BrowserCommonActivator.getDefault().getPluginProperties()
+ .getString( "PropPage_Search_id" ); //$NON-NLS-1$
+ public static final String PROP_BOOKMARK = BrowserCommonActivator.getDefault().getPluginProperties()
+ .getString( "PropPage_Bookmark_id" ); //$NON-NLS-1$
+ public static final String PROP_ENTRY = BrowserCommonActivator.getDefault().getPluginProperties()
+ .getString( "PropPage_Entry_id" ); //$NON-NLS-1$
public static final String DND_ENTRY_TRANSFER = BrowserCommonActivator.getDefault().getPluginProperties()
.getString( "DnD_EntryTransfer" ); //$NON-NLS-1$
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java
index 8068265..399f1f2 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java
@@ -123,6 +123,10 @@
store.setDefault( BrowserCommonConstants.PREFERENCE_BROWSER_SORT_BY, BrowserCoreConstants.SORT_BY_RDN_VALUE );
store.setDefault( BrowserCommonConstants.PREFERENCE_BROWSER_SORT_ORDER,
BrowserCoreConstants.SORT_ORDER_ASCENDING );
+ store.setDefault( BrowserCommonConstants.PREFERENCE_BROWSER_SORT_SEARCHES_ORDER,
+ BrowserCoreConstants.SORT_ORDER_ASCENDING );
+ store.setDefault( BrowserCommonConstants.PREFERENCE_BROWSER_SORT_BOOKMARKS_ORDER,
+ BrowserCoreConstants.SORT_ORDER_ASCENDING );
store.setDefault( BrowserCommonConstants.PREFERENCE_BROWSER_SORT_LIMIT, 10000 );
store.setDefault( BrowserCommonConstants.PREFERENCE_BROWSER_LEAF_ENTRIES_FIRST, true );
store.setDefault( BrowserCommonConstants.PREFERENCE_BROWSER_CONTAINER_ENTRIES_FIRST, false );
@@ -190,17 +194,17 @@
// Active Directory
new ObjectClassIconPair( new String[]
- { "1.2.840.113556.1.5.9" }, BrowserCommonConstants.IMG_ENTRY_PERSON ), // User
+ { "1.2.840.113556.1.5.9" }, BrowserCommonConstants.IMG_ENTRY_PERSON ), // User //$NON-NLS-1$
new ObjectClassIconPair( new String[]
- { "1.2.840.113556.1.5.8" }, BrowserCommonConstants.IMG_ENTRY_GROUP ), // Group
+ { "1.2.840.113556.1.5.8" }, BrowserCommonConstants.IMG_ENTRY_GROUP ), // Group //$NON-NLS-1$
new ObjectClassIconPair( new String[]
- { "1.2.840.113556.1.3.23" }, BrowserCommonConstants.IMG_ENTRY_ORG ), // Container
+ { "1.2.840.113556.1.3.23" }, BrowserCommonConstants.IMG_ENTRY_ORG ), // Container //$NON-NLS-1$
new ObjectClassIconPair( new String[]
- { "1.2.840.113556.1.5.66", "1.2.840.113556.1.5.67" }, BrowserCommonConstants.IMG_ENTRY_DC ), // Domain, DomainDNS
+ { "1.2.840.113556.1.5.66", "1.2.840.113556.1.5.67" }, BrowserCommonConstants.IMG_ENTRY_DC ), // Domain, DomainDNS //$NON-NLS-1$ //$NON-NLS-2$
new ObjectClassIconPair( new String[]
- { "1.2.840.113556.1.3.13" }, BrowserCommonConstants.IMG_OCD ), // ClassSchema
+ { "1.2.840.113556.1.3.13" }, BrowserCommonConstants.IMG_OCD ), // ClassSchema //$NON-NLS-1$
new ObjectClassIconPair( new String[]
- { "1.2.840.113556.1.3.14" }, BrowserCommonConstants.IMG_ATD ), // AttributeSchema
+ { "1.2.840.113556.1.3.14" }, BrowserCommonConstants.IMG_ATD ), // AttributeSchema //$NON-NLS-1$
};
BrowserCorePlugin.getDefault().getCorePreferences().setDefaultObjectClassIcons( objectClassIcons );
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/CopyAction.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/CopyAction.java
index 7df4568..5c54a55 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/CopyAction.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/CopyAction.java
@@ -248,7 +248,18 @@
try
{
clipboard = new Clipboard( Display.getCurrent() );
- clipboard.setContents( data, dataTypes );
+
+ try
+ {
+ clipboard.setContents( data, dataTypes );
+ }
+ catch ( IllegalArgumentException e )
+ {
+ // Nothing to do.
+ // Preventing an error to be shown in the case of the RootDSE being copied
+ // See DIRSTUDIO-773 (IllegalArgumentException thrown when copying the RootDSE)
+ // https://issues.apache.org/jira/browse/DIRSTUDIO-773
+ }
}
finally
{
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/OpenQuickSearchAction.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/OpenQuickSearchAction.java
index f41ad20..5d448e0 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/OpenQuickSearchAction.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/OpenQuickSearchAction.java
@@ -24,6 +24,7 @@
import org.apache.directory.studio.connection.core.Utils;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
+import org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserWidget;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IQuickSearch;
import org.apache.directory.studio.ldapbrowser.core.model.impl.QuickSearch;
@@ -40,12 +41,16 @@
*/
public class OpenQuickSearchAction extends BrowserAction
{
+ /** The browser widget */
+ private BrowserWidget widget;
+
/**
* Creates a new instance of OpenQuickSearchAction.
*/
- public OpenQuickSearchAction()
+ public OpenQuickSearchAction( BrowserWidget widget )
{
+ this.widget = widget;
}
@@ -57,11 +62,11 @@
IBrowserConnection browserConnection = getBrowserConnection();
if ( browserConnection != null )
{
- IQuickSearch quickSearch = browserConnection.getSearchManager().getQuickSearch();
+ IQuickSearch quickSearch = widget.getQuickSearch();
if ( quickSearch == null )
{
quickSearch = new QuickSearch( browserConnection.getRootDSE(), browserConnection );
- browserConnection.getSearchManager().setQuickSearch( quickSearch );
+ widget.setQuickSearch( quickSearch );
}
String pageId = BrowserCommonConstants.PROP_SEARCH;
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/RenameEntryDialog.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/RenameEntryDialog.java
index 93e9a20..908e83d 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/RenameEntryDialog.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/RenameEntryDialog.java
@@ -69,6 +69,9 @@
/** The new rdn. */
private Rdn rdn;
+ /** The initialization flag */
+ private boolean initialized = false;
+
/**
* Creates a new instance of RenameEntryDialog.
@@ -151,6 +154,9 @@
dnBuilderWidget.setInput( entry.getBrowserConnection(), allAttributeNames, entry.getRdn(), null );
applyDialogFont( composite );
+
+ initialized = true;
+
return composite;
}
@@ -164,6 +170,12 @@
{
okButton.setEnabled( dnBuilderWidget.getRdn() != null );
}
+
+ // Forcing the redraw of the whole dialog
+ if ( initialized && ( getShell() != null ) && ( !getShell().isDisposed() ) )
+ {
+ getShell().pack();
+ }
}
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectBrowserConnectionDialog.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectBrowserConnectionDialog.java
index 043ee16..5100a38 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectBrowserConnectionDialog.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectBrowserConnectionDialog.java
@@ -52,26 +52,25 @@
*/
public class SelectBrowserConnectionDialog extends Dialog
{
-
- /** The title. */
+ /** The title */
private String title;
- /** The initial browser connection. */
+ /** The initial browser connection */
private IBrowserConnection initialBrowserConnection;
- /** The selected browser connection. */
+ /** The selected browser connection */
private IBrowserConnection selectedBrowserConnection;
- /** The connection configuration. */
+ /** The connection configuration */
private ConnectionConfiguration connectionConfiguration;
- /** The connection universal listener. */
+ /** The connection universal listener */
private ConnectionUniversalListener connectionUniversalListener;
- /** The connection action group. */
+ /** The connection action group */
private ConnectionActionGroup connectionActionGroup;
- /** The connection main widget. */
+ /** The connection main widget */
private ConnectionWidget connectionMainWidget;
@@ -197,7 +196,6 @@
IBrowserConnection browserConnection = BrowserCorePlugin.getDefault().getConnectionManager()
.getBrowserConnection( connection );
initialBrowserConnection = browserConnection;
-
}
}
}
@@ -237,7 +235,6 @@
connectionMainWidget.setFocus();
return composite;
-
}
@@ -250,5 +247,4 @@
{
return selectedBrowserConnection;
}
-
}
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectEntryDialog.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectEntryDialog.java
index 6cfce2b..d747987 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectEntryDialog.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectEntryDialog.java
@@ -181,7 +181,7 @@
browserActionGroup.activateGlobalActionHandlers();
// create the listener
- browserUniversalListener = new BrowserUniversalListener( browserWidget.getViewer() );
+ browserUniversalListener = new BrowserUniversalListener( browserWidget );
browserWidget.getViewer().addSelectionChangedListener( new ISelectionChangedListener()
{
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/messages_fr.properties b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/messages_fr.properties
index 3b06453..9049d5c 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/messages_fr.properties
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/messages_fr.properties
@@ -22,7 +22,7 @@
EntryExistsCopyStrategyDialogImpl.SelectCopyStrategyDescription=L''entr\u00E9e {0} existe d\u00E9j\u00E0. Veuillez s\u00E9lectionner la fa\u00E7on de proc\u00E9der.
EntryExistsCopyStrategyDialogImpl.StopCopyProcess=Arr\u00EAter le processus de copie
FilterDialog.FilterEditor=Editeur de filtre
-FilterDialog.Format=Format
+FilterDialog.Format=Formater
FilterWidgetDialog.EnterValidFilter=Veuillez entrer un filtre valide.
HexDialog.CantReadFile=Impossible de lire le fichier
HexDialog.CantWriteToFile=Impossible d'\u00E9crire le fichier
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/AttributeDialog.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/AttributeDialog.java
index 6cc36a0..c3f322f 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/AttributeDialog.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/AttributeDialog.java
@@ -27,6 +27,7 @@
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
@@ -40,7 +41,6 @@
*/
public class AttributeDialog extends Dialog
{
-
/** The initial attribute. */
private BinaryAttribute currentAttribute;
@@ -53,6 +53,9 @@
/** The combo. */
private Combo typeOrOidCombo;
+ /** The OK button of the dialog */
+ private Button okButton;
+
/**
* Creates a new instance of AttributeDialog.
@@ -78,6 +81,17 @@
super.configureShell( newShell );
newShell.setText( Messages.getString( "AttributeDialog.SelectAttributeTypeOrOID" ) ); //$NON-NLS-1$
}
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void createButtonsForButtonBar( Composite parent )
+ {
+ okButton = createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true );
+ createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false );
+
+ validate();
+ }
/**
@@ -118,7 +132,7 @@
private void validate()
{
- getButton( IDialogConstants.OK_ID ).setEnabled( !"".equals( typeOrOidCombo.getText() ) ); //$NON-NLS-1$
+ okButton.setEnabled( !"".equals( typeOrOidCombo.getText() ) ); //$NON-NLS-1$
}
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/AttributeValueEditorDialog.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/AttributeValueEditorDialog.java
index 5f3a835..35a802f 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/AttributeValueEditorDialog.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/AttributeValueEditorDialog.java
@@ -31,6 +31,7 @@
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
@@ -45,7 +46,6 @@
*/
public class AttributeValueEditorDialog extends Dialog
{
-
/** The initial attribute to value editor relation. */
private AttributeValueEditorRelation relation;
@@ -67,6 +67,9 @@
/** The value editor combo. */
private Combo valueEditorCombo;
+ /** The OK button of the dialog */
+ private Button okButton;
+
/**
* Creates a new instance of AttributeValueEditorDialog.
@@ -106,6 +109,18 @@
/**
* {@inheritDoc}
*/
+ protected void createButtonsForButtonBar( Composite parent )
+ {
+ okButton = createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true );
+ createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false );
+
+ validate();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
protected void okPressed()
{
returnRelation = new AttributeValueEditorRelation( typeOrOidCombo.getText(), veName2classMap
@@ -158,7 +173,7 @@
private void validate()
{
- super.getButton( IDialogConstants.OK_ID ).setEnabled(
+ okButton.setEnabled(
!"".equals( valueEditorCombo.getText() ) && !"".equals( typeOrOidCombo.getText() ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java
index 835adcc..04aff7a 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java
@@ -43,8 +43,10 @@
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.swt.SWT;
@@ -268,6 +270,15 @@
}
} );
+ attributeViewer.addSelectionChangedListener( new ISelectionChangedListener()
+ {
+ public void selectionChanged( SelectionChangedEvent event )
+ {
+ attributeEditButton.setEnabled( !attributeViewer.getSelection().isEmpty() );
+ attributeRemoveButton.setEnabled( !attributeViewer.getSelection().isEmpty() );
+ }
+ } );
+
attributeAddButton = BaseWidgetUtils.createButton( buttonComposite, Messages
.getString( "BinaryAttributesAndSyntaxesPreferencePage.Add" ), 1 ); //$NON-NLS-1$
attributeAddButton.addSelectionListener( new SelectionAdapter()
@@ -279,6 +290,7 @@
} );
attributeEditButton = BaseWidgetUtils.createButton( buttonComposite, Messages
.getString( "BinaryAttributesAndSyntaxesPreferencePage.Edit" ), 1 ); //$NON-NLS-1$
+ attributeEditButton.setEnabled( false );
attributeEditButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
@@ -288,6 +300,7 @@
} );
attributeRemoveButton = BaseWidgetUtils.createButton( buttonComposite, Messages
.getString( "BinaryAttributesAndSyntaxesPreferencePage.Remove" ), 1 ); //$NON-NLS-1$
+ attributeRemoveButton.setEnabled( false );
attributeRemoveButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
@@ -339,6 +352,15 @@
}
} );
+ syntaxViewer.addSelectionChangedListener( new ISelectionChangedListener()
+ {
+ public void selectionChanged( SelectionChangedEvent event )
+ {
+ syntaxEditButton.setEnabled( !syntaxViewer.getSelection().isEmpty() );
+ syntaxRemoveButton.setEnabled( !syntaxViewer.getSelection().isEmpty() );
+ }
+ } );
+
syntaxAddButton = BaseWidgetUtils.createButton( buttonComposite, Messages
.getString( "BinaryAttributesAndSyntaxesPreferencePage.Add" ), 1 ); //$NON-NLS-1$
syntaxAddButton.addSelectionListener( new SelectionAdapter()
@@ -350,6 +372,7 @@
} );
syntaxEditButton = BaseWidgetUtils.createButton( buttonComposite, Messages
.getString( "BinaryAttributesAndSyntaxesPreferencePage.Edit" ), 1 ); //$NON-NLS-1$
+ syntaxEditButton.setEnabled( false );
syntaxEditButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
@@ -359,6 +382,7 @@
} );
syntaxRemoveButton = BaseWidgetUtils.createButton( buttonComposite, Messages
.getString( "BinaryAttributesAndSyntaxesPreferencePage.Remove" ), 1 ); //$NON-NLS-1$
+ syntaxRemoveButton.setEnabled( false );
syntaxRemoveButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
@@ -374,7 +398,21 @@
AttributeDialog dialog = new AttributeDialog( getShell(), null, attributeNamesAndOids );
if ( dialog.open() == AttributeValueEditorDialog.OK )
{
- attributeList.add( dialog.getAttribute() );
+ BinaryAttribute attribute = dialog.getAttribute();
+
+ // Ensuring we use OID for consistency in the table viewer
+ if ( attributeNames2AtdMap.containsKey( attribute.getAttributeNumericOidOrName() ) )
+ {
+ attribute = new BinaryAttribute( attributeNames2AtdMap.get( attribute.getAttributeNumericOidOrName() )
+ .getOid() );
+ }
+ else if ( attributeOid2AtdMap.containsKey( attribute.getAttributeNumericOidOrName() ) )
+ {
+ attribute = new BinaryAttribute( attributeOid2AtdMap.get( attribute.getAttributeNumericOidOrName() )
+ .getOid() );
+ }
+
+ attributeList.add( attribute );
attributeViewer.refresh();
}
}
@@ -491,8 +529,7 @@
{
if ( attributeNames2AtdMap.containsKey( attribute.getAttributeNumericOidOrName() ) )
{
- AttributeType atd = ( AttributeType ) attributeNames2AtdMap
- .get( attribute.getAttributeNumericOidOrName() );
+ AttributeType atd = attributeNames2AtdMap.get( attribute.getAttributeNumericOidOrName() );
String s = atd.getOid();
for ( String attributeName : atd.getNames() )
{
@@ -505,8 +542,7 @@
}
else if ( attributeOid2AtdMap.containsKey( attribute.getAttributeNumericOidOrName() ) )
{
- AttributeType atd = ( AttributeType ) attributeOid2AtdMap
- .get( attribute.getAttributeNumericOidOrName() );
+ AttributeType atd = attributeOid2AtdMap.get( attribute.getAttributeNumericOidOrName() );
return SchemaUtils.toString( atd );
}
else if ( Utils.getOidDescription( attribute.getAttributeNumericOidOrName() ) != null )
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BrowserPreferencePage.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BrowserPreferencePage.java
index 0ed6ef1..65ae20a 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BrowserPreferencePage.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BrowserPreferencePage.java
@@ -52,9 +52,9 @@
public class BrowserPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
{
- private static final String DN = Messages.getString( "BrowserPreferencePage.Dn" ); //$NON-NLS-1$
+ private static final String DN = Messages.getString( "BrowserPreferencePage.DN" ); //$NON-NLS-1$
- private static final String RDN = Messages.getString( "BrowserPreferencePage.Rdn" ); //$NON-NLS-1$
+ private static final String RDN = Messages.getString( "BrowserPreferencePage.RDN" ); //$NON-NLS-1$
private static final String RDN_VALUE = Messages.getString( "BrowserPreferencePage.RDNValue" ); //$NON-NLS-1$
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/SyntaxDialog.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/SyntaxDialog.java
index db83eda..9a6c7f0 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/SyntaxDialog.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/SyntaxDialog.java
@@ -27,6 +27,7 @@
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
@@ -40,7 +41,6 @@
*/
public class SyntaxDialog extends Dialog
{
-
/** The initial syntax. */
private BinarySyntax currentSyntax;
@@ -53,6 +53,9 @@
/** The combo. */
private Combo oidCombo;
+ /** The OK button of the dialog */
+ private Button okButton;
+
/**
* Creates a new instance of SyntaxDialog.
@@ -83,6 +86,18 @@
/**
* {@inheritDoc}
*/
+ protected void createButtonsForButtonBar( Composite parent )
+ {
+ okButton = createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true );
+ createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false );
+
+ validate();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
protected void okPressed()
{
returnSyntax = new BinarySyntax( oidCombo.getText() );
@@ -118,7 +133,7 @@
private void validate()
{
- getButton( IDialogConstants.OK_ID ).setEnabled( !"".equals( oidCombo.getText() ) ); //$NON-NLS-1$
+ okButton.setEnabled( !"".equals( oidCombo.getText() ) ); //$NON-NLS-1$
}
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/SyntaxValueEditorDialog.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/SyntaxValueEditorDialog.java
index 927e032..0ed4aea 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/SyntaxValueEditorDialog.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/SyntaxValueEditorDialog.java
@@ -31,6 +31,7 @@
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
@@ -45,7 +46,6 @@
*/
public class SyntaxValueEditorDialog extends Dialog
{
-
/** The initial syntax to value editor relation. */
private SyntaxValueEditorRelation relation;
@@ -67,6 +67,9 @@
/** The value editor combo. */
private Combo valueEditorCombo;
+ /** The OK button of the dialog */
+ private Button okButton;
+
/**
* Creates a new instance of SyntaxValueEditorDialog.
@@ -106,6 +109,18 @@
/**
* {@inheritDoc}
*/
+ protected void createButtonsForButtonBar( Composite parent )
+ {
+ okButton = createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true );
+ createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false );
+
+ validate();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
protected void okPressed()
{
returnRelation = new SyntaxValueEditorRelation( oidCombo.getText(), ( String ) veName2classMap
@@ -158,7 +173,7 @@
private void validate()
{
- super.getButton( IDialogConstants.OK_ID ).setEnabled(
+ okButton.setEnabled(
!"".equals( valueEditorCombo.getText() ) && !"".equals( oidCombo.getText() ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/TextFormatsPreferencePage.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/TextFormatsPreferencePage.java
index 52e77f7..3a63c30 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/TextFormatsPreferencePage.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/TextFormatsPreferencePage.java
@@ -94,6 +94,8 @@
private Button ldifSpaceAfterColonButton;
+ private Button includeVersionLineButton;
+
private LineSeparatorInput ldifLineSeparator;
private OptionsInput tableAttributeDelimiterWidget;
@@ -429,6 +431,11 @@
ldifSpaceAfterColonButton.setSelection( coreStore
.getBoolean( BrowserCoreConstants.PREFERENCE_LDIF_SPACE_AFTER_COLON ) );
+ includeVersionLineButton = BaseWidgetUtils.createCheckbox( ldifInnerComposite, Messages
+ .getString( "TextFormatsPreferencePage.IncludeVersionLine" ), 1 ); //$NON-NLS-1$
+ includeVersionLineButton.setSelection( coreStore
+ .getBoolean( BrowserCoreConstants.PREFERENCE_LDIF_INCLUDE_VERSION_LINE ) );
+
ldifTab.setControl( ldifComposite );
}
@@ -442,7 +449,8 @@
coreStore.setValue( BrowserCoreConstants.PREFERENCE_LDIF_LINE_SEPARATOR, ldifLineSeparator.getRawValue() );
coreStore.setValue( BrowserCoreConstants.PREFERENCE_LDIF_SPACE_AFTER_COLON, ldifSpaceAfterColonButton
.getSelection() );
- BrowserCorePlugin.getDefault().savePluginPreferences();
+ coreStore.setValue( BrowserCoreConstants.PREFERENCE_LDIF_INCLUDE_VERSION_LINE, includeVersionLineButton
+ .getSelection() );
coreStore.setValue( BrowserCoreConstants.PREFERENCE_FORMAT_CSV_ATTRIBUTEDELIMITER, csvAttributeDelimiterWidget
.getRawValue() );
@@ -470,6 +478,8 @@
coreStore.setValue( BrowserCoreConstants.PREFERENCE_FORMAT_XLS_BINARYENCODING, xlsBinaryEncodingWidget
.getRawValue() );
+ BrowserCorePlugin.getDefault().savePluginPreferences();
+
validate();
return true;
@@ -486,6 +496,8 @@
.setRawValue( coreStore.getDefaultString( BrowserCoreConstants.PREFERENCE_LDIF_LINE_SEPARATOR ) );
ldifSpaceAfterColonButton.setSelection( coreStore
.getDefaultBoolean( BrowserCoreConstants.PREFERENCE_LDIF_SPACE_AFTER_COLON ) );
+ includeVersionLineButton.setSelection( coreStore
+ .getDefaultBoolean( BrowserCoreConstants.PREFERENCE_LDIF_INCLUDE_VERSION_LINE ) );
csvAttributeDelimiterWidget.setRawValue( coreStore
.getDefaultString( BrowserCoreConstants.PREFERENCE_FORMAT_CSV_ATTRIBUTEDELIMITER ) );
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java
index 6c505cb..a2cae53 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java
@@ -48,8 +48,10 @@
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.swt.SWT;
@@ -316,6 +318,15 @@
editAttribute();
}
} );
+
+ attributeViewer.addSelectionChangedListener( new ISelectionChangedListener()
+ {
+ public void selectionChanged( SelectionChangedEvent event )
+ {
+ attributeEditButton.setEnabled( !attributeViewer.getSelection().isEmpty() );
+ attributeRemoveButton.setEnabled( !attributeViewer.getSelection().isEmpty() );
+ }
+ } );
attributeAddButton = BaseWidgetUtils.createButton( buttonComposite, Messages
.getString( "ValueEditorsPreferencePage.Add" ), 1 ); //$NON-NLS-1$
@@ -328,6 +339,7 @@
} );
attributeEditButton = BaseWidgetUtils.createButton( buttonComposite, Messages
.getString( "ValueEditorsPreferencePage.Edit" ), 1 ); //$NON-NLS-1$
+ attributeEditButton.setEnabled( false );
attributeEditButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
@@ -337,6 +349,7 @@
} );
attributeRemoveButton = BaseWidgetUtils.createButton( buttonComposite, Messages
.getString( "ValueEditorsPreferencePage.Remove" ), 1 ); //$NON-NLS-1$
+ attributeRemoveButton.setEnabled( false );
attributeRemoveButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
@@ -392,6 +405,15 @@
}
} );
+ syntaxViewer.addSelectionChangedListener( new ISelectionChangedListener()
+ {
+ public void selectionChanged( SelectionChangedEvent event )
+ {
+ syntaxEditButton.setEnabled( !syntaxViewer.getSelection().isEmpty() );
+ syntaxRemoveButton.setEnabled( !syntaxViewer.getSelection().isEmpty() );
+ }
+ } );
+
syntaxAddButton = BaseWidgetUtils.createButton( buttonComposite, Messages
.getString( "ValueEditorsPreferencePage.Add" ), 1 ); //$NON-NLS-1$
syntaxAddButton.addSelectionListener( new SelectionAdapter()
@@ -403,6 +425,7 @@
} );
syntaxEditButton = BaseWidgetUtils.createButton( buttonComposite, Messages
.getString( "ValueEditorsPreferencePage.Edit" ), 1 ); //$NON-NLS-1$
+ syntaxEditButton.setEnabled( false );
syntaxEditButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
@@ -412,6 +435,7 @@
} );
syntaxRemoveButton = BaseWidgetUtils.createButton( buttonComposite, Messages
.getString( "ValueEditorsPreferencePage.Remove" ), 1 ); //$NON-NLS-1$
+ syntaxRemoveButton.setEnabled( false );
syntaxRemoveButton.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties
index dd7797c..4c8c87c 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties
@@ -86,6 +86,7 @@
TextFormatsPreferencePage.ExcelExportLabel=Select Excel export file format options:
TextFormatsPreferencePage.OdfExport=ODF Export
TextFormatsPreferencePage.OdfExportLabel=Select ODF export file format options:
+TextFormatsPreferencePage.IncludeVersionLine=Include version line
TextFormatsPreferencePage.LDIF=LDIF
TextFormatsPreferencePage.LDIFLabel=Select LDIF format options:
TextFormatsPreferencePage.LineLength1=Line length:
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties
index 4e73532..6574155 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties
@@ -86,6 +86,7 @@
TextFormatsPreferencePage.ExcelExportLabel=Excel Exportformat:
TextFormatsPreferencePage.OdfExport=ODF Export
TextFormatsPreferencePage.OdfExportLabel=ODF Exportformat:
+TextFormatsPreferencePage.IncludeVersionLine=TODO:Include version line
TextFormatsPreferencePage.LDIF=LDIF
TextFormatsPreferencePage.LDIFLabel=LDIF Format:
TextFormatsPreferencePage.LineLength1=Zeilenl\u00E4nge:
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_fr.properties b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_fr.properties
index 4ade6d1..6943bdd 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_fr.properties
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_fr.properties
@@ -86,6 +86,7 @@
TextFormatsPreferencePage.ExcelExportLabel=S\u00E9lectionner les options de format pour l'export vers un fichier Excel:
TextFormatsPreferencePage.OdfExport=Export ODF
TextFormatsPreferencePage.OdfExportLabel=S\u00E9lectionner les options de format pour l'export vers un fichier ODF:
+TextFormatsPreferencePage.IncludeVersionLine=Include la ligne de version
TextFormatsPreferencePage.LDIF=LDIF
TextFormatsPreferencePage.LDIFLabel=S\u00E9lectionner les options de format pour LDIF:
TextFormatsPreferencePage.LineLength1=Longueur de ligne:
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/SearchTransfer.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/SearchTransfer.java
index 2ad0a71..e1a1f5f 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/SearchTransfer.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/SearchTransfer.java
@@ -33,7 +33,6 @@
import org.apache.directory.studio.ldapbrowser.core.BrowserConnectionManager;
import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
-import org.apache.directory.studio.ldapbrowser.core.model.IQuickSearch;
import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
import org.eclipse.swt.dnd.ByteArrayTransfer;
import org.eclipse.swt.dnd.Transfer;
@@ -106,16 +105,9 @@
byte[] connectionId = search.getBrowserConnection().getConnection().getId().getBytes( "UTF-8" ); //$NON-NLS-1$
writeOut.writeInt( connectionId.length );
writeOut.write( connectionId );
- if ( search instanceof IQuickSearch )
- {
- writeOut.writeInt( 0 );
- }
- else
- {
- byte[] searchName = search.getName().getBytes( "UTF-8" ); //$NON-NLS-1$
- writeOut.writeInt( searchName.length );
- writeOut.write( searchName );
- }
+ byte[] searchName = search.getName().getBytes( "UTF-8" ); //$NON-NLS-1$
+ writeOut.writeInt( searchName.length );
+ writeOut.write( searchName );
}
byte[] buffer = out.toByteArray();
@@ -174,16 +166,9 @@
if ( readIn.available() > 1 && connection != null )
{
int size = readIn.readInt();
- if ( size == 0 )
- {
- search = connection.getSearchManager().getQuickSearch();
- }
- else
- {
- byte[] searchName = new byte[size];
- readIn.read( searchName );
- search = connection.getSearchManager().getSearch( new String( searchName, "UTF-8" ) ); //$NON-NLS-1$
- }
+ byte[] searchName = new byte[size];
+ readIn.read( searchName );
+ search = connection.getSearchManager().getSearch( new String( searchName, "UTF-8" ) ); //$NON-NLS-1$
}
else
{
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java
index bd7620a..a7b2aa3 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java
@@ -41,6 +41,7 @@
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
@@ -104,6 +105,45 @@
/** The preview text. */
private Text previewText;
+ // Listeners
+ private SelectionListener rdnAddButtonSelectionListener = new SelectionAdapter()
+ {
+ public void widgetSelected( SelectionEvent e )
+ {
+ int index = rdnLineList.size();
+ for ( int i = 0; i < rdnLineList.size(); i++ )
+ {
+ RdnLine rdnLine = rdnLineList.get( i );
+ if ( rdnLine.rdnAddButton == e.widget )
+ {
+ index = i + 1;
+ }
+ }
+ addRdnLine( rdnComposite, index );
+
+ validate();
+ }
+ };
+
+ private SelectionListener rdnDeleteButtonSelectionListener = new SelectionAdapter()
+ {
+ public void widgetSelected( SelectionEvent e )
+ {
+ int index = 0;
+ for ( int i = 0; i < rdnLineList.size(); i++ )
+ {
+ RdnLine rdnLine = rdnLineList.get( i );
+ if ( rdnLine.rdnDeleteButton == e.widget )
+ {
+ index = i;
+ }
+ }
+ deleteRdnLine( rdnComposite, index );
+
+ validate();
+ }
+ };
+
/**
* Creates a new instance of DnBuilderWidget.
@@ -174,8 +214,14 @@
{
Ava ava = atavIterator.next();
addRdnLine( rdnComposite, i );
- rdnLineList.get( i ).rdnTypeCombo.setText( ava.getUpType() );
+
+ removeRdnLineListeners( i );
+
+ rdnLineList.get( i ).rdnTypeCombo.setText( ava.getType() );
rdnLineList.get( i ).rdnValueText.setText( ava.getNormValue().getString() );
+
+ addRdnLineListeners( i );
+
if ( i == 0 )
{
if ( "".equals( rdnLineList.get( i ).rdnTypeCombo ) ) //$NON-NLS-1$
@@ -304,7 +350,7 @@
public void validate()
{
Exception rdnE = null;
-
+
if ( showRDN )
{
try
@@ -312,10 +358,10 @@
// calculate Rdn
String[] rdnTypes = new String[rdnLineList.size()];
String[] rdnValues = new String[rdnLineList.size()];
-
+
for ( int i = 0; i < rdnLineList.size(); i++ )
{
- RdnLine rdnLine = ( RdnLine ) rdnLineList.get( i );
+ RdnLine rdnLine = rdnLineList.get( i );
rdnTypes[i] = rdnLine.rdnTypeCombo.getText();
rdnValues[i] = rdnLine.rdnValueText.getText();
@@ -328,7 +374,7 @@
rdnLine.rdnDeleteButton.setEnabled( false );
}
}
-
+
rdn = DnUtils.composeRdn( rdnTypes, rdnValues );
}
catch ( Exception e )
@@ -339,7 +385,7 @@
}
Exception parentE = null;
-
+
if ( showParent )
{
try
@@ -355,12 +401,12 @@
}
String s = ""; //$NON-NLS-1$
-
+
if ( rdnE != null )
{
s += rdnE.getMessage() != null ? rdnE.getMessage() : Messages.getString( "DnBuilderWidget.ErrorInRDN" ); //$NON-NLS-1$
}
-
+
if ( parentE != null )
{
s += ", " + parentE.getMessage() != null ? parentE.getMessage() : Messages.getString( "DnBuilderWidget.ErrorInParentDN" ); //$NON-NLS-1$ //$NON-NLS-2$
@@ -407,7 +453,7 @@
{
dn = Dn.EMPTY_DN;
}
-
+
previewText.setText( dn.getName() );
}
}
@@ -497,67 +543,30 @@
rdnLine.rdnAddButton = new Button( rdnComposite, SWT.PUSH );
rdnLine.rdnAddButton.setText( " + " ); //$NON-NLS-1$
- rdnLine.rdnAddButton.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent e )
- {
- int index = rdnLineList.size();
- for ( int i = 0; i < rdnLineList.size(); i++ )
- {
- RdnLine rdnLine = ( RdnLine ) rdnLineList.get( i );
- if ( rdnLine.rdnAddButton == e.widget )
- {
- index = i + 1;
- }
- }
- addRdnLine( rdnComposite, index );
-
- validate();
- }
- } );
rdnLine.rdnDeleteButton = new Button( rdnComposite, SWT.PUSH );
rdnLine.rdnDeleteButton.setText( " \u2212 " ); //$NON-NLS-1$
- rdnLine.rdnDeleteButton.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent e )
- {
- int index = 0;
- for ( int i = 0; i < rdnLineList.size(); i++ )
- {
- RdnLine rdnLine = ( RdnLine ) rdnLineList.get( i );
- if ( rdnLine.rdnDeleteButton == e.widget )
- {
- index = i;
- }
- }
- deleteRdnLine( rdnComposite, index );
-
- validate();
- }
- } );
if ( attributeNames != null )
{
rdnLine.rdnTypeCombo.setItems( attributeNames );
}
- rdnLine.rdnTypeCombo.addModifyListener( this );
- rdnLine.rdnValueText.addModifyListener( this );
+ addRdnLineListeners( rdnLine );
return rdnLine;
}
/**
- * Delete thd Rdn line on the given index.
+ * Delete the Rdn line on the given index.
*
* @param rdnComposite the Rdn composite
* @param index the index
*/
private void deleteRdnLine( Composite rdnComposite, int index )
{
- RdnLine rdnLine = ( RdnLine ) rdnLineList.remove( index );
+ RdnLine rdnLine = rdnLineList.remove( index );
if ( rdnLine != null )
{
rdnLine.rdnTypeCombo.dispose();
@@ -573,6 +582,68 @@
}
}
+
+ /**
+ * Adds listeners for the Rdn line at the given index.
+ *
+ * @param index the index
+ */
+ private void addRdnLineListeners( int index )
+ {
+ if ( rdnLineList != null )
+ {
+ addRdnLineListeners( rdnLineList.get( index ) );
+ }
+ }
+
+
+ /**
+ * Adds listeners for the Rdn line.
+ *
+ * @param rdnLine the Rdn line
+ */
+ private void addRdnLineListeners( RdnLine rdnLine )
+ {
+ if ( rdnLine != null )
+ {
+ rdnLine.rdnAddButton.addSelectionListener( rdnAddButtonSelectionListener );
+ rdnLine.rdnDeleteButton.addSelectionListener( rdnDeleteButtonSelectionListener );
+ rdnLine.rdnTypeCombo.addModifyListener( this );
+ rdnLine.rdnValueText.addModifyListener( this );
+ }
+ }
+
+
+ /**
+ * Removes listeners for the Rdn line at the given index.
+ *
+ * @param index the index
+ */
+ private void removeRdnLineListeners( int index )
+ {
+ if ( rdnLineList != null )
+ {
+ removeRdnLineListeners( rdnLineList.get( index ) );
+ }
+ }
+
+
+ /**
+ * Removes listeners for the Rdn line.
+ *
+ * @param rdnLine the Rdn line
+ */
+ private void removeRdnLineListeners( RdnLine rdnLine )
+ {
+ if ( rdnLine != null )
+ {
+ rdnLine.rdnAddButton.removeSelectionListener( rdnAddButtonSelectionListener );
+ rdnLine.rdnDeleteButton.removeSelectionListener( rdnDeleteButtonSelectionListener );
+ rdnLine.rdnTypeCombo.removeModifyListener( this );
+ rdnLine.rdnValueText.removeModifyListener( this );
+ }
+ }
+
/**
* The Class RdnLine is a wrapper for all input elements
* of an Rdn line. It contains a combo for the Rdn attribute,
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/FileBrowserWidget.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/FileBrowserWidget.java
index 4ea8af4..b66a8dc 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/FileBrowserWidget.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/FileBrowserWidget.java
@@ -23,6 +23,7 @@
import java.io.File;
+import org.apache.directory.studio.common.ui.HistoryUtils;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
@@ -31,6 +32,7 @@
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
@@ -39,13 +41,12 @@
/**
* The FileBrowserWidget provides a combo with a history of recently
- * used files an a browse button to open the file browser.
+ * used files and a browse button to open the file browser.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class FileBrowserWidget extends BrowserWidget
{
-
/** The Constant TYPE_OPEN is used to create a Open file dialog. */
public static final int TYPE_OPEN = SWT.OPEN;
@@ -53,19 +54,19 @@
public static final int TYPE_SAVE = SWT.SAVE;
/** The combo with the history of recently used files */
- private Combo fileCombo;
+ protected Combo fileCombo;
/** The button to launch the file browser */
- private Button browseButton;
+ protected Button browseButton;
/** The title */
- private String title;
+ protected String title;
- /** File extensions used within the lauched file browser */
- private String[] extensions;
+ /** File extensions used within the launched file browser */
+ protected String[] extensions;
/** The type */
- private int type;
+ protected int type;
/**
@@ -88,11 +89,14 @@
*
* @param parent the parent
*/
- public void createWidget( final Composite parent )
+ public void createWidget( Composite parent )
{
-
// Combo
- fileCombo = BaseWidgetUtils.createCombo( parent, new String[0], -1, 1 );
+ fileCombo = new Combo( parent, SWT.DROP_DOWN | SWT.BORDER );
+ GridData gd = new GridData( GridData.FILL_HORIZONTAL );
+ gd.widthHint = 50;
+ fileCombo.setLayoutData( gd );
+ fileCombo.setVisibleItemCount( 20 );
fileCombo.addModifyListener( new ModifyListener()
{
public void modifyText( ModifyEvent e )
@@ -107,7 +111,7 @@
{
public void widgetSelected( SelectionEvent event )
{
- FileDialog fileDialog = new FileDialog( parent.getShell(), type );
+ FileDialog fileDialog = new FileDialog( browseButton.getShell(), type );
fileDialog.setText( title );
fileDialog.setFilterExtensions( extensions );
@@ -140,7 +144,8 @@
} );
// file history
- String[] history = HistoryUtils.load( BrowserCommonConstants.DIALOGSETTING_KEY_FILE_HISTORY );
+ String[] history = HistoryUtils.load( BrowserCommonActivator.getDefault().getDialogSettings(),
+ BrowserCommonConstants.DIALOGSETTING_KEY_FILE_HISTORY );
fileCombo.setItems( history );
}
@@ -172,7 +177,8 @@
*/
public void saveDialogSettings()
{
- HistoryUtils.save( BrowserCommonConstants.DIALOGSETTING_KEY_FILE_HISTORY, fileCombo.getText() );
+ HistoryUtils.save( BrowserCommonActivator.getDefault().getDialogSettings(),
+ BrowserCommonConstants.DIALOGSETTING_KEY_FILE_HISTORY, fileCombo.getText() );
}
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/HistoryUtils.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/HistoryUtils.java
deleted file mode 100644
index b210410..0000000
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/HistoryUtils.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.directory.studio.ldapbrowser.common.widgets;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
-import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
-
-
-/**
- * The HistoryUtils are used to save and load the history of input fields.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public class HistoryUtils
-{
-
- /**
- * Saves the the given value under the given key in the dialog settings.
- *
- * @param key the key
- * @param value the value
- */
- public static void save( String key, String value )
- {
- // get current history
- String[] history = load( key );
- List<String> list = new ArrayList<String>( Arrays.asList( history ) );
-
- // add new value or move to first position
- if ( list.contains( value ) )
- {
- list.remove( value );
- }
- list.add( 0, value );
-
- // check history size
- while ( list.size() > BrowserCommonConstants.HISTORYSIZE )
- {
- list.remove( list.size() - 1 );
- }
-
- // save
- history = list.toArray( new String[list.size()] );
- BrowserCommonActivator.getDefault().getDialogSettings().put( key, history );
-
- }
-
-
- /**
- * Loads the value of the given key from the dialog settings
- *
- * @param key the key
- * @return the value
- */
- public static String[] load( String key )
- {
- String[] history = BrowserCommonActivator.getDefault().getDialogSettings().getArray( key );
- if ( history == null )
- {
- history = new String[0];
- }
- return history;
- }
-
-}
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserActionGroup.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserActionGroup.java
index 814b4fb..df0fb8c 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserActionGroup.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserActionGroup.java
@@ -108,7 +108,8 @@
showQuickSearchAction = new ShowQuickSearchAction( mainWidget.getQuickSearchWidget() );
collapseAllAction = new CollapseAllAction( viewer );
- browserActionMap.put( openQuickSearchAction, new BrowserViewActionProxy( viewer, new OpenQuickSearchAction() ) );
+ browserActionMap.put( openQuickSearchAction, new BrowserViewActionProxy( viewer, new OpenQuickSearchAction(
+ mainWidget ) ) );
browserActionMap.put( upAction, new BrowserViewActionProxy( viewer, new UpAction( viewer ) ) );
browserActionMap.put( refreshAction, new BrowserViewActionProxy( viewer, new RefreshAction() ) );
browserActionMap.put( filterChildrenAction, new BrowserViewActionProxy( viewer, new FilterChildrenAction() ) );
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserCategory.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserCategory.java
index ebf4211..2c8480a 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserCategory.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserCategory.java
@@ -50,7 +50,7 @@
public static final String TITLE_SEARCHES = Messages.getString( "BrowserCategory.Searches" ); //$NON-NLS-1$
/** The title for the bookmarks categoy */
- public static final String TITLE_BOOKMARKS = Messages.getString( "BrowserCategory.Bookmarsk" ); //$NON-NLS-1$
+ public static final String TITLE_BOOKMARKS = Messages.getString( "BrowserCategory.Bookmarks" ); //$NON-NLS-1$
/** The category's connection */
private IBrowserConnection parent;
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserConfiguration.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserConfiguration.java
index c52ee3a..79c9d62 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserConfiguration.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserConfiguration.java
@@ -76,12 +76,6 @@
{
if ( !disposed )
{
- if ( sorter != null )
- {
- sorter.dispose();
- sorter = null;
- }
-
if ( preferences != null )
{
preferences.dispose();
@@ -136,15 +130,15 @@
/**
* Gets the content provider.
*
- * @param viewer the browser widget's tree viewer
+ * @param widget the browser widget
*
* @return the content provider
*/
- public BrowserContentProvider getContentProvider( TreeViewer viewer )
+ public BrowserContentProvider getContentProvider( BrowserWidget widget )
{
if ( contentProvider == null )
{
- contentProvider = new BrowserContentProvider( viewer, getPreferences(), getSorter() );
+ contentProvider = new BrowserContentProvider( widget, getPreferences(), getSorter() );
}
return contentProvider;
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java
index 45f420e..c9e55a9 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java
@@ -30,7 +30,6 @@
import org.apache.directory.studio.connection.core.jobs.OpenConnectionsRunnable;
import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress;
-import org.apache.directory.studio.ldapbrowser.core.SearchManager;
import org.apache.directory.studio.ldapbrowser.core.jobs.InitializeChildrenRunnable;
import org.apache.directory.studio.ldapbrowser.core.jobs.SearchRunnable;
import org.apache.directory.studio.ldapbrowser.core.jobs.StudioBrowserJob;
@@ -61,6 +60,8 @@
*/
public class BrowserContentProvider implements ITreeContentProvider
{
+ /** The browser widget */
+ private BrowserWidget widget;
/** The viewer. */
private TreeViewer viewer;
@@ -88,7 +89,8 @@
IStructuredSelection selection = ( IStructuredSelection ) event.getSelection();
if ( selection.size() == 1 && selection.getFirstElement() instanceof StudioConnectionRunnableWithProgress )
{
- StudioConnectionRunnableWithProgress runnable = ( StudioConnectionRunnableWithProgress ) selection.getFirstElement();
+ StudioConnectionRunnableWithProgress runnable = ( StudioConnectionRunnableWithProgress ) selection
+ .getFirstElement();
new StudioBrowserJob( runnable ).execute();
}
}
@@ -102,9 +104,10 @@
* @param preferences the preferences
* @param sorter the sorter
*/
- public BrowserContentProvider( TreeViewer viewer, BrowserPreferences preferences, BrowserSorter sorter )
+ public BrowserContentProvider( BrowserWidget widget, BrowserPreferences preferences, BrowserSorter sorter )
{
- this.viewer = viewer;
+ this.widget = widget;
+ this.viewer = widget.getViewer();
this.preferences = preferences;
this.sorter = sorter;
this.entryToEntryPagesMap = new HashMap<IEntry, BrowserEntryPage[]>();
@@ -381,11 +384,10 @@
List<Object> objects = new ArrayList<Object>();
- SearchManager sm = parentEntry.getBrowserConnection().getSearchManager();
- if ( sm != null && sm.getQuickSearch() != null
- && parentEntry.getDn().equals( sm.getQuickSearch().getSearchBase() ) )
+ if ( widget.getQuickSearch() != null
+ && parentEntry.getDn().equals( widget.getQuickSearch().getSearchBase() ) )
{
- objects.add( sm.getQuickSearch() );
+ objects.add( widget.getQuickSearch() );
}
if ( parentEntry.getTopPageChildrenRunnable() != null )
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserPreferences.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserPreferences.java
index 24447cf..89adaa7 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserPreferences.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserPreferences.java
@@ -76,12 +76,12 @@
/**
- * Gets the sort by, one of BrowserCoreConstants.SORT_BY_NONE,
+ * Gets the sort entries by, one of BrowserCoreConstants.SORT_BY_NONE,
* BrowserCoreConstants.SORT_BY_RDN or BrowserCoreConstants.SORT_BY_RDN_VALUE.
*
- * @return the sort by
+ * @return the sort entries by
*/
- public int getSortBy()
+ public int getSortEntriesBy()
{
return BrowserCommonActivator.getDefault().getPreferenceStore().getInt(
BrowserCommonConstants.PREFERENCE_BROWSER_SORT_BY );
@@ -89,15 +89,41 @@
/**
- * Gets the sort order, one of one of BrowserCoreConstants.SORT_ORDER_NONE,
+ * Gets the sort entries order, one of one of BrowserCoreConstants.SORT_ORDER_NONE,
+ * BrowserCoreConstants.SORT_ORDER_ASCENDING or BrowserCoreConstants.SORT_ORDER_DESCENDING.
+ *
+ * @return the sort entries order
+ */
+ public int getSortEntriesOrder()
+ {
+ return BrowserCommonActivator.getDefault().getPreferenceStore().getInt(
+ BrowserCommonConstants.PREFERENCE_BROWSER_SORT_ORDER );
+ }
+
+
+ /**
+ * Gets the searches sort order, one of one of BrowserCoreConstants.SORT_ORDER_NONE,
+ * BrowserCoreConstants.SORT_ORDER_ASCENDING or BrowserCoreConstants.SORT_ORDER_DESCENDING.
+ *
+ * @return the searches sort order
+ */
+ public int getSortSearchesOrder()
+ {
+ return BrowserCommonActivator.getDefault().getPreferenceStore().getInt(
+ BrowserCommonConstants.PREFERENCE_BROWSER_SORT_SEARCHES_ORDER );
+ }
+
+
+ /**
+ * Gets the bookmarks sort order, one of one of BrowserCoreConstants.SORT_ORDER_NONE,
* BrowserCoreConstants.SORT_ORDER_ASCENDING or BrowserCoreConstants.SORT_ORDER_DESCENDING.
*
* @return the sort order
*/
- public int getSortOrder()
+ public int getSortBookmarksOrder()
{
return BrowserCommonActivator.getDefault().getPreferenceStore().getInt(
- BrowserCommonConstants.PREFERENCE_BROWSER_SORT_ORDER );
+ BrowserCommonConstants.PREFERENCE_BROWSER_SORT_BOOKMARKS_ORDER );
}
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java
index 5677f7f..d814e90 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java
@@ -26,12 +26,12 @@
import org.apache.directory.shared.ldap.model.message.SearchScope;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.studio.common.ui.HistoryUtils;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.ui.widgets.ExtendedContentAssistCommandAdapter;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
import org.apache.directory.studio.ldapbrowser.common.actions.BrowserSelectionUtils;
-import org.apache.directory.studio.ldapbrowser.common.widgets.HistoryUtils;
import org.apache.directory.studio.ldapbrowser.common.widgets.ListContentProposalProvider;
import org.apache.directory.studio.ldapbrowser.core.jobs.SearchRunnable;
import org.apache.directory.studio.ldapbrowser.core.jobs.StudioBrowserJob;
@@ -41,6 +41,7 @@
import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
import org.apache.directory.studio.ldapbrowser.core.model.impl.QuickSearch;
import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
+import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.fieldassist.ComboContentAdapter;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -134,7 +135,8 @@
{
this.browserWidget = browserWidget;
- if ( HistoryUtils.load( ATTRIBUTE_HISTORY_DIALOGSETTING_KEY ).length == 0 )
+ if ( HistoryUtils.load( BrowserCommonActivator.getDefault().getDialogSettings(),
+ ATTRIBUTE_HISTORY_DIALOGSETTING_KEY ).length == 0 )
{
BrowserCommonActivator.getDefault().getDialogSettings().put( ATTRIBUTE_HISTORY_DIALOGSETTING_KEY,
new String[]
@@ -183,13 +185,15 @@
{
this.browserWidget.getViewer().addPostSelectionChangedListener( selectionListener );
+ IDialogSettings dialogSettings = BrowserCommonActivator.getDefault().getDialogSettings();
+
// Reseting the layout of the composite to be displayed correctly
GridData compositeGridData = new GridData( SWT.FILL, SWT.NONE, true, false );
composite.setLayoutData( compositeGridData );
innerComposite = BaseWidgetUtils.createColumnContainer( composite, 5, 1 );
- String[] attributes = HistoryUtils.load( ATTRIBUTE_HISTORY_DIALOGSETTING_KEY );
+ String[] attributes = HistoryUtils.load( dialogSettings, ATTRIBUTE_HISTORY_DIALOGSETTING_KEY );
quickSearchAttributeCombo = BaseWidgetUtils.createCombo( innerComposite, attributes, -1, 1 );
quickSearchAttributePP = new ListContentProposalProvider( attributes );
new ExtendedContentAssistCommandAdapter( quickSearchAttributeCombo, new ComboContentAdapter(),
@@ -198,7 +202,7 @@
{
public void modifyText( ModifyEvent e )
{
- quickSearchRunButton.setEnabled( !"".equals( quickSearchAttributeCombo.getText() ) );
+ quickSearchRunButton.setEnabled( !"".equals( quickSearchAttributeCombo.getText() ) ); //$NON-NLS-1$
}
} );
quickSearchAttributeCombo.addSelectionListener( new SelectionAdapter()
@@ -213,12 +217,12 @@
quickSearchAttributeCombo.setLayoutData( gd );
String[] operators = new String[]
- { "=", "!=", "<=", ">=", "~=" };
+ { "=", "!=", "<=", ">=", "~=" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
quickSearchOperatorCombo = BaseWidgetUtils.createReadonlyCombo( innerComposite, operators, 0, 1 );
GridData data = new GridData();
quickSearchOperatorCombo.setLayoutData( data );
- String[] values = HistoryUtils.load( VALUE_HISTORY_DIALOGSETTING_KEY );
+ String[] values = HistoryUtils.load( dialogSettings, VALUE_HISTORY_DIALOGSETTING_KEY );
quickSearchValueCombo = BaseWidgetUtils.createCombo( innerComposite, values, -1, 1 );
quickSearchValuePP = new ListContentProposalProvider( values );
new ExtendedContentAssistCommandAdapter( quickSearchValueCombo, new ComboContentAdapter(), quickSearchValuePP,
@@ -280,12 +284,14 @@
return;
}
- HistoryUtils.save( ATTRIBUTE_HISTORY_DIALOGSETTING_KEY, quickSearchAttributeCombo.getText() );
- String[] attributes = HistoryUtils.load( ATTRIBUTE_HISTORY_DIALOGSETTING_KEY );
+ IDialogSettings dialogSettings = BrowserCommonActivator.getDefault().getDialogSettings();
+
+ HistoryUtils.save( dialogSettings, ATTRIBUTE_HISTORY_DIALOGSETTING_KEY, quickSearchAttributeCombo.getText() );
+ String[] attributes = HistoryUtils.load( dialogSettings, ATTRIBUTE_HISTORY_DIALOGSETTING_KEY );
quickSearchAttributeCombo.setItems( attributes );
quickSearchAttributeCombo.select( 0 );
- HistoryUtils.save( VALUE_HISTORY_DIALOGSETTING_KEY, quickSearchValueCombo.getText() );
- String[] values = HistoryUtils.load( VALUE_HISTORY_DIALOGSETTING_KEY );
+ HistoryUtils.save( dialogSettings, VALUE_HISTORY_DIALOGSETTING_KEY, quickSearchValueCombo.getText() );
+ String[] values = HistoryUtils.load( dialogSettings, VALUE_HISTORY_DIALOGSETTING_KEY );
quickSearchValueCombo.setItems( values );
quickSearchValueCombo.select( 0 );
quickSearchValuePP.setProposals( Arrays.asList( values ) );
@@ -293,34 +299,36 @@
IBrowserConnection conn = entry.getBrowserConnection();
QuickSearch quickSearch = new QuickSearch( entry, conn );
- quickSearch.getSearchParameter().setScope( quickSearchScopeButton.getSelection() ? SearchScope.SUBTREE : SearchScope.ONELEVEL );
+ quickSearch.getSearchParameter().setScope(
+ quickSearchScopeButton.getSelection() ? SearchScope.SUBTREE : SearchScope.ONELEVEL );
StringBuffer filter = new StringBuffer();
- filter.append( "(" );
- if ( "!=".equals( quickSearchOperatorCombo.getText() ) )
+ filter.append( "(" ); //$NON-NLS-1$
+ if ( "!=".equals( quickSearchOperatorCombo.getText() ) ) //$NON-NLS-1$
{
- filter.append( "!(" );
+ filter.append( "!(" ); //$NON-NLS-1$
}
filter.append( quickSearchAttributeCombo.getText() );
- filter.append( "!=".equals( quickSearchOperatorCombo.getText() ) ? "=" : quickSearchOperatorCombo.getText() );
+ filter
+ .append( Messages.getString( "BrowserQuickSearchWidget.9" ).equals( quickSearchOperatorCombo.getText() ) ? "=" : quickSearchOperatorCombo.getText() ); //$NON-NLS-1$ //$NON-NLS-2$
// only escape '\', '(', ')', and '\u0000'
// don't escape '*' to allow substring search
String value = quickSearchValueCombo.getText();
- value = value.replaceAll( "\\\\", "\\\\5c" );
- value = value.replaceAll( "\u0000", "\\\\00" );
- value = value.replaceAll( "\\(", "\\\\28" );
- value = value.replaceAll( "\\)", "\\\\29" );
+ value = value.replaceAll( "\\\\", "\\\\5c" ); //$NON-NLS-1$ //$NON-NLS-2$
+ value = value.replaceAll( "\u0000", "\\\\00" ); //$NON-NLS-1$ //$NON-NLS-2$
+ value = value.replaceAll( "\\(", "\\\\28" ); //$NON-NLS-1$ //$NON-NLS-2$
+ value = value.replaceAll( "\\)", "\\\\29" ); //$NON-NLS-1$ //$NON-NLS-2$
filter.append( value );
- if ( "!=".equals( quickSearchOperatorCombo.getText() ) )
+ if ( "!=".equals( quickSearchOperatorCombo.getText() ) ) //$NON-NLS-1$
{
- filter.append( ")" );
+ filter.append( ")" ); //$NON-NLS-1$
}
- filter.append( ")" );
+ filter.append( ")" ); //$NON-NLS-1$
quickSearch.getSearchParameter().setFilter( filter.toString() );
// set new quick search
- conn.getSearchManager().setQuickSearch( quickSearch );
+ browserWidget.setQuickSearch( quickSearch );
// execute quick search
new StudioBrowserJob( new SearchRunnable( new ISearch[]
@@ -410,7 +418,7 @@
quickSearchOperatorCombo.setEnabled( enabled );
quickSearchValueCombo.setEnabled( enabled );
quickSearchScopeButton.setEnabled( enabled );
- quickSearchRunButton.setEnabled( enabled && !"".equals( quickSearchAttributeCombo.getText() ) );
+ quickSearchRunButton.setEnabled( enabled && !"".equals( quickSearchAttributeCombo.getText() ) ); //$NON-NLS-1$
if ( !enabled )
{
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java
index 4c70915..7fe67df 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java
@@ -26,6 +26,7 @@
import org.apache.directory.shared.ldap.model.name.Rdn;
import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
+import org.apache.directory.studio.ldapbrowser.core.model.IBookmark;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult;
@@ -43,7 +44,6 @@
*/
public class BrowserSorter extends ViewerSorter
{
-
/** The browser preferences, used to get the sort settings */
private BrowserPreferences preferences;
@@ -71,23 +71,14 @@
/**
- * Disposes this sorter.
- */
- public void dispose()
- {
- }
-
-
- /**
* {@inheritDoc}
*
- * For performance reasons this implemention first checks if sorting is enabled
+ * For performance reasons this implementation first checks if sorting is enabled
* and if the number of elements is less than the sort limit.
*/
public void sort( final Viewer viewer, final Object[] elements )
{
- if ( elements != null && ( preferences.getSortLimit() <= 0 || elements.length < preferences.getSortLimit() )
- && ( preferences.getSortBy() != BrowserCoreConstants.SORT_BY_NONE || preferences.isLeafEntriesFirst() ) )
+ if ( elements != null && ( preferences.getSortLimit() <= 0 || elements.length < preferences.getSortLimit() ) )
{
BrowserSorter.super.sort( viewer, elements );
}
@@ -143,83 +134,101 @@
*/
public int compare( Viewer viewer, Object o1, Object o2 )
{
+ // o1 is StudioConnectionRunnableWithProgress
if ( o1 instanceof StudioConnectionRunnableWithProgress )
{
StudioConnectionRunnableWithProgress runnable = ( StudioConnectionRunnableWithProgress ) o1;
+
for ( Object lockedObject : runnable.getLockedObjects() )
{
if ( lockedObject instanceof ISearch )
{
ISearch search = ( ISearch ) lockedObject;
+
if ( o1 == search.getTopSearchRunnable() )
{
- return lessThan();
+ return lessThanEntries();
}
else if ( o1 == search.getNextSearchRunnable() )
{
- return greaterThan();
+ return greaterThanEntries();
}
}
else if ( lockedObject instanceof IEntry )
{
IEntry entry = ( IEntry ) lockedObject;
+
if ( o1 == entry.getTopPageChildrenRunnable() )
{
- return lessThan();
+ return lessThanEntries();
}
else if ( o1 == entry.getNextPageChildrenRunnable() )
{
- return greaterThan();
+ return greaterThanEntries();
}
}
}
- return lessThan();
+
+ return lessThanEntries();
}
+
+ // o2 is StudioConnectionRunnableWithProgress
if ( o2 instanceof StudioConnectionRunnableWithProgress )
{
StudioConnectionRunnableWithProgress runnable = ( StudioConnectionRunnableWithProgress ) o2;
+
for ( Object lockedObject : runnable.getLockedObjects() )
{
if ( lockedObject instanceof ISearch )
{
ISearch search = ( ISearch ) lockedObject;
+
if ( o2 == search.getTopSearchRunnable() )
{
- return greaterThan();
+ return greaterThanEntries();
}
else if ( o2 == search.getNextSearchRunnable() )
{
- return lessThan();
+ return lessThanEntries();
}
}
else if ( lockedObject instanceof IEntry )
{
IEntry entry = ( IEntry ) lockedObject;
+
if ( o2 == entry.getTopPageChildrenRunnable() )
{
- return greaterThan();
+ return greaterThanEntries();
}
else if ( o2 == entry.getNextPageChildrenRunnable() )
{
- return lessThan();
+ return lessThanEntries();
}
}
}
- return greaterThan();
+
+ return greaterThanEntries();
}
+ // o1 and o2 are null
if ( o1 == null && o2 == null )
{
return equal();
}
+
+ // o1 is null, o2 isn't
else if ( o1 == null && o2 != null )
{
- return lessThan();
+ return lessThanEntries();
}
+
+ // o1 isn't null, o1 is
else if ( o1 != null && o2 == null )
{
- return greaterThan();
+ return greaterThanEntries();
}
+
+ // o1 and o2 are entries
else if ( o1 instanceof IEntry || o2 instanceof IEntry )
{
if ( !( o1 instanceof IEntry ) && !( o2 instanceof IEntry ) )
@@ -228,11 +237,11 @@
}
else if ( !( o1 instanceof IEntry ) && ( o2 instanceof IEntry ) )
{
- return lessThan();
+ return lessThanEntries();
}
else if ( ( o1 instanceof IEntry ) && !( o2 instanceof IEntry ) )
{
- return greaterThan();
+ return greaterThanEntries();
}
else
{
@@ -241,19 +250,20 @@
int cat1 = category( entry1 );
int cat2 = category( entry2 );
+
if ( cat1 != cat2 )
{
return cat1 - cat2;
}
- else if ( preferences.getSortBy() == BrowserCoreConstants.SORT_BY_NONE )
+ else if ( preferences.getSortEntriesBy() == BrowserCoreConstants.SORT_BY_NONE )
{
return equal();
}
- else if ( preferences.getSortBy() == BrowserCoreConstants.SORT_BY_RDN )
+ else if ( preferences.getSortEntriesBy() == BrowserCoreConstants.SORT_BY_RDN )
{
return compareRdns( entry1, entry2 );
}
- else if ( preferences.getSortBy() == BrowserCoreConstants.SORT_BY_RDN_VALUE )
+ else if ( preferences.getSortEntriesBy() == BrowserCoreConstants.SORT_BY_RDN_VALUE )
{
return compareRdnValues( entry1, entry2 );
}
@@ -263,6 +273,8 @@
}
}
}
+
+ // o1 and o2 are search results
else if ( o1 instanceof ISearchResult || o2 instanceof ISearchResult )
{
if ( !( o1 instanceof ISearchResult ) && !( o2 instanceof ISearchResult ) )
@@ -271,11 +283,11 @@
}
else if ( !( o1 instanceof ISearchResult ) && ( o2 instanceof ISearchResult ) )
{
- return lessThan();
+ return lessThanEntries();
}
else if ( ( o1 instanceof ISearchResult ) && !( o2 instanceof ISearchResult ) )
{
- return greaterThan();
+ return greaterThanEntries();
}
else
{
@@ -284,19 +296,20 @@
int cat1 = category( sr1 );
int cat2 = category( sr2 );
+
if ( cat1 != cat2 )
{
return cat1 - cat2;
}
- else if ( preferences.getSortBy() == BrowserCoreConstants.SORT_BY_NONE )
+ else if ( preferences.getSortEntriesBy() == BrowserCoreConstants.SORT_BY_NONE )
{
return equal();
}
- else if ( preferences.getSortBy() == BrowserCoreConstants.SORT_BY_RDN )
+ else if ( preferences.getSortEntriesBy() == BrowserCoreConstants.SORT_BY_RDN )
{
return compareRdns( sr1.getEntry(), sr2.getEntry() );
}
- else if ( preferences.getSortBy() == BrowserCoreConstants.SORT_BY_RDN_VALUE )
+ else if ( preferences.getSortEntriesBy() == BrowserCoreConstants.SORT_BY_RDN_VALUE )
{
return compareRdnValues( sr1.getEntry(), sr2.getEntry() );
}
@@ -306,6 +319,68 @@
}
}
}
+
+ // o1 and o2 are searches
+ else if ( o1 instanceof ISearch || o2 instanceof ISearch )
+ {
+ if ( !( o1 instanceof ISearch ) && !( o2 instanceof ISearch ) )
+ {
+ return equal();
+ }
+ else if ( !( o1 instanceof ISearch ) && ( o2 instanceof ISearch ) )
+ {
+ return lessThanSearches();
+ }
+ else if ( ( o1 instanceof ISearch ) && !( o2 instanceof ISearch ) )
+ {
+ return greaterThanSearches();
+ }
+ else
+ {
+ ISearch s1 = ( ISearch ) o1;
+ ISearch s2 = ( ISearch ) o2;
+
+ if ( preferences.getSortSearchesOrder() == BrowserCoreConstants.SORT_ORDER_NONE )
+ {
+ return equal();
+ }
+ else
+ {
+ return compareSearches( s1.getName(), s2.getName() );
+ }
+ }
+ }
+
+ // o1 and o2 are bookmarks
+ else if ( o1 instanceof IBookmark || o2 instanceof IBookmark )
+ {
+ if ( !( o1 instanceof IBookmark ) && !( o2 instanceof IBookmark ) )
+ {
+ return equal();
+ }
+ else if ( !( o1 instanceof IBookmark ) && ( o2 instanceof IBookmark ) )
+ {
+ return lessThanBookmarks();
+ }
+ else if ( ( o1 instanceof IBookmark ) && !( o2 instanceof IBookmark ) )
+ {
+ return greaterThanBookmarks();
+ }
+ else
+ {
+ IBookmark b1 = ( IBookmark ) o1;
+ IBookmark b2 = ( IBookmark ) o2;
+
+ if ( preferences.getSortBookmarksOrder() == BrowserCoreConstants.SORT_ORDER_NONE )
+ {
+ return equal();
+ }
+ else
+ {
+ return compareBookmarks( b1.getName(), b2.getName() );
+ }
+ }
+ }
else
{
return equal();
@@ -331,15 +406,15 @@
}
else if ( rdn1 == null && rdn2 != null )
{
- return greaterThan();
+ return greaterThanEntries();
}
else if ( rdn1 != null && rdn2 == null )
{
- return lessThan();
+ return lessThanEntries();
}
else
{
- return compare( rdn1.getName(), rdn2.getName() );
+ return compareEntries( rdn1.getName(), rdn2.getName() );
}
}
@@ -360,11 +435,11 @@
}
else if ( ( entry1 != null ) && ( entry2 == null ) )
{
- return greaterThan();
+ return greaterThanEntries();
}
else if ( ( entry1 == null ) && ( entry2 != null ) )
{
- return lessThan();
+ return lessThanEntries();
}
else
{
@@ -379,12 +454,12 @@
else if ( ( rdn1 == null || rdn1.getName() == null || "".equals( rdn1.getName() ) ) //$NON-NLS-1$
&& !( rdn2 == null || rdn2.getName() == null || "".equals( rdn2.getName() ) ) ) //$NON-NLS-1$
{
- return greaterThan();
+ return greaterThanEntries();
}
else if ( !( rdn1 == null || rdn1.getName() == null || "".equals( rdn1.getName() ) ) //$NON-NLS-1$
&& ( rdn2 == null || rdn2.getName() == null || "".equals( rdn2.getName() ) ) ) //$NON-NLS-1$
{
- return lessThan();
+ return lessThanEntries();
}
String rdn1Value = ( String ) rdn1.getName();
@@ -392,12 +467,12 @@
if ( rdn1Value.matches( "\\d*" ) && !rdn2Value.matches( "\\d*" ) ) //$NON-NLS-1$ //$NON-NLS-2$
{
// return lessThan();
- return compare( rdn1Value, rdn2Value );
+ return compareEntries( rdn1Value, rdn2Value );
}
else if ( !rdn1Value.matches( "\\d*" ) && rdn2Value.matches( "\\d*" ) ) //$NON-NLS-1$ //$NON-NLS-2$
{
// return greaterThan();
- return compare( rdn1Value, rdn2Value );
+ return compareEntries( rdn1Value, rdn2Value );
}
else if ( rdn2Value.matches( "\\d*" ) && rdn2Value.matches( "\\d*" ) ) //$NON-NLS-1$ //$NON-NLS-2$
{
@@ -409,20 +484,42 @@
}
else
{
- return compare( rdn1Value, rdn2Value );
+ return compareEntries( rdn1Value, rdn2Value );
}
}
}
/**
- * Returns +1 or -1, depending on the sort order.
+ * Returns +1 or -1, depending on the sort entries order.
*
- * @return +1 or -1, depending on the sort order
+ * @return +1 or -1, depending on the sort entries order
*/
- private int lessThan()
+ private int lessThanEntries()
{
- return preferences.getSortOrder() == BrowserCoreConstants.SORT_ORDER_ASCENDING ? -1 : 1;
+ return preferences.getSortEntriesOrder() == BrowserCoreConstants.SORT_ORDER_ASCENDING ? -1 : 1;
+ }
+
+
+ /**
+ * Returns +1 or -1, depending on the sort searches order.
+ *
+ * @return +1 or -1, depending on the sort searches order
+ */
+ private int lessThanSearches()
+ {
+ return preferences.getSortSearchesOrder() == BrowserCoreConstants.SORT_ORDER_ASCENDING ? -1 : 1;
+ }
+
+
+ /**
+ * Returns +1 or -1, depending on the sort entries order.
+ *
+ * @return +1 or -1, depending on the sort entries order
+ */
+ private int lessThanBookmarks()
+ {
+ return preferences.getSortBookmarksOrder() == BrowserCoreConstants.SORT_ORDER_ASCENDING ? -1 : 1;
}
@@ -438,29 +535,83 @@
/**
- * Returns +1 or -1, depending on the sort order.
+ * Returns +1 or -1, depending on the sort entries order.
*
- * @return +1 or -1, depending on the sort order
+ * @return +1 or -1, depending on the sort entries order
*/
- private int greaterThan()
+ private int greaterThanEntries()
{
- return preferences.getSortOrder() == BrowserCoreConstants.SORT_ORDER_ASCENDING ? 1 : -1;
+ return preferences.getSortEntriesOrder() == BrowserCoreConstants.SORT_ORDER_ASCENDING ? 1 : -1;
+ }
+
+
+ /**
+ * Returns +1 or -1, depending on the sort searches order.
+ *
+ * @return +1 or -1, depending on the sort searches order
+ */
+ private int greaterThanSearches()
+ {
+ return preferences.getSortSearchesOrder() == BrowserCoreConstants.SORT_ORDER_ASCENDING ? 1 : -1;
+ }
+
+
+ /**
+ * Returns +1 or -1, depending on the sort bookmarks order.
+ *
+ * @return +1 or -1, depending on the sort bookmarks order
+ */
+ private int greaterThanBookmarks()
+ {
+ return preferences.getSortBookmarksOrder() == BrowserCoreConstants.SORT_ORDER_ASCENDING ? 1 : -1;
}
/**
* Compares the two strings using the Strings's compareToIgnoreCase method,
- * pays attention for the sort order.
+ * pays attention for the sort entries order.
*
* @param s1 the first string to compare
* @param s2 the second string to compare
* @return a negative integer, zero, or a positive integer
* @see java.lang.String#compareToIgnoreCase(String)
*/
- private int compare( String s1, String s2 )
+ private int compareEntries( String s1, String s2 )
{
- return preferences.getSortOrder() == BrowserCoreConstants.SORT_ORDER_ASCENDING ? s1.compareToIgnoreCase( s2 )
- : s2.compareToIgnoreCase( s1 );
+ return preferences.getSortEntriesOrder() == BrowserCoreConstants.SORT_ORDER_ASCENDING ? s1
+ .compareToIgnoreCase( s2 ) : s2.compareToIgnoreCase( s1 );
+ }
+
+
+ /**
+ * Compares the two strings using the Strings's compareToIgnoreCase method,
+ * pays attention for the sort searches order.
+ *
+ * @param s1 the first string to compare
+ * @param s2 the second string to compare
+ * @return a negative integer, zero, or a positive integer
+ * @see java.lang.String#compareToIgnoreCase(String)
+ */
+ private int compareSearches( String s1, String s2 )
+ {
+ return preferences.getSortSearchesOrder() == BrowserCoreConstants.SORT_ORDER_ASCENDING ? s1
+ .compareToIgnoreCase( s2 ) : s2.compareToIgnoreCase( s1 );
+ }
+
+
+ /**
+ * Compares the two strings using the Strings's compareToIgnoreCase method,
+ * pays attention for the sort bookmarks order.
+ *
+ * @param s1 the first string to compare
+ * @param s2 the second string to compare
+ * @return a negative integer, zero, or a positive integer
+ * @see java.lang.String#compareToIgnoreCase(String)
+ */
+ private int compareBookmarks( String s1, String s2 )
+ {
+ return preferences.getSortBookmarksOrder() == BrowserCoreConstants.SORT_ORDER_ASCENDING ? s1
+ .compareToIgnoreCase( s2 ) : s2.compareToIgnoreCase( s1 );
}
@@ -476,8 +627,7 @@
*/
private int compare( BigInteger bi1, BigInteger bi2 )
{
- return preferences.getSortOrder() == BrowserCoreConstants.SORT_ORDER_ASCENDING ? bi1.compareTo( bi2 ) : bi2
- .compareTo( bi1 );
+ return preferences.getSortEntriesOrder() == BrowserCoreConstants.SORT_ORDER_ASCENDING ? bi1.compareTo( bi2 )
+ : bi2.compareTo( bi1 );
}
-
}
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorterDialog.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorterDialog.java
index 5a08dcc..a08414a 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorterDialog.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorterDialog.java
@@ -50,7 +50,6 @@
*/
public class BrowserSorterDialog extends Dialog
{
-
/** The dialog title. */
public static final String DIALOG_TITLE = Messages.getString( "BrowserSorterDialog.BrowserSorting" ); //$NON-NLS-1$
@@ -58,7 +57,7 @@
public static final String SORT_BY_NONE = Messages.getString( "BrowserSorterDialog.NoSorting" ); //$NON-NLS-1$
/** The Constant SORT_BY_RDN. */
- public static final String SORT_BY_RDN = Messages.getString( "BrowserSorterDialog.Rdn" ); //$NON-NLS-1$
+ public static final String SORT_BY_RDN = Messages.getString( "BrowserSorterDialog.RDN" ); //$NON-NLS-1$
/** The Constant SORT_BY_RDN_VALUE. */
public static final String SORT_BY_RDN_VALUE = Messages.getString( "BrowserSorterDialog.RDNValue" ); //$NON-NLS-1$
@@ -66,15 +65,6 @@
/** The browser preferences. */
private BrowserPreferences preferences;
- /** The sort by combo. */
- private Combo sortByCombo;
-
- /** The sort acending button. */
- private Button sortAcendingButton;
-
- /** The sort descending button. */
- private Button sortDescendingButton;
-
/** The leaf entries first button. */
private Button leafEntriesFirstButton;
@@ -87,6 +77,33 @@
/** The meta entries last button. */
private Button metaEntriesLastButton;
+ /** The sort entries by combo. */
+ private Combo sortEntriesByCombo;
+
+ /** The sort entries ascending button. */
+ private Button sortEntriesAscendingButton;
+
+ /** The sort entries descending button. */
+ private Button sortEntriesDescendingButton;
+
+ /** The sort searches ascending button. */
+ private Button sortSearchesAscendingButton;
+
+ /** The sort searches descending button. */
+ private Button sortSearchesDescendingButton;
+
+ /** The sort searches none button. */
+ private Button sortSearchesNoSortingButton;
+
+ /** The sort bookmarks ascending button. */
+ private Button sortBookmarksAscendingButton;
+
+ /** The sort bookmarks descending button. */
+ private Button sortBookmarksDescendingButton;
+
+ /** The sort bookmarks none button. */
+ private Button sortBookmarksNoSortingButton;
+
/** The sort limit text. */
private Text sortLimitText;
@@ -135,19 +152,55 @@
}
IPreferenceStore store = BrowserCommonActivator.getDefault().getPreferenceStore();
+
store.setValue( BrowserCommonConstants.PREFERENCE_BROWSER_LEAF_ENTRIES_FIRST, leafEntriesFirstButton
.getSelection() );
store.setValue( BrowserCommonConstants.PREFERENCE_BROWSER_CONTAINER_ENTRIES_FIRST,
containerEntriesFirstButton.getSelection() );
store.setValue( BrowserCommonConstants.PREFERENCE_BROWSER_META_ENTRIES_LAST, metaEntriesLastButton
.getSelection() );
- store.setValue( BrowserCommonConstants.PREFERENCE_BROWSER_SORT_LIMIT, sortLimit );
+
store.setValue( BrowserCommonConstants.PREFERENCE_BROWSER_SORT_ORDER,
- sortDescendingButton.getSelection() ? BrowserCoreConstants.SORT_ORDER_DESCENDING
+ sortEntriesDescendingButton.getSelection() ? BrowserCoreConstants.SORT_ORDER_DESCENDING
: BrowserCoreConstants.SORT_ORDER_ASCENDING );
store.setValue( BrowserCommonConstants.PREFERENCE_BROWSER_SORT_BY,
- sortByCombo.getSelectionIndex() == 2 ? BrowserCoreConstants.SORT_BY_RDN_VALUE : sortByCombo
- .getSelectionIndex() == 1 ? BrowserCoreConstants.SORT_BY_RDN : BrowserCoreConstants.SORT_BY_NONE );
+ sortEntriesByCombo.getSelectionIndex() == 2 ? BrowserCoreConstants.SORT_BY_RDN_VALUE
+ : sortEntriesByCombo
+ .getSelectionIndex() == 1 ? BrowserCoreConstants.SORT_BY_RDN
+ : BrowserCoreConstants.SORT_BY_NONE );
+ store.setValue( BrowserCommonConstants.PREFERENCE_BROWSER_SORT_LIMIT, sortLimit );
+
+ if ( sortSearchesAscendingButton.getSelection() )
+ {
+ store.setValue( BrowserCommonConstants.PREFERENCE_BROWSER_SORT_SEARCHES_ORDER,
+ BrowserCoreConstants.SORT_ORDER_ASCENDING );
+ }
+ else if ( sortSearchesDescendingButton.getSelection() )
+ {
+ store.setValue( BrowserCommonConstants.PREFERENCE_BROWSER_SORT_SEARCHES_ORDER,
+ BrowserCoreConstants.SORT_ORDER_DESCENDING );
+ }
+ else if ( sortSearchesNoSortingButton.getSelection() )
+ {
+ store.setValue( BrowserCommonConstants.PREFERENCE_BROWSER_SORT_SEARCHES_ORDER,
+ BrowserCoreConstants.SORT_ORDER_NONE );
+ }
+
+ if ( sortBookmarksAscendingButton.getSelection() )
+ {
+ store.setValue( BrowserCommonConstants.PREFERENCE_BROWSER_SORT_BOOKMARKS_ORDER,
+ BrowserCoreConstants.SORT_ORDER_ASCENDING );
+ }
+ else if ( sortBookmarksDescendingButton.getSelection() )
+ {
+ store.setValue( BrowserCommonConstants.PREFERENCE_BROWSER_SORT_BOOKMARKS_ORDER,
+ BrowserCoreConstants.SORT_ORDER_DESCENDING );
+ }
+ else if ( sortBookmarksNoSortingButton.getSelection() )
+ {
+ store.setValue( BrowserCommonConstants.PREFERENCE_BROWSER_SORT_BOOKMARKS_ORDER,
+ BrowserCoreConstants.SORT_ORDER_NONE );
+ }
}
else
{
@@ -163,74 +216,188 @@
*/
protected Control createDialogArea( Composite parent )
{
-
Composite composite = ( Composite ) super.createDialogArea( parent );
GridData gd = new GridData( GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL );
gd.widthHint = convertHorizontalDLUsToPixels( IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH );
composite.setLayoutData( gd );
- Group groupingGroup = BaseWidgetUtils.createGroup( composite, Messages
- .getString( "BrowserSorterDialog.GroupEntries" ), 1 ); //$NON-NLS-1$
- Composite columGroup = BaseWidgetUtils.createColumnContainer( groupingGroup, 3, 1 );
+ createGroupEntriesGroup( composite );
+ createSortEntriesGroup( composite );
+ createSortSearchesGroup( composite );
+ createSortBookmarksGroup( composite );
+ createSortLimitGroup( composite );
- leafEntriesFirstButton = BaseWidgetUtils.createRadiobutton( columGroup, Messages
+ applyDialogFont( composite );
+ return composite;
+ }
+
+
+ /**
+ * Creates the group entries group.
+ *
+ * @param composite the parent composite
+ */
+ private void createGroupEntriesGroup( Composite composite )
+ {
+ // Group entries group and composite
+ Group groupEntriesGroup = BaseWidgetUtils.createGroup( composite, Messages
+ .getString( "BrowserSorterDialog.GroupEntries" ), 1 ); //$NON-NLS-1$
+ Composite groupEntriesButtonsComposite = BaseWidgetUtils.createColumnContainer( groupEntriesGroup, 3, 1 );
+
+ // Leaf entries first button
+ leafEntriesFirstButton = BaseWidgetUtils.createRadiobutton( groupEntriesButtonsComposite, Messages
.getString( "BrowserSorterDialog.LeafEntriesFirst" ), 1 ); //$NON-NLS-1$
leafEntriesFirstButton.setToolTipText( Messages.getString( "BrowserSorterDialog.LeafEntriesFirstToolTip" ) ); //$NON-NLS-1$
leafEntriesFirstButton.setSelection( preferences.isLeafEntriesFirst() );
- containerEntriesFirstButton = BaseWidgetUtils.createRadiobutton( columGroup, Messages
+ // Container entries first button
+ containerEntriesFirstButton = BaseWidgetUtils.createRadiobutton( groupEntriesButtonsComposite, Messages
.getString( "BrowserSorterDialog.ContainerEntriesFirst" ), 1 ); //$NON-NLS-1$
containerEntriesFirstButton.setToolTipText( Messages
.getString( "BrowserSorterDialog.ContainerEntriesFirstToolTip" ) ); //$NON-NLS-1$
containerEntriesFirstButton.setSelection( preferences.isContainerEntriesFirst() );
- mixedButton = BaseWidgetUtils.createRadiobutton( columGroup,
+ // Mixed button
+ mixedButton = BaseWidgetUtils.createRadiobutton( groupEntriesButtonsComposite,
Messages.getString( "BrowserSorterDialog.Mixed" ), 1 ); //$NON-NLS-1$
mixedButton.setToolTipText( Messages.getString( "BrowserSorterDialog.MixedToolTip" ) ); //$NON-NLS-1$
mixedButton.setSelection( !preferences.isLeafEntriesFirst() && !preferences.isContainerEntriesFirst() );
- metaEntriesLastButton = BaseWidgetUtils.createCheckbox( groupingGroup, Messages
+ // Meta entries last button
+ metaEntriesLastButton = BaseWidgetUtils.createCheckbox( groupEntriesGroup, Messages
.getString( "BrowserSorterDialog.MetaEntriesLast" ), 1 ); //$NON-NLS-1$
metaEntriesLastButton.setToolTipText( Messages.getString( "BrowserSorterDialog.MetaEntriesLastToolTip" ) ); //$NON-NLS-1$
metaEntriesLastButton.setSelection( preferences.isMetaEntriesLast() );
+ }
- Group sortingGroup = BaseWidgetUtils.createGroup( composite, Messages
+
+ /**
+ * Creates the sort entries group.
+ *
+ * @param composite the parent composite
+ */
+ private void createSortEntriesGroup( Composite composite )
+ {
+ // Sort entries group and composite
+ Group sortEntriesGroup = BaseWidgetUtils.createGroup( composite, Messages
.getString( "BrowserSorterDialog.SortEntries" ), 1 ); //$NON-NLS-1$
+ Composite sortByComposite = BaseWidgetUtils.createColumnContainer( sortEntriesGroup, 4, 1 );
- Composite sortByComposite = BaseWidgetUtils.createColumnContainer( sortingGroup, 4, 1 );
+ // Sort entries by combo
BaseWidgetUtils.createLabel( sortByComposite, Messages.getString( "BrowserSorterDialog.SortBy" ), 1 ); //$NON-NLS-1$
- sortByCombo = BaseWidgetUtils.createReadonlyCombo( sortByComposite, new String[]
+ sortEntriesByCombo = BaseWidgetUtils.createReadonlyCombo( sortByComposite, new String[]
{ SORT_BY_NONE, SORT_BY_RDN, SORT_BY_RDN_VALUE }, 0, 1 );
- sortByCombo.select( preferences.getSortBy() == BrowserCoreConstants.SORT_BY_RDN_VALUE ? 2 : preferences
- .getSortBy() == BrowserCoreConstants.SORT_BY_RDN ? 1 : 0 );
- sortByCombo.addSelectionListener( new SelectionAdapter()
+ sortEntriesByCombo.select( preferences.getSortEntriesBy() == BrowserCoreConstants.SORT_BY_RDN_VALUE ? 2
+ : preferences
+ .getSortEntriesBy() == BrowserCoreConstants.SORT_BY_RDN ? 1 : 0 );
+ sortEntriesByCombo.addSelectionListener( new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
{
- sortAcendingButton.setEnabled( sortByCombo.getSelectionIndex() != 0 );
- sortDescendingButton.setEnabled( sortByCombo.getSelectionIndex() != 0 );
- sortLimitText.setEnabled( sortByCombo.getSelectionIndex() != 0 );
+ sortEntriesAscendingButton.setEnabled( sortEntriesByCombo.getSelectionIndex() != 0 );
+ sortEntriesDescendingButton.setEnabled( sortEntriesByCombo.getSelectionIndex() != 0 );
}
} );
- sortAcendingButton = BaseWidgetUtils.createRadiobutton( sortByComposite, Messages
+ // Sort entries ascending button
+ sortEntriesAscendingButton = BaseWidgetUtils.createRadiobutton( sortByComposite, Messages
.getString( "BrowserSorterDialog.Ascending" ), 1 ); //$NON-NLS-1$
- sortAcendingButton.setSelection( preferences.getSortOrder() == BrowserCoreConstants.SORT_ORDER_ASCENDING );
- sortAcendingButton.setEnabled( sortByCombo.getSelectionIndex() != 0 );
+ sortEntriesAscendingButton
+ .setSelection( preferences.getSortEntriesOrder() == BrowserCoreConstants.SORT_ORDER_ASCENDING );
+ sortEntriesAscendingButton.setEnabled( sortEntriesByCombo.getSelectionIndex() != 0 );
- sortDescendingButton = BaseWidgetUtils.createRadiobutton( sortByComposite, Messages
+ // Sort entries descending button
+ sortEntriesDescendingButton = BaseWidgetUtils.createRadiobutton( sortByComposite, Messages
.getString( "BrowserSorterDialog.Descending" ), 1 ); //$NON-NLS-1$
- sortDescendingButton.setSelection( preferences.getSortOrder() == BrowserCoreConstants.SORT_ORDER_DESCENDING );
- sortDescendingButton.setEnabled( sortByCombo.getSelectionIndex() != 0 );
+ sortEntriesDescendingButton
+ .setSelection( preferences.getSortEntriesOrder() == BrowserCoreConstants.SORT_ORDER_DESCENDING );
+ sortEntriesDescendingButton.setEnabled( sortEntriesByCombo.getSelectionIndex() != 0 );
+ }
- Composite sortLimitComposite = BaseWidgetUtils.createColumnContainer( sortingGroup, 2, 1 );
+
+ /**
+ * Creates the sort searches group.
+ *
+ * @param parent the parent composite
+ */
+ private void createSortSearchesGroup( Composite parent )
+ {
+ // Sort searches group and composite
+ Group sortSearchesGroup = BaseWidgetUtils.createGroup( parent, Messages
+ .getString( "BrowserSorterDialog.SortSearches" ), 1 ); //$NON-NLS-1$
+ Composite sortSearchesComposite = BaseWidgetUtils.createColumnContainer( sortSearchesGroup, 3, 1 );
+
+ // Sort searches ascending button
+ sortSearchesAscendingButton = BaseWidgetUtils.createRadiobutton( sortSearchesComposite, Messages
+ .getString( "BrowserSorterDialog.Ascending" ), 1 ); //$NON-NLS-1$
+ sortSearchesAscendingButton
+ .setSelection( preferences.getSortSearchesOrder() == BrowserCoreConstants.SORT_ORDER_ASCENDING );
+
+ // Sort searches descending button
+ sortSearchesDescendingButton = BaseWidgetUtils.createRadiobutton( sortSearchesComposite, Messages
+ .getString( "BrowserSorterDialog.Descending" ), 1 ); //$NON-NLS-1$
+ sortSearchesDescendingButton
+ .setSelection( preferences.getSortSearchesOrder() == BrowserCoreConstants.SORT_ORDER_DESCENDING );
+
+ // Sort searches none button
+ sortSearchesNoSortingButton = BaseWidgetUtils.createRadiobutton( sortSearchesComposite, Messages
+ .getString( "BrowserSorterDialog.NoSorting" ), 1 ); //$NON-NLS-1$
+ sortSearchesNoSortingButton
+ .setSelection( preferences.getSortSearchesOrder() == BrowserCoreConstants.SORT_ORDER_NONE );
+ }
+
+
+ /**
+ * Creates the sort bookmarks group.
+ *
+ * @param parent the parent composite
+ */
+ private void createSortBookmarksGroup( Composite parent )
+ {
+ // Sort bookmarks group and composite
+ Group sortBookmarksGroup = BaseWidgetUtils.createGroup( parent, Messages
+ .getString( "BrowserSorterDialog.SortBookmarks" ), 1 ); //$NON-NLS-1$
+ Composite sortBookmarksComposite = BaseWidgetUtils.createColumnContainer( sortBookmarksGroup, 3, 1 );
+
+ // Sort bookmarks ascending button
+ sortBookmarksAscendingButton = BaseWidgetUtils.createRadiobutton( sortBookmarksComposite, Messages
+ .getString( "BrowserSorterDialog.Ascending" ), 1 ); //$NON-NLS-1$
+ sortBookmarksAscendingButton
+ .setSelection( preferences.getSortBookmarksOrder() == BrowserCoreConstants.SORT_ORDER_ASCENDING );
+
+ // Sort bookmarks descending button
+ sortBookmarksDescendingButton = BaseWidgetUtils.createRadiobutton( sortBookmarksComposite, Messages
+ .getString( "BrowserSorterDialog.Descending" ), 1 ); //$NON-NLS-1$
+ sortBookmarksDescendingButton
+ .setSelection( preferences.getSortBookmarksOrder() == BrowserCoreConstants.SORT_ORDER_DESCENDING );
+
+ // Sort bookmarks none button
+ sortBookmarksNoSortingButton = BaseWidgetUtils.createRadiobutton( sortBookmarksComposite, Messages
+ .getString( "BrowserSorterDialog.NoSorting" ), 1 ); //$NON-NLS-1$
+ sortBookmarksNoSortingButton
+ .setSelection( preferences.getSortBookmarksOrder() == BrowserCoreConstants.SORT_ORDER_NONE );
+ }
+
+
+ /**
+ * Creates the sort limit group.
+ *
+ * @param composite the parent composite
+ */
+ private void createSortLimitGroup( Composite composite )
+ {
+ // Sort limit group and composite
+ Group sortLimitGroup = BaseWidgetUtils.createGroup( composite, Messages
+ .getString( "BrowserSorterDialog.SortLimit" ), 1 ); //$NON-NLS-1$
+ Composite sortLimitComposite = BaseWidgetUtils.createColumnContainer( sortLimitGroup, 2, 1 );
+
+ // Sort limit text
String sortLimitTooltip = Messages.getString( "BrowserSorterDialog.SortLimitToolTip" ); //$NON-NLS-1$
Label sortLimitLabel = BaseWidgetUtils.createLabel( sortLimitComposite, Messages
- .getString( "BrowserSorterDialog.SortLimit" ), 1 ); //$NON-NLS-1$
+ .getString( "BrowserSorterDialog.SortLimitColon" ), 1 ); //$NON-NLS-1$
sortLimitLabel.setToolTipText( sortLimitTooltip );
sortLimitText = BaseWidgetUtils.createText( sortLimitComposite, "" + preferences.getSortLimit(), 5, 1 ); //$NON-NLS-1$
sortLimitText.setToolTipText( sortLimitTooltip );
- sortLimitText.setEnabled( sortByCombo.getSelectionIndex() != 0 );
sortLimitText.addVerifyListener( new VerifyListener()
{
public void verifyText( VerifyEvent e )
@@ -241,9 +408,5 @@
}
}
} );
-
- applyDialogFont( composite );
- return composite;
}
-
}
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserUniversalListener.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserUniversalListener.java
index f8df806..6b2599c 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserUniversalListener.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserUniversalListener.java
@@ -34,7 +34,9 @@
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
import org.apache.directory.studio.ldapbrowser.core.events.SearchUpdateEvent;
import org.apache.directory.studio.ldapbrowser.core.events.SearchUpdateListener;
+import org.apache.directory.studio.ldapbrowser.core.events.SearchUpdateEvent.EventDetail;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
+import org.apache.directory.studio.ldapbrowser.core.model.IQuickSearch;
import org.apache.directory.studio.ldapbrowser.core.model.IRootDSE;
import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -54,6 +56,8 @@
*/
public class BrowserUniversalListener implements ConnectionUpdateListener, EntryUpdateListener, SearchUpdateListener
{
+ /** The browser widget */
+ protected BrowserWidget widget;
/** The tree viewer */
protected TreeViewer viewer;
@@ -121,9 +125,10 @@
*
* @param viewer the tree viewer
*/
- public BrowserUniversalListener( TreeViewer viewer )
+ public BrowserUniversalListener( BrowserWidget widget )
{
- this.viewer = viewer;
+ this.widget = widget;
+ this.viewer = widget.getViewer();
viewer.addTreeListener( treeViewerListener );
viewer.addDoubleClickListener( doubleClickListener );
@@ -269,13 +274,21 @@
public void searchUpdated( SearchUpdateEvent searchUpdateEvent )
{
ISearch search = searchUpdateEvent.getSearch();
+
+ if ( ( search instanceof IQuickSearch ) && ( searchUpdateEvent.getDetail() == EventDetail.SEARCH_REMOVED ) )
+ {
+ if ( widget.getQuickSearch() == search )
+ {
+ widget.setQuickSearch( null );
+ }
+ }
+
viewer.refresh();
- if ( search.getBrowserConnection().getSearchManager().getQuickSearch() == search )
+ if ( ( search instanceof IQuickSearch ) && ( searchUpdateEvent.getDetail() != EventDetail.SEARCH_REMOVED ) )
{
viewer.setSelection( new StructuredSelection( search ), true );
viewer.expandToLevel( search, 1 );
}
}
-
}
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserWidget.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserWidget.java
index 523270b..f7ef227 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserWidget.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserWidget.java
@@ -24,6 +24,7 @@
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.common.ui.widgets.ViewFormWidget;
import org.apache.directory.studio.ldapbrowser.common.dialogs.SelectEntryDialog;
+import org.apache.directory.studio.ldapbrowser.core.model.IQuickSearch;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.viewers.TreeViewer;
@@ -64,6 +65,9 @@
/** The tree viewer. */
private TreeViewer viewer;
+ /** The quick search. */
+ private IQuickSearch quickSearch;
+
/**
* Creates a new instance of BrowserWidget.
@@ -172,7 +176,7 @@
configuration.getPreferences().connect( viewer );
// setup providers
- viewer.setContentProvider( configuration.getContentProvider( viewer ) );
+ viewer.setContentProvider( configuration.getContentProvider( this ) );
viewer.setLabelProvider( configuration.getLabelProvider( viewer ) );
return tree;
@@ -243,4 +247,25 @@
return viewer;
}
+
+ /**
+ * Sets the quick search.
+ *
+ * @param quickSearch the new quick search
+ */
+ public void setQuickSearch( IQuickSearch quickSearch )
+ {
+ this.quickSearch = quickSearch;
+ }
+
+
+ /**
+ * Gets the quick search.
+ *
+ * @return the quick search
+ */
+ public IQuickSearch getQuickSearch()
+ {
+ return quickSearch;
+ }
}
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages.properties b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages.properties
index 32611dc..99f0c65 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages.properties
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages.properties
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-BrowserCategory.Bookmarsk=Bookmarks
+BrowserCategory.Bookmarks=Bookmarks
BrowserCategory.DIT=DIT
BrowserCategory.Searches=Searches
BrowserContentProvider.FetchingEntries=Fetching Entries...
@@ -41,10 +41,14 @@
BrowserSorterDialog.RDNValue=RDN Value
BrowserSorterDialog.SortBy=Sort by
BrowserSorterDialog.SortEntries=Sort entries
-BrowserSorterDialog.SortLimit=Sort limit:
+BrowserSorterDialog.SortLimit=Sort limit
+BrowserSorterDialog.SortLimitColon=Sort limit:
BrowserSorterDialog.SortLimitToolTip=If there are more than the specified number of children they won't be sorted. Hint: For performance reason the maximum value should be 10.000\!
+BrowserSorterDialog.SortSearches=Sort searches
+BrowserSorterDialog.SortBookmarks=Sort bookmarks
OpenSortDialogAction.Sorting=Sorting...
ShowQuickSearchAction.ShowQuickSearch=Show Quick Search
+BrowserQuickSearchWidget.9=\!=
BrowserQuickSearchWidget.RunQuickSearch=Run Quick Search
BrowserQuickSearchWidget.ScopeOneLevelToolTip=Search one level only
BrowserQuickSearchWidget.ScopeSubtreeToolTip=Search whole subtree
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages_de.properties b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages_de.properties
index 8e02333..21b946f 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages_de.properties
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages_de.properties
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-BrowserCategory.Bookmarsk=Lesezeichen
+BrowserCategory.Bookmarks=Lesezeichen
BrowserCategory.DIT=DIT
BrowserCategory.Searches=Suchen
BrowserContentProvider.FetchingEntries=Eintr\u00E4ge werden abgerufen...
@@ -41,8 +41,11 @@
BrowserSorterDialog.RDNValue=RDN Wert
BrowserSorterDialog.SortBy=Sortieren nach
BrowserSorterDialog.SortEntries=Eintr\u00E4ge sortieren
-BrowserSorterDialog.SortLimit=Sortier-Limit:
+BrowserSorterDialog.SortLimit=Sortier-Limit
+BrowserSorterDialog.SortLimitColon=Sortier-Limit:
BrowserSorterDialog.SortLimitToolTip=Bei mehr Eintr\u00E4gen wird keine Sortierung durchgef\u00FChrt. Hinweis: Der Wert sollte 10000 nicht \u00FCbersteigen\!
+BrowserSorterDialog.SortSearches=Suchen sortieren
+BrowserSorterDialog.SortBookmarks=Lesezeichen sortieren
OpenSortDialogAction.Sorting=Sortierung...
BrowserQuickSearchWidget.RunQuickSearch=Schnellsuche ausf\u00FChren
BrowserQuickSearchWidget.QuickSearch=Schnellsuche
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages_fr.properties b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages_fr.properties
index b6243c2..224ed29 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages_fr.properties
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/messages_fr.properties
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-BrowserCategory.Bookmarsk=Signets
+BrowserCategory.Bookmarks=Signets
BrowserCategory.DIT=DIT
BrowserCategory.Searches=Recherches
BrowserContentProvider.FetchingEntries=R\u00E9cup\u00E9ration des entr\u00E9es...
@@ -41,8 +41,11 @@
BrowserSorterDialog.RDNValue=Valeur de RDN
BrowserSorterDialog.SortBy=Trier par
BrowserSorterDialog.SortEntries=Tri des entr\u00E9es
-BrowserSorterDialog.SortLimit=Limite de tri:
+BrowserSorterDialog.SortLimit=Limite de tri
+BrowserSorterDialog.SortLimitColon=Limite de tri:
BrowserSorterDialog.SortLimitToolTip=S'il y a plus de fils que la valeur sp\u00E9cifi\u00E9e, le tri ne sera pas effectu\u00E9. Conseil: Pour des raisons de performance, la valeur maximale ne devrait pas d\u00E9passer 10 000 \!
+BrowserSorterDialog.SortSearches=Tri des recherches
+BrowserSorterDialog.SortBookmarks=Tri des signets
OpenSortDialogAction.Sorting=Tri...
BrowserQuickSearchWidget.RunQuickSearch=Lancer la recherche rapide
BrowserQuickSearchWidget.QuickSearch=Recherche rapide
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/messages_fr.properties b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/messages_fr.properties
index dfc1988..bb2a281 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/messages_fr.properties
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/messages_fr.properties
@@ -21,7 +21,7 @@
BrowserParameterPage.Controls=Controls
BrowserParameterPage.EnterValidBaseDN=Veuillez entrer un DN de base valide.
BrowserParameterPage.FetchBaseDNs=R\u00E9cup\u00E9rer les DNs de base
-BrowserParameterPage.FetchSubentriesWhileBrowsing=R\u00E9cup\u00E9rer les sous-entr\u00E9es au cours de la navigation (n\u00E9cessite une requ\u00E8te de recherche suppl\u00E9mentaire)
+BrowserParameterPage.FetchSubentriesWhileBrowsing=R\u00E9cup\u00E9rer les sous-entr\u00E9es durant la navigation (n\u00E9cessite une recherche suppl\u00E9mentaire)
BrowserParameterPage.FetchSubentriesWhileBrowsingTooltip=Si activ\u00E9, les entr\u00E9es normales et les sous-entr\u00E9es conformes \u00E0 la RFC 3672 sont r\u00E9cup\u00E9r\u00E9es. Cela entraine des requ\u00E8tes de recherche suppl\u00E9mentaires au cours de la navigation du DIT.
BrowserParameterPage.GetBaseDNsFromRootDSE=Obtenir les DNs de base depuis la Root DSE.
BrowserParameterPage.NoBaseDNReturnedFromServer=Aucun DN de base n'a \u00E9t\u00E9 retourn\u00E9 par le serveur.Veuillez entrer le DN de base manuellement.
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetConfiguration.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetConfiguration.java
index f72f177..c7cefa1 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetConfiguration.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetConfiguration.java
@@ -151,7 +151,7 @@
{
if ( labelProvider == null )
{
- labelProvider = new EntryEditorWidgetLabelProvider( getValueEditorManager( viewer ) );
+ labelProvider = new EntryEditorWidgetLabelProvider( viewer, getValueEditorManager( viewer ) );
}
return labelProvider;
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetFilter.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetFilter.java
index 9c20f43..d165a86 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetFilter.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetFilter.java
@@ -128,7 +128,7 @@
}
}
- // fitler value
+ // filter value
if ( quickFilterValue != null && !"".equals( quickFilterValue ) ) //$NON-NLS-1$
{
if ( value.isString()
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetLabelProvider.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetLabelProvider.java
index 54cc44d..1ae11dd 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetLabelProvider.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetLabelProvider.java
@@ -32,6 +32,7 @@
import org.eclipse.jface.viewers.IFontProvider;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
@@ -56,6 +57,8 @@
public class EntryEditorWidgetLabelProvider extends LabelProvider implements ITableLabelProvider, IFontProvider,
IColorProvider
{
+ /** The viewer */
+ private TreeViewer viewer;
/** The value editor manager. */
private ValueEditorManager valueEditorManager;
@@ -64,10 +67,12 @@
/**
* Creates a new instance of EntryEditorWidgetLabelProvider.
*
+ * @param viewer the viewer
* @param valueEditorManager the value editor manager
*/
- public EntryEditorWidgetLabelProvider( ValueEditorManager valueEditorManager )
+ public EntryEditorWidgetLabelProvider( TreeViewer viewer, ValueEditorManager valueEditorManager )
{
+ this.viewer = viewer;
this.valueEditorManager = valueEditorManager;
}
@@ -109,7 +114,7 @@
{
return NLS
.bind(
- Messages.getString( "EntryEditorWidgetLabelProvider.AttributeLabel" ), attribute.getDescription(), attribute.getValueSize() ); //$NON-NLS-1$
+ Messages.getString( "EntryEditorWidgetLabelProvider.AttributeLabel" ), attribute.getDescription(), getNumberOfValues( attribute ) ); //$NON-NLS-1$
}
else
{
@@ -124,6 +129,32 @@
/**
+ * Gets the number of values attribute.
+ *
+ * @param element
+ * @return
+ */
+ private int getNumberOfValues( IAttribute attribute )
+ {
+ EntryEditorWidgetContentProvider contentProvider = ( EntryEditorWidgetContentProvider ) viewer
+ .getContentProvider();
+ EntryEditorWidgetFilter filter = ( EntryEditorWidgetFilter ) viewer.getFilters()[0];
+
+ int count = 0;
+
+ for ( Object child : contentProvider.getChildren( attribute ) )
+ {
+ if ( filter.select( viewer, attribute, child ) )
+ {
+ count++;
+ }
+ }
+
+ return count;
+ }
+
+
+ /**
* {@inheritDoc}
*/
public final Image getColumnImage( Object element, int index )
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/EntryWidget.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/EntryWidget.java
index 8563fb3..08a1411 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/EntryWidget.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/EntryWidget.java
@@ -23,6 +23,7 @@
import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.studio.common.ui.HistoryUtils;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.core.DnUtils;
import org.apache.directory.studio.connection.ui.RunnableContextRunner;
@@ -30,7 +31,6 @@
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
import org.apache.directory.studio.ldapbrowser.common.dialogs.SelectEntryDialog;
import org.apache.directory.studio.ldapbrowser.common.widgets.BrowserWidget;
-import org.apache.directory.studio.ldapbrowser.common.widgets.HistoryUtils;
import org.apache.directory.studio.ldapbrowser.core.jobs.ReadEntryRunnable;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
@@ -138,7 +138,8 @@
dnCombo.setLayoutData( gd );
// Dn history
- String[] history = HistoryUtils.load( BrowserCommonConstants.DIALOGSETTING_KEY_DN_HISTORY );
+ String[] history = HistoryUtils.load( BrowserCommonActivator.getDefault().getDialogSettings(),
+ BrowserCommonConstants.DIALOGSETTING_KEY_DN_HISTORY );
dnCombo.setItems( history );
dnCombo.addModifyListener( new ModifyListener()
{
@@ -170,7 +171,7 @@
if ( !Dn.isNullOrEmpty( dn ) )
{
dn = dn.getParent();
-
+
dnChanged();
internalSetEnabled();
notifyListeners();
@@ -201,13 +202,13 @@
// calculate initial Dn
Dn initialDn = dn;
-
+
if ( useLocalName && suffix != null && suffix.size() > 0 )
{
if ( initialDn != null && initialDn.size() > 0 )
{
try
- {
+ {
initialDn = initialDn.add( suffix );
}
catch ( LdapInvalidDnException lide )
@@ -221,10 +222,10 @@
IEntry entry = rootEntry;
if ( initialDn != null && initialDn.size() > 0 )
{
- entry = browserConnection.getEntryFromCache(initialDn);
+ entry = browserConnection.getEntryFromCache( initialDn );
if ( entry == null )
{
- ReadEntryRunnable runnable = new ReadEntryRunnable( browserConnection, initialDn);
+ ReadEntryRunnable runnable = new ReadEntryRunnable( browserConnection, initialDn );
RunnableContextRunner.execute( runnable, null, true );
entry = runnable.getReadEntry();
}
@@ -302,7 +303,8 @@
*/
public void saveDialogSettings()
{
- HistoryUtils.save( BrowserCommonConstants.DIALOGSETTING_KEY_DN_HISTORY, this.dnCombo.getText() );
+ HistoryUtils.save( BrowserCommonActivator.getDefault().getDialogSettings(),
+ BrowserCommonConstants.DIALOGSETTING_KEY_DN_HISTORY, this.dnCombo.getText() );
}
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java
index 5db550c..3cb9a98 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java
@@ -21,13 +21,14 @@
package org.apache.directory.studio.ldapbrowser.common.widgets.search;
+import org.apache.directory.studio.common.ui.HistoryUtils;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.ui.widgets.ExtendedContentAssistCommandAdapter;
+import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
import org.apache.directory.studio.ldapbrowser.common.dialogs.FilterDialog;
import org.apache.directory.studio.ldapbrowser.common.filtereditor.FilterContentAssistProcessor;
import org.apache.directory.studio.ldapbrowser.common.widgets.BrowserWidget;
-import org.apache.directory.studio.ldapbrowser.common.widgets.HistoryUtils;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.filter.parser.LdapFilterParser;
import org.eclipse.jface.fieldassist.ComboContentAdapter;
@@ -53,7 +54,6 @@
*/
public class FilterWidget extends BrowserWidget
{
-
/** The filter combo. */
private Combo filterCombo;
@@ -170,7 +170,8 @@
} );
// filter history
- String[] history = HistoryUtils.load( BrowserCommonConstants.DIALOGSETTING_KEY_SEARCH_FILTER_HISTORY );
+ String[] history = HistoryUtils.load( BrowserCommonActivator.getDefault().getDialogSettings(),
+ BrowserCommonConstants.DIALOGSETTING_KEY_SEARCH_FILTER_HISTORY );
filterCombo.setItems( history );
// initial values
@@ -185,7 +186,7 @@
*/
public String getFilter()
{
- if ( "".equals( filterCombo.getText() ) )
+ if ( "".equals( filterCombo.getText() ) ) //$NON-NLS-1$
{
return ""; //$NON-NLS-1$
}
@@ -201,7 +202,14 @@
*/
public void setFilter( String filter )
{
- filterCombo.setText( filter );
+ if ( filterCombo == null )
+ {
+ initalFilter = filter;
+ }
+ else
+ {
+ filterCombo.setText( filter );
+ }
}
@@ -215,9 +223,13 @@
if ( this.browserConnection != browserConnection )
{
this.browserConnection = browserConnection;
- contentAssistProcessor.setSchema( browserConnection == null ? null : browserConnection.getSchema() );
- filterCPA.setAutoActivationCharacters( contentAssistProcessor
- .getCompletionProposalAutoActivationCharacters() );
+
+ if ( filterCombo != null )
+ {
+ contentAssistProcessor.setSchema( browserConnection == null ? null : browserConnection.getSchema() );
+ filterCPA.setAutoActivationCharacters( contentAssistProcessor
+ .getCompletionProposalAutoActivationCharacters() );
+ }
}
}
@@ -227,7 +239,8 @@
*/
public void saveDialogSettings()
{
- HistoryUtils.save( BrowserCommonConstants.DIALOGSETTING_KEY_SEARCH_FILTER_HISTORY, filterCombo.getText() );
+ HistoryUtils.save( BrowserCommonActivator.getDefault().getDialogSettings(),
+ BrowserCommonConstants.DIALOGSETTING_KEY_SEARCH_FILTER_HISTORY, filterCombo.getText() );
}
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesWidget.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesWidget.java
index e6e5aac..e7e000b 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesWidget.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ReturningAttributesWidget.java
@@ -25,11 +25,12 @@
import java.util.Collection;
import java.util.List;
+import org.apache.directory.studio.common.ui.HistoryUtils;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
+import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
import org.apache.directory.studio.ldapbrowser.common.widgets.BrowserWidget;
import org.apache.directory.studio.ldapbrowser.common.widgets.DialogContentAssistant;
-import org.apache.directory.studio.ldapbrowser.common.widgets.HistoryUtils;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
@@ -113,7 +114,8 @@
raca.install( returningAttributesCombo );
// History
- String[] history = HistoryUtils.load( BrowserCommonConstants.DIALOGSETTING_KEY_RETURNING_ATTRIBUTES_HISTORY );
+ String[] history = HistoryUtils.load( BrowserCommonActivator.getDefault().getDialogSettings(),
+ BrowserCommonConstants.DIALOGSETTING_KEY_RETURNING_ATTRIBUTES_HISTORY );
for ( int i = 0; i < history.length; i++ )
{
history[i] = Utils.arrayToString( stringToArray( history[i] ) );
@@ -204,8 +206,9 @@
*/
public void saveDialogSettings()
{
- HistoryUtils.save( BrowserCommonConstants.DIALOGSETTING_KEY_RETURNING_ATTRIBUTES_HISTORY, Utils
- .arrayToString( getReturningAttributes() ) );
+ HistoryUtils.save( BrowserCommonActivator.getDefault().getDialogSettings(),
+ BrowserCommonConstants.DIALOGSETTING_KEY_RETURNING_ATTRIBUTES_HISTORY,
+ Utils.arrayToString( getReturningAttributes() ) );
}
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/messages.properties b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/messages.properties
index eb9ae87..23be55c 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/messages.properties
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/messages.properties
@@ -39,7 +39,7 @@
ScopeWidget.Object=&Object
ScopeWidget.OneLevel=One &Level
ScopeWidget.Scope=Scope
-ScopeWidget.Subtree=&Subtree
+ScopeWidget.Subtree=S&ubtree
SearchPageWrapper.AllUserAttributes=All user attributes
SearchPageWrapper.Connection=Connection:
SearchPageWrapper.Controls=Controls
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/messages_de.properties b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/messages_de.properties
index 4b36ded..e9175ac 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/messages_de.properties
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/messages_de.properties
@@ -39,7 +39,7 @@
ScopeWidget.Object=&Objekt
ScopeWidget.OneLevel=One &Level
ScopeWidget.Scope=Scope
-ScopeWidget.Subtree=&Subtree
+ScopeWidget.Subtree=S&ubtree
SearchPageWrapper.AllUserAttributes=Alle Benutzer Attribute
SearchPageWrapper.Connection=Verbindung:
SearchPageWrapper.Controls=Steuerungen
diff --git a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java
index 96e40d4..c989c3a 100644
--- a/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java
+++ b/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java
@@ -229,7 +229,7 @@
while ( atavIterator.hasNext() )
{
Ava atav = atavIterator.next();
- IAttribute attribute = newEntry.getAttribute( atav.getUpType() );
+ IAttribute attribute = newEntry.getAttribute( atav.getType() );
if ( attribute != null )
{
IValue[] values = attribute.getValues();
@@ -288,10 +288,10 @@
while ( atavIterator.hasNext() )
{
Ava atav = atavIterator.next();
- IAttribute rdnAttribute = newEntry.getAttribute( atav.getUpType() );
+ IAttribute rdnAttribute = newEntry.getAttribute( atav.getType() );
if ( rdnAttribute == null )
{
- rdnAttribute = new Attribute( newEntry, atav.getUpType() );
+ rdnAttribute = new Attribute( newEntry, atav.getType() );
newEntry.addAttribute( rdnAttribute );
}
Object rdnValue = atav.getNormValue().getString();
diff --git a/plugins/ldapbrowser.core/pom.xml b/plugins/ldapbrowser.core/pom.xml
index c680194..c0f1104 100644
--- a/plugins/ldapbrowser.core/pom.xml
+++ b/plugins/ldapbrowser.core/pom.xml
@@ -214,7 +214,12 @@
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-util</artifactId>
+ <artifactId>shared-asn1-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-codec-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -224,7 +229,7 @@
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
+ <artifactId>shared-util</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java
index 06f0286..de62ea1 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java
@@ -64,30 +64,38 @@
public class BrowserConnectionIO
{
// XML tags
- private static final String BROWSER_CONNECTIONS_TAG = "browserConnections";
+ private static final String BROWSER_CONNECTIONS_TAG = "browserConnections"; //$NON-NLS-1$
- private static final String BROWSER_CONNECTION_TAG = "browserConnection";
- private static final String ID_TAG = "id";
+ private static final String BROWSER_CONNECTION_TAG = "browserConnection"; //$NON-NLS-1$
+ private static final String ID_TAG = "id"; //$NON-NLS-1$
- private static final String SEARCHES_TAG = "searches";
- private static final String SEARCH_PARAMETER_TAG = "searchParameter";
- private static final String NAME_TAG = "name";
- private static final String SEARCH_BASE_TAG = "searchBase";
- private static final String FILTER_TAG = "filer";
- private static final String RETURNING_ATTRIBUTES_TAG = "returningAttributes";
- private static final String RETURNING_ATTRIBUTE_TAG = "returningAttribute";
- private static final String VALUE_TAG = "value";
- private static final String SCOPE_TAG = "scope";
- private static final String TIME_LIMIT_TAG = "timeLimit";
- private static final String COUNT_LIMIT_TAG = "countLimit";
- private static final String ALIASES_DEREFERENCING_METHOD_TAG = "aliasesDereferencingMethod";
- private static final String REFERRALS_HANDLING_METHOD_TAG = "referralsHandlingMethod";
- private static final String CONTROLS_TAG = "controls";
- private static final String CONTROL_TAG = "control";
+ private static final String SEARCHES_TAG = "searches"; //$NON-NLS-1$
+ private static final String SEARCH_PARAMETER_TAG = "searchParameter"; //$NON-NLS-1$
+ private static final String NAME_TAG = "name"; //$NON-NLS-1$
+ private static final String SEARCH_BASE_TAG = "searchBase"; //$NON-NLS-1$
+ private static final String FILTER_TAG = "filer"; //$NON-NLS-1$
+ private static final String RETURNING_ATTRIBUTES_TAG = "returningAttributes"; //$NON-NLS-1$
+ private static final String RETURNING_ATTRIBUTE_TAG = "returningAttribute"; //$NON-NLS-1$
+ private static final String VALUE_TAG = "value"; //$NON-NLS-1$
+ private static final String SCOPE_TAG = "scope"; //$NON-NLS-1$
+ private static final String TIME_LIMIT_TAG = "timeLimit"; //$NON-NLS-1$
+ private static final String COUNT_LIMIT_TAG = "countLimit"; //$NON-NLS-1$
+ private static final String ALIASES_DEREFERENCING_METHOD_TAG = "aliasesDereferencingMethod"; //$NON-NLS-1$
+ private static final String REFERRALS_HANDLING_METHOD_TAG = "referralsHandlingMethod"; //$NON-NLS-1$
+ private static final String CONTROLS_TAG = "controls"; //$NON-NLS-1$
+ private static final String CONTROL_TAG = "control"; //$NON-NLS-1$
- private static final String BOOKMARKS_TAG = "bookmarks";
- private static final String BOOKMARK_PARAMETER_TAG = "bookmarkParameter";
- private static final String DN_TAG = "dn";
+ private static final String BOOKMARKS_TAG = "bookmarks"; //$NON-NLS-1$
+ private static final String BOOKMARK_PARAMETER_TAG = "bookmarkParameter"; //$NON-NLS-1$
+ private static final String DN_TAG = "dn"; //$NON-NLS-1$
+
+ // Scope values
+ private static final String SCOPE_OBJECT = "OBJECT";
+ private static final String SCOPE_ONELEVEL = "ONELEVEL";
+ private static final String SCOPE_SUBTREE = "SUBTREE";
+ private static final String SCOPE_OBJECT_2 = "base";
+ private static final String SCOPE_ONELEVEL_2 = "one";
+ private static final String SCOPE_SUBTREE_2 = "sub";
/**
@@ -238,7 +246,7 @@
{
try
{
- searchParameter.setScope( SearchScope.valueOf( scopeAttribute.getValue() ) );
+ searchParameter.setScope( convertSearchScope( scopeAttribute.getValue() ) );
}
catch ( IllegalArgumentException e )
{
@@ -408,7 +416,7 @@
// Writing the file to disk
OutputFormat outformat = OutputFormat.createPrettyPrint();
- outformat.setEncoding( "UTF-8" );
+ outformat.setEncoding( "UTF-8" ); //$NON-NLS-1$
XMLWriter writer = new XMLWriter( stream, outformat );
writer.write( document );
writer.flush();
@@ -459,7 +467,7 @@
searchParameterElement.addAttribute( NAME_TAG, searchParameter.getName() );
// Search base
- String searchBase = searchParameter.getSearchBase() != null ? searchParameter.getSearchBase().getName() : "";
+ String searchBase = searchParameter.getSearchBase() != null ? searchParameter.getSearchBase().getName() : ""; //$NON-NLS-1$
searchParameterElement.addAttribute( SEARCH_BASE_TAG, searchBase );
// Filter
@@ -474,13 +482,13 @@
}
// Scope
- searchParameterElement.addAttribute( SCOPE_TAG, searchParameter.getScope().toString() );
+ searchParameterElement.addAttribute( SCOPE_TAG, convertSearchScope( searchParameter.getScope() ) );
// Time limit
- searchParameterElement.addAttribute( TIME_LIMIT_TAG, "" + searchParameter.getTimeLimit() );
+ searchParameterElement.addAttribute( TIME_LIMIT_TAG, "" + searchParameter.getTimeLimit() ); //$NON-NLS-1$
// Count limit
- searchParameterElement.addAttribute( COUNT_LIMIT_TAG, "" + searchParameter.getCountLimit() );
+ searchParameterElement.addAttribute( COUNT_LIMIT_TAG, "" + searchParameter.getCountLimit() ); //$NON-NLS-1$
// Alias dereferencing method
searchParameterElement.addAttribute( ALIASES_DEREFERENCING_METHOD_TAG, searchParameter
@@ -499,7 +507,7 @@
oos.writeObject( studioControl );
oos.close();
byte[] bytes = baos.toByteArray();
- String controlsValue = new String( Base64.encode(bytes) );
+ String controlsValue = new String( Base64.encode( bytes ) );
Element controlElement = controlsElement.addElement( CONTROL_TAG );
controlElement.addAttribute( VALUE_TAG, controlsValue );
@@ -513,8 +521,62 @@
bookmarkParameterElement.addAttribute( NAME_TAG, bookmarkParameter.getName() );
// Dn
- String dn = bookmarkParameter.getDn() != null ? bookmarkParameter.getDn().getName() : "";
+ String dn = bookmarkParameter.getDn() != null ? bookmarkParameter.getDn().getName() : ""; //$NON-NLS-1$
bookmarkParameterElement.addAttribute( DN_TAG, dn );
}
+
+ /**
+ * Converts the given search scope to a string.
+ *
+ * @param scope the search scope
+ * @return the converted string for the search scope
+ * @see https://issues.apache.org/jira/browse/DIRSTUDIO-771
+ */
+ private static String convertSearchScope( SearchScope scope )
+ {
+ if ( scope != null )
+ {
+ switch ( scope )
+ {
+ case OBJECT:
+ return SCOPE_OBJECT;
+ case ONELEVEL:
+ return SCOPE_ONELEVEL;
+ case SUBTREE:
+ return SCOPE_SUBTREE;
+ }
+ }
+
+ return SCOPE_SUBTREE;
+ }
+
+
+ /**
+ * Converts the given string to a search scope.
+ *
+ * @param scope the scope string
+ * @return the corresponding search scope
+ * @throws IllegalArgumentException if the string could not be converted
+ * @see https://issues.apache.org/jira/browse/DIRSTUDIO-771
+ */
+ private static SearchScope convertSearchScope( String scope ) throws IllegalArgumentException
+ {
+ if ( ( SCOPE_OBJECT.equalsIgnoreCase( scope ) || SCOPE_OBJECT_2.equalsIgnoreCase( scope ) ) )
+ {
+ return SearchScope.OBJECT;
+ }
+ else if ( ( SCOPE_ONELEVEL.equalsIgnoreCase( scope ) || SCOPE_ONELEVEL_2.equalsIgnoreCase( scope ) ) )
+ {
+ return SearchScope.ONELEVEL;
+ }
+ else if ( ( SCOPE_SUBTREE.equalsIgnoreCase( scope ) || SCOPE_SUBTREE_2.equalsIgnoreCase( scope ) ) )
+ {
+ return SearchScope.SUBTREE;
+ }
+ else
+ {
+ throw new IllegalArgumentException();
+ }
+ }
}
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java
index 6732ba0..3717b49 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java
@@ -128,9 +128,9 @@
// 1st search it in current workspace with the old ldapstudio plugin ID
// 2nd search it in old .ldapstudio workspace with the old ldapstudio plugin ID
String[] oldFilenames = new String[2];
- oldFilenames[0] = filename.replace( "org.apache.directory.studio.ldapbrowser.core",
- "org.apache.directory.ldapstudio.browser.core" );
- oldFilenames[1] = oldFilenames[0].replace( ".ApacheDirectoryStudio", ".ldapstudio" );
+ oldFilenames[0] = filename.replace( "org.apache.directory.studio.ldapbrowser.core", //$NON-NLS-1$
+ "org.apache.directory.ldapstudio.browser.core" ); //$NON-NLS-1$
+ oldFilenames[1] = oldFilenames[0].replace( ".ApacheDirectoryStudio", ".ldapstudio" ); //$NON-NLS-1$ //$NON-NLS-2$
for ( int i = 0; i < oldFilenames.length; i++ )
{
File oldFile = new File( oldFilenames[i] );
@@ -138,10 +138,10 @@
{
try
{
- String oldContent = FileUtils.readFileToString( oldFile, "UTF-8" );
- String newContent = oldContent.replace( "org.apache.directory.ldapstudio.browser.core",
- "org.apache.directory.studio.ldapbrowser.core" );
- FileUtils.writeStringToFile( file, newContent, "UTF-8" );
+ String oldContent = FileUtils.readFileToString( oldFile, "UTF-8" ); //$NON-NLS-1$
+ String newContent = oldContent.replace( "org.apache.directory.ldapstudio.browser.core", //$NON-NLS-1$
+ "org.apache.directory.studio.ldapbrowser.core" ); //$NON-NLS-1$
+ FileUtils.writeStringToFile( file, newContent, "UTF-8" ); //$NON-NLS-1$
break;
}
catch ( IOException e )
@@ -345,7 +345,7 @@
// To avoid a corrupt file, save object to a temp file first
try
{
- BrowserConnectionIO.save( new FileOutputStream( getBrowserConnectionStoreFileName() + "-temp" ),
+ BrowserConnectionIO.save( new FileOutputStream( getBrowserConnectionStoreFileName() + "-temp" ), //$NON-NLS-1$
connectionMap );
}
catch ( IOException e )
@@ -356,7 +356,7 @@
// move temp file to good file
File file = new File( getBrowserConnectionStoreFileName() );
- File tempFile = new File( getBrowserConnectionStoreFileName() + "-temp" );
+ File tempFile = new File( getBrowserConnectionStoreFileName() + "-temp" ); //$NON-NLS-1$
if ( file.exists() )
{
file.delete();
@@ -364,8 +364,8 @@
try
{
- String content = FileUtils.readFileToString( tempFile, "UTF-8" );
- FileUtils.writeStringToFile( file, content, "UTF-8" );
+ String content = FileUtils.readFileToString( tempFile, "UTF-8" ); //$NON-NLS-1$
+ FileUtils.writeStringToFile( file, content, "UTF-8" ); //$NON-NLS-1$
}
catch ( IOException e )
{
@@ -457,8 +457,8 @@
File file = new File( fileName );
if ( file.exists() )
{
- String oldContent = FileUtils.readFileToString( file, "UTF-8" );
- if ( !oldContent.contains( "java.beans.XMLDecoder" ) )
+ String oldContent = FileUtils.readFileToString( file, "UTF-8" ); //$NON-NLS-1$
+ if ( !oldContent.contains( "java.beans.XMLDecoder" ) ) //$NON-NLS-1$
{
// new file format
try
@@ -472,7 +472,7 @@
try
{
BrowserConnectionIO.load( new FileInputStream( getBrowserConnectionStoreFileName()
- + "-temp" ), connectionMap );
+ + "-temp" ), connectionMap ); //$NON-NLS-1$
}
catch ( FileNotFoundException e1 )
{
@@ -568,7 +568,7 @@
catch ( Exception e )
{
// if loading failed, try with temp file
- String tempFilename = filename + "-temp";
+ String tempFilename = filename + "-temp"; //$NON-NLS-1$
try
{
XMLDecoder decoder = new XMLDecoder( new BufferedInputStream( ( new FileInputStream( tempFilename ) ) ) );
@@ -614,7 +614,7 @@
{
if ( oldInstance == field.get( null ) )
{
- return new Expression( oldInstance, field, "get", new Object[]
+ return new Expression( oldInstance, field, "get", new Object[] //$NON-NLS-1$
{ null } );
}
}
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreConstants.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreConstants.java
index 5d2c6b0..6763de8 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreConstants.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCoreConstants.java
@@ -43,7 +43,7 @@
}
/** The plug-in ID */
- public static final String PLUGIN_ID = BrowserCorePlugin.getDefault().getPluginProperties().getString( "Plugin_id" );
+ public static final String PLUGIN_ID = BrowserCorePlugin.getDefault().getPluginProperties().getString( "Plugin_id" ); //$NON-NLS-1$
public static final String PREFERENCE_BINARY_SYNTAXES = "binarySyntaxes"; //$NON-NLS-1$
@@ -84,6 +84,8 @@
public static final String PREFERENCE_LDIF_LINE_SEPARATOR = "ldifLineSeparator"; //$NON-NLS-1$
public static final String PREFERENCE_LDIF_SPACE_AFTER_COLON = "ldifSpaceAfterColon"; //$NON-NLS-1$
+
+ public static final String PREFERENCE_LDIF_INCLUDE_VERSION_LINE = "ldifIncludeVersionLine"; //$NON-NLS-1$
public static final int BINARYENCODING_IGNORE = 0;
@@ -108,5 +110,5 @@
public static final int SORT_ORDER_DESCENDING = 2;
public static final String LDAP_SEARCH_PAGE_ID = BrowserCorePlugin.getDefault().getPluginProperties().getString(
- "SearchPage_LdapSearch_id" );
+ "SearchPage_LdapSearch_id" ); //$NON-NLS-1$
}
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCorePlugin.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCorePlugin.java
index 44f7c62..da16206 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCorePlugin.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCorePlugin.java
@@ -165,14 +165,14 @@
try
{
properties = new PropertyResourceBundle( FileLocator.openStream( this.getBundle(), new Path(
- "plugin.properties" ), false ) );
+ "plugin.properties" ), false ) ); //$NON-NLS-1$
}
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, "org.apache.directory.studio.ldapbrowser.core", Status.OK,
+ new Status( Status.ERROR, "org.apache.directory.studio.ldapbrowser.core", Status.OK, //$NON-NLS-1$
"Unable to get the plugin properties.", e ) );
}
}
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCorePreferencesInitializer.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCorePreferencesInitializer.java
index 536836a..528d5bd 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCorePreferencesInitializer.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserCorePreferencesInitializer.java
@@ -63,6 +63,7 @@
store.setDefault( BrowserCoreConstants.PREFERENCE_LDIF_LINE_WIDTH, 76 );
store.setDefault( BrowserCoreConstants.PREFERENCE_LDIF_LINE_SEPARATOR, BrowserCoreConstants.LINE_SEPARATOR );
store.setDefault( BrowserCoreConstants.PREFERENCE_LDIF_SPACE_AFTER_COLON, true );
+ store.setDefault( BrowserCoreConstants.PREFERENCE_LDIF_INCLUDE_VERSION_LINE, true );
// default binary attributes
BinaryAttribute[] defaultBinaryAttributes = new BinaryAttribute[]
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/SearchManager.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/SearchManager.java
index 09c2aa7..80d9603 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/SearchManager.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/SearchManager.java
@@ -28,7 +28,6 @@
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
import org.apache.directory.studio.ldapbrowser.core.events.SearchUpdateEvent;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
-import org.apache.directory.studio.ldapbrowser.core.model.IQuickSearch;
import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
import org.eclipse.osgi.util.NLS;
@@ -50,9 +49,6 @@
/** The connection. */
private IBrowserConnection connection;
- /** The quick search. */
- private IQuickSearch quickSearch;
-
/**
* Creates a new instance of SearchManager.
@@ -171,14 +167,8 @@
*/
public void removeSearch( ISearch search )
{
- if ( search == quickSearch )
- {
- quickSearch = null;
- }
- else
- {
- searchList.remove( search );
- }
+ searchList.remove( search );
+
EventRegistry.fireSearchUpdated( new SearchUpdateEvent( search, SearchUpdateEvent.EventDetail.SEARCH_REMOVED ),
this );
}
@@ -219,27 +209,4 @@
{
return searchList.size();
}
-
-
- /**
- * Sets the quick search.
- *
- * @param quickSearch the new quick search
- */
- public void setQuickSearch( IQuickSearch quickSearch )
- {
- this.quickSearch = quickSearch;
- }
-
-
- /**
- * Gets the quick search.
- *
- * @return the quick search
- */
- public IQuickSearch getQuickSearch()
- {
- return quickSearch;
- }
-
}
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages.properties b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages.properties
index 3dafc2b..9d3a34a 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages.properties
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages.properties
@@ -46,13 +46,13 @@
model__url_no_dn=No DN
model__empty_password=Empty password is not allowed\!
model__loading_schema=Loading Schema...
-model__invalid_record=Record is invalid
+model__invalid_record=Record is invalid: {0}
model__invalid_rdn=Invalid RDN
model__invalid_protocol=Invalid protocol
model__invalid_url=Invalid URL
model__loading_rootdse=Loading Root DSE...
model__setting_base_dn=Setting Base DN...
-model__no_such_entry=Entry {0} doesn't exist or wasn't returned from server
+model__no_such_entry=Entry {0} doesn''t exist or wasn''t returned from server
model__binding=Binding...
model__connecting=Connecting...
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_de.properties b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_de.properties
index c1148e5..f3ce5f0 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_de.properties
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_de.properties
@@ -44,7 +44,7 @@
model__url_no_dn=Kein DN
model__empty_password=Leeres Passwort ist nicht erlaubt\!
model__loading_schema=Schema laden...
-model__invalid_record=Datensatz ist ung\u00FCltig
+model__invalid_record=Datensatz ist ung\u00FCltig: {0}
model__invalid_rdn=Ung\u00FCltiger RDN
model__invalid_protocol=Ung\u00FCltiges Protokoll
model__invalid_url=Ung\u00FCltige URL
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_fr.properties b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_fr.properties
index 3f9cf8a..e08fdd3 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_fr.properties
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_fr.properties
@@ -46,7 +46,7 @@
model__url_no_dn=Pas de DN
model__empty_password=Un mot de passe vide n'est pas autoris\u00E9 \!
model__loading_schema=Chargement du Sch\u00E9ma...
-model__invalid_record=L'enregistrement est invalide
+model__invalid_record=L''enregistrement est invalide : {0}
model__invalid_rdn=RDN invalide
model__invalid_protocol=Protocol invalide
model__invalid_url=URL invalide
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/BulkModificationEvent.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/BulkModificationEvent.java
index 843b474..a412508 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/BulkModificationEvent.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/BulkModificationEvent.java
@@ -26,7 +26,7 @@
/**
- * An BulkModificationEvent indicates that a bulk modification has occured.
+ * A BulkModificationEvent indicates that a bulk modification has occurred.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EventRegistry.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EventRegistry.java
index 2c0360c..ebd3ee0 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EventRegistry.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EventRegistry.java
@@ -242,7 +242,7 @@
public String toString()
{
- return "EventRunnableFactory [entryUpdateEvent=" + entryUpdateEvent + "]";
+ return "EventRunnableFactory [entryUpdateEvent=" + entryUpdateEvent + "]"; //$NON-NLS-1$ //$NON-NLS-2$
}
};
entryUpdateEventManager.fire( factory );
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java
index 7a81dd1..1485c0e 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java
@@ -442,13 +442,13 @@
for ( Iterator<Ava> it = oldRdn.iterator(); it.hasNext(); )
{
Ava atav = it.next();
- Attribute attribute = attributes.get( atav.getUpType() );
+ Attribute attribute = attributes.get( atav.getType() );
if ( attribute != null )
{
attribute.remove( atav.getNormValue().getString() );
if ( attribute.size() == 0 )
{
- attributes.remove( atav.getUpType() );
+ attributes.remove( atav.getType() );
}
}
}
@@ -457,10 +457,10 @@
for ( Iterator<Ava> it = newRdn.iterator(); it.hasNext(); )
{
Ava atav = it.next();
- Attribute attribute = attributes.get( atav.getUpType() );
+ Attribute attribute = attributes.get( atav.getType() );
if ( attribute == null )
{
- attribute = new BasicAttribute( atav.getUpType() );
+ attribute = new BasicAttribute( atav.getType() );
attributes.put( attribute );
}
if ( !attribute.contains( atav.getNormValue().getString() ) )
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifRunnable.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifRunnable.java
index 175ef0d..0f03f5c 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifRunnable.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExecuteLdifRunnable.java
@@ -101,7 +101,7 @@
public Object[] getLockedObjects()
{
List<Object> l = new ArrayList<Object>();
- l.add( browserConnection.getUrl() + "_" + DigestUtils.shaHex( ldif ) );
+ l.add( browserConnection.getUrl() + "_" + DigestUtils.shaHex( ldif ) ); //$NON-NLS-1$
return l.toArray();
}
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvRunnable.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvRunnable.java
index 078bba4..5f2ca16 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvRunnable.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvRunnable.java
@@ -114,7 +114,7 @@
public Object[] getLockedObjects()
{
return new Object[]
- { browserConnection.getUrl() + "_" + DigestUtils.shaHex( exportCsvFilename ) };
+ { browserConnection.getUrl() + "_" + DigestUtils.shaHex( exportCsvFilename ) }; //$NON-NLS-1$
}
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java
index 6fee0ce..790d181 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java
@@ -220,7 +220,7 @@
if ( dsmlExportString != null )
{
FileOutputStream fos = new FileOutputStream( exportDsmlFilename );
- OutputStreamWriter osw = new OutputStreamWriter( fos, "UTF-8" );
+ OutputStreamWriter osw = new OutputStreamWriter( fos, "UTF-8" ); //$NON-NLS-1$
BufferedWriter bufferedWriter = new BufferedWriter( osw );
bufferedWriter.write( dsmlExportString );
bufferedWriter.close();
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java
index dd1010b..cbc4602 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java
@@ -44,7 +44,9 @@
import org.apache.directory.studio.connection.core.StudioPagedResultsControl;
import org.apache.directory.studio.connection.core.io.StudioNamingEnumeration;
import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress;
+import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
+import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.SearchParameter;
import org.apache.directory.studio.ldapbrowser.core.model.impl.DummyEntry;
@@ -120,7 +122,7 @@
public Object[] getLockedObjects()
{
List<Object> l = new ArrayList<Object>();
- l.add( browserConnection.getUrl() + "_" + DigestUtils.shaHex( exportLdifFilename ) );
+ l.add( browserConnection.getUrl() + "_" + DigestUtils.shaHex( exportLdifFilename ) ); //$NON-NLS-1$
return l.toArray();
}
@@ -174,12 +176,16 @@
LdifFormatParameters ldifFormatParameters = Utils.getLdifFormatParameters();
// add version spec
- LdifVersionLine ldifVersionLine = LdifVersionLine.create();
- String ldifVersionLineString = ldifVersionLine.toFormattedString( ldifFormatParameters );
- bufferedWriter.write( ldifVersionLineString );
- LdifSepLine ldifSepLine = LdifSepLine.create();
- String ldifSepLineString = ldifSepLine.toFormattedString( ldifFormatParameters );
- bufferedWriter.write( ldifSepLineString );
+ if ( BrowserCorePlugin.getDefault().getPluginPreferences()
+ .getBoolean( BrowserCoreConstants.PREFERENCE_LDIF_INCLUDE_VERSION_LINE ) )
+ {
+ LdifVersionLine ldifVersionLine = LdifVersionLine.create();
+ String ldifVersionLineString = ldifVersionLine.toFormattedString( ldifFormatParameters );
+ bufferedWriter.write( ldifVersionLineString );
+ LdifSepLine ldifSepLine = LdifSepLine.create();
+ String ldifSepLineString = ldifSepLine.toFormattedString( ldifFormatParameters );
+ bufferedWriter.write( ldifSepLineString );
+ }
// add the records
while ( !monitor.isCanceled() && !monitor.errorsReported() && enumeration.hasNext() )
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java
index bb469cf..0bcef3e 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java
@@ -118,7 +118,7 @@
public Object[] getLockedObjects()
{
return new Object[]
- { browserConnection.getUrl() + "_" + DigestUtils.shaHex( exportOdfFilename ) };
+ { browserConnection.getUrl() + "_" + DigestUtils.shaHex( exportOdfFilename ) }; //$NON-NLS-1$
}
@@ -152,16 +152,16 @@
// Remove the default table added in construction
Element spreadsheetElement = ( Element ) contentDoc.getElementsByTagNameNS( OdfNamespace.OFFICE.getUri(),
- "spreadsheet" ).item( 0 );
+ "spreadsheet" ).item( 0 ); //$NON-NLS-1$
OdfTable table = ( OdfTable ) ( spreadsheetElement.getElementsByTagNameNS( OdfNamespace.TABLE.getUri(),
- "table" ).item( 0 ) );
+ "table" ).item( 0 ) ); //$NON-NLS-1$
table.getParentNode().removeChild( table );
// create the table
table = new OdfTable( contentDoc );
table.setName( "Export" ); //$NON-NLS-1$
Element officeSpreadsheet = ( Element ) contentDoc.getElementsByTagNameNS( OdfNamespace.OFFICE.getUri(),
- "spreadsheet" ).item( 0 );
+ "spreadsheet" ).item( 0 ); //$NON-NLS-1$
officeSpreadsheet.appendChild( table );
// header
@@ -277,7 +277,7 @@
String valueDelimiter, int binaryEncoding, boolean exportDn )
{
// group multi-valued attributes
- Map<String, String> attributeMap = ExportCsvRunnable.getAttributeMap( null, record, valueDelimiter, "UTF-16",
+ Map<String, String> attributeMap = ExportCsvRunnable.getAttributeMap( null, record, valueDelimiter, "UTF-16", //$NON-NLS-1$
binaryEncoding );
// output attributes
@@ -311,7 +311,7 @@
String value = attributeMap.get( attributeName );
if ( value == null )
{
- value = "";
+ value = ""; //$NON-NLS-1$
}
OdfTableCell cell = new OdfTableCell( contentDoc );
cell.setValueType( OdfValueType.STRING );
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsRunnable.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsRunnable.java
index 2f55d04..97411d3 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsRunnable.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsRunnable.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.ldapbrowser.core.jobs;
@@ -115,7 +115,7 @@
public Object[] getLockedObjects()
{
return new Object[]
- { browserConnection.getUrl() + "_" + DigestUtils.shaHex( exportXlsFilename ) };
+ { browserConnection.getUrl() + "_" + DigestUtils.shaHex( exportXlsFilename ) }; //$NON-NLS-1$
}
@@ -146,11 +146,11 @@
// header
HSSFRow headerRow = sheet.createRow( 0 );
- LinkedHashMap<String, Short> attributeNameMap = new LinkedHashMap<String, Short>();
+ LinkedHashMap<String, Integer> attributeNameMap = new LinkedHashMap<String, Integer>();
if ( this.exportDn )
{
- short cellNum = ( short ) 0;
- attributeNameMap.put( "dn", new Short( cellNum ) ); //$NON-NLS-1$
+ int cellNum = 0;
+ attributeNameMap.put( "dn", cellNum ); //$NON-NLS-1$
headerRow.createCell( cellNum ).setCellValue( "dn" ); //$NON-NLS-1$
}
@@ -232,7 +232,7 @@
*/
private static void exportToXls( IBrowserConnection browserConnection, SearchParameter searchParameter,
HSSFSheet sheet, HSSFRow headerRow, int count, StudioProgressMonitor monitor,
- LinkedHashMap<String, Short> attributeNameMap, String valueDelimiter, int binaryEncoding, boolean exportDn )
+ LinkedHashMap<String, Integer> attributeNameMap, String valueDelimiter, int binaryEncoding, boolean exportDn )
throws IOException
{
try
@@ -288,45 +288,42 @@
* @param exportDn the export dn
*/
private static void recordToHSSFRow( IBrowserConnection browserConnection, LdifContentRecord record,
- HSSFSheet sheet, HSSFRow headerRow, Map<String, Short> headerRowAttributeNameMap, String valueDelimiter,
+ HSSFSheet sheet, HSSFRow headerRow, Map<String, Integer> headerRowAttributeNameMap, String valueDelimiter,
int binaryEncoding, boolean exportDn )
{
// group multi-valued attributes
- Map<String, String> attributeMap = ExportCsvRunnable.getAttributeMap( null, record, valueDelimiter, "UTF-16",
+ Map<String, String> attributeMap = ExportCsvRunnable.getAttributeMap( null, record, valueDelimiter, "UTF-16", //$NON-NLS-1$
binaryEncoding );
// output attributes
HSSFRow row = sheet.createRow( sheet.getLastRowNum() + 1 );
if ( exportDn )
{
- HSSFCell cell = row.createCell( ( short ) 0 );
- cell.setEncoding( HSSFCell.ENCODING_UTF_16 );
+ HSSFCell cell = row.createCell( 0 );
cell.setCellValue( record.getDnLine().getValueAsString() );
}
for ( String attributeName : attributeMap.keySet() )
{
- String value = ( String ) attributeMap.get( attributeName );
+ String value = attributeMap.get( attributeName );
if ( !headerRowAttributeNameMap.containsKey( attributeName ) )
{
- short cellNum = ( short ) headerRowAttributeNameMap.size();
- headerRowAttributeNameMap.put( attributeName, new Short( cellNum ) );
+ int cellNum = headerRowAttributeNameMap.size();
+ headerRowAttributeNameMap.put( attributeName, new Integer( cellNum ) );
HSSFCell cell = headerRow.createCell( cellNum );
- cell.setEncoding( HSSFCell.ENCODING_UTF_16 );
cell.setCellValue( attributeName );
}
if ( headerRowAttributeNameMap.containsKey( attributeName ) )
{
- short cellNum = ( ( Short ) headerRowAttributeNameMap.get( attributeName ) ).shortValue();
+ int cellNum = headerRowAttributeNameMap.get( attributeName ).shortValue();
HSSFCell cell = row.createCell( cellNum );
- cell.setEncoding( HSSFCell.ENCODING_UTF_16 );
cell.setCellValue( value );
}
}
// for (int i = 0; i < attributes.length; i++) {
- //
+ //
// String attributeName = attributes[i];
// if (attributeMap.containsKey(attributeName)) {
// String value = (String)attributeMap.get(attributeName);
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java
index dc50d26..553b0a8 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java
@@ -169,7 +169,7 @@
public Object[] getLockedObjects()
{
List<Object> l = new ArrayList<Object>();
- l.add( browserConnection.getUrl() + "_" + DigestUtils.shaHex( dsmlFile.toString() ) );
+ l.add( browserConnection.getUrl() + "_" + DigestUtils.shaHex( dsmlFile.toString() ) ); //$NON-NLS-1$
return l.toArray();
}
@@ -197,7 +197,7 @@
// Parsing the file
Dsmlv2Grammar grammar = new Dsmlv2Grammar();
Dsmlv2Parser parser = new Dsmlv2Parser( grammar );
- parser.setInput( new FileInputStream( dsmlFile ), "UTF-8" );
+ parser.setInput( new FileInputStream( dsmlFile ), "UTF-8" ); //$NON-NLS-1$
parser.parseAllRequests();
// Getting the batch request
@@ -237,7 +237,7 @@
if ( responseFile != null )
{
FileOutputStream fos = new FileOutputStream( responseFile );
- OutputStreamWriter osw = new OutputStreamWriter( fos, "UTF-8" );
+ OutputStreamWriter osw = new OutputStreamWriter( fos, "UTF-8" ); //$NON-NLS-1$
BufferedWriter bufferedWriter = new BufferedWriter( osw );
bufferedWriter.write( batchResponseDsml.toDsml() );
bufferedWriter.close();
@@ -250,7 +250,7 @@
{
monitor.reportError( BrowserCoreMessages.bind(
"{0} errors occurred, see the response file for details", new String[]
- { "" + errorsCount } ) );
+ { "" + errorsCount } ) ); //$NON-NLS-1$
}
}
catch ( Exception e )
@@ -677,7 +677,7 @@
// these signify that all user attributes are to be returned."]
if ( returningAttributes.size() == 0 )
{
- returningAttributes.add( "*" );
+ returningAttributes.add( "*" ); //$NON-NLS-1$
}
controls.setReturningAttributes( returningAttributes.toArray( new String[0] ) );
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java
index f4d8029..215f558 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java
@@ -161,7 +161,7 @@
public Object[] getLockedObjects()
{
List<Object> l = new ArrayList<Object>();
- l.add( browserConnection.getUrl() + "_" + DigestUtils.shaHex( ldifFile.toString() ) );
+ l.add( browserConnection.getUrl() + "_" + DigestUtils.shaHex( ldifFile.toString() ) ); //$NON-NLS-1$
return l.toArray();
}
@@ -406,7 +406,8 @@
{
if ( !record.isValid() )
{
- throw new NamingException( BrowserCoreMessages.model__invalid_record );
+ throw new NamingException( BrowserCoreMessages.bind( BrowserCoreMessages.model__invalid_record,
+ record.getInvalidString() ) );
}
String dn = record.getDnLine().getValueAsString();
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesRunnable.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesRunnable.java
index e578274..f32cf1a 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesRunnable.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesRunnable.java
@@ -75,12 +75,17 @@
*/
public Connection[] getConnections()
{
- Connection[] connections = new Connection[entries.length];
- for ( int i = 0; i < connections.length; i++ )
+ List<Connection> connections = new ArrayList<Connection>();
+
+ for ( IEntry entry : entries )
{
- connections[i] = entries[i].getBrowserConnection().getConnection();
+ if ( entry != null )
+ {
+ connections.add( entry.getBrowserConnection().getConnection() );
+ }
}
- return connections;
+
+ return connections.toArray( new Connection[0] );
}
@@ -124,12 +129,18 @@
for ( int pi = 0; pi < entries.length && !monitor.isCanceled(); pi++ )
{
- monitor.setTaskName( BrowserCoreMessages.bind( BrowserCoreMessages.jobs__init_entries_task, new String[]
- { this.entries[pi].getDn().getName() } ) );
- monitor.worked( 1 );
- if ( entries[pi].getBrowserConnection() != null )
+ IEntry entry = entries[pi];
+
+ if ( entry != null )
{
- initializeAttributes( entries[pi], monitor );
+ monitor.setTaskName( BrowserCoreMessages.bind( BrowserCoreMessages.jobs__init_entries_task,
+ new String[]
+ { entry.getDn().getName() } ) );
+ monitor.worked( 1 );
+ if ( entry.getBrowserConnection() != null )
+ {
+ initializeAttributes( entry, monitor );
+ }
}
}
}
@@ -142,7 +153,7 @@
{
for ( IEntry entry : entries )
{
- if ( entry.getBrowserConnection() != null && entry.isAttributesInitialized() )
+ if ( ( entry != null ) && ( entry.getBrowserConnection() != null ) && ( entry.isAttributesInitialized() ) )
{
// lookup the entry from cache and fire event with real entry
if ( entry.getBrowserConnection().getEntryFromCache( entry.getDn() ) != null )
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java
index 9045cf8..35df893 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java
@@ -190,7 +190,7 @@
// 1st: add base DNs, either the specified or from the namingContexts attribute
if ( !browserConnection.isFetchBaseDNs() && browserConnection.getBaseDN() != null
- && !"".equals( browserConnection.getBaseDN().toString() ) )
+ && !"".equals( browserConnection.getBaseDN().toString() ) ) //$NON-NLS-1$
{
// only add the specified base Dn
Dn dn = browserConnection.getBaseDN();
@@ -302,29 +302,29 @@
// Set detected connection properties
DetectedConnectionProperties detectedConnectionProperties = browserConnection.getConnection()
.getDetectedConnectionProperties();
- IAttribute vendorNameAttribute = browserConnection.getRootDSE().getAttribute( "vendorName" );
+ IAttribute vendorNameAttribute = browserConnection.getRootDSE().getAttribute( "vendorName" ); //$NON-NLS-1$
if ( ( vendorNameAttribute != null ) && ( vendorNameAttribute.getValueSize() > 0 ) )
{
detectedConnectionProperties.setVendorName( vendorNameAttribute.getStringValue() );
}
- IAttribute vendorVersionAttribute = browserConnection.getRootDSE().getAttribute( "vendorVersion" );
+ IAttribute vendorVersionAttribute = browserConnection.getRootDSE().getAttribute( "vendorVersion" ); //$NON-NLS-1$
if ( ( vendorVersionAttribute != null ) && ( vendorVersionAttribute.getValueSize() > 0 ) )
{
detectedConnectionProperties.setVendorVersion( vendorVersionAttribute.getStringValue() );
}
- IAttribute supportedControlAttribute = browserConnection.getRootDSE().getAttribute( "supportedControl" );
+ IAttribute supportedControlAttribute = browserConnection.getRootDSE().getAttribute( "supportedControl" ); //$NON-NLS-1$
if ( ( supportedControlAttribute != null ) && ( supportedControlAttribute.getValueSize() > 0 ) )
{
detectedConnectionProperties.setSupportedControls( Arrays.asList( supportedControlAttribute
.getStringValues() ) );
}
- IAttribute supportedExtensionAttribute = browserConnection.getRootDSE().getAttribute( "supportedExtension" );
+ IAttribute supportedExtensionAttribute = browserConnection.getRootDSE().getAttribute( "supportedExtension" ); //$NON-NLS-1$
if ( ( supportedExtensionAttribute != null ) && ( supportedExtensionAttribute.getValueSize() > 0 ) )
{
detectedConnectionProperties.setSupportedExtensions( Arrays.asList( supportedExtensionAttribute
.getStringValues() ) );
}
- IAttribute supportedFeaturesAttribute = browserConnection.getRootDSE().getAttribute( "supportedFeatures" );
+ IAttribute supportedFeaturesAttribute = browserConnection.getRootDSE().getAttribute( "supportedFeatures" ); //$NON-NLS-1$
if ( ( supportedFeaturesAttribute != null ) && ( supportedFeaturesAttribute.getValueSize() > 0 ) )
{
detectedConnectionProperties.setSupportedFeatures( Arrays.asList( supportedFeaturesAttribute
@@ -376,7 +376,7 @@
String[] values = attribute.getStringValues();
for ( String dn : values )
{
- if ( dn != null && !"".equals( dn ) )
+ if ( dn != null && !"".equals( dn ) ) //$NON-NLS-1$
{
try
{
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryRunnable.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryRunnable.java
index d6d723f..f7e14f5 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryRunnable.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryRunnable.java
@@ -148,7 +148,7 @@
Dn oldDn = oldEntry.getDn();
Dn parentDn = oldDn.getParent();
Dn newDn = null;
-
+
try
{
newDn = parentDn.add( newRdn );
@@ -213,42 +213,45 @@
// remove old entry and add new entry to parent
IEntry parent = oldEntry.getParententry();
- boolean hasMoreChildren = parent.hasMoreChildren();
- parent.deleteChild( oldEntry );
-
- List<StudioControl> controls = new ArrayList<StudioControl>();
- if ( oldEntry.isReferral() )
+ if ( parent != null )
{
- controls.add( StudioControl.MANAGEDSAIT_CONTROL );
- }
+ boolean hasMoreChildren = parent.hasMoreChildren();
+ parent.deleteChild( oldEntry );
- // Here we try to read the renamed entry to be able to send the right event notification.
- // In some cases this don't work:
- // - if there was a referral and the entry was created on another (master) server and not yet sync'ed to the current server
- // So we use a dummy monitor to no bother the user with an error message.
- dummyMonitor.reset();
- newEntry = ReadEntryRunnable.getEntry( browserConnection, newDn, controls, dummyMonitor );
- dummyMonitor.done();
- if ( newEntry != null )
- {
- parent.addChild( newEntry );
- }
- parent.setHasMoreChildren( hasMoreChildren );
-
- // reset searches, if the renamed entry is a result of a search
- List<ISearch> searches = browserConnection.getSearchManager().getSearches();
- for ( ISearch search : searches )
- {
- if ( search.getSearchResults() != null )
+ List<StudioControl> controls = new ArrayList<StudioControl>();
+ if ( oldEntry.isReferral() )
{
- ISearchResult[] searchResults = search.getSearchResults();
- for ( ISearchResult result : searchResults )
+ controls.add( StudioControl.MANAGEDSAIT_CONTROL );
+ }
+
+ // Here we try to read the renamed entry to be able to send the right event notification.
+ // In some cases this don't work:
+ // - if there was a referral and the entry was created on another (master) server and not yet sync'ed to the current server
+ // So we use a dummy monitor to no bother the user with an error message.
+ dummyMonitor.reset();
+ newEntry = ReadEntryRunnable.getEntry( browserConnection, newDn, controls, dummyMonitor );
+ dummyMonitor.done();
+ if ( newEntry != null )
+ {
+ parent.addChild( newEntry );
+ }
+ parent.setHasMoreChildren( hasMoreChildren );
+
+ // reset searches, if the renamed entry is a result of a search
+ List<ISearch> searches = browserConnection.getSearchManager().getSearches();
+ for ( ISearch search : searches )
+ {
+ if ( search.getSearchResults() != null )
{
- if ( oldEntry.equals( result.getEntry() ) )
+ ISearchResult[] searchResults = search.getSearchResults();
+ for ( ISearchResult result : searchResults )
{
- search.setSearchResults( null );
- searchesToUpdateSet.add( search );
- break;
+ if ( oldEntry.equals( result.getEntry() ) )
+ {
+ search.setSearchResults( null );
+ searchesToUpdateSet.add( search );
+ break;
+ }
}
}
}
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java
index d949c51..3dc193f 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java
@@ -458,7 +458,7 @@
String searchBase = parameter.getSearchBase().getName();
SearchControls controls = new SearchControls();
SearchScope scope = parameter.getScope();
-
+
switch ( scope )
{
case OBJECT:
@@ -473,7 +473,7 @@
default:
controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
}
-
+
controls.setReturningAttributes( parameter.getReturningAttributes() );
controls.setCountLimit( parameter.getCountLimit() );
int timeLimit = parameter.getTimeLimit() * 1000;
@@ -614,9 +614,9 @@
// build tree to parent
LinkedList<Dn> parentDnList = new LinkedList<Dn>();
Dn parentDn = dn;
- while ( parentDn != null && browserConnection.getEntryFromCache(parentDn) == null )
+ while ( parentDn != null && browserConnection.getEntryFromCache( parentDn ) == null )
{
- parentDnList.addFirst(parentDn);
+ parentDnList.addFirst( parentDn );
parentDn = parentDn.getParent();
}
@@ -628,10 +628,10 @@
// only the root DSE has a null parent
entry = browserConnection.getRootDSE();
}
- else if ( !parentDn.isEmpty() && browserConnection.getEntryFromCache(parentDn) != null )
+ else if ( !parentDn.isEmpty() && browserConnection.getEntryFromCache( parentDn ) != null )
{
// a normal entry has a parent but the parent isn't the rootDSE
- IEntry parentEntry = browserConnection.getEntryFromCache(parentDn);
+ IEntry parentEntry = browserConnection.getEntryFromCache( parentDn );
entry = new Entry( parentEntry, aDn.getRdn() );
entry.setDirectoryEntry( true );
parentEntry.addChild( entry );
@@ -645,7 +645,7 @@
// we have a base Dn, check if the entry really exists in LDAP
// this is to avoid that a node "dc=com" is created for "dc=example,dc=com" context entry
SearchParameter searchParameter = new SearchParameter();
- searchParameter.setSearchBase(aDn);
+ searchParameter.setSearchBase( aDn );
searchParameter.setFilter( null );
searchParameter.setReturningAttributes( ISearch.NO_ATTRIBUTES );
searchParameter.setScope( SearchScope.OBJECT );
@@ -661,7 +661,7 @@
if ( enumeration != null && enumeration.hasMore() )
{
// create base Dn entry
- entry = new BaseDNEntry(aDn, browserConnection );
+ entry = new BaseDNEntry( aDn, browserConnection );
browserConnection.getRootDSE().addChild( entry );
browserConnection.cacheEntry( entry );
enumeration.close();
@@ -697,64 +697,68 @@
while ( attributeEnumeration.hasMore() )
{
Attribute attribute = attributeEnumeration.next();
- String attributeDescription = attribute.getID();
- NamingEnumeration<?> valueEnumeration = attribute.getAll();
- if ( SchemaConstants.OBJECT_CLASS_AT.equalsIgnoreCase( attributeDescription ) )
- {
- if ( entry.getAttribute( attributeDescription ) != null )
- {
- entry.deleteAttribute( entry.getAttribute( attributeDescription ) );
- }
- entry.addAttribute( new org.apache.directory.studio.ldapbrowser.core.model.impl.Attribute( entry,
- attributeDescription ) );
- }
- while ( valueEnumeration.hasMore() )
- {
- Object o = valueEnumeration.next();
- if ( o instanceof String )
- {
- String value = ( String ) o;
- if ( searchParameter.isInitHasChildrenFlag() )
+ if ( attribute != null )
+ {
+ String attributeDescription = attribute.getID();
+ NamingEnumeration<?> valueEnumeration = attribute.getAll();
+ if ( SchemaConstants.OBJECT_CLASS_AT.equalsIgnoreCase( attributeDescription ) )
+ {
+ if ( entry.getAttribute( attributeDescription ) != null )
{
- // hasChildren flag
- if ( SchemaConstants.HAS_SUBORDINATES_AT.equalsIgnoreCase( attributeDescription ) )
- {
- if ( "FALSE".equalsIgnoreCase( value ) ) { //$NON-NLS-1$
- entry.setHasChildrenHint( false );
- }
- }
- if ( SchemaConstants.NUM_SUBORDINATES_AT.equalsIgnoreCase( attributeDescription ) )
- {
- if ( "0".equalsIgnoreCase( value ) ) { //$NON-NLS-1$
- entry.setHasChildrenHint( false );
- }
- }
- if ( SchemaConstants.SUBORDINATE_COUNT_AT.equalsIgnoreCase( attributeDescription ) )
- {
- if ( "0".equalsIgnoreCase( value ) ) { //$NON-NLS-1$
- entry.setHasChildrenHint( false );
- }
- }
+ entry.deleteAttribute( entry.getAttribute( attributeDescription ) );
}
-
- if ( SchemaConstants.OBJECT_CLASS_AT.equalsIgnoreCase( attributeDescription ) )
+ entry.addAttribute( new org.apache.directory.studio.ldapbrowser.core.model.impl.Attribute( entry,
+ attributeDescription ) );
+ }
+ while ( valueEnumeration.hasMore() )
+ {
+ Object o = valueEnumeration.next();
+ if ( o instanceof String )
{
- if ( SchemaConstants.ALIAS_OC.equalsIgnoreCase( value ) )
+ String value = ( String ) o;
+
+ if ( searchParameter.isInitHasChildrenFlag() )
{
- entry.setAlias( true );
- entry.setHasChildrenHint( false );
+ // hasChildren flag
+ if ( SchemaConstants.HAS_SUBORDINATES_AT.equalsIgnoreCase( attributeDescription ) )
+ {
+ if ( "FALSE".equalsIgnoreCase( value ) ) { //$NON-NLS-1$
+ entry.setHasChildrenHint( false );
+ }
+ }
+ if ( SchemaConstants.NUM_SUBORDINATES_AT.equalsIgnoreCase( attributeDescription ) )
+ {
+ if ( "0".equalsIgnoreCase( value ) ) { //$NON-NLS-1$
+ entry.setHasChildrenHint( false );
+ }
+ }
+ if ( SchemaConstants.SUBORDINATE_COUNT_AT.equalsIgnoreCase( attributeDescription ) )
+ {
+ if ( "0".equalsIgnoreCase( value ) ) { //$NON-NLS-1$
+ entry.setHasChildrenHint( false );
+ }
+ }
}
- if ( SchemaConstants.REFERRAL_OC.equalsIgnoreCase( value ) )
+ if ( SchemaConstants.OBJECT_CLASS_AT.equalsIgnoreCase( attributeDescription ) )
{
- entry.setReferral( true );
- entry.setHasChildrenHint( false );
- }
+ if ( SchemaConstants.ALIAS_OC.equalsIgnoreCase( value ) )
+ {
+ entry.setAlias( true );
+ entry.setHasChildrenHint( false );
+ }
- IAttribute ocAttribute = entry.getAttribute( attributeDescription );
- Value ocValue = new Value( ocAttribute, value );
- ocAttribute.addValue( ocValue );
+ if ( SchemaConstants.REFERRAL_OC.equalsIgnoreCase( value ) )
+ {
+ entry.setReferral( true );
+ entry.setHasChildrenHint( false );
+ }
+
+ IAttribute ocAttribute = entry.getAttribute( attributeDescription );
+ Value ocValue = new Value( ocAttribute, value );
+ ocAttribute.addValue( ocValue );
+ }
}
}
}
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ServerTypeDetector.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ServerTypeDetector.java
index d49f2fc..9364afa 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ServerTypeDetector.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ServerTypeDetector.java
@@ -149,7 +149,7 @@
{
// IBM SecureWay Directory
String[] iswVersions =
- { "3.2", "3.2.1", "3.2.2" }; //$NON-NLS-1$
+ { "3.2", "3.2.1", "3.2.2" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
for ( String version : iswVersions )
{
if ( vendorVersion.indexOf( version ) > -1 )
@@ -160,7 +160,7 @@
// IBM Directory Server
String[] idsVersions =
- { "4.1", "5.1" }; //$NON-NLS-1$
+ { "4.1", "5.1" }; //$NON-NLS-1$ //$NON-NLS-2$
for ( String version : idsVersions )
{
if ( vendorVersion.indexOf( version ) > -1 )
@@ -171,7 +171,7 @@
// IBM Tivoli Directory Server
String[] tdsVersions =
- { "5.2", "6.0", "6.1", "6.2" }; //$NON-NLS-1$
+ { "5.2", "6.0", "6.1", "6.2" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
for ( String version : tdsVersions )
{
if ( vendorVersion.indexOf( version ) > -1 )
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java
index 17027c1..8204b33 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/AttributeDescription.java
@@ -244,7 +244,7 @@
}
// special case @: attributes by object class (RFC4529)
- if ( other.description.length() > 1 && other.description.startsWith( "@" ) )
+ if ( other.description.length() > 1 && other.description.startsWith( "@" ) ) //$NON-NLS-1$
{
String objectClass = other.description.substring( 1 );
ObjectClass ocd = schema.getObjectClassDescription( objectClass );
@@ -301,7 +301,7 @@
for ( Iterator<String> otherIt = otherLangList.iterator(); otherIt.hasNext(); )
{
String otherLang = otherIt.next();
- if ( otherLang.endsWith( "-" ) )
+ if ( otherLang.endsWith( "-" ) ) //$NON-NLS-1$
{
if ( Strings.toLowerCase( myLang ).startsWith( Strings.toLowerCase( otherLang ) ) )
{
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java
index bfcdd44..2e39182 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java
@@ -160,49 +160,49 @@
}
/** The key for the connection parameter "Get Base DNs from Root DSE". */
- public static String CONNECTION_PARAMETER_FETCH_BASE_DNS = "ldapbrowser.fetchBaseDns";
+ public static String CONNECTION_PARAMETER_FETCH_BASE_DNS = "ldapbrowser.fetchBaseDns"; //$NON-NLS-1$
/** The key for the connection parameter "Base Dn". */
- public static String CONNECTION_PARAMETER_BASE_DN = "ldapbrowser.baseDn";
+ public static String CONNECTION_PARAMETER_BASE_DN = "ldapbrowser.baseDn"; //$NON-NLS-1$
/** The key for the connection parameter "Count Limit". */
- public static String CONNECTION_PARAMETER_COUNT_LIMIT = "ldapbrowser.countLimit";
+ public static String CONNECTION_PARAMETER_COUNT_LIMIT = "ldapbrowser.countLimit"; //$NON-NLS-1$
/** The key for the connection parameter "Time Limit". */
- public static String CONNECTION_PARAMETER_TIME_LIMIT = "ldapbrowser.timeLimit";
+ public static String CONNECTION_PARAMETER_TIME_LIMIT = "ldapbrowser.timeLimit"; //$NON-NLS-1$
/** The key for the connection parameter "Alias Dereferencing". */
- public static String CONNECTION_PARAMETER_ALIASES_DEREFERENCING_METHOD = "ldapbrowser.aliasesDereferencingMethod";
+ public static String CONNECTION_PARAMETER_ALIASES_DEREFERENCING_METHOD = "ldapbrowser.aliasesDereferencingMethod"; //$NON-NLS-1$
/** The key for the connection parameter "Referrals Handling". */
- public static String CONNECTION_PARAMETER_REFERRALS_HANDLING_METHOD = "ldapbrowser.referralsHandlingMethod";
+ public static String CONNECTION_PARAMETER_REFERRALS_HANDLING_METHOD = "ldapbrowser.referralsHandlingMethod"; //$NON-NLS-1$
/** The key for the connection parameter "Fetch Operational Attributes. */
- public static String CONNECTION_PARAMETER_FETCH_OPERATIONAL_ATTRIBUTES = "ldapbrowser.fetchOperationalAttributes";
+ public static String CONNECTION_PARAMETER_FETCH_OPERATIONAL_ATTRIBUTES = "ldapbrowser.fetchOperationalAttributes"; //$NON-NLS-1$
/** The key for the connection parameter "Fetch Sub-entries". */
- public static String CONNECTION_PARAMETER_FETCH_SUBENTRIES = "ldapbrowser.fetchSubentries";
+ public static String CONNECTION_PARAMETER_FETCH_SUBENTRIES = "ldapbrowser.fetchSubentries"; //$NON-NLS-1$
/** The key for the connection parameter "Paged Search". */
- public static String CONNECTION_PARAMETER_PAGED_SEARCH = "ldapbrowser.pagedSearch";
+ public static String CONNECTION_PARAMETER_PAGED_SEARCH = "ldapbrowser.pagedSearch"; //$NON-NLS-1$
/** The key for the connection parameter "Paged Search Size". */
- public static String CONNECTION_PARAMETER_PAGED_SEARCH_SIZE = "ldapbrowser.pagedSearchSize";
+ public static String CONNECTION_PARAMETER_PAGED_SEARCH_SIZE = "ldapbrowser.pagedSearchSize"; //$NON-NLS-1$
/** The key for the connection parameter "Paged Search Scroll Mode". */
- public static String CONNECTION_PARAMETER_PAGED_SEARCH_SCROLL_MODE = "ldapbrowser.pagedSearchScrollMode";
+ public static String CONNECTION_PARAMETER_PAGED_SEARCH_SCROLL_MODE = "ldapbrowser.pagedSearchScrollMode"; //$NON-NLS-1$
/** The key for the connection parameter "Modify Mode for attributes with equality matching rule". */
- public static String CONNECTION_PARAMETER_MODIFY_MODE = "ldapbrowser.modifyMode";
+ public static String CONNECTION_PARAMETER_MODIFY_MODE = "ldapbrowser.modifyMode"; //$NON-NLS-1$
/** The key for the connection parameter "Modify Mode for attributes without equality matching rule". */
- public static String CONNECTION_PARAMETER_MODIFY_MODE_NO_EMR = "ldapbrowser.modifyModeNoEMR";
+ public static String CONNECTION_PARAMETER_MODIFY_MODE_NO_EMR = "ldapbrowser.modifyModeNoEMR"; //$NON-NLS-1$
/** The key for the connection parameter "Modify add delete order". */
- public static String CONNECTION_PARAMETER_MODIFY_ORDER = "ldapbrowser.modifyOrder";
+ public static String CONNECTION_PARAMETER_MODIFY_ORDER = "ldapbrowser.modifyOrder"; //$NON-NLS-1$
/** The key for the connection parameter "Use ManageDsaIT Control" */
- public static String CONNECTION_PARAMETER_MANAGE_DSA_IT = "ldapbrowser.manageDsaIT";
+ public static String CONNECTION_PARAMETER_MANAGE_DSA_IT = "ldapbrowser.manageDsaIT"; //$NON-NLS-1$
/**
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapAndFilterComponent.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapAndFilterComponent.java
index 130b793..5faa138 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapAndFilterComponent.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapAndFilterComponent.java
@@ -84,7 +84,7 @@
*/
public String toString()
{
- String s = startToken != null ? "&" : "";
+ String s = startToken != null ? "&" : ""; //$NON-NLS-1$ //$NON-NLS-2$
for ( LdapFilter filter : filterList )
{
if ( filter != null )
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterExtensibleComponent.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterExtensibleComponent.java
index dad5d67..f16d9cd 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterExtensibleComponent.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterExtensibleComponent.java
@@ -406,14 +406,14 @@
*/
public String toString()
{
- return ( attributeToken != null ? startToken.getValue() : "" )
- + ( dnAttrColonToken != null ? dnAttrColonToken.getValue() : "" )
- + ( dnAttrToken != null ? dnAttrToken.getValue() : "" )
- + ( matchingRuleColonToken != null ? matchingRuleColonToken.getValue() : "" )
- + ( matchingRuleToken != null ? matchingRuleToken.getValue() : "" )
- + ( equalsColonToken != null ? equalsColonToken.getValue() : "" )
- + ( equalsToken != null ? equalsToken.getValue() : "" )
- + ( valueToken != null ? valueToken.getValue() : "" );
+ return ( attributeToken != null ? startToken.getValue() : "" ) //$NON-NLS-1$
+ + ( dnAttrColonToken != null ? dnAttrColonToken.getValue() : "" ) //$NON-NLS-1$
+ + ( dnAttrToken != null ? dnAttrToken.getValue() : "" ) //$NON-NLS-1$
+ + ( matchingRuleColonToken != null ? matchingRuleColonToken.getValue() : "" ) //$NON-NLS-1$
+ + ( matchingRuleToken != null ? matchingRuleToken.getValue() : "" ) //$NON-NLS-1$
+ + ( equalsColonToken != null ? equalsColonToken.getValue() : "" ) //$NON-NLS-1$
+ + ( equalsToken != null ? equalsToken.getValue() : "" ) //$NON-NLS-1$
+ + ( valueToken != null ? valueToken.getValue() : "" ); //$NON-NLS-1$
}
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterItemComponent.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterItemComponent.java
index d0ed30e..7b323ca 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterItemComponent.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterItemComponent.java
@@ -212,9 +212,9 @@
*/
public String toString()
{
- return ( startToken != null ? startToken.getValue() : "" )
- + ( filtertypeToken != null ? filtertypeToken.getValue() : "" )
- + ( valueToken != null ? valueToken.getValue() : "" );
+ return ( startToken != null ? startToken.getValue() : "" ) //$NON-NLS-1$
+ + ( filtertypeToken != null ? filtertypeToken.getValue() : "" ) //$NON-NLS-1$
+ + ( valueToken != null ? valueToken.getValue() : "" ); //$NON-NLS-1$
}
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapNotFilterComponent.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapNotFilterComponent.java
index 8dfeda9..4e52aba 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapNotFilterComponent.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapNotFilterComponent.java
@@ -102,7 +102,7 @@
*/
public String toString()
{
- return ( startToken != null ? "!" : "" ) + ( !filterList.isEmpty() ? filterList.get( 0 ).toString() : "" );
+ return ( startToken != null ? "!" : "" ) + ( !filterList.isEmpty() ? filterList.get( 0 ).toString() : "" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapOrFilterComponent.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapOrFilterComponent.java
index 40d6864..4b60663 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapOrFilterComponent.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapOrFilterComponent.java
@@ -84,7 +84,7 @@
*/
public String toString()
{
- String s = startToken != null ? "|" : "";
+ String s = startToken != null ? "|" : ""; //$NON-NLS-1$ //$NON-NLS-2$
for ( LdapFilter filter : filterList )
{
if ( filter != null )
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterScanner.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterScanner.java
index 69e6d09..95cca41 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterScanner.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterScanner.java
@@ -93,7 +93,7 @@
public LdapFilterScanner()
{
super();
- this.filter = "";
+ this.filter = ""; //$NON-NLS-1$
}
@@ -186,7 +186,7 @@
c = nextChar();
if ( c == '\u0000' )
{
- return new LdapFilterToken( LdapFilterToken.EOF, "", pos );
+ return new LdapFilterToken( LdapFilterToken.EOF, "", pos ); //$NON-NLS-1$
}
else
{
@@ -219,14 +219,14 @@
{
case '(':
this.lastTokenType = LdapFilterToken.LPAR;
- return new LdapFilterToken( this.lastTokenType, "(", pos );
+ return new LdapFilterToken( this.lastTokenType, "(", pos ); //$NON-NLS-1$
case ')':
if ( lastTokenType != LdapFilterToken.EQUAL && lastTokenType != LdapFilterToken.GREATER
&& lastTokenType != LdapFilterToken.LESS && lastTokenType != LdapFilterToken.APROX
&& lastTokenType != LdapFilterToken.SUBSTRING )
{
this.lastTokenType = LdapFilterToken.RPAR;
- return new LdapFilterToken( this.lastTokenType, ")", pos );
+ return new LdapFilterToken( this.lastTokenType, ")", pos ); //$NON-NLS-1$
}
case '&':
if ( lastTokenType == LdapFilterToken.LPAR )
@@ -234,7 +234,7 @@
// if(nextNonWhitespaceChar()=='(') {
// prevNonWhitespaceChar();
this.lastTokenType = LdapFilterToken.AND;
- return new LdapFilterToken( this.lastTokenType, "&", pos );
+ return new LdapFilterToken( this.lastTokenType, "&", pos ); //$NON-NLS-1$
// }
// else {
// prevNonWhitespaceChar();
@@ -247,7 +247,7 @@
// if(nextNonWhitespaceChar()=='(') {
// prevNonWhitespaceChar();
this.lastTokenType = LdapFilterToken.OR;
- return new LdapFilterToken( this.lastTokenType, "|", pos );
+ return new LdapFilterToken( this.lastTokenType, "|", pos ); //$NON-NLS-1$
// }
// else {
// prevNonWhitespaceChar();
@@ -260,7 +260,7 @@
// if(nextNonWhitespaceChar()=='(') {
// prevNonWhitespaceChar();
this.lastTokenType = LdapFilterToken.NOT;
- return new LdapFilterToken( this.lastTokenType, "!", pos );
+ return new LdapFilterToken( this.lastTokenType, "!", pos ); //$NON-NLS-1$
// }
// else {
// prevNonWhitespaceChar();
@@ -277,7 +277,7 @@
{
prevChar();
this.lastTokenType = LdapFilterToken.PRESENT;
- return new LdapFilterToken( this.lastTokenType, "=*", pos - 1 );
+ return new LdapFilterToken( this.lastTokenType, "=*", pos - 1 ); //$NON-NLS-1$
}
else
{
@@ -314,18 +314,18 @@
if ( asteriskFound )
{
this.lastTokenType = LdapFilterToken.SUBSTRING;
- return new LdapFilterToken( this.lastTokenType, "=", pos );
+ return new LdapFilterToken( this.lastTokenType, "=", pos ); //$NON-NLS-1$
}
else
{
this.lastTokenType = LdapFilterToken.EQUAL;
- return new LdapFilterToken( this.lastTokenType, "=", pos );
+ return new LdapFilterToken( this.lastTokenType, "=", pos ); //$NON-NLS-1$
}
}
else if ( lastTokenType == LdapFilterToken.EXTENSIBLE_EQUALS_COLON )
{
this.lastTokenType = LdapFilterToken.EQUAL;
- return new LdapFilterToken( this.lastTokenType, "=", pos );
+ return new LdapFilterToken( this.lastTokenType, "=", pos ); //$NON-NLS-1$
}
break;
case '>':
@@ -334,7 +334,7 @@
if ( nextChar() == '=' )
{
this.lastTokenType = LdapFilterToken.GREATER;
- return new LdapFilterToken( this.lastTokenType, ">=", pos - 1 );
+ return new LdapFilterToken( this.lastTokenType, ">=", pos - 1 ); //$NON-NLS-1$
}
else
{
@@ -348,7 +348,7 @@
if ( nextChar() == '=' )
{
this.lastTokenType = LdapFilterToken.LESS;
- return new LdapFilterToken( this.lastTokenType, "<=", pos - 1 );
+ return new LdapFilterToken( this.lastTokenType, "<=", pos - 1 ); //$NON-NLS-1$
}
else
{
@@ -362,7 +362,7 @@
if ( nextChar() == '=' )
{
this.lastTokenType = LdapFilterToken.APROX;
- return new LdapFilterToken( this.lastTokenType, "~=", pos - 1 );
+ return new LdapFilterToken( this.lastTokenType, "~=", pos - 1 ); //$NON-NLS-1$
}
else
{
@@ -386,7 +386,7 @@
( ( t1 == 'd' || t1 == 'D' ) && ( t2 == 'n' || t2 == 'N' ) && ( t3 == ':' ) ) ) )
{
this.lastTokenType = LdapFilterToken.EXTENSIBLE_DNATTR_COLON;
- return new LdapFilterToken( this.lastTokenType, ":", pos );
+ return new LdapFilterToken( this.lastTokenType, ":", pos ); //$NON-NLS-1$
}
else if ( ( lastTokenType == LdapFilterToken.EXTENSIBLE_ATTRIBUTE
|| lastTokenType == LdapFilterToken.EXTENSIBLE_DNATTR
@@ -394,14 +394,14 @@
&& t1 == '=' )
{
this.lastTokenType = LdapFilterToken.EXTENSIBLE_EQUALS_COLON;
- return new LdapFilterToken( this.lastTokenType, ":", pos );
+ return new LdapFilterToken( this.lastTokenType, ":", pos ); //$NON-NLS-1$
}
else if ( ( lastTokenType == LdapFilterToken.LPAR
|| lastTokenType == LdapFilterToken.EXTENSIBLE_ATTRIBUTE
|| lastTokenType == LdapFilterToken.EXTENSIBLE_DNATTR || lastTokenType == LdapFilterToken.EXTENSIBLE_DNATTR_COLON ) )
{
this.lastTokenType = LdapFilterToken.EXTENSIBLE_MATCHINGRULEOID_COLON;
- return new LdapFilterToken( this.lastTokenType, ":", pos );
+ return new LdapFilterToken( this.lastTokenType, ":", pos ); //$NON-NLS-1$
}
break;
@@ -521,7 +521,7 @@
if ( ( t1 == 'd' || t1 == 'D' ) && ( t2 == 'n' || t2 == 'N' ) && ( t3 == ':' || t3 == '\u0000' ) )
{
this.lastTokenType = LdapFilterToken.EXTENSIBLE_DNATTR;
- return new LdapFilterToken( this.lastTokenType, "" + t1 + t2, pos - 1 );
+ return new LdapFilterToken( this.lastTokenType, "" + t1 + t2, pos - 1 ); //$NON-NLS-1$
}
prevChar();
prevChar();
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterToken.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterToken.java
index 9efc63a..71660b4 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterToken.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterToken.java
@@ -178,7 +178,7 @@
*/
public String toString()
{
- return "(" + offset + ") " + "(" + type + ") " + value;
+ return "(" + offset + ") " + "(" + type + ") " + value; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java
index b373923..eae8315 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java
@@ -212,7 +212,7 @@
{
if ( objectClassAttribute == null )
{
- throw new IllegalArgumentException( BrowserCoreMessages.model__attribute_does_not_exist + ": "
+ throw new IllegalArgumentException( BrowserCoreMessages.model__attribute_does_not_exist + ": " //$NON-NLS-1$
+ attributeToDelete );
}
@@ -223,7 +223,8 @@
String oidString = attributeToDelete.getAttributeDescription().toOidString(
getBrowserConnection().getSchema() );
AttributeInfo ai = getBrowserConnectionImpl().getAttributeInfo( this );
- if ( ai != null && ai.attributeMap != null && ai.attributeMap.containsKey( Strings.toLowerCase( oidString ) ) )
+ if ( ai != null && ai.attributeMap != null
+ && ai.attributeMap.containsKey( Strings.toLowerCase( oidString ) ) )
{
attributeToDelete = ( IAttribute ) ai.attributeMap.get( Strings.toLowerCase( oidString ) );
ai.attributeMap.remove( Strings.toLowerCase( oidString ) );
@@ -234,7 +235,7 @@
}
else
{
- throw new IllegalArgumentException( BrowserCoreMessages.model__attribute_does_not_exist + ": "
+ throw new IllegalArgumentException( BrowserCoreMessages.model__attribute_does_not_exist + ": " //$NON-NLS-1$
+ attributeToDelete );
}
}
@@ -556,7 +557,8 @@
{
AttributeDescription ad = new AttributeDescription( attributeDescription );
String oidString = ad.toOidString( getBrowserConnection().getSchema() );
- if ( oidString.equals( SchemaConstants.OBJECT_CLASS_AT_OID ) )
+ if ( oidString.equals( SchemaConstants.OBJECT_CLASS_AT_OID )
+ || ( SchemaConstants.OBJECT_CLASS_AT.equalsIgnoreCase( attributeDescription ) ) )
{
return objectClassAttribute;
}
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java
index 280584d..2207c8c 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java
@@ -100,7 +100,7 @@
connection.getConnectionParameter().setExtendedIntProperty( CONNECTION_PARAMETER_REFERRALS_HANDLING_METHOD,
ReferralHandlingMethod.FOLLOW_MANUALLY.getOrdinal() );
connection.getConnectionParameter().setExtendedBoolProperty( CONNECTION_PARAMETER_FETCH_BASE_DNS, true );
- connection.getConnectionParameter().setExtendedProperty( CONNECTION_PARAMETER_BASE_DN, "" );
+ connection.getConnectionParameter().setExtendedProperty( CONNECTION_PARAMETER_BASE_DN, "" ); //$NON-NLS-1$
connection.getConnectionParameter().setExtendedBoolProperty( CONNECTION_PARAMETER_FETCH_SUBENTRIES, false );
connection.getConnectionParameter().setExtendedBoolProperty( CONNECTION_PARAMETER_PAGED_SEARCH, false );
connection.getConnectionParameter().setExtendedIntProperty( CONNECTION_PARAMETER_PAGED_SEARCH_SIZE, 100 );
@@ -154,7 +154,7 @@
entryToAttributeInfoMap.clear();
entryToChildrenInfoMap.clear();
entryToChildrenFilterMap.clear();
- searchManager.setQuickSearch( null );
+// searchManager.setQuickSearch( null ); TODO
rootDSE = new RootDSE( this );
cacheEntry( rootDSE );
@@ -527,7 +527,7 @@
*/
public String toString()
{
- return getConnection() != null ? getConnection().getName() : "null";
+ return getConnection() != null ? getConnection().getName() : "null"; //$NON-NLS-1$
}
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Entry.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Entry.java
index 090c396..89a154e 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Entry.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Entry.java
@@ -60,7 +60,7 @@
{
assert parent != null;
assert rdn != null;
- assert !"".equals( rdn.toString() );
+ assert !"".equals( rdn.toString() ); //$NON-NLS-1$
this.parent = parent;
this.rdn = rdn;
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java
index 5952054..a8d35e0 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java
@@ -309,7 +309,7 @@
while ( atavIterator.hasNext() )
{
Ava ava = atavIterator.next();
- if ( getAttribute().getDescription().equals( ava.getUpType() )
+ if ( getAttribute().getDescription().equals( ava.getNormType() )
&& getStringValue().equals( ava.getNormValue().getString() ) )
{
return true;
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
index 0da3f3c..a93be90 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.ldapbrowser.core.model.schema;
@@ -41,6 +41,8 @@
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.UsageEnum;
import org.apache.directory.shared.ldap.model.schema.parsers.AttributeTypeDescriptionSchemaParser;
@@ -67,16 +69,16 @@
public class Schema
{
- public static final String SCHEMA_FILTER = "(objectClass=subschema)";
+ public static final String SCHEMA_FILTER = "(objectClass=subschema)"; //$NON-NLS-1$
- public static final String RAW_SCHEMA_DEFINITION_LDIF_VALUE = "RAW_SCHEMA_DEFINITION_LDIF_VALUE";
+ public static final String RAW_SCHEMA_DEFINITION_LDIF_VALUE = "RAW_SCHEMA_DEFINITION_LDIF_VALUE"; //$NON-NLS-1$
- public static final String DN_SYNTAX_OID = "1.3.6.1.4.1.1466.115.121.1.12";
+ public static final String DN_SYNTAX_OID = "1.3.6.1.4.1.1466.115.121.1.12"; //$NON-NLS-1$
public static final LdapSyntax DUMMY_LDAP_SYNTAX;
static
{
- DUMMY_LDAP_SYNTAX = new LdapSyntax( "", "" );
+ DUMMY_LDAP_SYNTAX = new LdapSyntax( "", "" ); //$NON-NLS-1$ //$NON-NLS-2$
}
public static final HashMap<String, List<String>> DUMMY_EXTENSIONS;
@@ -84,8 +86,8 @@
{
DUMMY_EXTENSIONS = new HashMap<String, List<String>>();
List<String> dummyValues = new ArrayList<String>();
- dummyValues.add( "DUMMY" );
- DUMMY_EXTENSIONS.put( "X-DUMMY", dummyValues );
+ dummyValues.add( "DUMMY" ); //$NON-NLS-1$
+ DUMMY_EXTENSIONS.put( "X-DUMMY", dummyValues ); //$NON-NLS-1$
}
public static final Schema DEFAULT_SCHEMA;
@@ -95,7 +97,7 @@
try
{
- URL url = Schema.class.getClassLoader().getResource( "default_schema.ldif" );
+ URL url = Schema.class.getClassLoader().getResource( "default_schema.ldif" ); //$NON-NLS-1$
InputStream is = url.openStream();
Reader reader = new InputStreamReader( is );
@@ -127,7 +129,7 @@
private String modifyTimestamp;
- private Map<String, ObjectClass> ocdMapByNameOrNumericOid;
+ private Map<String, MutableObjectClass> ocdMapByNameOrNumericOid;
private Map<String, AttributeType> atdMapByNameOrNumericOid;
@@ -147,7 +149,7 @@
this.dn = null;
this.createTimestamp = null;
this.modifyTimestamp = null;
- this.ocdMapByNameOrNumericOid = new HashMap<String, ObjectClass>();
+ this.ocdMapByNameOrNumericOid = new HashMap<String, MutableObjectClass>();
this.atdMapByNameOrNumericOid = new HashMap<String, AttributeType>();
this.lsdMapByNumericOid = new HashMap<String, LdapSyntax>();
this.mrdMapByNameOrNumericOid = new HashMap<String, MatchingRule>();
@@ -180,7 +182,7 @@
catch ( Exception e )
{
// TODO: exception handling
- System.out.println( "Schema#loadFromLdif: " + e.toString() );
+ System.out.println( "Schema#loadFromLdif: " + e.toString() ); //$NON-NLS-1$
}
}
@@ -199,7 +201,7 @@
catch ( Exception e )
{
// TODO: exception handling
- System.out.println( "Schema#loadFromRecord: " + e.toString() );
+ System.out.println( "Schema#loadFromRecord: " + e.toString() ); //$NON-NLS-1$
}
}
@@ -218,7 +220,7 @@
catch ( Exception e )
{
// TODO: exception handling
- System.out.println( "Schema#saveToLdif: " + e.toString() );
+ System.out.println( "Schema#saveToLdif: " + e.toString() ); //$NON-NLS-1$
}
}
@@ -259,7 +261,7 @@
{
if ( attributeName.equalsIgnoreCase( SchemaConstants.OBJECT_CLASSES_AT ) )
{
- ObjectClass ocd = ocdPparser.parseObjectClassDescription( value );
+ MutableObjectClass ocd = ocdPparser.parseObjectClassDescription( value );
ocd.addExtension( RAW_SCHEMA_DEFINITION_LDIF_VALUE, ldifValues );
addObjectClass( ocd );
}
@@ -304,7 +306,7 @@
catch ( Exception e )
{
// TODO: exception handling
- System.out.println( "Error reading schema: " + attributeName + " = " + value );
+ System.out.println( "Error reading schema: " + attributeName + " = " + value ); //$NON-NLS-1$ //$NON-NLS-2$
System.out.println( e.getMessage() );
}
}
@@ -328,7 +330,7 @@
}
// set extensibleObject may attributes
- ObjectClass extensibleObjectOcd = this
+ MutableObjectClass extensibleObjectOcd = this
.getObjectClassDescription( SchemaConstants.EXTENSIBLE_OBJECT_OC );
Collection<AttributeType> userAtds = SchemaUtils.getUserAttributeDescriptions( this );
Collection<String> atdNames = SchemaUtils.getNames( userAtds );
@@ -447,7 +449,7 @@
*
* @param ocd the object class description
*/
- private void addObjectClass( ObjectClass ocd )
+ private void addObjectClass( MutableObjectClass ocd )
{
if ( ocd.getOid() != null )
{
@@ -503,7 +505,7 @@
*
* @return the object class description, or the default or a dummy
*/
- public ObjectClass getObjectClassDescription( String nameOrOid )
+ public MutableObjectClass getObjectClassDescription( String nameOrOid )
{
if ( ocdMapByNameOrNumericOid.containsKey( Strings.toLowerCase( nameOrOid ) ) )
{
@@ -518,7 +520,7 @@
// DUMMY
List<String> names = new ArrayList<String>();
names.add( nameOrOid );
- ObjectClass ocd = new ObjectClass( nameOrOid );
+ MutableObjectClass ocd = new MutableObjectClass( nameOrOid );
ocd.setNames( names );
ocd.setExtensions( DUMMY_EXTENSIONS );
return ocd;
@@ -607,7 +609,7 @@
// DUMMY
List<String> attributeTypes = new ArrayList<String>();
attributeTypes.add( attributeType );
- AttributeType atd = new AttributeType( attributeType );
+ MutableAttributeType atd = new MutableAttributeType( attributeType );
atd.setNames( attributeTypes );
atd.setUserModifiable( true );
atd.setUsage( UsageEnum.USER_APPLICATIONS );
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java
index 87f1807..9a9180f 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java
@@ -367,13 +367,17 @@
{
Schema schema = entry.getBrowserConnection().getSchema();
Collection<AttributeType> atds = new HashSet<AttributeType>();
- for ( ObjectClass ocd : entry.getObjectClassDescriptions() )
+ Collection<ObjectClass> ocds = entry.getObjectClassDescriptions();
+ if ( ocds != null )
{
- Collection<String> musts = getMustAttributeTypeDescriptionNamesTransitive( ocd, schema );
- for ( String must : musts )
+ for ( ObjectClass ocd : entry.getObjectClassDescriptions() )
{
- AttributeType atd = schema.getAttributeTypeDescription( must );
- atds.add( atd );
+ Collection<String> musts = getMustAttributeTypeDescriptionNamesTransitive( ocd, schema );
+ for ( String must : musts )
+ {
+ AttributeType atd = schema.getAttributeTypeDescription( must );
+ atds.add( atd );
+ }
}
}
return atds;
@@ -391,13 +395,17 @@
{
Schema schema = entry.getBrowserConnection().getSchema();
Collection<AttributeType> atds = new HashSet<AttributeType>();
- for ( ObjectClass ocd : entry.getObjectClassDescriptions() )
+ Collection<ObjectClass> ocds = entry.getObjectClassDescriptions();
+ if ( ocds != null )
{
- Collection<String> mays = getMayAttributeTypeDescriptionNamesTransitive( ocd, schema );
- for ( String may : mays )
+ for ( ObjectClass ocd : entry.getObjectClassDescriptions() )
{
- AttributeType atd = schema.getAttributeTypeDescription( may );
- atds.add( atd );
+ Collection<String> mays = getMayAttributeTypeDescriptionNamesTransitive( ocd, schema );
+ for ( String may : mays )
+ {
+ AttributeType atd = schema.getAttributeTypeDescription( may );
+ atds.add( atd );
+ }
}
}
return atds;
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/LdapFilterUtils.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/LdapFilterUtils.java
index e1723af..89660bc 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/LdapFilterUtils.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/LdapFilterUtils.java
@@ -43,14 +43,14 @@
{
if ( value.isString() )
{
- return "(" + value.getAttribute().getDescription() + "=" + getEncodedValue( value.getStringValue() ) + ")";
+ return "(" + value.getAttribute().getDescription() + "=" + getEncodedValue( value.getStringValue() ) + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
else
{
StringBuffer filter = new StringBuffer();
- filter.append( "(" );
+ filter.append( "(" ); //$NON-NLS-1$
filter.append( value.getAttribute().getDescription() );
- filter.append( "=" );
+ filter.append( "=" ); //$NON-NLS-1$
byte[] bytes = value.getBinaryValue();
for ( int i = 0; i < bytes.length; i++ )
@@ -61,15 +61,15 @@
b = 256 + b;
}
String s = Integer.toHexString( b );
- filter.append( "\\" );
+ filter.append( "\\" ); //$NON-NLS-1$
if ( s.length() == 1 )
{
- filter.append( "0" );
+ filter.append( "0" ); //$NON-NLS-1$
}
filter.append( s );
}
- filter.append( ")" );
+ filter.append( ")" ); //$NON-NLS-1$
return filter.toString();
}
}
@@ -99,11 +99,11 @@
*/
public static String getEncodedValue( String value )
{
- value = value.replaceAll( "\\\\", "\\\\5c" );
- value = value.replaceAll( "" + '\u0000', "\\\\00" );
- value = value.replaceAll( "\\*", "\\\\2a" );
- value = value.replaceAll( "\\(", "\\\\28" );
- value = value.replaceAll( "\\)", "\\\\29" );
+ value = value.replaceAll( "\\\\", "\\\\5c" ); //$NON-NLS-1$ //$NON-NLS-2$
+ value = value.replaceAll( "" + '\u0000', "\\\\00" ); //$NON-NLS-1$ //$NON-NLS-2$
+ value = value.replaceAll( "\\*", "\\\\2a" ); //$NON-NLS-1$ //$NON-NLS-2$
+ value = value.replaceAll( "\\(", "\\\\28" ); //$NON-NLS-1$ //$NON-NLS-2$
+ value = value.replaceAll( "\\)", "\\\\29" ); //$NON-NLS-1$ //$NON-NLS-2$
return value;
}
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java
index 0c76d57..4d88bb6 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java
@@ -131,8 +131,8 @@
else if ( !( parts[i] instanceof LdifDnLine ) && !( parts[i] instanceof LdifSepLine ) )
{
String name = parts[i].toRawString();
- name = name.replaceAll( "\n", "" );
- name = name.replaceAll( "\r", "" );
+ name = name.replaceAll( "\n", "" ); //$NON-NLS-1$ //$NON-NLS-2$
+ name = name.replaceAll( "\r", "" ); //$NON-NLS-1$ //$NON-NLS-2$
IAttribute attribute = new Attribute( entry, name );
attribute.addValue( new Value( attribute, parts[i] ) );
entry.addAttribute( attribute );
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/UnixCrypt.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/UnixCrypt.java
index 9d3ea83..e17b875 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/UnixCrypt.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/UnixCrypt.java
@@ -487,7 +487,7 @@
long keyword = 0L;
/* invalid parameters! */
if ( key == null || setting == null )
- return "*"; // will NOT match under ANY circumstances!
+ return "*"; // will NOT match under ANY circumstances! //$NON-NLS-1$
int keylen = key.length();
@@ -524,11 +524,11 @@
{
if ( arg.length != 2 )
{
- System.err.println( "Usage - java org.mortbay.util.UnixCrypt <key> <salt>" );
+ System.err.println( "Usage - java org.mortbay.util.UnixCrypt <key> <salt>" ); //$NON-NLS-1$
System.exit( 1 );
}
- System.err.println( "Crypt=" + crypt( arg[0], arg[1] ) );
+ System.err.println( "Crypt=" + crypt( arg[0], arg[1] ) ); //$NON-NLS-1$
}
}
diff --git a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java
index df5aba9..f771f12 100644
--- a/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java
+++ b/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java
@@ -129,7 +129,7 @@
{
String oid = schema != null ? schema.getAttributeTypeDescription( ava.getNormType() ).getOid() : ava
.getNormType();
- return Strings.toLowerCase( Strings.trim( oid ) ) + "=" + Strings.toLowerCase( Strings.trim( ava.getUpValue().getString() ) ); //$NON-NLS-1$
+ return Strings.toLowerCase( Strings.trim( oid ) ) + "=" + Strings.toLowerCase( Strings.trim( ava.getValue().getString() ) ); //$NON-NLS-1$
}
@@ -137,14 +137,14 @@
{
if ( array == null || array.length == 0 )
{
- return "";
+ return ""; //$NON-NLS-1$
}
else
{
StringBuffer sb = new StringBuffer( array[0] );
for ( int i = 1; i < array.length; i++ )
{
- sb.append( ", " );
+ sb.append( ", " ); //$NON-NLS-1$
sb.append( array[i] );
}
return sb.toString();
@@ -173,11 +173,11 @@
{
if ( value == null )
- return "";
+ return ""; //$NON-NLS-1$
if ( value.length() > length )
{
- value = value.substring( 0, length ) + "...";
+ value = value.substring( 0, length ) + "..."; //$NON-NLS-1$
}
return value;
@@ -225,13 +225,13 @@
public static String getNonNullString( Object o )
{
- return o == null ? "-" : o.toString();
+ return o == null ? "-" : o.toString(); //$NON-NLS-1$
}
public static String formatBytes( long bytes )
{
- String size = "";
+ String size = ""; //$NON-NLS-1$
if ( bytes > 1024 * 1024 )
size += ( bytes / 1024 / 1024 ) + " MB (" + bytes + " Bytes)";
else if ( bytes > 1024 )
@@ -405,8 +405,8 @@
|| ( !hasEMR && modifyModeNoEMR == ModifyMode.REPLACE );
boolean isAddDelForced = ( hasEMR && modifyMode == ModifyMode.ADD_DELETE )
|| ( !hasEMR && modifyModeNoEMR == ModifyMode.ADD_DELETE );
- boolean isOrderedValue = atd.getExtensions().containsKey( "X-ORDERED" )
- && atd.getExtensions().get( "X-ORDERED" ).contains( "VALUES" );
+ boolean isOrderedValue = atd.getExtensions().containsKey( "X-ORDERED" ) //$NON-NLS-1$
+ && atd.getExtensions().get( "X-ORDERED" ).contains( "VALUES" ); //$NON-NLS-1$ //$NON-NLS-2$
// get old an new values for comparison
IAttribute oldAttribute = oldEntry.getAttribute( attributeDescription );
diff --git a/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/LdapFilterParserErrorTolerantTest.java b/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/LdapFilterParserErrorTolerantTest.java
index 23c8ff0..efaedd7 100755
--- a/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/LdapFilterParserErrorTolerantTest.java
+++ b/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/LdapFilterParserErrorTolerantTest.java
@@ -42,7 +42,7 @@
public void testLpar()
{
- parser.parse( "(" );
+ parser.parse( "(" ); //$NON-NLS-1$
LdapFilter model = parser.getModel();
@@ -50,21 +50,21 @@
assertEquals( 0, model.getStartToken().getOffset() );
assertEquals( 1, model.getStartToken().getLength() );
assertEquals( LdapFilterToken.LPAR, model.getStartToken().getType() );
- assertEquals( "(", model.getStartToken().getValue() );
+ assertEquals( "(", model.getStartToken().getValue() ); //$NON-NLS-1$
assertNull( model.getFilterComponent() );
assertNull( model.getStopToken() );
- assertEquals( "(", model.toString() );
- assertEquals( "(", model.toUserProvidedString() );
+ assertEquals( "(", model.toString() ); //$NON-NLS-1$
+ assertEquals( "(", model.toUserProvidedString() ); //$NON-NLS-1$
assertFalse( parser.getModel().isValid() );
}
public void testLparAttr()
{
- parser.parse( "(objectClass" );
+ parser.parse( "(objectClass" ); //$NON-NLS-1$
LdapFilter model = parser.getModel();
@@ -72,7 +72,7 @@
assertEquals( 0, model.getStartToken().getOffset() );
assertEquals( 1, model.getStartToken().getLength() );
assertEquals( LdapFilterToken.LPAR, model.getStartToken().getType() );
- assertEquals( "(", model.getStartToken().getValue() );
+ assertEquals( "(", model.getStartToken().getValue() ); //$NON-NLS-1$
LdapFilterComponent filterComponent = model.getFilterComponent();
assertNotNull( filterComponent );
@@ -82,21 +82,21 @@
assertEquals( 1, filterItemComponent.getAttributeToken().getOffset() );
assertEquals( 11, filterItemComponent.getAttributeToken().getLength() );
assertEquals( LdapFilterToken.ATTRIBUTE, filterItemComponent.getAttributeToken().getType() );
- assertEquals( "objectClass", filterItemComponent.getAttributeToken().getValue() );
+ assertEquals( "objectClass", filterItemComponent.getAttributeToken().getValue() ); //$NON-NLS-1$
assertNull( filterItemComponent.getFilterToken() );
assertNull( filterItemComponent.getValueToken() );
assertNull( model.getStopToken() );
- assertEquals( "(objectClass", model.toString() );
- assertEquals( "(objectClass", model.toUserProvidedString() );
+ assertEquals( "(objectClass", model.toString() ); //$NON-NLS-1$
+ assertEquals( "(objectClass", model.toUserProvidedString() ); //$NON-NLS-1$
assertFalse( parser.getModel().isValid() );
}
public void testLparAttrEquals()
{
- parser.parse( "(objectClass=" );
+ parser.parse( "(objectClass=" ); //$NON-NLS-1$
LdapFilter model = parser.getModel();
@@ -104,7 +104,7 @@
assertEquals( 0, model.getStartToken().getOffset() );
assertEquals( 1, model.getStartToken().getLength() );
assertEquals( LdapFilterToken.LPAR, model.getStartToken().getType() );
- assertEquals( "(", model.getStartToken().getValue() );
+ assertEquals( "(", model.getStartToken().getValue() ); //$NON-NLS-1$
LdapFilterComponent filterComponent = model.getFilterComponent();
assertNotNull( filterComponent );
@@ -114,27 +114,27 @@
assertEquals( 1, filterItemComponent.getAttributeToken().getOffset() );
assertEquals( 11, filterItemComponent.getAttributeToken().getLength() );
assertEquals( LdapFilterToken.ATTRIBUTE, filterItemComponent.getAttributeToken().getType() );
- assertEquals( "objectClass", filterItemComponent.getAttributeToken().getValue() );
+ assertEquals( "objectClass", filterItemComponent.getAttributeToken().getValue() ); //$NON-NLS-1$
assertNotNull( filterItemComponent.getFilterToken() );
assertEquals( 12, filterItemComponent.getFilterToken().getOffset() );
assertEquals( 1, filterItemComponent.getFilterToken().getLength() );
assertEquals( LdapFilterToken.EQUAL, filterItemComponent.getFilterToken().getType() );
- assertEquals( "=", filterItemComponent.getFilterToken().getValue() );
+ assertEquals( "=", filterItemComponent.getFilterToken().getValue() ); //$NON-NLS-1$
assertNull( filterItemComponent.getValueToken() );
assertNull( model.getStopToken() );
- assertEquals( "(objectClass=", model.toString() );
- assertEquals( "(objectClass=", model.toUserProvidedString() );
+ assertEquals( "(objectClass=", model.toString() ); //$NON-NLS-1$
+ assertEquals( "(objectClass=", model.toUserProvidedString() ); //$NON-NLS-1$
assertFalse( parser.getModel().isValid() );
}
public void testLparAttrEqualsRpar()
{
- parser.parse( "(objectClass=)" );
+ parser.parse( "(objectClass=)" ); //$NON-NLS-1$
LdapFilter model = parser.getModel();
@@ -142,7 +142,7 @@
assertEquals( 0, model.getStartToken().getOffset() );
assertEquals( 1, model.getStartToken().getLength() );
assertEquals( LdapFilterToken.LPAR, model.getStartToken().getType() );
- assertEquals( "(", model.getStartToken().getValue() );
+ assertEquals( "(", model.getStartToken().getValue() ); //$NON-NLS-1$
LdapFilterComponent filterComponent = model.getFilterComponent();
assertNotNull( filterComponent );
@@ -152,20 +152,20 @@
assertEquals( 1, filterItemComponent.getAttributeToken().getOffset() );
assertEquals( 11, filterItemComponent.getAttributeToken().getLength() );
assertEquals( LdapFilterToken.ATTRIBUTE, filterItemComponent.getAttributeToken().getType() );
- assertEquals( "objectClass", filterItemComponent.getAttributeToken().getValue() );
+ assertEquals( "objectClass", filterItemComponent.getAttributeToken().getValue() ); //$NON-NLS-1$
assertNotNull( filterItemComponent.getFilterToken() );
assertEquals( 12, filterItemComponent.getFilterToken().getOffset() );
assertEquals( 1, filterItemComponent.getFilterToken().getLength() );
assertEquals( LdapFilterToken.EQUAL, filterItemComponent.getFilterToken().getType() );
- assertEquals( "=", filterItemComponent.getFilterToken().getValue() );
+ assertEquals( "=", filterItemComponent.getFilterToken().getValue() ); //$NON-NLS-1$
assertNotNull( filterItemComponent.getValueToken() );
assertNotNull( model.getStopToken() );
- assertEquals( "(objectClass=)", model.toString() );
- assertEquals( "(objectClass=)", model.toUserProvidedString() );
+ assertEquals( "(objectClass=)", model.toString() ); //$NON-NLS-1$
+ assertEquals( "(objectClass=)", model.toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
diff --git a/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/LdapFilterParserTest.java b/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/LdapFilterParserTest.java
index 59ff775..23f551f 100644
--- a/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/LdapFilterParserTest.java
+++ b/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/LdapFilterParserTest.java
@@ -41,9 +41,9 @@
*/
public void testEqualsFilter()
{
- parser.parse( "(cn=test)" );
- assertEquals( "(cn=test)", parser.getModel().toString() );
- assertEquals( "(cn=test)", parser.getModel().toUserProvidedString() );
+ parser.parse( "(cn=test)" ); //$NON-NLS-1$
+ assertEquals( "(cn=test)", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(cn=test)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
@@ -53,9 +53,9 @@
*/
public void testGreaterEqualsFilter()
{
- parser.parse( "(cn>=test)" );
- assertEquals( "(cn>=test)", parser.getModel().toString() );
- assertEquals( "(cn>=test)", parser.getModel().toUserProvidedString() );
+ parser.parse( "(cn>=test)" ); //$NON-NLS-1$
+ assertEquals( "(cn>=test)", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(cn>=test)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
@@ -65,9 +65,9 @@
*/
public void testLessEqualsFilter()
{
- parser.parse( "(cn<=test)" );
- assertEquals( "(cn<=test)", parser.getModel().toString() );
- assertEquals( "(cn<=test)", parser.getModel().toUserProvidedString() );
+ parser.parse( "(cn<=test)" ); //$NON-NLS-1$
+ assertEquals( "(cn<=test)", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(cn<=test)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
@@ -77,9 +77,9 @@
*/
public void testAproxFilter()
{
- parser.parse( "(cn~=test)" );
- assertEquals( "(cn~=test)", parser.getModel().toString() );
- assertEquals( "(cn~=test)", parser.getModel().toUserProvidedString() );
+ parser.parse( "(cn~=test)" ); //$NON-NLS-1$
+ assertEquals( "(cn~=test)", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(cn~=test)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
@@ -89,9 +89,9 @@
*/
public void testSubstringFilter()
{
- parser.parse( "(cn=te*st)" );
- assertEquals( "(cn=te*st)", parser.getModel().toString() );
- assertEquals( "(cn=te*st)", parser.getModel().toUserProvidedString() );
+ parser.parse( "(cn=te*st)" ); //$NON-NLS-1$
+ assertEquals( "(cn=te*st)", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(cn=te*st)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
@@ -101,9 +101,9 @@
*/
public void testPresentFilter()
{
- parser.parse( "(cn=*)" );
- assertEquals( "(cn=*)", parser.getModel().toString() );
- assertEquals( "(cn=*)", parser.getModel().toUserProvidedString() );
+ parser.parse( "(cn=*)" ); //$NON-NLS-1$
+ assertEquals( "(cn=*)", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(cn=*)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
@@ -113,9 +113,9 @@
*/
public void testRFC4515_1()
{
- parser.parse( "(cn=Babs Jensen)" );
- assertEquals( "(cn=Babs Jensen)", parser.getModel().toString() );
- assertEquals( "(cn=Babs Jensen)", parser.getModel().toUserProvidedString() );
+ parser.parse( "(cn=Babs Jensen)" ); //$NON-NLS-1$
+ assertEquals( "(cn=Babs Jensen)", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(cn=Babs Jensen)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
@@ -125,9 +125,9 @@
*/
public void testRFC4515_2()
{
- parser.parse( "(!(cn=Tim Howes))" );
- assertEquals( "(!(cn=Tim Howes))", parser.getModel().toString() );
- assertEquals( "(!(cn=Tim Howes))", parser.getModel().toUserProvidedString() );
+ parser.parse( "(!(cn=Tim Howes))" ); //$NON-NLS-1$
+ assertEquals( "(!(cn=Tim Howes))", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(!(cn=Tim Howes))", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
@@ -137,9 +137,9 @@
*/
public void testRFC4515_3()
{
- parser.parse( "(&(objectClass=Person)(|(sn=Jensen)(cn=Babs J*)))" );
- assertEquals( "(&(objectClass=Person)(|(sn=Jensen)(cn=Babs J*)))", parser.getModel().toString() );
- assertEquals( "(&(objectClass=Person)(|(sn=Jensen)(cn=Babs J*)))", parser.getModel().toUserProvidedString() );
+ parser.parse( "(&(objectClass=Person)(|(sn=Jensen)(cn=Babs J*)))" ); //$NON-NLS-1$
+ assertEquals( "(&(objectClass=Person)(|(sn=Jensen)(cn=Babs J*)))", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(&(objectClass=Person)(|(sn=Jensen)(cn=Babs J*)))", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
@@ -149,9 +149,9 @@
*/
public void testRFC4515_4()
{
- parser.parse( "(o=univ*of*mich*)" );
- assertEquals( "(o=univ*of*mich*)", parser.getModel().toString() );
- assertEquals( "(o=univ*of*mich*)", parser.getModel().toUserProvidedString() );
+ parser.parse( "(o=univ*of*mich*)" ); //$NON-NLS-1$
+ assertEquals( "(o=univ*of*mich*)", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(o=univ*of*mich*)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
@@ -161,9 +161,9 @@
*/
public void testRFC4515_5()
{
- parser.parse( "(seeAlso=)" );
- assertEquals( "(seeAlso=)", parser.getModel().toString() );
- assertEquals( "(seeAlso=)", parser.getModel().toUserProvidedString() );
+ parser.parse( "(seeAlso=)" ); //$NON-NLS-1$
+ assertEquals( "(seeAlso=)", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(seeAlso=)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
@@ -177,9 +177,9 @@
*/
public void testEscapeRFC4515_1()
{
- parser.parse( "(o=Parens R Us \\28for all your parenthetical needs\\29)" );
- assertEquals( "(o=Parens R Us \\28for all your parenthetical needs\\29)", parser.getModel().toString() );
- assertEquals( "(o=Parens R Us \\28for all your parenthetical needs\\29)", parser.getModel()
+ parser.parse( "(o=Parens R Us \\28for all your parenthetical needs\\29)" ); //$NON-NLS-1$
+ assertEquals( "(o=Parens R Us \\28for all your parenthetical needs\\29)", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(o=Parens R Us \\28for all your parenthetical needs\\29)", parser.getModel() //$NON-NLS-1$
.toUserProvidedString() );
assertTrue( parser.getModel().isValid() );
}
@@ -195,9 +195,9 @@
*/
public void testEscapeRFC4515_2()
{
- parser.parse( "(cn=*\\2A*)" );
- assertEquals( "(cn=*\\2A*)", parser.getModel().toString() );
- assertEquals( "(cn=*\\2A*)", parser.getModel().toUserProvidedString() );
+ parser.parse( "(cn=*\\2A*)" ); //$NON-NLS-1$
+ assertEquals( "(cn=*\\2A*)", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(cn=*\\2A*)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
@@ -210,9 +210,9 @@
*/
public void testEscapeRFC4515_3()
{
- parser.parse( "(filename=C:\\5cMyFile)" );
- assertEquals( "(filename=C:\\5cMyFile)", parser.getModel().toString() );
- assertEquals( "(filename=C:\\5cMyFile)", parser.getModel().toUserProvidedString() );
+ parser.parse( "(filename=C:\\5cMyFile)" ); //$NON-NLS-1$
+ assertEquals( "(filename=C:\\5cMyFile)", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(filename=C:\\5cMyFile)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
@@ -227,9 +227,9 @@
*/
public void testEscapeRFC4515_4()
{
- parser.parse( "(bin=\\00\\00\\00\\04)" );
- assertEquals( "(bin=\\00\\00\\00\\04)", parser.getModel().toString() );
- assertEquals( "(bin=\\00\\00\\00\\04)", parser.getModel().toUserProvidedString() );
+ parser.parse( "(bin=\\00\\00\\00\\04)" ); //$NON-NLS-1$
+ assertEquals( "(bin=\\00\\00\\00\\04)", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(bin=\\00\\00\\00\\04)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
@@ -247,9 +247,9 @@
*/
public void testEscapeRFC4515_5()
{
- parser.parse( "(sn=Lu\\c4\\8di\\c4\\87)" );
- assertEquals( "(sn=Lu\\c4\\8di\\c4\\87)", parser.getModel().toString() );
- assertEquals( "(sn=Lu\\c4\\8di\\c4\\87)", parser.getModel().toUserProvidedString() );
+ parser.parse( "(sn=Lu\\c4\\8di\\c4\\87)" ); //$NON-NLS-1$
+ assertEquals( "(sn=Lu\\c4\\8di\\c4\\87)", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(sn=Lu\\c4\\8di\\c4\\87)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
@@ -263,9 +263,9 @@
*/
public void testEscapeRFC4515_6()
{
- parser.parse( "(1.3.6.1.4.1.1466.0=\\04\\02\\48\\69)" );
- assertEquals( "(1.3.6.1.4.1.1466.0=\\04\\02\\48\\69)", parser.getModel().toString() );
- assertEquals( "(1.3.6.1.4.1.1466.0=\\04\\02\\48\\69)", parser.getModel().toUserProvidedString() );
+ parser.parse( "(1.3.6.1.4.1.1466.0=\\04\\02\\48\\69)" ); //$NON-NLS-1$
+ assertEquals( "(1.3.6.1.4.1.1466.0=\\04\\02\\48\\69)", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(1.3.6.1.4.1.1466.0=\\04\\02\\48\\69)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
@@ -278,9 +278,9 @@
*/
public void testExtensibleFilterRFC4515_1()
{
- parser.parse( "(cn:caseExactMatch:=Fred Flintstone)" );
- assertEquals( "(cn:caseExactMatch:=Fred Flintstone)", parser.getModel().toString() );
- assertEquals( "(cn:caseExactMatch:=Fred Flintstone)", parser.getModel().toUserProvidedString() );
+ parser.parse( "(cn:caseExactMatch:=Fred Flintstone)" ); //$NON-NLS-1$
+ assertEquals( "(cn:caseExactMatch:=Fred Flintstone)", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(cn:caseExactMatch:=Fred Flintstone)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
@@ -294,9 +294,9 @@
*/
public void testExtensibleFilterRFC4515_2()
{
- parser.parse( "(cn:=Betty Rubble)" );
- assertEquals( "(cn:=Betty Rubble)", parser.getModel().toString() );
- assertEquals( "(cn:=Betty Rubble)", parser.getModel().toUserProvidedString() );
+ parser.parse( "(cn:=Betty Rubble)" ); //$NON-NLS-1$
+ assertEquals( "(cn:=Betty Rubble)", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(cn:=Betty Rubble)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
@@ -313,9 +313,9 @@
*/
public void testExtensibleFilterRFC4515_3()
{
- parser.parse( "(sn:dn:2.4.6.8.10:=Barney Rubble)" );
- assertEquals( "(sn:dn:2.4.6.8.10:=Barney Rubble)", parser.getModel().toString() );
- assertEquals( "(sn:dn:2.4.6.8.10:=Barney Rubble)", parser.getModel().toUserProvidedString() );
+ parser.parse( "(sn:dn:2.4.6.8.10:=Barney Rubble)" ); //$NON-NLS-1$
+ assertEquals( "(sn:dn:2.4.6.8.10:=Barney Rubble)", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(sn:dn:2.4.6.8.10:=Barney Rubble)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
@@ -330,9 +330,9 @@
*/
public void testExtensibleFilterRFC4515_4()
{
- parser.parse( "(o:dn:=Ace Industry)" );
- assertEquals( "(o:dn:=Ace Industry)", parser.getModel().toString() );
- assertEquals( "(o:dn:=Ace Industry)", parser.getModel().toUserProvidedString() );
+ parser.parse( "(o:dn:=Ace Industry)" ); //$NON-NLS-1$
+ assertEquals( "(o:dn:=Ace Industry)", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(o:dn:=Ace Industry)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
@@ -347,9 +347,9 @@
*/
public void testExtensibleFilterRFC4515_5()
{
- parser.parse( "(:1.2.3:=Wilma Flintstone)" );
- assertEquals( "(:1.2.3:=Wilma Flintstone)", parser.getModel().toString() );
- assertEquals( "(:1.2.3:=Wilma Flintstone)", parser.getModel().toUserProvidedString() );
+ parser.parse( "(:1.2.3:=Wilma Flintstone)" ); //$NON-NLS-1$
+ assertEquals( "(:1.2.3:=Wilma Flintstone)", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(:1.2.3:=Wilma Flintstone)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
@@ -365,9 +365,9 @@
*/
public void testExtensibleFilterRFC4515_6()
{
- parser.parse( "(:Dn:2.4.6.8.10:=Dino)" );
- assertEquals( "(:Dn:2.4.6.8.10:=Dino)", parser.getModel().toString() );
- assertEquals( "(:Dn:2.4.6.8.10:=Dino)", parser.getModel().toUserProvidedString() );
+ parser.parse( "(:Dn:2.4.6.8.10:=Dino)" ); //$NON-NLS-1$
+ assertEquals( "(:Dn:2.4.6.8.10:=Dino)", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(:Dn:2.4.6.8.10:=Dino)", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertTrue( parser.getModel().isValid() );
}
@@ -377,9 +377,9 @@
*/
public void testDIRSTUDIO210()
{
- parser.parse( "(objectClass>=z*) " );
- assertEquals( "(objectClass>=)", parser.getModel().toString() );
- assertEquals( "(objectClass>=z*) ", parser.getModel().toUserProvidedString() );
+ parser.parse( "(objectClass>=z*) " ); //$NON-NLS-1$
+ assertEquals( "(objectClass>=)", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( "(objectClass>=z*) ", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertFalse( parser.getModel().isValid() );
}
@@ -389,9 +389,9 @@
*/
public void testDIRSTUDIO279()
{
- parser.parse( " (&\n (objectClass=person)\n (cn=a*)\n) " );
- assertEquals( "(&(objectClass=person)(cn=a*))", parser.getModel().toString() );
- assertEquals( " (&\n (objectClass=person)\n (cn=a*)\n) ", parser.getModel().toUserProvidedString() );
+ parser.parse( " (&\n (objectClass=person)\n (cn=a*)\n) " ); //$NON-NLS-1$
+ assertEquals( "(&(objectClass=person)(cn=a*))", parser.getModel().toString() ); //$NON-NLS-1$
+ assertEquals( " (&\n (objectClass=person)\n (cn=a*)\n) ", parser.getModel().toUserProvidedString() ); //$NON-NLS-1$
assertFalse( parser.getModel().isValid() );
}
}
diff --git a/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/PasswordTest.java b/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/PasswordTest.java
index 8349244..13f94a1 100644
--- a/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/PasswordTest.java
+++ b/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/PasswordTest.java
@@ -53,9 +53,9 @@
*/
public void testPasswordSHAEncrypted()
{
- Password password = new Password( "{SHA}5en6G6MezRroT3XKqkdPOmY/BfQ=" );
+ Password password = new Password( "{SHA}5en6G6MezRroT3XKqkdPOmY/BfQ=" ); //$NON-NLS-1$
- assertTrue( password.verify( "secret" ) );
+ assertTrue( password.verify( "secret" ) ); //$NON-NLS-1$
}
@@ -64,9 +64,9 @@
*/
public void testPasswordSHAEncryptedLowercase()
{
- Password password = new Password( "{sha}5en6G6MezRroT3XKqkdPOmY/BfQ=" );
+ Password password = new Password( "{sha}5en6G6MezRroT3XKqkdPOmY/BfQ=" ); //$NON-NLS-1$
- assertTrue( password.verify( "secret" ) );
+ assertTrue( password.verify( "secret" ) ); //$NON-NLS-1$
}
@@ -75,9 +75,9 @@
*/
public void testPasswordSSHAEncrypted()
{
- Password password = new Password( "{SSHA}mjVVxasFkk59wMW4L1Ldt+YCblfhULHs03WW7g==" );
+ Password password = new Password( "{SSHA}mjVVxasFkk59wMW4L1Ldt+YCblfhULHs03WW7g==" ); //$NON-NLS-1$
- assertTrue( password.verify( "secret" ) );
+ assertTrue( password.verify( "secret" ) ); //$NON-NLS-1$
}
@@ -86,9 +86,9 @@
*/
public void testPasswordSSHAEncryptedLowercase()
{
- Password password = new Password( "{ssha}mjVVxasFkk59wMW4L1Ldt+YCblfhULHs03WW7g==" );
+ Password password = new Password( "{ssha}mjVVxasFkk59wMW4L1Ldt+YCblfhULHs03WW7g==" ); //$NON-NLS-1$
- assertTrue( password.verify( "secret" ) );
+ assertTrue( password.verify( "secret" ) ); //$NON-NLS-1$
}
@@ -97,9 +97,9 @@
*/
public void testPasswordMD5Encrypted()
{
- Password password = new Password( "{MD5}Xr4ilOzQ4PCOq3aQ0qbuaQ==" );
+ Password password = new Password( "{MD5}Xr4ilOzQ4PCOq3aQ0qbuaQ==" ); //$NON-NLS-1$
- assertTrue( password.verify( "secret" ) );
+ assertTrue( password.verify( "secret" ) ); //$NON-NLS-1$
}
@@ -108,9 +108,9 @@
*/
public void testPasswordMD5EncryptedLowercase()
{
- Password password = new Password( "{md5}Xr4ilOzQ4PCOq3aQ0qbuaQ==" );
+ Password password = new Password( "{md5}Xr4ilOzQ4PCOq3aQ0qbuaQ==" ); //$NON-NLS-1$
- assertTrue( password.verify( "secret" ) );
+ assertTrue( password.verify( "secret" ) ); //$NON-NLS-1$
}
@@ -119,9 +119,9 @@
*/
public void testPasswordSMD5Encrypted()
{
- Password password = new Password( "{SMD5}tQ9wo/VBuKsqBtylMMCcORbnYOJFMyDJ" );
+ Password password = new Password( "{SMD5}tQ9wo/VBuKsqBtylMMCcORbnYOJFMyDJ" ); //$NON-NLS-1$
- assertTrue( password.verify( "secret" ) );
+ assertTrue( password.verify( "secret" ) ); //$NON-NLS-1$
}
@@ -130,9 +130,9 @@
*/
public void testPasswordSMD5EncryptedLowercase()
{
- Password password = new Password( "{smd5}tQ9wo/VBuKsqBtylMMCcORbnYOJFMyDJ" );
+ Password password = new Password( "{smd5}tQ9wo/VBuKsqBtylMMCcORbnYOJFMyDJ" ); //$NON-NLS-1$
- assertTrue( password.verify( "secret" ) );
+ assertTrue( password.verify( "secret" ) ); //$NON-NLS-1$
}
@@ -141,9 +141,9 @@
*/
public void testPasswordCRYPTEncrypted()
{
- Password password = new Password( "{CRYPT}qFkH8Z1woBlXw" );
+ Password password = new Password( "{CRYPT}qFkH8Z1woBlXw" ); //$NON-NLS-1$
- assertTrue( password.verify( "secret" ) );
+ assertTrue( password.verify( "secret" ) ); //$NON-NLS-1$
}
@@ -152,9 +152,9 @@
*/
public void testPasswordCRYPTEncryptedLowercase()
{
- Password password = new Password( "{crypt}qFkH8Z1woBlXw" );
+ Password password = new Password( "{crypt}qFkH8Z1woBlXw" ); //$NON-NLS-1$
- assertTrue( password.verify( "secret" ) );
+ assertTrue( password.verify( "secret" ) ); //$NON-NLS-1$
}
@@ -163,8 +163,8 @@
*/
public void testPasswordBadAlgorithm()
{
- Password password = new Password( "{CRYPTE}qFkH8Z1woBlXw" );
+ Password password = new Password( "{CRYPTE}qFkH8Z1woBlXw" ); //$NON-NLS-1$
- assertFalse( password.verify( "secret" ) );
+ assertFalse( password.verify( "secret" ) ); //$NON-NLS-1$
}
}
diff --git a/plugins/ldapbrowser.ui/plugin.properties b/plugins/ldapbrowser.ui/plugin.properties
index cf420e7..2331850 100644
--- a/plugins/ldapbrowser.ui/plugin.properties
+++ b/plugins/ldapbrowser.ui/plugin.properties
@@ -216,6 +216,10 @@
Action_NewLdifFileAction_label=New LDIF File
Action_NewLdifFileAction_menubarpath=org.apache.directory.studio.ldapbrowser.ldapMenu/newLdifFile
+Action_GotoDnAction_id=org.apache.directory.studio.ldapbrowser.ui.actions.GotoDnAction
+Action_GotoDnAction_label=Go to DN...
+Action_GotoDnAction_menubarpath=navigate/navEnd
+
Decorator_BrowserViewLabelDecorator_id=org.apache.directory.studio.ldapbrowser.decorator
Decorator_BrowserViewLabelDecorator_label=LDAP Decorator
Decorator_BrowserViewLabelDecorator_description=Decorates LDAP icons
diff --git a/plugins/ldapbrowser.ui/plugin.xml b/plugins/ldapbrowser.ui/plugin.xml
index 594194d..6e185d0 100644
--- a/plugins/ldapbrowser.ui/plugin.xml
+++ b/plugins/ldapbrowser.ui/plugin.xml
@@ -441,6 +441,13 @@
label="%Action_NewLdifFileAction_label"
menubarPath="%Action_NewLdifFileAction_menubarpath"
style="push"/>
+ <action
+ class="org.apache.directory.studio.ldapbrowser.ui.actions.GotoDnNavigateMenuAction"
+ icon="resources/icons/locate_dn_in_dit.gif"
+ id="%Action_GotoDnAction_id"
+ label="%Action_GotoDnAction_label"
+ menubarPath="%Action_GotoDnAction_menubarpath"
+ style="push"/>
</actionSet>
</extension>
<extension
diff --git a/plugins/ldapbrowser.ui/plugin_de.properties b/plugins/ldapbrowser.ui/plugin_de.properties
index fb6d50c..1c4c584 100644
--- a/plugins/ldapbrowser.ui/plugin_de.properties
+++ b/plugins/ldapbrowser.ui/plugin_de.properties
@@ -33,19 +33,13 @@
Editor_SearchResultEditor_name=Suchresultat Editor
View_ConnectionView_name=Verbindungen
-
View_ModificationLogsView_name=\u00C4nderungs-Logs
-
View_SearchLogsView_name=Such-Logs
NewWizard_NewEntryWizard_name=LDAP Entry
-
NewWizard_NewContextEntryWizard_name=LDAP Kontext Eintrag
-
NewWizard_NewSearchWizard_name=LDAP Suche
-
NewWizard_NewBookmarkWizard_name=LDAP Lesezeichen
-
NewWizard_BatchOperationWizard_name=LDAP Batch Operation
ImportWizard_ImportLdifWizard_name=LDIF in LDAP
@@ -72,40 +66,26 @@
SearchPage_LdapSearch_label=LDAP Suche
PrefPage_SearchResultEditorPreferencePage_name=Suchresultat Editor
-
PrefPage_ModificationLogsPreferencePage_name=\u00C4nderungs-Logs Ansicht
-
PrefPage_SearchLogsPreferencePage_name=Such-Logs Ansicht
-
PrefPage_EntryEditorsPreferencePage_name=Eintrags-Editoren
PropPage_Search_name=Suche
-
PropPage_Entry_name=Eintrag
-
PropPage_Value_name=Wert
-
PropPage_Bookmark_name=Lesezeichen
Action_OpenSchemaBrowserAction_label=Schema Browser \u00F6ffnen
-
Action_NewConnectionAction_label=Neue Verbindung...
-
Action_NewEntryAction_label=Neuer Eintrag...
-
Action_NewAttributeAction_label=Neues Attribut...
-
Action_NewValueAction_label=Neuer Wert
-
Action_NewSearchAction_label=Neue Suche...
-
Action_NewBookmarkAction_label=Neues Lesezeichen...
-
Action_NewBatchOperationAction_label=Neue Batch Operation...
-
Action_OpenEncoderDecoderDialogAction_label=Encoder/Decoder \u00F6ffnen
-
Action_NewLdifFileAction_label=Neue LDIF Datei
+Action_GotoDnAction_label=Gehe zu DN...
Decorator_BrowserViewLabelDecorator_label=LDAP Decorator
Decorator_BrowserViewLabelDecorator_description=Decorates LDAP icons
diff --git a/plugins/ldapbrowser.ui/plugin_fr.properties b/plugins/ldapbrowser.ui/plugin_fr.properties
index 230a10f..4441394 100644
--- a/plugins/ldapbrowser.ui/plugin_fr.properties
+++ b/plugins/ldapbrowser.ui/plugin_fr.properties
@@ -78,7 +78,6 @@
PropPage_Value_name=Valeur
PropPage_Bookmark_name=Signet
-
Action_OpenSchemaBrowserAction_label=Ouvrir l'explorateur de sch\u00E9ma
Action_NewConnectionAction_label=Nouvelle Connexion...
Action_NewEntryAction_label=Nouvelle entr\u00E9e...
@@ -89,6 +88,7 @@
Action_NewBatchOperationAction_label=Nouveau groupe d'op\u00E9rations...
Action_OpenEncoderDecoderDialogAction_label=Ouvre un encodeur/d\u00E9codeur
Action_NewLdifFileAction_label=Nouveau fichier LDIF
+Action_GotoDnAction_label=Aller au DN...
Decorator_BrowserViewLabelDecorator_label=D\u00E9corateur LDAP
Decorator_BrowserViewLabelDecorator_description=D\u00E9core les icones LDAP
diff --git a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorExtension.java b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorExtension.java
index 5b07377..5c86b91 100644
--- a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorExtension.java
+++ b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorExtension.java
@@ -288,8 +288,8 @@
@Override
public String toString()
{
- return "EntryEditorExtension [className=" + className + ", description=" + description + ", editorId="
- + editorId + ", icon=" + icon + ", id=" + id + ", member=" + member + ", name=" + name + ", priority="
- + priority + ", multiWindow=" + multiWindow + "]";
+ return "EntryEditorExtension [className=" + className + ", description=" + description + ", editorId=" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ + editorId + ", icon=" + icon + ", id=" + id + ", member=" + member + ", name=" + name + ", priority=" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ + priority + ", multiWindow=" + multiWindow + "]"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnNavigateMenuAction.java b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnNavigateMenuAction.java
new file mode 100644
index 0000000..968eb93
--- /dev/null
+++ b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnNavigateMenuAction.java
@@ -0,0 +1,167 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.directory.studio.ldapbrowser.ui.actions;
+
+
+import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.studio.connection.core.Connection;
+import org.apache.directory.studio.connection.core.Utils;
+import org.apache.directory.studio.ldapbrowser.common.dialogs.DnDialog;
+import org.apache.directory.studio.ldapbrowser.common.dialogs.TextDialog;
+import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
+import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
+import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
+import org.apache.directory.studio.ldapbrowser.ui.views.connection.ConnectionView;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.dnd.Clipboard;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+
+
+/**
+ * This action locates a Dn that the user entered into a dialog.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class GotoDnNavigateMenuAction extends LocateInDitAction
+{
+ /**
+ * {@inheritDoc}
+ */
+ public String getText()
+ {
+ return Messages.getString( "GotoDnAction.GotoDN" ); //$NON-NLS-1$
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public ImageDescriptor getImageDescriptor()
+ {
+ return BrowserUIPlugin.getDefault().getImageDescriptor( BrowserUIConstants.IMG_LOCATE_DN_IN_DIT );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isEnabled()
+ {
+ return ( getSelectedConnection() != null );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected ConnectionAndDn getConnectionAndDn()
+ {
+ Connection selectedConnection = getSelectedConnection();
+
+ if ( selectedConnection != null )
+ {
+ // Getting the browser connection associated with the connection
+ IBrowserConnection connection = BrowserCorePlugin.getDefault().getConnectionManager()
+ .getBrowserConnection( selectedConnection );
+
+ // Getting the DN from the clipboard (if any)
+ Dn dn = Utils.getLdapDn( getStringFromClipboard() );
+
+ // Displaying the DN dialog
+ DnDialog dialog = new DnDialog(
+ getShell(),
+ Messages.getString( "GotoDnAction.GotoDNAction" ), Messages.getString( "GotoDnAction.EnterDNAction" ), connection, dn ); //$NON-NLS-1$ //$NON-NLS-2$
+ if ( dialog.open() == TextDialog.OK && dialog.getDn() != null )
+ {
+ dn = dialog.getDn();
+ return new ConnectionAndDn( connection, dn );
+ }
+ }
+
+ return null;
+ }
+
+
+ /**
+ * Gets the currently selected connection.
+ *
+ * @return the currently selected connection
+ */
+ private Connection getSelectedConnection()
+ {
+ // Getting the connections view
+ ConnectionView connectionView = ( ConnectionView ) PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+ .getActivePage().findView( ConnectionView.getId() );
+
+ if ( connectionView != null )
+ {
+ // Getting the selection of the connections view
+ StructuredSelection selection = ( StructuredSelection ) connectionView.getMainWidget().getViewer()
+ .getSelection();
+
+ // Checking if only one object is selected
+ if ( selection.size() == 1 )
+ {
+ Object selectedObject = selection.getFirstElement();
+
+ // Checking if the selected object is a connection
+ if ( selectedObject instanceof Connection )
+ {
+ return ( Connection ) selectedObject;
+ }
+ }
+ }
+
+ return null;
+ }
+
+
+ /**
+ * Gets the string from the clipboard.
+ *
+ * @return the string from the clipboard
+ */
+ private String getStringFromClipboard()
+ {
+ Clipboard clipboard = null;
+ try
+ {
+ clipboard = new Clipboard( Display.getCurrent() );
+ Object contents = clipboard.getContents( TextTransfer.getInstance() );
+ if ( contents != null && contents instanceof String )
+ {
+ return ( String ) contents;
+ }
+ }
+ finally
+ {
+ if ( clipboard != null )
+ {
+ clipboard.dispose();
+ }
+ }
+ return null;
+ }
+}
diff --git a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateEntryInDitAction.java b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateEntryInDitAction.java
index 2fdc5b3..ed259c7 100644
--- a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateEntryInDitAction.java
+++ b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateEntryInDitAction.java
@@ -51,17 +51,17 @@
if ( getSelectedSearchResults().length == 1
&& getSelectedBookmarks().length + getSelectedEntries().length + getSelectedBrowserViewCategories().length == 0 )
{
- return Messages.getString( "LocateEntryInDitAction.OpenSearchResult" ); //$NON-NLS-1$
+ return Messages.getString( "LocateEntryInDitAction.ShowSearchResult" ); //$NON-NLS-1$
}
else if ( getSelectedBookmarks().length == 1
&& getSelectedSearchResults().length + getSelectedEntries().length
+ getSelectedBrowserViewCategories().length == 0 )
{
- return Messages.getString( "LocateEntryInDitAction.OpenBookmark" ); //$NON-NLS-1$
+ return Messages.getString( "LocateEntryInDitAction.ShowBookmark" ); //$NON-NLS-1$
}
else
{
- return Messages.getString( "LocateEntryInDitAction.OpenEntry" ); //$NON-NLS-1$
+ return Messages.getString( "LocateEntryInDitAction.ShowInDit" ); //$NON-NLS-1$
}
}
diff --git a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages.properties b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages.properties
index 25f4785..a696980 100644
--- a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages.properties
+++ b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages.properties
@@ -60,9 +60,9 @@
ImportExportAction.LDIFExport=LDIF Export...
ImportExportAction.LDIFImport=LDIF Import...
LocateDnInDitAction.LocateDN=Locate DN in DIT
-LocateEntryInDitAction.OpenBookmark=Open Bookmark in DIT
-LocateEntryInDitAction.OpenEntry=Open Entry in DIT
-LocateEntryInDitAction.OpenSearchResult=Open Search Result in DIT
+LocateEntryInDitAction.ShowBookmark=Show Bookmark in DIT
+LocateEntryInDitAction.ShowInDit=Show in DIT
+LocateEntryInDitAction.ShowSearchResult=Show Search Result in DIT
MoveAction.Move=Move...
MoveAction.MoveEntries=Move Entries...
MoveAction.MoveEntry=Move Entry...
@@ -95,3 +95,4 @@
BrowserPasteAction.PasteValue=Paste Value
BrowserPasteAction.PasteValues=Paste Values
BrowserPasteAction.SelectCopyDepth=Select Copy Depth
+PropertiesAction.PropertiesForX=Properties for {0}
diff --git a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages_de.properties b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages_de.properties
index 88f5ee2..09653f2 100644
--- a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages_de.properties
+++ b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages_de.properties
@@ -58,9 +58,9 @@
ImportExportAction.LDIFExport=LDIF exportieren...
ImportExportAction.LDIFImport=LDIF importieren...
LocateDnInDitAction.LocateDN=Lokalisiere DN in DIT
-LocateEntryInDitAction.OpenBookmark=\u00D6ffne Lesezeichen in DIT
-LocateEntryInDitAction.OpenEntry=\u00D6ffne Eintrag in DIT
-LocateEntryInDitAction.openSearchResult=\u00D6ffne Suchresultat in DIT
+LocateEntryInDitAction.ShowBookmark=Anzeigen Lesezeichen in DIT
+LocateEntryInDitAction.ShowInDit=Anzeigen in DIT
+LocateEntryInDitAction.ShowSearchResult=Anzeigen Suchresultat in DIT
MoveAction.Move=Verschiebe...
MoveAction.MoveEntries=Verschiebe Eintr\u00E4ge...
MoveAction.MoveEntry=Verschiebe Eintrag...
@@ -93,3 +93,4 @@
BrowserPasteAction.PasteValue=Wert einf\u00FCgen
BrowserPasteAction.PasteValues=Werte einf\u00FCgen
BrowserPasteAction.SelectCopyDepth=Kopiertiefe ausw\u00E4hlen
+PropertiesAction.PropertiesForX=Eigenschaften f\u00FCr {0}
diff --git a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages_fr.properties b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages_fr.properties
index e611261..a4f2fa3 100644
--- a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages_fr.properties
+++ b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages_fr.properties
@@ -47,7 +47,7 @@
CopyValueAction.VopyValuesHex=Copier les valeurs (HEX)
EntryEditorMenuManager.OpenWith=Ouvrir avec
ExportConnectionsAction.ExportConnections=Export de connexions...
-GotoDnAction.EnterDNAction=Veuillez entrer le DN ou vous souhaitez vous aller.
+GotoDnAction.EnterDNAction=Veuillez entrer le DN où vous souhaitez vous rendre.
GotoDnAction.GotoDN=Aller au DN...
GotoDnAction.GotoDNAction=Aller au DN
ImportConnectionsAction.ImportConnections=Import de connexions...
@@ -60,15 +60,15 @@
ImportExportAction.LDIFExport=Export LDIF...
ImportExportAction.LDIFImport=Import LDIF...
LocateDnInDitAction.LocateDN=Localiser le DN dans le DIT
-LocateEntryInDitAction.OpenBookmark=Ouvrir le signet dans le DIT
-LocateEntryInDitAction.OpenEntry=Ouvrir l'entr\u00E9e dans le DIT
-LocateEntryInDitAction.openSearchResult=Ouvrir le r\u00E9sultat de recherche dans le DIT
+LocateEntryInDitAction.ShowBookmark=Afficher le signet dans le DIT
+LocateEntryInDitAction.ShowInDit=Afficher dans le DIT
+LocateEntryInDitAction.ShowSearchResult=Afficher le r\u00E9sultat de recherche dans le DIT
MoveAction.Move=D\u00E9placer...
MoveAction.MoveEntries=D\u00E9placer les entr\u00E9es...
MoveAction.MoveEntry=D\u00E9placer l'entr\u00E9e...
NewBatchOperationAction.NewBatch=Nouveau groupe d'op\u00E9rations...
NewBookmarkAction.NewBookmark=Nouveau signet...
-NewEntryAction.NewContextEntry=Nouvelle Context Entry...
+NewEntryAction.NewContextEntry=Nouvelle entr\u00E9e de contexte...
NewEntryAction.NewEntry=Nouvelle entr\u00E9e...
NewLdifFileAction.NewLDIF=Nouveau fichier LDIF
NewSearchAction.NewSearch=Nouvelle recherche...
@@ -95,3 +95,4 @@
BrowserPasteAction.PasteValue=Coller la valeur
BrowserPasteAction.PasteValues=Coller les valeurs
BrowserPasteAction.SelectCopyDepth=S\u00E9lectionner la profondeur de copie
+PropertiesAction.PropertiesForX=Propri\u00E9t\u00E9s pour {0}
diff --git a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/EncoderDecoderDialog.java b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/EncoderDecoderDialog.java
index e1dc286..cae260c 100644
--- a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/EncoderDecoderDialog.java
+++ b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/EncoderDecoderDialog.java
@@ -121,16 +121,14 @@
inModify = true;
try
{
- String iso = iso88591Text.getText();
- byte[] isoHex = iso.getBytes( "ISO-8859-1" ); //$NON-NLS-1$
- byte[] utf8 = LdifUtils.utf8encode( iso );
- String utf8String = new String( utf8, "ISO-8859-1" ); //$NON-NLS-1$
- String base64 = LdifUtils.base64encode( utf8 );
+ String isoString = iso88591Text.getText();
+ byte[] isoBytes = isoString.getBytes( "ISO-8859-1" ); //$NON-NLS-1$
+ String utf8String = new String( isoBytes, "UTF-8" ); //$NON-NLS-1$
- iso88591HexText.setText( LdifUtils.hexEncode( isoHex ) );
+ iso88591HexText.setText( LdifUtils.hexEncode( isoBytes ) );
utf8Text.setText( utf8String );
- utf8HexText.setText( LdifUtils.hexEncode( utf8 ) );
- base64Text.setText( base64 );
+ utf8HexText.setText( LdifUtils.hexEncode( utf8String.getBytes( "UTF-8" ) ) ); //$NON-NLS-1$
+ base64Text.setText( LdifUtils.base64encode( isoBytes ) );
errorText.setText( "" ); //$NON-NLS-1$
}
catch ( Exception ex )
@@ -156,15 +154,13 @@
try
{
String utf8String = utf8Text.getText();
- byte[] utf8 = utf8String.getBytes( "ISO-8859-1" ); //$NON-NLS-1$
- String iso = LdifUtils.utf8decode( utf8 );
- byte[] isoHex = iso.getBytes( "ISO-8859-1" ); //$NON-NLS-1$
- String base64 = LdifUtils.base64encode( utf8 );
+ byte[] utf8Bytes = utf8String.getBytes( "UTF-8" ); //$NON-NLS-1$
+ String isoString = new String( utf8Bytes, "ISO-8859-1" ); //$NON-NLS-1$
- iso88591Text.setText( iso );
- iso88591HexText.setText( LdifUtils.hexEncode( isoHex ) );
- utf8HexText.setText( LdifUtils.hexEncode( utf8 ) );
- base64Text.setText( base64 );
+ iso88591Text.setText( isoString );
+ iso88591HexText.setText( LdifUtils.hexEncode( isoString.getBytes( "ISO-8859-1" ) ) ); //$NON-NLS-1$
+ utf8HexText.setText( LdifUtils.hexEncode( utf8Bytes ) );
+ base64Text.setText( LdifUtils.base64encode( utf8Bytes ) );
errorText.setText( "" ); //$NON-NLS-1$
}
catch ( Exception ex )
@@ -189,16 +185,14 @@
inModify = true;
try
{
- String base64 = base64Text.getText();
- byte[] utf8 = LdifUtils.base64decodeToByteArray( base64 );
- String utf8String = new String( utf8, "ISO-8859-1" ); //$NON-NLS-1$
- String iso = LdifUtils.utf8decode( utf8 );
- byte[] isoHex = iso.getBytes( "ISO-8859-1" ); //$NON-NLS-1$
+ byte[] base64Bytes = LdifUtils.base64decodeToByteArray( base64Text.getText() );
+ String isoString = new String( base64Bytes, "ISO-8859-1" ); //$NON-NLS-1$
+ String utf8String = LdifUtils.utf8decode( base64Bytes );
- iso88591Text.setText( iso );
- iso88591HexText.setText( LdifUtils.hexEncode( isoHex ) );
+ iso88591Text.setText( isoString );
+ iso88591HexText.setText( LdifUtils.hexEncode( isoString.getBytes( "ISO-8859-1" ) ) ); //$NON-NLS-1$
utf8Text.setText( utf8String );
- utf8HexText.setText( LdifUtils.hexEncode( utf8 ) );
+ utf8HexText.setText( LdifUtils.hexEncode( utf8String.getBytes( "UTF-8" ) ) ); //$NON-NLS-1$
errorText.setText( "" ); //$NON-NLS-1$
}
catch ( Exception ex )
diff --git a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/EntryPropertyPage.java b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/EntryPropertyPage.java
index b96e1eb..85a4ae9 100644
--- a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/EntryPropertyPage.java
+++ b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/EntryPropertyPage.java
@@ -112,7 +112,7 @@
Composite mainGroup = BaseWidgetUtils.createColumnContainer( BaseWidgetUtils.createColumnContainer( composite,
1, 1 ), 2, 1 );
- BaseWidgetUtils.createLabel( mainGroup, Messages.getString( "EntryPropertyPage.Dn" ), 1 ); //$NON-NLS-1$
+ BaseWidgetUtils.createLabel( mainGroup, Messages.getString( "EntryPropertyPage.DN" ), 1 ); //$NON-NLS-1$
dnText = BaseWidgetUtils.createWrappedLabeledText( mainGroup, "", 1 ); //$NON-NLS-1$
GridData dnTextGridData = new GridData( SWT.FILL, SWT.NONE, true, false );
dnTextGridData.widthHint = 300;
diff --git a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditor.java b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditor.java
index e0a89cb..3422924 100644
--- a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditor.java
+++ b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditor.java
@@ -31,7 +31,6 @@
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
-import org.apache.directory.studio.ldapbrowser.ui.views.browser.BrowserView;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.viewers.ISelection;
@@ -50,9 +49,6 @@
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.EditorPart;
-import org.eclipse.ui.part.IShowInSource;
-import org.eclipse.ui.part.IShowInTargetList;
-import org.eclipse.ui.part.ShowInContext;
import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
@@ -187,30 +183,6 @@
return outlinePage;
}
- if ( IShowInTargetList.class.equals( required ) )
- {
- return new IShowInTargetList()
- {
- public String[] getShowInTargetIds()
- {
- return new String[]
- { BrowserView.getId() };
- }
- };
- }
-
- if ( IShowInSource.class.equals( required ) )
- {
- return new IShowInSource()
- {
- public ShowInContext getShowInContext()
- {
- return new ShowInContext( getMainWidget().getViewer().getInput(), getMainWidget().getViewer()
- .getSelection() );
- }
- };
- }
-
return super.getAdapter( required );
}
diff --git a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorActionGroup.java b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorActionGroup.java
index f3021e3..5056c0e 100644
--- a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorActionGroup.java
+++ b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorActionGroup.java
@@ -53,9 +53,7 @@
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.actions.ContributionItemFactory;
/**
@@ -80,6 +78,9 @@
/** The expand all action. */
private ExpandAllAction expandAllAction;
+
+ /** The 'Show In' menu manager */
+ private EntryEditorShowInMenuManager showInMenuManager;
/** The Constant editAttributeDescriptionAction. */
private static final String editAttributeDescriptionAction = "editAttributeDescriptionAction"; //$NON-NLS-1$
@@ -183,6 +184,7 @@
openEntryEditorPreferencePage = new OpenEntryEditorPreferencePageAction();
collapseAllAction = new CollapseAllAction( viewer );
expandAllAction = new ExpandAllAction( viewer );
+ showInMenuManager = new EntryEditorShowInMenuManager( entryEditor );
entryEditorActionMap.put( editAttributeDescriptionAction, new EntryEditorActionProxy( viewer,
new EditAttributeDescriptionAction( viewer ) ) );
@@ -239,7 +241,6 @@
entryEditorActionMap.put( propertyDialogAction, new EntryEditorActionProxy( viewer,
new EntryEditorPropertiesAction( entryEditor ) ) );
-
}
@@ -336,11 +337,7 @@
schemaMenuManager.add( entryEditorActionMap.get( showOrderingMrdAction ) );
schemaMenuManager.add( entryEditorActionMap.get( showLsdAction ) );
menuManager.add( schemaMenuManager );
- MenuManager showInSubMenu = new MenuManager( Messages.getString( "EntryEditorActionGroup.ShowIn" ) ); //$NON-NLS-1$
- showInSubMenu.add( ContributionItemFactory.VIEWS_SHOW_IN.create( PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow() ) );
- menuManager.add( showInSubMenu );
-
+ showInMenuManager.createMenuManager( menuManager );
menuManager.add( new Separator() );
// copy, paste, delete
diff --git a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorShowInMenuManager.java b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorShowInMenuManager.java
new file mode 100644
index 0000000..592f143
--- /dev/null
+++ b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorShowInMenuManager.java
@@ -0,0 +1,124 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.directory.studio.ldapbrowser.ui.editors.entry;
+
+
+import org.apache.directory.studio.entryeditors.EntryEditorInput;
+import org.apache.directory.studio.ldapbrowser.core.model.IBookmark;
+import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.actions.ContributionItemFactory;
+
+
+/**
+ * The EntryEditorShowInMenuManager manages actions for the "Show In" menu manager.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class EntryEditorShowInMenuManager
+{
+ /** The entry editor */
+ private EntryEditor entryEditor;
+
+ /** The locate entry in DIT action */
+ private LocateEntryInLdapBrowserAction locateEntryInDitAction;
+
+ /** The locate search result or bookmark action */
+ private LocateSearchResultOrBookmarkAction locateSearchResultOrBookmarkAction;
+
+
+ /**
+ * Creates a new instance of EntryEditorShowInMenuManager.
+ *
+ * @param entryEditor the entry editor
+ */
+ public EntryEditorShowInMenuManager( EntryEditor entryEditor )
+ {
+ this.entryEditor = entryEditor;
+
+ locateEntryInDitAction = new LocateEntryInLdapBrowserAction( entryEditor, this );
+ locateSearchResultOrBookmarkAction = new LocateSearchResultOrBookmarkAction( entryEditor, this );
+ }
+
+
+ /**
+ * Creates the menu manager.
+ *
+ * @param parent parent menu manager
+ */
+ public void createMenuManager( IMenuManager parent )
+ {
+ MenuManager showInMenuManager = new MenuManager( Messages.getString( "EntryEditorShowInMenuManager.ShowIn" ) ); //$NON-NLS-1$
+ parent.add( showInMenuManager );
+
+ Object input = getInput();
+
+ if ( input != null )
+ {
+ showInMenuManager.add( locateEntryInDitAction );
+
+ if ( inputIsSearchResultOrBookmark() )
+ {
+ showInMenuManager.add( locateSearchResultOrBookmarkAction );
+ }
+ }
+
+ showInMenuManager.add( ContributionItemFactory.VIEWS_SHOW_IN.create( PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow() ) );
+ }
+
+
+ /**
+ * Gets the input.
+ *
+ * @return the input
+ */
+ public Object getInput()
+ {
+ if ( entryEditor != null )
+ {
+ EntryEditorInput editorInput = entryEditor.getEntryEditorInput();
+
+ if ( editorInput != null )
+ {
+ return editorInput.getInput();
+ }
+ }
+
+ return null;
+ }
+
+
+ /**
+ * Indicates if the input is a search result or a bookmark.
+ *
+ * @return <code>true</code> if the input is a search result or a bookmark,
+ * <code>false</code> if not.
+ */
+ private boolean inputIsSearchResultOrBookmark()
+ {
+ Object input = getInput();
+
+ return ( ( input instanceof ISearchResult ) || ( input instanceof IBookmark ) );
+ }
+}
diff --git a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LocateEntryInLdapBrowserAction.java b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LocateEntryInLdapBrowserAction.java
new file mode 100644
index 0000000..128a05d
--- /dev/null
+++ b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LocateEntryInLdapBrowserAction.java
@@ -0,0 +1,143 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.directory.studio.ldapbrowser.ui.editors.entry;
+
+
+import org.apache.directory.studio.entryeditors.EntryEditorInput;
+import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
+import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
+import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
+import org.apache.directory.studio.ldapbrowser.ui.views.browser.BrowserView;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+
+
+/**
+ * This action is used to locate the input entry in the LDAP Browser DIT.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class LocateEntryInLdapBrowserAction extends Action
+{
+ /** The entry editor */
+ protected EntryEditor entryEditor;
+
+ /** The menu manager */
+ protected EntryEditorShowInMenuManager showInMenuManager;
+
+
+ /**
+ * Creates a new instance of LocateEntryInLdapBrowserAction.
+ *
+ * @param entryEditor the entry editor
+ * @param showInMenuManager the menu manager
+ */
+ public LocateEntryInLdapBrowserAction( EntryEditor entryEditor, EntryEditorShowInMenuManager showInMenuManager )
+ {
+ super();
+ this.entryEditor = entryEditor;
+ this.showInMenuManager = showInMenuManager;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ if ( entryEditor != null )
+ {
+ EntryEditorInput editorInput = entryEditor.getEntryEditorInput();
+
+ if ( editorInput != null )
+ {
+ IEntry entry = editorInput.getResolvedEntry();
+
+ if ( entry != null )
+ {
+ select( entry );
+ }
+ }
+ }
+ }
+
+
+ /**
+ * Select the object in the LDAP Browser.
+ *
+ * @param o the object
+ */
+ protected void select( Object o )
+ {
+ String targetId = BrowserView.getId();
+ IViewPart targetView = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(
+ targetId );
+
+ if ( targetView == null )
+ {
+ try
+ {
+ targetView = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(
+ targetId, null, IWorkbenchPage.VIEW_ACTIVATE );
+ }
+ catch ( PartInitException e )
+ {
+ }
+ }
+
+ if ( targetView != null && targetView instanceof BrowserView )
+ {
+ ( ( BrowserView ) targetView ).select( o );
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().activate( targetView );
+ }
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getText()
+ {
+ return Messages.getString( "LocateEntryInLdapBrowserAction.LDAPBrowser" ); //$NON-NLS-1$
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getToolTipText()
+ {
+ return getText();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public ImageDescriptor getImageDescriptor()
+ {
+ return BrowserUIPlugin.getDefault().getImageDescriptor( BrowserUIConstants.IMG_LOCATE_ENTRY_IN_DIT );
+ }
+}
diff --git a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LocateSearchResultOrBookmarkAction.java b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LocateSearchResultOrBookmarkAction.java
new file mode 100644
index 0000000..c35be73
--- /dev/null
+++ b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LocateSearchResultOrBookmarkAction.java
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.directory.studio.ldapbrowser.ui.editors.entry;
+
+
+import org.apache.directory.studio.ldapbrowser.core.model.IBookmark;
+import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult;
+import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
+import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
+import org.eclipse.jface.resource.ImageDescriptor;
+
+
+/**
+ * This action is used to locate the search result or bookmark in the LDAP Browser view.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class LocateSearchResultOrBookmarkAction extends LocateEntryInLdapBrowserAction
+{
+ /**
+ * Creates a new instance of LocateSearchResultOrBookmarkAction.
+ *
+ * @param entryEditor the entry editor
+ * @param showInMenuManager the menu manager
+ */
+ public LocateSearchResultOrBookmarkAction( EntryEditor entryEditor, EntryEditorShowInMenuManager showInMenuManager )
+ {
+ super( entryEditor, showInMenuManager );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ Object input = showInMenuManager.getInput();
+
+ if ( input != null )
+ {
+ select( input );
+ }
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getText()
+ {
+ Object input = showInMenuManager.getInput();
+
+ if ( input != null )
+ {
+ if ( input instanceof ISearchResult )
+ {
+ return Messages.getString( "LocateSearchResultOrBookmarkAction.Searches" ); //$NON-NLS-1$
+ }
+ else if ( input instanceof IBookmark )
+ {
+ return Messages.getString( "LocateSearchResultOrBookmarkAction.Bookmarks" ); //$NON-NLS-1$
+ }
+ }
+
+ return super.getText();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public ImageDescriptor getImageDescriptor()
+ {
+ Object input = showInMenuManager.getInput();
+
+ if ( input != null )
+ {
+ if ( input instanceof ISearchResult )
+ {
+ return BrowserUIPlugin.getDefault().getImageDescriptor(
+ BrowserUIConstants.IMG_LOCATE_SEARCHRESULT_IN_DIT );
+ }
+ else if ( input instanceof IBookmark )
+ {
+ return BrowserUIPlugin.getDefault().getImageDescriptor(
+ BrowserUIConstants.IMG_LOCATE_BOOKMARK_IN_DIT );
+ }
+ }
+
+ return super.getImageDescriptor();
+ }
+}
diff --git a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages.properties b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages.properties
index aef5852..16f7a03 100644
--- a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages.properties
+++ b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages.properties
@@ -18,13 +18,14 @@
ToggleAutosaveAction.Autosave=Save Automatically
EntryEditorActionGroup.Advanced=Advanced
EntryEditorActionGroup.OpenSchemaBrowser=Open Schema Browser
-EntryEditorActionGroup.ShowIn=Show In
-EntryEditorInput.EntryEditor=Entry Editor
+EntryEditorShowInMenuManager.ShowIn=Show In
LdifEntryEditorDocumentProvider.InvalidDN=Invalid Distinguished Name.
LdifEntryEditorDocumentProvider.InvalidLdif=Invalid LDIF: {0}
LdifEntryEditorDocumentProvider.InvalidRecordType=Exactly one LDIF content record expected.
LdifEntryEditorDocumentProvider.ModDnNotSupported=Modification of Distinguished Name is not supported by the LDIF Entry Editor.
+LocateEntryInLdapBrowserAction.LDAPBrowser=LDAP Browser
+LocateSearchResultOrBookmarkAction.Bookmarks=Bookmarks
+LocateSearchResultOrBookmarkAction.Searches=Searches
OpenEntryEditorAction.EditEntry=Edit Entry...
OpenEntryEditorPreferencePageAction.Preferences=Preferences...
OpenEntryEditorPreferencePageAction.PreferencesToolTip=Preferences...
-ShowOperationalAttributesAction.ShowOperationalAttributes=Show Operational Attributes
diff --git a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages_de.properties b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages_de.properties
index 22eff21..85e0aa5 100644
--- a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages_de.properties
+++ b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages_de.properties
@@ -18,13 +18,13 @@
ToggleAutosaveAction.Autosave=Automatisch speichern
EntryEditorActionGroup.Advanced=Erweitert
EntryEditorActionGroup.OpenSchemaBrowser=\u00D6ffne Schema Browser
-EntryEditorActionGroup.ShowIn=Anzeigen in
-EntryEditorInput.EntryEditor=Eintrag Editor
+EntryEditorShowInMenuManager.ShowIn=Anzeigen in
LdifEntryEditorDocumentProvider.InvalidDN=Ung\u00fcltiger Distinguished Name.
LdifEntryEditorDocumentProvider.InvalidLdif=Ung\u00fcltiges LDIF: {0}
LdifEntryEditorDocumentProvider.InvalidRecordType=Genau ein LDIF Inhaltsdatensatz erwartet.
LdifEntryEditorDocumentProvider.ModDnNotSupported=\u00c4nderung des Distinguished Name wird vom LDIF-Eintrags-Editor nicht unterst\u00fctzt.
+LocateSearchResultOrBookmarkAction.Bookmarks=Lesezeichen
+LocateSearchResultOrBookmarkAction.Searches=Suchen
OpenEntryEditorAction.EditEntry=Eintrag bearbeiten...
OpenEntryEditorPreferencePageAction.Preferences=Benutzervorgaben...
OpenEntryEditorPreferencePageAction.PreferencesToolTip=Benutzervorgaben...
-ShowOperationalAttributesAction.ShowOperationalAttributes=Operative Attribute anzeigen
diff --git a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages_fr.properties b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages_fr.properties
index 8d38724..ea705be 100644
--- a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages_fr.properties
+++ b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages_fr.properties
@@ -18,13 +18,14 @@
ToggleAutosaveAction.Autosave=Sauvegarder automatiquement
EntryEditorActionGroup.Advanced=Avanc\u00E9
EntryEditorActionGroup.OpenSchemaBrowser=Ouvrir le navigateur de sch\u00E9ma
-EntryEditorActionGroup.ShowIn=Afficher dans
-EntryEditorInput.EntryEditor=Editeur d'entr\u00E9e
+EntryEditorShowInMenuManager.ShowIn=Afficher dans
LdifEntryEditorDocumentProvider.InvalidDN=Distinguished Name invalide.
LdifEntryEditorDocumentProvider.InvalidLdif=LDIF invalide: {0}
LdifEntryEditorDocumentProvider.InvalidRecordType=Le contenu d'un unique enregistrement LDIF est attendu.
LdifEntryEditorDocumentProvider.ModDnNotSupported=La modification du Distinguished Name n'est pas support\u00E9 par l'\u00E9diteur d'entr\u00E9e LDIF.
+LocateEntryInLdapBrowserAction.LDAPBrowser=Navigateur LDAP
+LocateSearchResultOrBookmarkAction.Bookmarks=Signets
+LocateSearchResultOrBookmarkAction.Searches=Recherches
OpenEntryEditorAction.EditEntry=Editer l'entr\u00E9e...
OpenEntryEditorPreferencePageAction.Preferences=Pr\u00E9f\u00E9rences...
OpenEntryEditorPreferencePageAction.PreferencesToolTip=Pr\u00E9f\u00E9rences...
-ShowOperationalAttributesAction.ShowOperationalAttributes=Afficher les attributs op\u00E9rationnels
diff --git a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages.properties b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages.properties
index fa1fddf..902fa62 100644
--- a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages.properties
+++ b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages.properties
@@ -36,8 +36,6 @@
SearchResultEditorContentProvider.Results=\ Results -
SearchResultEditorContentProvider.SearchBase=Search Base\:
SearchResultEditorContentProvider.SearchNotPerformed=Search not performed -
-SearchResultEditorInput.SearchResultEditor=Search Result Editor
-SearchResultEditorInput.SearchResultEditorToolTip=
SearchResultEditorNavigationLocation.Search=Search {0}
SearchResultEditorPasteAction.PasteValues=Paste Values
SearchResultEditorPasteAction.Paste=Paste
diff --git a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages_de.properties b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages_de.properties
index fb5338b..1c32714 100644
--- a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages_de.properties
+++ b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages_de.properties
@@ -35,8 +35,6 @@
SearchResultEditorContentProvider.Results=\ Resultate -
SearchResultEditorContentProvider.SearchBase=Suchbasis\:
SearchResultEditorContentProvider.SearchNotPerformed=Suche nicht ausgef\u00FChrt -
-SearchResultEditorInput.SearchResultEditor=Suchresultat Editor
-SearchResultEditorInput.SearchResultEditorToolTip=
SearchResultEditorNavigationLocation.Search=Suche {0}
SearchResultEditorPasteAction.PasteValues=Werte einf\u00FCgen
SearchResultEditorPasteAction.Paste=Einf\u00FCgen
diff --git a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages_fr.properties b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages_fr.properties
index f1fc6ea..16f06ba 100644
--- a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages_fr.properties
+++ b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages_fr.properties
@@ -36,8 +36,6 @@
SearchResultEditorContentProvider.Results=\ R\u00E9sultats -
SearchResultEditorContentProvider.SearchBase=Base de recherche\:
SearchResultEditorContentProvider.SearchNotPerformed=Recherche non effectu\u00E9e -
-SearchResultEditorInput.SearchResultEditor=Editeur de r\u00E9sultat de recherche
-SearchResultEditorInput.SearchResultEditorToolTip=
SearchResultEditorNavigationLocation.Search=Recherche {0}
SearchResultEditorPasteAction.PasteValues=Coller les valeurs
SearchResultEditorPasteAction.Paste=Coller
diff --git a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewUniversalListener.java b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewUniversalListener.java
index 8ed4579..480d267 100644
--- a/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewUniversalListener.java
+++ b/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewUniversalListener.java
@@ -49,11 +49,13 @@
import org.apache.directory.studio.ldapbrowser.core.events.EntryRenamedEvent;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
import org.apache.directory.studio.ldapbrowser.core.events.SearchUpdateEvent;
+import org.apache.directory.studio.ldapbrowser.core.events.SearchUpdateEvent.EventDetail;
import org.apache.directory.studio.ldapbrowser.core.events.SearchUpdateListener;
import org.apache.directory.studio.ldapbrowser.core.model.IBookmark;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IContinuation;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
+import org.apache.directory.studio.ldapbrowser.core.model.IQuickSearch;
import org.apache.directory.studio.ldapbrowser.core.model.IRootDSE;
import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult;
@@ -273,7 +275,7 @@
*/
public BrowserViewUniversalListener( BrowserView view )
{
- super( view.getMainWidget().getViewer() );
+ super( view.getMainWidget() );
this.view = view;
// create maps
@@ -525,7 +527,15 @@
public void searchUpdated( SearchUpdateEvent searchUpdateEvent )
{
ISearch search = searchUpdateEvent.getSearch();
- viewer.setSelection( StructuredSelection.EMPTY );
+
+ if ( ( search instanceof IQuickSearch ) && ( searchUpdateEvent.getDetail() == EventDetail.SEARCH_REMOVED ) )
+ {
+ if ( widget.getQuickSearch() == search )
+ {
+ widget.setQuickSearch( null );
+ }
+ }
+
viewer.refresh();
if ( search instanceof IContinuation )
@@ -536,9 +546,12 @@
{
viewer.setSelection( new StructuredSelection( search ), true );
}
- else if ( search.getBrowserConnection().getSearchManager().getQuickSearch() == search )
+ else if ( ( search instanceof IQuickSearch ) && ( searchUpdateEvent.getDetail() != EventDetail.SEARCH_REMOVED ) )
{
- viewer.setSelection( new StructuredSelection( search ), true );
+ if ( widget.getQuickSearch() == search )
+ {
+ viewer.setSelection( new StructuredSelection( search ), true );
+ }
}
else
{
diff --git a/plugins/ldapservers.apacheds.v153/plugin.xml b/plugins/ldapservers.apacheds.v153/plugin.xml
index edfb0e5..e03a44e 100644
--- a/plugins/ldapservers.apacheds.v153/plugin.xml
+++ b/plugins/ldapservers.apacheds.v153/plugin.xml
@@ -43,10 +43,16 @@
icon="resources/icons/connection_new.gif">
</action>
<visibility>
+ <and>
+ <objectState
+ name="isLdapPerspectiveAvailable"
+ value="true">
+ </objectState>
<objectState
name="extensionId"
value="%LdapServerAdapter_id">
</objectState>
+ </and>
</visibility>
</objectContribution>
</extension>
diff --git a/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/ApacheDS153LdapServerAdapter.java b/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/ApacheDS153LdapServerAdapter.java
index 1ffba03..996e452 100644
--- a/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/ApacheDS153LdapServerAdapter.java
+++ b/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/ApacheDS153LdapServerAdapter.java
@@ -58,30 +58,30 @@
public class ApacheDS153LdapServerAdapter implements LdapServerAdapter
{
// Various strings constants used in paths
- private static final String SERVER_XML = "server.xml";
- private static final String LOG4J_PROPERTIES = "log4j.properties";
- private static final String RESOURCES = "resources";
- private static final String LIBS = "libs";
- private static final String CONF = "conf";
+ private static final String SERVER_XML = "server.xml"; //$NON-NLS-1$
+ private static final String LOG4J_PROPERTIES = "log4j.properties"; //$NON-NLS-1$
+ private static final String RESOURCES = "resources"; //$NON-NLS-1$
+ private static final String LIBS = "libs"; //$NON-NLS-1$
+ private static final String CONF = "conf"; //$NON-NLS-1$
/** The array of libraries names */
private static final String[] libraries = new String[]
- { "antlr-2.7.7.jar", "apacheds-bootstrap-extract-1.5.3.jar", "apacheds-bootstrap-partition-1.5.3.jar",
- "apacheds-btree-base-1.5.3.jar", "apacheds-core-1.5.3.jar", "apacheds-core-constants-1.5.3.jar",
- "apacheds-core-entry-1.5.3.jar", "apacheds-core-shared-1.5.3.jar", "apacheds-jdbm-1.5.3.jar",
- "apacheds-jdbm-store-1.5.3.jar", "apacheds-kerberos-shared-1.5.3.jar", "apacheds-launcher-1.2.0.jar",
- "apacheds-protocol-changepw-1.5.3.jar", "apacheds-protocol-dns-1.5.3.jar",
- "apacheds-protocol-kerberos-1.5.3.jar", "apacheds-protocol-ldap-1.5.3.jar",
- "apacheds-protocol-ntp-1.5.3.jar", "apacheds-protocol-shared-1.5.3.jar",
- "apacheds-schema-bootstrap-1.5.3.jar", "apacheds-schema-extras-1.5.3.jar",
- "apacheds-schema-registries-1.5.3.jar", "apacheds-server-jndi-1.5.3.jar", "apacheds-server-xml-1.5.3.jar",
- "apacheds-utils-1.5.3.jar", "apacheds-xbean-spring-1.5.3.jar", "commons-cli-1.1.jar",
- "commons-collections-3.2.jar", "commons-daemon-1.0.1.jar", "commons-lang-2.3.jar",
- "daemon-bootstrappers-1.1.3.jar", "jcl104-over-slf4j-1.4.3.jar", "log4j-1.2.14.jar", "mina-core-1.1.6.jar",
- "mina-filter-ssl-1.1.6.jar", "shared-asn1-0.9.11.jar", "shared-asn1-codec-0.9.11.jar",
- "shared-bouncycastle-reduced-0.9.11.jar", "shared-ldap-0.9.11.jar", "shared-ldap-constants-0.9.11.jar",
- "slf4j-api-1.4.3.jar", "slf4j-log4j12-1.4.3.jar", "spring-beans-2.0.6.jar", "spring-context-2.0.6.jar",
- "spring-core-2.0.6.jar", "xbean-spring-3.3.jar" };
+ { "antlr-2.7.7.jar", "apacheds-bootstrap-extract-1.5.3.jar", "apacheds-bootstrap-partition-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-btree-base-1.5.3.jar", "apacheds-core-1.5.3.jar", "apacheds-core-constants-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-entry-1.5.3.jar", "apacheds-core-shared-1.5.3.jar", "apacheds-jdbm-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-jdbm-store-1.5.3.jar", "apacheds-kerberos-shared-1.5.3.jar", "apacheds-launcher-1.2.0.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-protocol-changepw-1.5.3.jar", "apacheds-protocol-dns-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-kerberos-1.5.3.jar", "apacheds-protocol-ldap-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-ntp-1.5.3.jar", "apacheds-protocol-shared-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-schema-bootstrap-1.5.3.jar", "apacheds-schema-extras-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-schema-registries-1.5.3.jar", "apacheds-server-jndi-1.5.3.jar", "apacheds-server-xml-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-utils-1.5.3.jar", "apacheds-xbean-spring-1.5.3.jar", "commons-cli-1.1.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "commons-collections-3.2.jar", "commons-daemon-1.0.1.jar", "commons-lang-2.3.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "daemon-bootstrappers-1.1.3.jar", "jcl104-over-slf4j-1.4.3.jar", "log4j-1.2.14.jar", "mina-core-1.1.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "mina-filter-ssl-1.1.6.jar", "shared-asn1-0.9.11.jar", "shared-asn1-codec-0.9.11.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-bouncycastle-reduced-0.9.11.jar", "shared-ldap-0.9.11.jar", "shared-ldap-constants-0.9.11.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "slf4j-api-1.4.3.jar", "slf4j-log4j12-1.4.3.jar", "spring-beans-2.0.6.jar", "spring-context-2.0.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "spring-core-2.0.6.jar", "xbean-spring-3.3.jar" }; //$NON-NLS-1$ //$NON-NLS-2$
/**
@@ -102,11 +102,11 @@
File serverFolder = LdapServersManager.getServerFolder( server ).toFile();
File confFolder = new File( serverFolder, CONF );
confFolder.mkdir();
- File ldifFolder = new File( serverFolder, "ldif" );
+ File ldifFolder = new File( serverFolder, "ldif" ); //$NON-NLS-1$
ldifFolder.mkdir();
- File logFolder = new File( serverFolder, "log" );
+ File logFolder = new File( serverFolder, "log" ); //$NON-NLS-1$
logFolder.mkdir();
- File partitionFolder = new File( serverFolder, "partitions" );
+ File partitionFolder = new File( serverFolder, "partitions" ); //$NON-NLS-1$
partitionFolder.mkdir();
// Copying configuration files
@@ -118,7 +118,7 @@
LOG4J_PROPERTIES ) );
// Creating an empty log file
- new File( logFolder, "apacheds.log" ).createNewFile();
+ new File( logFolder, "apacheds.log" ).createNewFile(); //$NON-NLS-1$
}
diff --git a/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/CreateConnectionAction.java b/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/CreateConnectionAction.java
index 5b3d70b..18bceb9 100644
--- a/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/CreateConnectionAction.java
+++ b/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/CreateConnectionAction.java
@@ -23,6 +23,7 @@
import org.apache.directory.studio.apacheds.configuration.model.v153.ServerConfigurationV153;
import org.apache.directory.studio.connection.core.Connection;
+import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
import org.apache.directory.studio.connection.core.ConnectionParameter;
import org.apache.directory.studio.connection.core.ConnectionParameter.AuthenticationMethod;
import org.apache.directory.studio.connection.core.ConnectionParameter.EncryptionMethod;
@@ -46,7 +47,7 @@
*/
public class CreateConnectionAction implements IObjectActionDelegate
{
- private static final String EXTENSION_ID = "org.apache.directory.server.1.5.3";
+ private static final String EXTENSION_ID = "org.apache.directory.server.1.5.3"; //$NON-NLS-1$
/** The {@link ServersView} */
private ServersView view;
@@ -67,11 +68,10 @@
LdapServer server = ( LdapServer ) selection.getFirstElement();
// Checking that the server is really an ApacheDS 1.5.3 server
- // TODO
if ( !EXTENSION_ID.equalsIgnoreCase( server.getLdapServerAdapterExtension().getId() ) )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.NotA153Server" ); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -87,7 +87,7 @@
catch ( Exception e )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.FollowingErrorOccurred" ) + e.getMessage(); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -117,7 +117,6 @@
new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
}
}
@@ -138,7 +137,6 @@
null, message, MessageDialog.ERROR, new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
@@ -176,9 +174,9 @@
// Name
connectionParameter.setName( server.getName() );
-
+
// Network Provider
- connectionParameter.setNetworkProvider( NetworkProvider.JNDI );
+ connectionParameter.setNetworkProvider( ConnectionCorePlugin.getDefault().getDefaultNetworkProvider() );
// Creating the connection
CreateConnectionActionHelper.createLdapBrowserConnection( server, new Connection( connectionParameter ) );
diff --git a/plugins/ldapservers.apacheds.v154/plugin.xml b/plugins/ldapservers.apacheds.v154/plugin.xml
index 9ca5d2f..08dd23f 100644
--- a/plugins/ldapservers.apacheds.v154/plugin.xml
+++ b/plugins/ldapservers.apacheds.v154/plugin.xml
@@ -43,10 +43,16 @@
icon="resources/icons/connection_new.gif">
</action>
<visibility>
+ <and>
+ <objectState
+ name="isLdapPerspectiveAvailable"
+ value="true">
+ </objectState>
<objectState
name="extensionId"
value="%LdapServerAdapter_id">
</objectState>
+ </and>
</visibility>
</objectContribution>
</extension>
diff --git a/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/ApacheDS154LdapServerAdapter.java b/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/ApacheDS154LdapServerAdapter.java
index 79e38e2..777eaf9 100644
--- a/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/ApacheDS154LdapServerAdapter.java
+++ b/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/ApacheDS154LdapServerAdapter.java
@@ -58,32 +58,32 @@
public class ApacheDS154LdapServerAdapter implements LdapServerAdapter
{
// Various strings constants used in paths
- private static final String SERVER_XML = "server.xml";
- private static final String LOG4J_PROPERTIES = "log4j.properties";
- private static final String RESOURCES = "resources";
- private static final String LIBS = "libs";
- private static final String CONF = "conf";
+ private static final String SERVER_XML = "server.xml"; //$NON-NLS-1$
+ private static final String LOG4J_PROPERTIES = "log4j.properties"; //$NON-NLS-1$
+ private static final String RESOURCES = "resources"; //$NON-NLS-1$
+ private static final String LIBS = "libs"; //$NON-NLS-1$
+ private static final String CONF = "conf"; //$NON-NLS-1$
/** The array of libraries names */
private static final String[] libraries = new String[]
- { "antlr-2.7.7.jar", "xbean-spring-3.3.jar", "apacheds-bootstrap-extract-1.5.4.jar",
- "apacheds-bootstrap-partition-1.5.4.jar", "apacheds-core-1.5.4.jar", "apacheds-core-avl-1.5.4.jar",
- "apacheds-core-constants-1.5.4.jar", "apacheds-core-cursor-1.5.4.jar", "apacheds-core-entry-1.5.4.jar",
- "apacheds-core-shared-1.5.4.jar", "apacheds-jdbm-1.5.4.jar", "apacheds-jdbm-store-1.5.4.jar",
- "apacheds-kerberos-shared-1.5.4.jar", "apacheds-launcher-1.2.0.jar",
- "apacheds-protocol-changepw-1.5.4.jar", "apacheds-protocol-dns-1.5.4.jar",
- "apacheds-protocol-kerberos-1.5.4.jar", "apacheds-protocol-ldap-1.5.4.jar",
- "apacheds-protocol-ntp-1.5.4.jar", "apacheds-protocol-shared-1.5.4.jar",
- "apacheds-schema-bootstrap-1.5.4.jar", "apacheds-schema-extras-1.5.4.jar",
- "apacheds-schema-registries-1.5.4.jar", "apacheds-server-jndi-1.5.4.jar", "apacheds-server-xml-1.5.4.jar",
- "apacheds-utils-1.5.4.jar", "apacheds-xbean-spring-1.5.4.jar", "apacheds-xdbm-base-1.5.4.jar",
- "apacheds-xdbm-search-1.5.4.jar", "apacheds-xdbm-tools-1.5.4.jar", "commons-cli-1.1.jar",
- "commons-collections-3.2.jar", "commons-daemon-1.0.1.jar", "commons-lang-2.3.jar",
- "daemon-bootstrappers-1.1.4.jar", "jcl104-over-slf4j-1.4.3.jar", "log4j-1.2.14.jar", "mina-core-1.1.6.jar",
- "mina-filter-ssl-1.1.6.jar", "shared-asn1-0.9.12.jar", "shared-asn1-codec-0.9.12.jar",
- "shared-bouncycastle-reduced-0.9.12.jar", "shared-ldap-0.9.12.jar", "shared-ldap-constants-0.9.12.jar",
- "slf4j-api-1.4.3.jar", "slf4j-log4j12-1.4.3.jar", "spring-beans-2.0.6.jar", "spring-context-2.0.6.jar",
- "spring-core-2.0.6.jar" };
+ { "antlr-2.7.7.jar", "xbean-spring-3.3.jar", "apacheds-bootstrap-extract-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-bootstrap-partition-1.5.4.jar", "apacheds-core-1.5.4.jar", "apacheds-core-avl-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-constants-1.5.4.jar", "apacheds-core-cursor-1.5.4.jar", "apacheds-core-entry-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-shared-1.5.4.jar", "apacheds-jdbm-1.5.4.jar", "apacheds-jdbm-store-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-kerberos-shared-1.5.4.jar", "apacheds-launcher-1.2.0.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-changepw-1.5.4.jar", "apacheds-protocol-dns-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-kerberos-1.5.4.jar", "apacheds-protocol-ldap-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-ntp-1.5.4.jar", "apacheds-protocol-shared-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-schema-bootstrap-1.5.4.jar", "apacheds-schema-extras-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-schema-registries-1.5.4.jar", "apacheds-server-jndi-1.5.4.jar", "apacheds-server-xml-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-utils-1.5.4.jar", "apacheds-xbean-spring-1.5.4.jar", "apacheds-xdbm-base-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-xdbm-search-1.5.4.jar", "apacheds-xdbm-tools-1.5.4.jar", "commons-cli-1.1.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "commons-collections-3.2.jar", "commons-daemon-1.0.1.jar", "commons-lang-2.3.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "daemon-bootstrappers-1.1.4.jar", "jcl104-over-slf4j-1.4.3.jar", "log4j-1.2.14.jar", "mina-core-1.1.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "mina-filter-ssl-1.1.6.jar", "shared-asn1-0.9.12.jar", "shared-asn1-codec-0.9.12.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-bouncycastle-reduced-0.9.12.jar", "shared-ldap-0.9.12.jar", "shared-ldap-constants-0.9.12.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "slf4j-api-1.4.3.jar", "slf4j-log4j12-1.4.3.jar", "spring-beans-2.0.6.jar", "spring-context-2.0.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "spring-core-2.0.6.jar" }; //$NON-NLS-1$
/**
@@ -104,11 +104,11 @@
File serverFolder = LdapServersManager.getServerFolder( server ).toFile();
File confFolder = new File( serverFolder, CONF );
confFolder.mkdir();
- File ldifFolder = new File( serverFolder, "ldif" );
+ File ldifFolder = new File( serverFolder, "ldif" ); //$NON-NLS-1$
ldifFolder.mkdir();
- File logFolder = new File( serverFolder, "log" );
+ File logFolder = new File( serverFolder, "log" ); //$NON-NLS-1$
logFolder.mkdir();
- File partitionFolder = new File( serverFolder, "partitions" );
+ File partitionFolder = new File( serverFolder, "partitions" ); //$NON-NLS-1$
partitionFolder.mkdir();
// Copying configuration files
@@ -120,7 +120,7 @@
LOG4J_PROPERTIES ) );
// Creating an empty log file
- new File( logFolder, "apacheds.log" ).createNewFile();
+ new File( logFolder, "apacheds.log" ).createNewFile(); //$NON-NLS-1$
}
diff --git a/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/CreateConnectionAction.java b/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/CreateConnectionAction.java
index aabd680..9a4c80f 100644
--- a/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/CreateConnectionAction.java
+++ b/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/CreateConnectionAction.java
@@ -23,6 +23,7 @@
import org.apache.directory.studio.apacheds.configuration.model.v154.ServerConfigurationV154;
import org.apache.directory.studio.connection.core.Connection;
+import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
import org.apache.directory.studio.connection.core.ConnectionParameter;
import org.apache.directory.studio.connection.core.ConnectionParameter.AuthenticationMethod;
import org.apache.directory.studio.connection.core.ConnectionParameter.EncryptionMethod;
@@ -46,7 +47,7 @@
*/
public class CreateConnectionAction implements IObjectActionDelegate
{
- private static final String EXTENSION_ID = "org.apache.directory.server.1.5.4";
+ private static final String EXTENSION_ID = "org.apache.directory.server.1.5.4"; //$NON-NLS-1$
/** The {@link ServersView} */
private ServersView view;
@@ -67,11 +68,10 @@
LdapServer server = ( LdapServer ) selection.getFirstElement();
// Checking that the server is really an ApacheDS 1.5.4 server
- // TODO
if ( !EXTENSION_ID.equalsIgnoreCase( server.getLdapServerAdapterExtension().getId() ) )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.NotA154Server" ); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -87,7 +87,7 @@
catch ( Exception e )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.FollowingErrorOccurred" ) + e.getMessage(); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -117,7 +117,6 @@
new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
}
}
@@ -138,7 +137,6 @@
null, message, MessageDialog.ERROR, new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
@@ -176,9 +174,9 @@
// Name
connectionParameter.setName( server.getName() );
-
+
// Network Provider
- connectionParameter.setNetworkProvider( NetworkProvider.JNDI );
+ connectionParameter.setNetworkProvider( ConnectionCorePlugin.getDefault().getDefaultNetworkProvider() );
// Creating the connection
CreateConnectionActionHelper.createLdapBrowserConnection( server, new Connection( connectionParameter ) );
diff --git a/plugins/ldapservers.apacheds.v155/plugin.xml b/plugins/ldapservers.apacheds.v155/plugin.xml
index 7dfcc26..e11fd21 100644
--- a/plugins/ldapservers.apacheds.v155/plugin.xml
+++ b/plugins/ldapservers.apacheds.v155/plugin.xml
@@ -43,10 +43,16 @@
icon="resources/icons/connection_new.gif">
</action>
<visibility>
+ <and>
+ <objectState
+ name="isLdapPerspectiveAvailable"
+ value="true">
+ </objectState>
<objectState
name="extensionId"
value="%LdapServerAdapter_id">
</objectState>
+ </and>
</visibility>
</objectContribution>
</extension>
diff --git a/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/ApacheDS155LdapServerAdapter.java b/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/ApacheDS155LdapServerAdapter.java
index 77c18c0..46e151c 100644
--- a/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/ApacheDS155LdapServerAdapter.java
+++ b/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/ApacheDS155LdapServerAdapter.java
@@ -57,32 +57,32 @@
public class ApacheDS155LdapServerAdapter implements LdapServerAdapter
{
// Various strings constants used in paths
- private static final String SERVER_XML = "server.xml";
- private static final String LOG4J_PROPERTIES = "log4j.properties";
- private static final String RESOURCES = "resources";
- private static final String LIBS = "libs";
- private static final String CONF = "conf";
+ private static final String SERVER_XML = "server.xml"; //$NON-NLS-1$
+ private static final String LOG4J_PROPERTIES = "log4j.properties"; //$NON-NLS-1$
+ private static final String RESOURCES = "resources"; //$NON-NLS-1$
+ private static final String LIBS = "libs"; //$NON-NLS-1$
+ private static final String CONF = "conf"; //$NON-NLS-1$
/** The array of libraries names */
private static final String[] libraries = new String[]
- { "antlr-2.7.7.jar", "apacheds-bootstrap-extract-1.5.5.jar", "apacheds-bootstrap-partition-1.5.5.jar",
- "apacheds-core-1.5.5.jar", "apacheds-core-avl-1.5.5.jar", "apacheds-core-constants-1.5.5.jar",
- "apacheds-core-entry-1.5.5.jar", "apacheds-core-jndi-1.5.5.jar", "apacheds-core-shared-1.5.5.jar",
- "apacheds-interceptor-kerberos-1.5.5.jar", "apacheds-jdbm-1.5.5.jar", "apacheds-jdbm-store-1.5.5.jar",
- "apacheds-kerberos-shared-1.5.5.jar", "apacheds-launcher-1.5.0.jar",
- "apacheds-protocol-changepw-1.5.5.jar", "apacheds-protocol-dns-1.5.5.jar",
- "apacheds-protocol-kerberos-1.5.5.jar", "apacheds-protocol-ldap-1.5.5.jar",
- "apacheds-protocol-ntp-1.5.5.jar", "apacheds-protocol-shared-1.5.5.jar",
- "apacheds-schema-bootstrap-1.5.5.jar", "apacheds-schema-extras-1.5.5.jar",
- "apacheds-schema-registries-1.5.5.jar", "apacheds-server-jndi-1.5.5.jar", "apacheds-server-xml-1.5.5.jar",
- "apacheds-utils-1.5.5.jar", "apacheds-xbean-spring-1.5.5.jar", "apacheds-xdbm-base-1.5.5.jar",
- "apacheds-xdbm-search-1.5.5.jar", "apacheds-xdbm-tools-1.5.5.jar", "bcprov-jdk15-140.jar",
- "commons-cli-1.2.jar", "commons-collections-3.2.1.jar", "commons-daemon-1.0.1.jar", "commons-io-1.4.jar",
- "commons-lang-2.4.jar", "daemon-bootstrappers-1.1.6.jar", "jcl-over-slf4j-1.5.6.jar", "log4j-1.2.14.jar",
- "mina-core-2.0.0-M6.jar", "shared-asn1-0.9.15.jar", "shared-asn1-codec-0.9.15.jar",
- "shared-cursor-0.9.15.jar", "shared-ldap-0.9.15.jar", "shared-ldap-constants-0.9.15.jar",
- "slf4j-api-1.5.6.jar", "slf4j-log4j12-1.5.6.jar", "spring-beans-2.5.6.SEC01.jar",
- "spring-context-2.5.6.SEC01.jar", "spring-core-2.5.6.SEC01.jar", "xbean-spring-3.5.jar" };
+ { "antlr-2.7.7.jar", "apacheds-bootstrap-extract-1.5.5.jar", "apacheds-bootstrap-partition-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-1.5.5.jar", "apacheds-core-avl-1.5.5.jar", "apacheds-core-constants-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-entry-1.5.5.jar", "apacheds-core-jndi-1.5.5.jar", "apacheds-core-shared-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-interceptor-kerberos-1.5.5.jar", "apacheds-jdbm-1.5.5.jar", "apacheds-jdbm-store-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-kerberos-shared-1.5.5.jar", "apacheds-launcher-1.5.0.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-changepw-1.5.5.jar", "apacheds-protocol-dns-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-kerberos-1.5.5.jar", "apacheds-protocol-ldap-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-ntp-1.5.5.jar", "apacheds-protocol-shared-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-schema-bootstrap-1.5.5.jar", "apacheds-schema-extras-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-schema-registries-1.5.5.jar", "apacheds-server-jndi-1.5.5.jar", "apacheds-server-xml-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-utils-1.5.5.jar", "apacheds-xbean-spring-1.5.5.jar", "apacheds-xdbm-base-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-xdbm-search-1.5.5.jar", "apacheds-xdbm-tools-1.5.5.jar", "bcprov-jdk15-140.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "commons-cli-1.2.jar", "commons-collections-3.2.1.jar", "commons-daemon-1.0.1.jar", "commons-io-1.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "commons-lang-2.4.jar", "daemon-bootstrappers-1.1.6.jar", "jcl-over-slf4j-1.5.6.jar", "log4j-1.2.14.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "mina-core-2.0.0-M6.jar", "shared-asn1-0.9.15.jar", "shared-asn1-codec-0.9.15.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-cursor-0.9.15.jar", "shared-ldap-0.9.15.jar", "shared-ldap-constants-0.9.15.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "slf4j-api-1.5.6.jar", "slf4j-log4j12-1.5.6.jar", "spring-beans-2.5.6.SEC01.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "spring-context-2.5.6.SEC01.jar", "spring-core-2.5.6.SEC01.jar", "xbean-spring-3.5.jar" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
/**
@@ -103,11 +103,11 @@
File serverFolder = LdapServersManager.getServerFolder( server ).toFile();
File confFolder = new File( serverFolder, CONF );
confFolder.mkdir();
- File ldifFolder = new File( serverFolder, "ldif" );
+ File ldifFolder = new File( serverFolder, "ldif" ); //$NON-NLS-1$
ldifFolder.mkdir();
- File logFolder = new File( serverFolder, "log" );
+ File logFolder = new File( serverFolder, "log" ); //$NON-NLS-1$
logFolder.mkdir();
- File partitionFolder = new File( serverFolder, "partitions" );
+ File partitionFolder = new File( serverFolder, "partitions" ); //$NON-NLS-1$
partitionFolder.mkdir();
// Copying configuration files
@@ -119,7 +119,7 @@
LOG4J_PROPERTIES ) );
// Creating an empty log file
- new File( logFolder, "apacheds.log" ).createNewFile();
+ new File( logFolder, "apacheds.log" ).createNewFile(); //$NON-NLS-1$
}
diff --git a/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/CreateConnectionAction.java b/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/CreateConnectionAction.java
index e435c13..2baebf2 100644
--- a/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/CreateConnectionAction.java
+++ b/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/CreateConnectionAction.java
@@ -23,6 +23,7 @@
import org.apache.directory.studio.apacheds.configuration.model.v155.ServerConfigurationV155;
import org.apache.directory.studio.connection.core.Connection;
+import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
import org.apache.directory.studio.connection.core.ConnectionParameter;
import org.apache.directory.studio.connection.core.ConnectionParameter.AuthenticationMethod;
import org.apache.directory.studio.connection.core.ConnectionParameter.EncryptionMethod;
@@ -46,7 +47,7 @@
*/
public class CreateConnectionAction implements IObjectActionDelegate
{
- private static final String EXTENSION_ID = "org.apache.directory.server.1.5.5";
+ private static final String EXTENSION_ID = "org.apache.directory.server.1.5.5"; //$NON-NLS-1$
/** The {@link ServersView} */
private ServersView view;
@@ -67,11 +68,10 @@
LdapServer server = ( LdapServer ) selection.getFirstElement();
// Checking that the server is really an ApacheDS 1.5.5 server
- // TODO
if ( !EXTENSION_ID.equalsIgnoreCase( server.getLdapServerAdapterExtension().getId() ) )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.NotA155Server" ); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -87,7 +87,7 @@
catch ( Exception e )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.FollowingErrorOccurred" ) + e.getMessage(); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -117,7 +117,6 @@
new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
}
}
@@ -138,7 +137,6 @@
null, message, MessageDialog.ERROR, new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
@@ -176,9 +174,9 @@
// Name
connectionParameter.setName( server.getName() );
-
+
// Network Provider
- connectionParameter.setNetworkProvider( NetworkProvider.JNDI );
+ connectionParameter.setNetworkProvider( ConnectionCorePlugin.getDefault().getDefaultNetworkProvider() );
// Creating the connection
CreateConnectionActionHelper.createLdapBrowserConnection( server, new Connection( connectionParameter ) );
diff --git a/plugins/ldapservers.apacheds.v156/plugin.xml b/plugins/ldapservers.apacheds.v156/plugin.xml
index 548f759..d0159a9 100644
--- a/plugins/ldapservers.apacheds.v156/plugin.xml
+++ b/plugins/ldapservers.apacheds.v156/plugin.xml
@@ -43,10 +43,16 @@
icon="resources/icons/connection_new.gif">
</action>
<visibility>
+ <and>
+ <objectState
+ name="isLdapPerspectiveAvailable"
+ value="true">
+ </objectState>
<objectState
name="extensionId"
value="%LdapServerAdapter_id">
</objectState>
+ </and>
</visibility>
</objectContribution>
</extension>
diff --git a/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/ApacheDS156LdapServerAdapter.java b/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/ApacheDS156LdapServerAdapter.java
index ebe34a9..786b6d4 100644
--- a/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/ApacheDS156LdapServerAdapter.java
+++ b/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/ApacheDS156LdapServerAdapter.java
@@ -58,37 +58,37 @@
public class ApacheDS156LdapServerAdapter implements LdapServerAdapter
{
// Various strings constants used in paths
- private static final String SERVER_XML = "server.xml";
- private static final String LOG4J_PROPERTIES = "log4j.properties";
- private static final String RESOURCES = "resources";
- private static final String LIBS = "libs";
- private static final String CONF = "conf";
+ private static final String SERVER_XML = "server.xml"; //$NON-NLS-1$
+ private static final String LOG4J_PROPERTIES = "log4j.properties"; //$NON-NLS-1$
+ private static final String RESOURCES = "resources"; //$NON-NLS-1$
+ private static final String LIBS = "libs"; //$NON-NLS-1$
+ private static final String CONF = "conf"; //$NON-NLS-1$
/** The array of libraries names */
private static final String[] libraries = new String[]
- { "antlr-2.7.7.jar", "apacheds-avl-partition-1.5.6.jar", "apacheds-core-1.5.6.jar",
- "apacheds-core-annotations-1.5.6.jar", "apacheds-core-api-1.5.6.jar", "apacheds-core-avl-1.5.6.jar",
- "apacheds-core-constants-1.5.6.jar", "apacheds-core-entry-1.5.6.jar", "apacheds-core-jndi-1.5.6.jar",
- "apacheds-core-mock-1.5.6.jar", "apacheds-http-integration-1.5.6.jar", "apacheds-i18n-1.5.6.jar",
- "apacheds-interceptor-kerberos-1.5.6.jar", "apacheds-jdbm-1.5.6.jar", "apacheds-jdbm-partition-1.5.6.jar",
- "apacheds-jdbm-store-1.5.6.jar", "apacheds-kerberos-shared-1.5.6.jar", "apacheds-launcher-1.5.0.jar",
- "apacheds-ldif-partition-1.5.6.jar", "apacheds-protocol-changepw-1.5.6.jar",
- "apacheds-protocol-dns-1.5.6.jar", "apacheds-protocol-kerberos-1.5.6.jar",
- "apacheds-protocol-ldap-1.5.6.jar", "apacheds-protocol-ntp-1.5.6.jar",
- "apacheds-protocol-shared-1.5.6.jar", "apacheds-server-jndi-1.5.6.jar", "apacheds-server-xml-1.5.6.jar",
- "apacheds-utils-1.5.6.jar", "apacheds-xbean-spring-1.5.6.jar", "apacheds-xdbm-base-1.5.6.jar",
- "apacheds-xdbm-search-1.5.6.jar", "apacheds-xdbm-tools-1.5.6.jar", "bcprov-jdk15-140.jar",
- "commons-cli-1.2.jar", "commons-collections-3.2.1.jar", "commons-daemon-1.0.1.jar", "commons-io-1.4.jar",
- "commons-lang-2.5.jar", "daemon-bootstrappers-1.1.7.jar", "dom4j-1.6.1.jar", "jcl-over-slf4j-1.5.10.jar",
- "jetty-6.1.14.jar", "jetty-util-6.1.14.jar", "junit-4.7.jar", "log4j-1.2.14.jar",
- "mina-core-2.0.0-RC1.jar", "servlet-api-2.5-6.1.14.jar", "shared-asn1-0.9.18.jar",
- "shared-asn1-codec-0.9.18.jar", "shared-cursor-0.9.18.jar", "shared-dsml-parser-0.9.18.jar",
- "shared-i18n-0.9.18.jar", "shared-ldap-0.9.18.jar", "shared-ldap-constants-0.9.18.jar",
- "shared-ldap-converter-0.9.18.jar", "shared-ldap-jndi-0.9.18.jar", "shared-ldap-schema-0.9.18.jar",
- "shared-ldap-schema-dao-0.9.18.jar", "shared-ldap-schema-loader-0.9.18.jar",
- "shared-ldap-schema-manager-0.9.18.jar", "shared-ldif-0.9.18.jar", "slf4j-api-1.5.10.jar",
- "slf4j-log4j12-1.5.10.jar", "spring-beans-2.5.6.SEC01.jar", "spring-context-2.5.6.SEC01.jar",
- "spring-core-2.5.6.SEC01.jar", "xbean-spring-3.5.jar", "xercesImpl-2.9.1.jar", "xpp3-1.1.4c.jar" };
+ { "antlr-2.7.7.jar", "apacheds-avl-partition-1.5.6.jar", "apacheds-core-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-annotations-1.5.6.jar", "apacheds-core-api-1.5.6.jar", "apacheds-core-avl-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-constants-1.5.6.jar", "apacheds-core-entry-1.5.6.jar", "apacheds-core-jndi-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-mock-1.5.6.jar", "apacheds-http-integration-1.5.6.jar", "apacheds-i18n-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-interceptor-kerberos-1.5.6.jar", "apacheds-jdbm-1.5.6.jar", "apacheds-jdbm-partition-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-jdbm-store-1.5.6.jar", "apacheds-kerberos-shared-1.5.6.jar", "apacheds-launcher-1.5.0.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-ldif-partition-1.5.6.jar", "apacheds-protocol-changepw-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-dns-1.5.6.jar", "apacheds-protocol-kerberos-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-ldap-1.5.6.jar", "apacheds-protocol-ntp-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-shared-1.5.6.jar", "apacheds-server-jndi-1.5.6.jar", "apacheds-server-xml-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-utils-1.5.6.jar", "apacheds-xbean-spring-1.5.6.jar", "apacheds-xdbm-base-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-xdbm-search-1.5.6.jar", "apacheds-xdbm-tools-1.5.6.jar", "bcprov-jdk15-140.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "commons-cli-1.2.jar", "commons-collections-3.2.1.jar", "commons-daemon-1.0.1.jar", "commons-io-1.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "commons-lang-2.5.jar", "daemon-bootstrappers-1.1.7.jar", "dom4j-1.6.1.jar", "jcl-over-slf4j-1.5.10.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "jetty-6.1.14.jar", "jetty-util-6.1.14.jar", "junit-4.7.jar", "log4j-1.2.14.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "mina-core-2.0.0-RC1.jar", "servlet-api-2.5-6.1.14.jar", "shared-asn1-0.9.18.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-asn1-codec-0.9.18.jar", "shared-cursor-0.9.18.jar", "shared-dsml-parser-0.9.18.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-i18n-0.9.18.jar", "shared-ldap-0.9.18.jar", "shared-ldap-constants-0.9.18.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-ldap-converter-0.9.18.jar", "shared-ldap-jndi-0.9.18.jar", "shared-ldap-schema-0.9.18.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-ldap-schema-dao-0.9.18.jar", "shared-ldap-schema-loader-0.9.18.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "shared-ldap-schema-manager-0.9.18.jar", "shared-ldif-0.9.18.jar", "slf4j-api-1.5.10.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "slf4j-log4j12-1.5.10.jar", "spring-beans-2.5.6.SEC01.jar", "spring-context-2.5.6.SEC01.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "spring-core-2.5.6.SEC01.jar", "xbean-spring-3.5.jar", "xercesImpl-2.9.1.jar", "xpp3-1.1.4c.jar" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
/**
@@ -109,11 +109,11 @@
File serverFolder = LdapServersManager.getServerFolder( server ).toFile();
File confFolder = new File( serverFolder, CONF );
confFolder.mkdir();
- File ldifFolder = new File( serverFolder, "ldif" );
+ File ldifFolder = new File( serverFolder, "ldif" ); //$NON-NLS-1$
ldifFolder.mkdir();
- File logFolder = new File( serverFolder, "log" );
+ File logFolder = new File( serverFolder, "log" ); //$NON-NLS-1$
logFolder.mkdir();
- File partitionFolder = new File( serverFolder, "partitions" );
+ File partitionFolder = new File( serverFolder, "partitions" ); //$NON-NLS-1$
partitionFolder.mkdir();
// Copying configuration files
@@ -125,7 +125,7 @@
LOG4J_PROPERTIES ) );
// Creating an empty log file
- new File( logFolder, "apacheds.log" ).createNewFile();
+ new File( logFolder, "apacheds.log" ).createNewFile(); //$NON-NLS-1$
}
diff --git a/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/CreateConnectionAction.java b/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/CreateConnectionAction.java
index c2c7cad..27e3565 100644
--- a/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/CreateConnectionAction.java
+++ b/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/CreateConnectionAction.java
@@ -23,6 +23,7 @@
import org.apache.directory.studio.apacheds.configuration.model.v156.ServerConfigurationV156;
import org.apache.directory.studio.connection.core.Connection;
+import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
import org.apache.directory.studio.connection.core.ConnectionParameter;
import org.apache.directory.studio.connection.core.ConnectionParameter.AuthenticationMethod;
import org.apache.directory.studio.connection.core.ConnectionParameter.EncryptionMethod;
@@ -46,7 +47,7 @@
*/
public class CreateConnectionAction implements IObjectActionDelegate
{
- private static final String EXTENSION_ID = "org.apache.directory.server.1.5.6";
+ private static final String EXTENSION_ID = "org.apache.directory.server.1.5.6"; //$NON-NLS-1$
/** The {@link ServersView} */
private ServersView view;
@@ -67,11 +68,10 @@
LdapServer server = ( LdapServer ) selection.getFirstElement();
// Checking that the server is really an ApacheDS 1.5.6 server
- // TODO
if ( !EXTENSION_ID.equalsIgnoreCase( server.getLdapServerAdapterExtension().getId() ) )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.NotA156Server" ); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -87,7 +87,7 @@
catch ( Exception e )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.FollowingErrorOccurred" ) + e.getMessage(); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -117,7 +117,6 @@
new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
}
}
@@ -138,7 +137,6 @@
null, message, MessageDialog.ERROR, new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
@@ -176,9 +174,9 @@
// Name
connectionParameter.setName( server.getName() );
-
+
// Network Provider
- connectionParameter.setNetworkProvider( NetworkProvider.JNDI );
+ connectionParameter.setNetworkProvider( ConnectionCorePlugin.getDefault().getDefaultNetworkProvider() );
// Creating the connection
CreateConnectionActionHelper.createLdapBrowserConnection( server, new Connection( connectionParameter ) );
diff --git a/plugins/ldapservers.apacheds.v157/plugin.xml b/plugins/ldapservers.apacheds.v157/plugin.xml
index 1ddf86f..971e771 100644
--- a/plugins/ldapservers.apacheds.v157/plugin.xml
+++ b/plugins/ldapservers.apacheds.v157/plugin.xml
@@ -43,10 +43,16 @@
icon="resources/icons/connection_new.gif">
</action>
<visibility>
+ <and>
+ <objectState
+ name="isLdapPerspectiveAvailable"
+ value="true">
+ </objectState>
<objectState
name="extensionId"
value="%LdapServerAdapter_id">
</objectState>
+ </and>
</visibility>
</objectContribution>
</extension>
diff --git a/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/ApacheDS157LdapServerAdapter.java b/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/ApacheDS157LdapServerAdapter.java
index 349ce95..1152189 100644
--- a/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/ApacheDS157LdapServerAdapter.java
+++ b/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/ApacheDS157LdapServerAdapter.java
@@ -58,37 +58,37 @@
public class ApacheDS157LdapServerAdapter implements LdapServerAdapter
{
// Various strings constants used in paths
- private static final String SERVER_XML = "server.xml";
- private static final String LOG4J_PROPERTIES = "log4j.properties";
- private static final String RESOURCES = "resources";
- private static final String LIBS = "libs";
- private static final String CONF = "conf";
+ private static final String SERVER_XML = "server.xml"; //$NON-NLS-1$
+ private static final String LOG4J_PROPERTIES = "log4j.properties"; //$NON-NLS-1$
+ private static final String RESOURCES = "resources"; //$NON-NLS-1$
+ private static final String LIBS = "libs"; //$NON-NLS-1$
+ private static final String CONF = "conf"; //$NON-NLS-1$
/** The array of libraries names */
private static final String[] libraries = new String[]
- { "antlr-2.7.7.jar", "apacheds-avl-partition-1.5.7.jar", "apacheds-core-1.5.7.jar",
- "apacheds-core-annotations-1.5.7.jar", "apacheds-core-api-1.5.7.jar", "apacheds-core-avl-1.5.7.jar",
- "apacheds-core-constants-1.5.7.jar", "apacheds-core-entry-1.5.7.jar", "apacheds-core-jndi-1.5.7.jar",
- "apacheds-core-mock-1.5.7.jar", "apacheds-http-integration-1.5.7.jar", "apacheds-i18n-1.5.7.jar",
- "apacheds-interceptor-kerberos-1.5.7.jar", "apacheds-jdbm-1.5.7.jar", "apacheds-jdbm-partition-1.5.7.jar",
- "apacheds-jdbm-store-1.5.7.jar", "apacheds-kerberos-shared-1.5.7.jar", "apacheds-launcher-1.5.0.jar",
- "apacheds-ldif-partition-1.5.7.jar", "apacheds-protocol-changepw-1.5.7.jar",
- "apacheds-protocol-dns-1.5.7.jar", "apacheds-protocol-kerberos-1.5.7.jar",
- "apacheds-protocol-ldap-1.5.7.jar", "apacheds-protocol-ntp-1.5.7.jar",
- "apacheds-protocol-shared-1.5.7.jar", "apacheds-server-jndi-1.5.7.jar", "apacheds-server-xml-1.5.7.jar",
- "apacheds-utils-1.5.7.jar", "apacheds-xbean-spring-1.5.7.jar", "apacheds-xdbm-base-1.5.7.jar",
- "apacheds-xdbm-search-1.5.7.jar", "apacheds-xdbm-tools-1.5.7.jar", "bcprov-jdk15-140.jar",
- "commons-cli-1.2.jar", "commons-collections-3.2.1.jar", "commons-daemon-1.0.1.jar", "commons-io-1.4.jar",
- "commons-lang-2.5.jar", "daemon-bootstrappers-1.1.8.jar", "dom4j-1.6.1.jar", "jcl-over-slf4j-1.5.10.jar",
- "jetty-6.1.14.jar", "jetty-util-6.1.14.jar", "junit-4.7.jar", "log4j-1.2.14.jar",
- "mina-core-2.0.0-RC1.jar", "servlet-api-2.5-6.1.14.jar", "shared-asn1-0.9.19.jar",
- "shared-asn1-codec-0.9.19.jar", "shared-cursor-0.9.19.jar", "shared-dsml-parser-0.9.19.jar",
- "shared-i18n-0.9.19.jar", "shared-ldap-0.9.19.jar", "shared-ldap-constants-0.9.19.jar",
- "shared-ldap-converter-0.9.19.jar", "shared-ldap-jndi-0.9.19.jar", "shared-ldap-schema-0.9.19.jar",
- "shared-ldap-schema-dao-0.9.19.jar", "shared-ldap-schema-loader-0.9.19.jar",
- "shared-ldap-schema-manager-0.9.19.jar", "shared-ldif-0.9.19.jar", "slf4j-api-1.5.10.jar",
- "slf4j-log4j12-1.5.10.jar", "spring-beans-2.5.6.SEC01.jar", "spring-context-2.5.6.SEC01.jar",
- "spring-core-2.5.6.SEC01.jar", "xbean-spring-3.5.jar", "xercesImpl-2.9.1.jar", "xpp3-1.1.4c.jar" };
+ { "antlr-2.7.7.jar", "apacheds-avl-partition-1.5.7.jar", "apacheds-core-1.5.7.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-annotations-1.5.7.jar", "apacheds-core-api-1.5.7.jar", "apacheds-core-avl-1.5.7.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-constants-1.5.7.jar", "apacheds-core-entry-1.5.7.jar", "apacheds-core-jndi-1.5.7.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-core-mock-1.5.7.jar", "apacheds-http-integration-1.5.7.jar", "apacheds-i18n-1.5.7.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-interceptor-kerberos-1.5.7.jar", "apacheds-jdbm-1.5.7.jar", "apacheds-jdbm-partition-1.5.7.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-jdbm-store-1.5.7.jar", "apacheds-kerberos-shared-1.5.7.jar", "apacheds-launcher-1.5.0.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-ldif-partition-1.5.7.jar", "apacheds-protocol-changepw-1.5.7.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-dns-1.5.7.jar", "apacheds-protocol-kerberos-1.5.7.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-ldap-1.5.7.jar", "apacheds-protocol-ntp-1.5.7.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "apacheds-protocol-shared-1.5.7.jar", "apacheds-server-jndi-1.5.7.jar", "apacheds-server-xml-1.5.7.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-utils-1.5.7.jar", "apacheds-xbean-spring-1.5.7.jar", "apacheds-xdbm-base-1.5.7.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "apacheds-xdbm-search-1.5.7.jar", "apacheds-xdbm-tools-1.5.7.jar", "bcprov-jdk15-140.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "commons-cli-1.2.jar", "commons-collections-3.2.1.jar", "commons-daemon-1.0.1.jar", "commons-io-1.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "commons-lang-2.5.jar", "daemon-bootstrappers-1.1.8.jar", "dom4j-1.6.1.jar", "jcl-over-slf4j-1.5.10.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "jetty-6.1.14.jar", "jetty-util-6.1.14.jar", "junit-4.7.jar", "log4j-1.2.14.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "mina-core-2.0.0-RC1.jar", "servlet-api-2.5-6.1.14.jar", "shared-asn1-0.9.19.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-asn1-codec-0.9.19.jar", "shared-cursor-0.9.19.jar", "shared-dsml-parser-0.9.19.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-i18n-0.9.19.jar", "shared-ldap-0.9.19.jar", "shared-ldap-constants-0.9.19.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-ldap-converter-0.9.19.jar", "shared-ldap-jndi-0.9.19.jar", "shared-ldap-schema-0.9.19.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "shared-ldap-schema-dao-0.9.19.jar", "shared-ldap-schema-loader-0.9.19.jar", //$NON-NLS-1$ //$NON-NLS-2$
+ "shared-ldap-schema-manager-0.9.19.jar", "shared-ldif-0.9.19.jar", "slf4j-api-1.5.10.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "slf4j-log4j12-1.5.10.jar", "spring-beans-2.5.6.SEC01.jar", "spring-context-2.5.6.SEC01.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "spring-core-2.5.6.SEC01.jar", "xbean-spring-3.5.jar", "xercesImpl-2.9.1.jar", "xpp3-1.1.4c.jar" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
/**
@@ -109,11 +109,11 @@
File serverFolder = LdapServersManager.getServerFolder( server ).toFile();
File confFolder = new File( serverFolder, CONF );
confFolder.mkdir();
- File ldifFolder = new File( serverFolder, "ldif" );
+ File ldifFolder = new File( serverFolder, "ldif" ); //$NON-NLS-1$
ldifFolder.mkdir();
- File logFolder = new File( serverFolder, "log" );
+ File logFolder = new File( serverFolder, "log" ); //$NON-NLS-1$
logFolder.mkdir();
- File partitionFolder = new File( serverFolder, "partitions" );
+ File partitionFolder = new File( serverFolder, "partitions" ); //$NON-NLS-1$
partitionFolder.mkdir();
// Copying configuration files
@@ -125,7 +125,7 @@
LOG4J_PROPERTIES ) );
// Creating an empty log file
- new File( logFolder, "apacheds.log" ).createNewFile();
+ new File( logFolder, "apacheds.log" ).createNewFile(); //$NON-NLS-1$
}
diff --git a/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/CreateConnectionAction.java b/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/CreateConnectionAction.java
index ecb6545..18a769c 100644
--- a/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/CreateConnectionAction.java
+++ b/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/CreateConnectionAction.java
@@ -23,10 +23,10 @@
import org.apache.directory.studio.apacheds.configuration.model.v157.ServerConfigurationV157;
import org.apache.directory.studio.connection.core.Connection;
+import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
import org.apache.directory.studio.connection.core.ConnectionParameter;
import org.apache.directory.studio.connection.core.ConnectionParameter.AuthenticationMethod;
import org.apache.directory.studio.connection.core.ConnectionParameter.EncryptionMethod;
-import org.apache.directory.studio.connection.core.ConnectionParameter.NetworkProvider;
import org.apache.directory.studio.ldapservers.actions.CreateConnectionActionHelper;
import org.apache.directory.studio.ldapservers.model.LdapServer;
import org.apache.directory.studio.ldapservers.views.ServersView;
@@ -46,7 +46,7 @@
*/
public class CreateConnectionAction implements IObjectActionDelegate
{
- private static final String EXTENSION_ID = "org.apache.directory.server.1.5.7";
+ private static final String EXTENSION_ID = "org.apache.directory.server.1.5.7"; //$NON-NLS-1$
/** The {@link ServersView} */
private ServersView view;
@@ -67,11 +67,10 @@
LdapServer server = ( LdapServer ) selection.getFirstElement();
// Checking that the server is really an ApacheDS 1.5.7 server
- // TODO
if ( !EXTENSION_ID.equalsIgnoreCase( server.getLdapServerAdapterExtension().getId() ) )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.NotA157Server" ); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -87,7 +86,7 @@
catch ( Exception e )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.FollowingErrorOccurred" ) + e.getMessage(); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -117,7 +116,6 @@
new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
}
}
@@ -138,7 +136,6 @@
null, message, MessageDialog.ERROR, new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
@@ -176,9 +173,9 @@
// Name
connectionParameter.setName( server.getName() );
-
+
// Network Provider
- connectionParameter.setNetworkProvider( NetworkProvider.JNDI );
+ connectionParameter.setNetworkProvider( ConnectionCorePlugin.getDefault().getDefaultNetworkProvider() );
// Creating the connection
CreateConnectionActionHelper.createLdapBrowserConnection( server, new Connection( connectionParameter ) );
diff --git a/plugins/ldapservers.apacheds.v200/plugin.xml b/plugins/ldapservers.apacheds.v200/plugin.xml
index 44513a0..dccfb3b 100644
--- a/plugins/ldapservers.apacheds.v200/plugin.xml
+++ b/plugins/ldapservers.apacheds.v200/plugin.xml
@@ -43,10 +43,16 @@
icon="resources/icons/connection_new.gif">
</action>
<visibility>
+ <and>
+ <objectState
+ name="isLdapPerspectiveAvailable"
+ value="true">
+ </objectState>
<objectState
name="extensionId"
value="%LdapServerAdapter_id">
</objectState>
+ </and>
</visibility>
</objectContribution>
</extension>
diff --git a/plugins/ldapservers.apacheds.v200/pom.xml b/plugins/ldapservers.apacheds.v200/pom.xml
index f24e6d2..1b0539c 100644
--- a/plugins/ldapservers.apacheds.v200/pom.xml
+++ b/plugins/ldapservers.apacheds.v200/pom.xml
@@ -172,7 +172,7 @@
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-service</artifactId>
- <version>2.0.0-M3</version>
+ <version>2.0.0-M7-SNAPSHOT</version>
</artifactItem>
</artifactItems>
</configuration>
diff --git a/plugins/ldapservers.apacheds.v200/resources/conf/config.ldif b/plugins/ldapservers.apacheds.v200/resources/conf/config.ldif
index 187f029..de833e1 100644
--- a/plugins/ldapservers.apacheds.v200/resources/conf/config.ldif
+++ b/plugins/ldapservers.apacheds.v200/resources/conf/config.ldif
@@ -202,7 +202,7 @@
objectclass: ads-base
objectclass: ads-interceptor
ads-enabled: FALSE
-ads-interceptororder: 8
+ads-interceptororder: 7
ads-interceptorclassname: org.apache.directory.server.core.kerberos.KeyDerivationInterceptor
ads-interceptorid: keyDerivationInterceptor
@@ -219,7 +219,7 @@
objectclass: top
objectclass: ads-base
objectclass: ads-interceptor
-ads-interceptororder: 7
+ads-interceptororder: 10
ads-interceptorclassname: org.apache.directory.server.core.operational.OperationalAttributeInterceptor
ads-interceptorid: operationalAttributeInterceptor
ads-enabled: TRUE
@@ -229,7 +229,7 @@
objectclass: ads-base
objectclass: ads-interceptor
ads-enabled: TRUE
-ads-interceptororder: 9
+ads-interceptororder: 8
ads-interceptorclassname: org.apache.directory.server.core.hash.SshaPasswordHashingInterceptor
ads-interceptorid: passwordHashingInterceptor
@@ -246,7 +246,7 @@
objectclass: top
objectclass: ads-base
objectclass: ads-interceptor
-ads-interceptororder: 10
+ads-interceptororder: 9
ads-interceptorclassname: org.apache.directory.server.core.schema.SchemaInterceptor
ads-interceptorid: schemaInterceptor
ads-enabled: TRUE
diff --git a/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java b/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java
index 6cadfe9..19b5291 100644
--- a/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java
+++ b/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java
@@ -74,15 +74,15 @@
public class ApacheDS200LdapServerAdapter implements LdapServerAdapter
{
// Various strings constants used in paths
- private static final String CONFIG_LDIF = "config.ldif";
- private static final String LOG4J_PROPERTIES = "log4j.properties";
- private static final String RESOURCES = "resources";
- private static final String LIBS = "libs";
- private static final String CONF = "conf";
+ private static final String CONFIG_LDIF = "config.ldif"; //$NON-NLS-1$
+ private static final String LOG4J_PROPERTIES = "log4j.properties"; //$NON-NLS-1$
+ private static final String RESOURCES = "resources"; //$NON-NLS-1$
+ private static final String LIBS = "libs"; //$NON-NLS-1$
+ private static final String CONF = "conf"; //$NON-NLS-1$
/** The array of libraries names */
private static final String[] libraries = new String[]
- { "apacheds-service-2.0.0-M3.jar" };
+ { "apacheds-service-2.0.0-M6.jar" }; //$NON-NLS-1$
/**
@@ -103,11 +103,11 @@
File serverFolder = LdapServersManager.getServerFolder( server ).toFile();
File confFolder = new File( serverFolder, CONF );
confFolder.mkdir();
- File ldifFolder = new File( serverFolder, "ldif" );
+ File ldifFolder = new File( serverFolder, "ldif" ); //$NON-NLS-1$
ldifFolder.mkdir();
- File logFolder = new File( serverFolder, "log" );
+ File logFolder = new File( serverFolder, "log" ); //$NON-NLS-1$
logFolder.mkdir();
- File partitionFolder = new File( serverFolder, "partitions" );
+ File partitionFolder = new File( serverFolder, "partitions" ); //$NON-NLS-1$
partitionFolder.mkdir();
// Copying configuration files
@@ -119,7 +119,7 @@
LOG4J_PROPERTIES ) );
// Creating an empty log file
- new File( logFolder, "apacheds.log" ).createNewFile();
+ new File( logFolder, "apacheds.log" ).createNewFile(); //$NON-NLS-1$
}
@@ -251,7 +251,7 @@
"org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesFactory" ); //$NON-NLS-1$
vmArguments.append( " " ); //$NON-NLS-1$
vmArguments
- .append( "-Dextra.controls=org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyFactory," + //$NON-NLS-1$
+ .append( "-Dextra.controls=org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory," + //$NON-NLS-1$
"org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory," + //$NON-NLS-1$
"org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory," + //$NON-NLS-1$
"org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory," + //$NON-NLS-1$
@@ -432,7 +432,7 @@
*/
private static TransportBean getLdapServerTransportBean( ConfigBean configuration )
{
- return getLdapServerTransportBean( configuration, "ldap" );
+ return getLdapServerTransportBean( configuration, "ldap" ); //$NON-NLS-1$
}
@@ -444,7 +444,7 @@
*/
private static TransportBean getLdapsServerTransportBean( ConfigBean configuration )
{
- return getLdapServerTransportBean( configuration, "ldaps" );
+ return getLdapServerTransportBean( configuration, "ldaps" ); //$NON-NLS-1$
}
@@ -645,8 +645,8 @@
{
for ( TransportBean kdcServerTransportBean : kdcServerTransportBeans )
{
- if ( ( "tcp".equals( kdcServerTransportBean.getTransportId() ) )
- || ( "udp".equals( kdcServerTransportBean.getTransportId() ) ) )
+ if ( ( "tcp".equals( kdcServerTransportBean.getTransportId() ) ) //$NON-NLS-1$
+ || ( "udp".equals( kdcServerTransportBean.getTransportId() ) ) ) //$NON-NLS-1$
{
return kdcServerTransportBean.getSystemPort();
}
@@ -682,8 +682,8 @@
{
for ( TransportBean dnsServerTransportBean : dnsServerTransportBeans )
{
- if ( ( "tcp".equals( dnsServerTransportBean.getTransportId() ) )
- || ( "udp".equals( dnsServerTransportBean.getTransportId() ) ) )
+ if ( ( "tcp".equals( dnsServerTransportBean.getTransportId() ) ) //$NON-NLS-1$
+ || ( "udp".equals( dnsServerTransportBean.getTransportId() ) ) ) //$NON-NLS-1$
{
return dnsServerTransportBean.getSystemPort();
}
@@ -719,8 +719,8 @@
{
for ( TransportBean ntpServerTransportBean : ntpServerTransportBeans )
{
- if ( ( "tcp".equals( ntpServerTransportBean.getTransportId() ) )
- || ( "udp".equals( ntpServerTransportBean.getTransportId() ) ) )
+ if ( ( "tcp".equals( ntpServerTransportBean.getTransportId() ) ) //$NON-NLS-1$
+ || ( "udp".equals( ntpServerTransportBean.getTransportId() ) ) ) //$NON-NLS-1$
{
return ntpServerTransportBean.getSystemPort();
}
@@ -756,8 +756,8 @@
{
for ( TransportBean changePasswordServerTransportBean : changePasswordServerTransportBeans )
{
- if ( ( "tcp".equals( changePasswordServerTransportBean.getTransportId() ) )
- || ( "udp".equals( changePasswordServerTransportBean.getTransportId() ) ) )
+ if ( ( "tcp".equals( changePasswordServerTransportBean.getTransportId() ) ) //$NON-NLS-1$
+ || ( "udp".equals( changePasswordServerTransportBean.getTransportId() ) ) ) //$NON-NLS-1$
{
return changePasswordServerTransportBean.getSystemPort();
}
diff --git a/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/CreateConnectionAction.java b/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/CreateConnectionAction.java
index 3524fb8..5ab3efe 100644
--- a/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/CreateConnectionAction.java
+++ b/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/CreateConnectionAction.java
@@ -23,6 +23,7 @@
import org.apache.directory.server.config.beans.ConfigBean;
import org.apache.directory.studio.connection.core.Connection;
+import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
import org.apache.directory.studio.connection.core.ConnectionParameter;
import org.apache.directory.studio.connection.core.ConnectionParameter.AuthenticationMethod;
import org.apache.directory.studio.connection.core.ConnectionParameter.EncryptionMethod;
@@ -46,7 +47,7 @@
*/
public class CreateConnectionAction implements IObjectActionDelegate
{
- private static final String EXTENSION_ID = "org.apache.directory.server.2.0.0";
+ private static final String EXTENSION_ID = "org.apache.directory.server.2.0.0"; //$NON-NLS-1$
/** The {@link ServersView} */
private ServersView view;
@@ -67,11 +68,10 @@
LdapServer server = ( LdapServer ) selection.getFirstElement();
// Checking that the server is really an ApacheDS 2.0.0 server
- // TODO
if ( !EXTENSION_ID.equalsIgnoreCase( server.getLdapServerAdapterExtension().getId() ) )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.NotA200Server" ); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -87,7 +87,7 @@
catch ( Exception e )
{
String message = Messages.getString( "CreateConnectionAction.UnableReadServerConfiguration" ) //$NON-NLS-1$
- + "\n\n" // TODO
+ + "\n\n" //$NON-NLS-1$
+ Messages.getString( "CreateConnectionAction.FollowingErrorOccurred" ) + e.getMessage(); //$NON-NLS-1$
reportErrorReadingServerConfiguration( view, message );
@@ -103,7 +103,8 @@
}
// Checking is LDAP and/or LDAPS is/are enabled
- if ( ( ApacheDS200LdapServerAdapter.isEnableLdap( configuration ) ) || ( ApacheDS200LdapServerAdapter.isEnableLdaps( configuration ) ) )
+ if ( ( ApacheDS200LdapServerAdapter.isEnableLdap( configuration ) )
+ || ( ApacheDS200LdapServerAdapter.isEnableLdaps( configuration ) ) )
{
// Creating the connection using the helper class
createConnection( server, configuration );
@@ -117,7 +118,6 @@
new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
}
}
@@ -138,7 +138,6 @@
null, message, MessageDialog.ERROR, new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
@@ -178,14 +177,13 @@
connectionParameter.setName( server.getName() );
// Network Provider
- connectionParameter.setNetworkProvider( NetworkProvider.JNDI );
+ connectionParameter.setNetworkProvider( ConnectionCorePlugin.getDefault().getDefaultNetworkProvider() );
// Creating the connection
CreateConnectionActionHelper.createLdapBrowserConnection( server, new Connection( connectionParameter ) );
}
-
/**
* {@inheritDoc}
*/
diff --git a/plugins/ldapservers/plugin.properties b/plugins/ldapservers/plugin.properties
index a9417d7..b6d2dd6 100644
--- a/plugins/ldapservers/plugin.properties
+++ b/plugins/ldapservers/plugin.properties
@@ -61,4 +61,12 @@
Ctx_ServersView_name=In LDAP Servers View
Ctx_ServersView_description=In LDAP Servers View
+Plugin_ConnectionCore_id=org.apache.directory.studio.connection.core
+Plugin_ConnectionUi_id=org.apache.directory.studio.connection.ui
+Plugin_LdapBrowserCommon_id=org.apache.directory.studio.ldapbrowser.common
+Plugin_LdapBrowserCore_id=org.apache.directory.studio.ldapbrowser.core
+Plugin_LdapBrowserUi_id=org.apache.directory.studio.ldapbrowser.ui
+Plugin_LdifEditor_id=org.apache.directory.studio.ldifeditor
+Plugin_LdifParser_id=org.apache.directory.studio.ldifparser
+
Perspective_LdapBrowserPerspective_id=org.apache.directory.studio.ldapbrowser.ui.perspective.BrowserPerspective
diff --git a/plugins/ldapservers/resources/ldapServerAdapters.exsd b/plugins/ldapservers/resources/ldapServerAdapters.exsd
index abb7f4a..74b1bf6 100644
--- a/plugins/ldapservers/resources/ldapServerAdapters.exsd
+++ b/plugins/ldapservers/resources/ldapServerAdapters.exsd
@@ -1,4 +1,22 @@
<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<!-- Schema file written by PDE -->
<schema targetNamespace="org.apache.directory.studio.ldapservers" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
@@ -107,13 +125,20 @@
<attribute name="configurationPage" type="string">
<annotation>
<documentation>
-
+ The configuration page class
</documentation>
<appInfo>
<meta.attribute kind="java" basedOn=":org.apache.directory.studio.ldapservers.model.LdapServerAdapterConfigurationPage"/>
</appInfo>
</annotation>
</attribute>
+ <attribute name="openConfigurationActionEnabled" type="boolean" use="default" value="true">
+ <annotation>
+ <documentation>
+ The flag to enable the open configuration action
+ </documentation>
+ </annotation>
+ </attribute>
</complexType>
</element>
diff --git a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServerAdapterExtensionsManager.java b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServerAdapterExtensionsManager.java
index 7108d11..aecc6d7 100644
--- a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServerAdapterExtensionsManager.java
+++ b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServerAdapterExtensionsManager.java
@@ -52,6 +52,7 @@
public static final String DESCRIPTION_ATTR = "description"; //$NON-NLS-1$
public static final String ICON_ATTR = "icon"; //$NON-NLS-1$
public static final String CONFIGURATION_PAGE_ATTR = "configurationPage"; //$NON-NLS-1$
+ public static final String OPEN_CONFIGURATION_ACTION_ENABLED_ATTR = "openConfigurationActionEnabled"; //$NON-NLS-1$
/** The default instance */
private static LdapServerAdapterExtensionsManager instance;
@@ -122,6 +123,16 @@
ldapServerAdapterExtension.setIcon( icon );
}
ldapServerAdapterExtension.setConfigurationPageClassName( member.getAttribute( CONFIGURATION_PAGE_ATTR ) );
+ String openConfigurationActionEnabled = member.getAttribute( OPEN_CONFIGURATION_ACTION_ENABLED_ATTR );
+ if ( openConfigurationActionEnabled != null )
+ {
+ ldapServerAdapterExtension.setOpenConfigurationActionEnabled( Boolean.parseBoolean( openConfigurationActionEnabled ) );
+ }
+ else
+ {
+ // Enabled by default
+ ldapServerAdapterExtension.setOpenConfigurationActionEnabled( true );
+ }
ldapServerAdapterExtensionsList.add( ldapServerAdapterExtension );
ldapServerAdapterExtensionsByIdMap.put( ldapServerAdapterExtension.getId(), ldapServerAdapterExtension );
diff --git a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/CreateConnectionActionHelper.java b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/CreateConnectionActionHelper.java
index 8428c33..2952d22 100644
--- a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/CreateConnectionActionHelper.java
+++ b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/CreateConnectionActionHelper.java
@@ -20,16 +20,20 @@
package org.apache.directory.studio.ldapservers.actions;
+import java.util.PropertyResourceBundle;
+
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
import org.apache.directory.studio.ldapservers.LdapServersPlugin;
import org.apache.directory.studio.ldapservers.model.LdapServer;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IPerspectiveDescriptor;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
+import org.osgi.framework.Bundle;
/**
@@ -66,7 +70,6 @@
new String[]
{ IDialogConstants.OK_LABEL }, MessageDialog.OK );
dialog.open();
- // TODO use common methods in Common UI plugin
}
else
{
@@ -80,7 +83,6 @@
Messages.getString( "CreateConnectionActionHelper.ConnectionCalledCreatedSwitch" ), new String[] { connection.getName() } ), //$NON-NLS-1$
MessageDialog.INFORMATION, new String[]
{ IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }, MessageDialog.OK );
- // TODO use common methods in Common UI plugin
if ( dialog.open() == MessageDialog.OK )
{
// Switching to the LDAP perspective
@@ -110,4 +112,103 @@
return null;
}
+
+
+ /**
+ * Indicates if the LDAP Browser plugins are available or not.
+ *
+ * @return
+ * <code>true</code> if the LDAP Browser plugins are available,
+ * <code>false</code> if not.
+ */
+ public static boolean isLdapBrowserPluginsAvailable()
+ {
+ PropertyResourceBundle properties = LdapServersPlugin.getDefault().getPluginProperties();
+
+ // Connection Core Plugin
+ Bundle connectionCoreBundle = Platform.getBundle( properties.getString( "Plugin_ConnectionCore_id" ) ); //$NON-NLS-1$
+ if ( connectionCoreBundle != null )
+ {
+ // Checking the state of the plugin
+ if ( connectionCoreBundle.getState() == Bundle.UNINSTALLED )
+ {
+ return false;
+ }
+
+ // Connection UI Plugin
+ Bundle connectionUiBundle = Platform.getBundle( properties.getString( "Plugin_ConnectionUi_id" ) ); //$NON-NLS-1$
+ if ( connectionUiBundle != null )
+ {
+ // Checking the state of the plugin
+ if ( connectionUiBundle.getState() == Bundle.UNINSTALLED )
+ {
+ return false;
+ }
+
+ // LDAP Browser Common Plugin
+ Bundle ldapBrowserCommonBundle = Platform.getBundle( properties
+ .getString( "Plugin_LdapBrowserCommon_id" ) ); //$NON-NLS-1$
+ if ( ldapBrowserCommonBundle != null )
+ {
+ // Checking the state of the plugin
+ if ( ldapBrowserCommonBundle.getState() == Bundle.UNINSTALLED )
+ {
+ return false;
+ }
+
+ // LDAP Browser Core Plugin
+ Bundle ldapBrowserCoreBundle = Platform.getBundle( properties
+ .getString( "Plugin_LdapBrowserCore_id" ) ); //$NON-NLS-1$
+ if ( ldapBrowserCoreBundle != null )
+ {
+ // Checking the state of the plugin
+ if ( ldapBrowserCoreBundle.getState() == Bundle.UNINSTALLED )
+ {
+ return false;
+ }
+
+ // LDAP Browser UI Plugin
+ Bundle ldapBrowserUiBundle = Platform.getBundle( properties
+ .getString( "Plugin_LdapBrowserUi_id" ) ); //$NON-NLS-1$
+ if ( ldapBrowserUiBundle != null )
+ {
+ // Checking the state of the plugin
+ if ( ldapBrowserUiBundle.getState() == Bundle.UNINSTALLED )
+ {
+ return false;
+ }
+
+ // LDIF Editor Plugin
+ Bundle ldifEditorBundle = Platform
+ .getBundle( properties.getString( "Plugin_LdifEditor_id" ) ); //$NON-NLS-1$
+ if ( ldifEditorBundle != null )
+ {
+ // Checking the state of the plugin
+ if ( ldifEditorBundle.getState() == Bundle.UNINSTALLED )
+ {
+ return false;
+ }
+
+ // LDIF Parser Plugin
+ Bundle ldifParserBundle = Platform.getBundle( properties
+ .getString( "Plugin_LdifParser_id" ) ); //$NON-NLS-1$
+ if ( ldifParserBundle != null )
+ {
+ // Checking the state of the plugin
+ if ( ldifParserBundle.getState() == Bundle.UNINSTALLED )
+ {
+ return false;
+ }
+
+ return true;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ return false;
+ }
}
diff --git a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/NewServerAction.java b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/NewServerAction.java
index a06627e..f630ffb 100644
--- a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/NewServerAction.java
+++ b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/NewServerAction.java
@@ -31,9 +31,6 @@
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.IWorkbenchWindowActionDelegate;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.MessageConsole;
/**
@@ -62,18 +59,6 @@
*/
public void run()
{
-// MessageConsole messageConsole = new MessageConsole( "test", null );
-//
-// ConsolePlugin.getDefault().getConsoleManager().addConsoles( new IConsole[]
-// { messageConsole } );
-//
-// messageConsole.newMessageStream().print( "message" );
-//
-// if ( true )
-// {
-// return;
-// }
-
// Instantiates and initializes the wizard
NewServerWizard wizard = new NewServerWizard();
wizard.init( PlatformUI.getWorkbench(), StructuredSelection.EMPTY );
diff --git a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/RenameAction.java b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/RenameAction.java
index 734ad6f..1f45400 100644
--- a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/RenameAction.java
+++ b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/RenameAction.java
@@ -17,16 +17,6 @@
* under the License.
*
*/
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
package org.apache.directory.studio.ldapservers.actions;
@@ -36,24 +26,12 @@
import org.apache.directory.studio.ldapservers.views.ServersView;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.dialogs.InputDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TreeEditor;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.actions.TextActionHandler;
/**
@@ -65,25 +43,6 @@
{
/** The associated view */
private ServersView view;
- private Tree tree;
- private TreeEditor treeEditor;
- protected Composite textEditorParent;
- protected Text textEditor;
- private TextActionHandler textActionHandler;
- // The server being edited if this is being done inline
- protected LdapServer editedServer;
-
- protected boolean saving = false;
-
-
- /**
- * Creates a new instance of RenameAction.
- */
- public RenameAction()
- {
- super( Messages.getString( "RenameAction.Rename" ) ); //$NON-NLS-1$
- init();
- }
/**
@@ -94,22 +53,11 @@
*/
public RenameAction( ServersView view )
{
- super( Messages.getString( "RenameAction.Rename" ) ); //$NON-NLS-1$
this.view = view;
- this.tree = view.getViewer().getTree();
- this.treeEditor = new TreeEditor( tree );
- init();
- }
-
-
- /**
- * Initializes the action.
- */
- private void init()
- {
+ setText( Messages.getString( "RenameAction.Rename" ) ); //$NON-NLS-1$
+ setToolTipText( Messages.getString( "RenameAction.RenameToolTip" ) ); //$NON-NLS-1$
setId( LdapServersPluginConstants.CMD_RENAME );
setActionDefinitionId( LdapServersPluginConstants.CMD_RENAME );
- setToolTipText( Messages.getString( "RenameAction.RenameToolTip" ) ); //$NON-NLS-1$
}
@@ -120,239 +68,45 @@
{
if ( view != null )
{
- // What we get from the TableViewer is a StructuredSelection
+ // Getting the selected server
StructuredSelection selection = ( StructuredSelection ) view.getViewer().getSelection();
+ final LdapServer server = ( LdapServer ) selection.getFirstElement();
- // Here's the real object
- LdapServer server = ( LdapServer ) selection.getFirstElement();
if ( server != null )
{
- queryNewServerNameInline( server );
- }
- }
- }
-
-
- /**
- * Return the new name to be given to the target resource or
- * <code>null<code>
- * if the query was canceled. Rename the currently selected server using the table editor.
- * Continue the action when the user is done.
- *
- * @param server the server to rename
- */
- private void queryNewServerNameInline( final LdapServer server )
- {
- // Make sure text editor is created only once. Simply reset text
- // editor when action is executed more than once. Fixes bug 22269
- if ( textEditorParent == null )
- {
- createTextEditor( server );
- }
- textEditor.setText( server.getName() );
-
- // Open text editor with initial size
- textEditorParent.setVisible( true );
- Point textSize = textEditor.computeSize( SWT.DEFAULT, SWT.DEFAULT );
- textSize.x += textSize.y; // Add extra space for new characters
- Point parentSize = textEditorParent.getSize();
- int inset = getCellEditorInset( textEditorParent );
- textEditor.setBounds( 2, inset, Math.min( textSize.x, parentSize.x - 4 ), parentSize.y - 2 * inset );
- textEditorParent.redraw();
- textEditor.selectAll();
- textEditor.setFocus();
- }
-
-
- /**
- * Create the text editor widget.
- *
- * @param server the server to rename
- */
- private void createTextEditor( final LdapServer server )
- {
- // Create text editor parent. This draws a nice bounding rect
- textEditorParent = createParent();
- textEditorParent.setVisible( false );
- final int inset = getCellEditorInset( textEditorParent );
- if ( inset > 0 )
- {
- textEditorParent.addListener( SWT.Paint, new Listener()
- {
- public void handleEvent( Event e )
+ IInputValidator validator = new IInputValidator()
{
- Point textSize = textEditor.getSize();
- Point parentSize = textEditorParent.getSize();
- e.gc.drawRectangle( 0, 0, Math.min( textSize.x + 4, parentSize.x - 1 ), parentSize.y - 1 );
- }
- } );
- }
- // Create inner text editor
- textEditor = new Text( textEditorParent, SWT.NONE );
- textEditor.setFont( tree.getFont() );
- textEditorParent.setBackground( textEditor.getBackground() );
- textEditor.addListener( SWT.Modify, new Listener()
- {
- public void handleEvent( Event e )
- {
- Point textSize = textEditor.computeSize( SWT.DEFAULT, SWT.DEFAULT );
- textSize.x += textSize.y; // Add extra space for new
- // characters.
- Point parentSize = textEditorParent.getSize();
- textEditor.setBounds( 2, inset, Math.min( textSize.x, parentSize.x - 4 ), parentSize.y - 2 * inset );
- textEditorParent.redraw();
- }
- } );
- textEditor.addListener( SWT.Traverse, new Listener()
- {
- public void handleEvent( Event event )
- {
-
- // Workaround for Bug 20214 due to extra
- // traverse events
- switch ( event.detail )
- {
- case SWT.TRAVERSE_ESCAPE:
- // Do nothing in this case
- disposeTextWidget();
- event.doit = true;
- event.detail = SWT.TRAVERSE_NONE;
- break;
- case SWT.TRAVERSE_RETURN:
- saveChangesAndDispose( server );
- event.doit = true;
- event.detail = SWT.TRAVERSE_NONE;
- break;
- }
- }
- } );
- textEditor.addFocusListener( new FocusAdapter()
- {
- public void focusLost( FocusEvent fe )
- {
- saveChangesAndDispose( server );
- }
- } );
-
- if ( textActionHandler != null )
- {
- textActionHandler.addText( textEditor );
- }
- }
-
-
- private Composite createParent()
- {
- Tree tree2 = tree;
- Composite result = new Composite( tree2, SWT.NONE );
- TreeItem[] selectedItems = tree2.getSelection();
- treeEditor.horizontalAlignment = SWT.LEFT;
- treeEditor.grabHorizontal = true;
- treeEditor.setEditor( result, selectedItems[0] );
- return result;
- }
-
-
- /**
- * Close the text widget and reset the editorText field.
- */
- protected void disposeTextWidget()
- {
- if ( textActionHandler != null )
- textActionHandler.removeText( textEditor );
-
- if ( textEditorParent != null )
- {
- textEditorParent.dispose();
- textEditorParent = null;
- textEditor = null;
- treeEditor.setEditor( null, null );
- }
- }
-
-
- /**
- * Save the changes and dispose of the text widget.
- *
- * @param server the server to rename
- */
- protected void saveChangesAndDispose( LdapServer server )
- {
- if ( saving == true )
- return;
-
- saving = true;
- // Cache the resource to avoid selection loss since a selection of
- // another item can trigger this method
- editedServer = server;
- final String newName = textEditor.getText();
- // Run this in an async to make sure that the operation that triggered
- // this action is completed. Otherwise this leads to problems when the
- // icon of the item being renamed is clicked (i.e., which causes the
- // rename text widget to lose focus and trigger this method)
- tree.getShell().getDisplay().asyncExec( new Runnable()
- {
- public void run()
- {
- try
- {
- if ( !newName.equals( editedServer.getName() ) )
+ public String isValid( String newName )
{
- if ( !LdapServersManager.getDefault().isNameAvailable( newName ) )
+ if ( server.getName().equals( newName ) )
{
- MessageDialog.openError( tree.getShell(), Messages.getString( "RenameAction.Server" ), //$NON-NLS-1$
- Messages.getString( "RenameAction.ErrorNameInUse" ) ); //$NON-NLS-1$
+ return null;
+ }
+ else if ( !LdapServersManager.getDefault().isNameAvailable( newName ) )
+ {
+ return Messages.getString( "RenameAction.ErrorNameInUse" ); //$NON-NLS-1$
}
else
{
- editedServer.setName( newName );
+ return null;
}
}
- editedServer = null;
- // Dispose the text widget regardless
- disposeTextWidget();
- // Ensure the Navigator tree has focus, which it may not if
- // the text widget previously had focus
- if ( tree != null && !tree.isDisposed() )
- {
- tree.setFocus();
- }
- }
- finally
+ };
+
+ // Opening a dialog to ask the user a new name for the server
+ InputDialog dialog = new InputDialog( view.getSite().getShell(),
+ Messages.getString( "RenameAction.RenameServer" ), //$NON-NLS-1$
+ Messages.getString( "RenameAction.NewName" ), //$NON-NLS-1$
+ server.getName(), validator );
+ dialog.open();
+
+ String newName = dialog.getValue();
+ if ( newName != null )
{
- saving = false;
+ server.setName( newName );
}
}
- } );
- }
-
-
- /**
- * On Mac the text widget already provides a border when it has focus, so
- * there is no need to draw another one. The value of returned by this
- * method is usd to control the inset we apply to the text field bound's in
- * order to get space for drawing a border. A value of 1 means a one-pixel
- * wide border around the text field. A negative value supresses the border.
- * However, in M9 the system property
- * "org.eclipse.swt.internal.carbon.noFocusRing" has been introduced as a
- * temporary workaround for bug #28842. The existence of the property turns
- * the native focus ring off if the widget is contained in a main window
- * (not dialog). The check for the property should be removed after a final
- * fix for #28842 has been provided.
- */
- private static int getCellEditorInset( Control c )
- {
- // special cases for MacOS X
- if ( "carbon".equals( SWT.getPlatform() ) ) { //$NON-NLS-1$
- if ( System.getProperty( "org.eclipse.swt.internal.carbon.noFocusRing" ) == null || c.getShell().getParent() != null ) { //$NON-NLS-1$
- return -2; // native border
- }
}
- else if ( "cocoa".equals( SWT.getPlatform() ) ) //$NON-NLS-1$
- {
- return 0; // native border
- }
- return 1; // one pixel wide black border
}
diff --git a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/messages.properties b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/messages.properties
index 699819f..c2166d8 100644
--- a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/messages.properties
+++ b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/messages.properties
@@ -34,9 +34,10 @@
PropertiesAction.PropertiesToolTip=Properties
RenameAction.ErrorNameInUse=The name is already in use. Specify a different name.
+RenameAction.NewName=New name:
RenameAction.Rename=R&ename...
RenameAction.RenameToolTip=Rename...
-RenameAction.Server=Server
+RenameAction.RenameServer=Rename Server
StartAction.ChangePasswordPort=ChangePassword (port {0})
StartAction.DNSPort=DNS (port {0})
diff --git a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/messages_de.properties b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/messages_de.properties
index 3828eaa..659106c 100644
--- a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/messages_de.properties
+++ b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/messages_de.properties
@@ -34,8 +34,10 @@
PropertiesAction.PropertiesToolTip=Eigenschaften
RenameAction.ErrorNameInUse=Der Name wird bereits verwendet. Geben Sie einen anderen Namen an.
+RenameAction.NewName=Neuer Name\:
RenameAction.Rename=Umb&enennen...
RenameAction.RenameToolTip=Umbenennen...
+RenameAction.RenameServer=Server umbenennen
StartAction.Continue=Wollen Sie weiterfahren?
StartAction.PortInUse=Der Port wird bereits verwendet
diff --git a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/messages_fr.properties b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/messages_fr.properties
index c99a45d..cdc66c2 100644
--- a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/messages_fr.properties
+++ b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/actions/messages_fr.properties
@@ -43,9 +43,10 @@
PropertiesAction.PropertiesToolTip=Propri\u00E9t\u00E9s
RenameAction.ErrorNameInUse=Ce nom est d\u00E9j\u00E0 utilis\u00E9. Veuillez en s\u00E9lectionner un autre.
+RenameAction.NewName=Nouveau nom:
RenameAction.Rename=&Renommer...
RenameAction.RenameToolTip=Renommer...
-RenameAction.Server=Serveur
+RenameAction.RenameServer=Renommer le serveur
StartAction.Continue=Voulez-vous poursuivre l'op\u00E9ration ?
StartAction.PortInUse=Le port est d\u00E9j\u00E0 utilis\u00E9
diff --git a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerActionFilterAdapter.java b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerActionFilterAdapter.java
index eefa506..8a35999 100644
--- a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerActionFilterAdapter.java
+++ b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerActionFilterAdapter.java
@@ -21,6 +21,7 @@
package org.apache.directory.studio.ldapservers.model;
+import org.apache.directory.studio.ldapservers.actions.CreateConnectionActionHelper;
import org.eclipse.ui.IActionFilter;
@@ -32,19 +33,20 @@
public class LdapServerActionFilterAdapter implements IActionFilter
{
// Identifier and value strings
- private static final String ID = "id";
- private static final String NAME = "name";
- private static final Object STATUS = "status";
- private static final Object STATUS_STARTED = "started";
- private static final Object STATUS_STARTING = "starting";
- private static final Object STATUS_STOPPED = "stopped";
- private static final Object STATUS_STOPPING = "stopping";
- private static final Object STATUS_UNKNOWN = "unknown";
- private static final Object EXTENSION_ID = "extensionId";
- private static final Object EXTENSION_NAME = "extensionName";
- private static final Object EXTENSION_VERSION = "extensionVersion";
- private static final Object EXTENSION_VENDOR = "extensionVendor";
- private static final Object HAS_CONFIGURATION_PAGE = "hasConfigurationPage";
+ private static final String ID = "id"; //$NON-NLS-1$
+ private static final String NAME = "name"; //$NON-NLS-1$
+ private static final Object STATUS = "status"; //$NON-NLS-1$
+ private static final Object STATUS_STARTED = "started"; //$NON-NLS-1$
+ private static final Object STATUS_STARTING = "starting"; //$NON-NLS-1$
+ private static final Object STATUS_STOPPED = "stopped"; //$NON-NLS-1$
+ private static final Object STATUS_STOPPING = "stopping"; //$NON-NLS-1$
+ private static final Object STATUS_UNKNOWN = "unknown"; //$NON-NLS-1$
+ private static final Object EXTENSION_ID = "extensionId"; //$NON-NLS-1$
+ private static final Object EXTENSION_NAME = "extensionName"; //$NON-NLS-1$
+ private static final Object EXTENSION_VERSION = "extensionVersion"; //$NON-NLS-1$
+ private static final Object EXTENSION_VENDOR = "extensionVendor"; //$NON-NLS-1$
+ private static final Object HAS_CONFIGURATION_PAGE = "hasConfigurationPage"; //$NON-NLS-1$
+ private static final Object IS_LDAP_PERSPECTIVE_AVAILABLE = "isLdapPerspectiveAvailable"; //$NON-NLS-1$
/** The class instance */
private static LdapServerActionFilterAdapter INSTANCE = new LdapServerActionFilterAdapter();
@@ -145,10 +147,18 @@
String configurationPageClassName = server.getLdapServerAdapterExtension()
.getConfigurationPageClassName();
- boolean hasConfigurationPage = ( ( configurationPageClassName != null ) && ( !""
+ boolean hasConfigurationPage = ( ( configurationPageClassName != null ) && ( !"" //$NON-NLS-1$
.equals( configurationPageClassName ) ) );
- return value.equalsIgnoreCase( hasConfigurationPage ? "true" : "false" );
+ return value.equalsIgnoreCase( hasConfigurationPage ? "true" : "false" ); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ // IS LDAP PERSPECTIVE AVAILABLE
+ else if ( IS_LDAP_PERSPECTIVE_AVAILABLE.equals( name ) )
+ {
+ boolean isLdapPerspectiveAvailable = CreateConnectionActionHelper.isLdapBrowserPluginsAvailable();
+ boolean booleanValue = Boolean.parseBoolean( value );
+
+ return isLdapPerspectiveAvailable == booleanValue;
}
}
diff --git a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerAdapterConfigurationPageModifyListener.java b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerAdapterConfigurationPageModifyListener.java
index 93e9e56..5f9e8d3 100644
--- a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerAdapterConfigurationPageModifyListener.java
+++ b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerAdapterConfigurationPageModifyListener.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
package org.apache.directory.studio.ldapservers.model;
diff --git a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerAdapterExtension.java b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerAdapterExtension.java
index 77c5578..d3e6bbc 100644
--- a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerAdapterExtension.java
+++ b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerAdapterExtension.java
@@ -64,6 +64,9 @@
/** The configuration page class name */
private String configurationPageClassName;
+
+ /** The flag to enable the open configuration action */
+ private boolean openConfigurationActionEnabled;
/**
@@ -91,26 +94,6 @@
/**
- * Gets a new configuration page instance.
- *
- * @return
- * a new configuration page instance
- */
- public LdapServerAdapterConfigurationPage getNewConfigurationPageInstance()
- {
- try
- {
- return ( LdapServerAdapterConfigurationPage ) extensionPointConfiguration
- .createExecutableExtension( LdapServerAdapterExtensionsManager.CONFIGURATION_PAGE_ATTR );
- }
- catch ( CoreException e )
- {
- return null;
- }
- }
-
-
- /**
* Gets the description.
*
* @return
@@ -183,6 +166,26 @@
/**
+ * Gets a new configuration page instance.
+ *
+ * @return
+ * a new configuration page instance
+ */
+ public LdapServerAdapterConfigurationPage getNewConfigurationPageInstance()
+ {
+ try
+ {
+ return ( LdapServerAdapterConfigurationPage ) extensionPointConfiguration
+ .createExecutableExtension( LdapServerAdapterExtensionsManager.CONFIGURATION_PAGE_ATTR );
+ }
+ catch ( CoreException e )
+ {
+ return null;
+ }
+ }
+
+
+ /**
* Gets the vendor.
*
* @return
@@ -207,6 +210,17 @@
/**
+ * Returns the flag to enable the open configuration action.
+ *
+ * @return the flag to enable the open configuration action
+ */
+ public boolean isOpenConfigurationActionEnabled()
+ {
+ return openConfigurationActionEnabled;
+ }
+
+
+ /**
* Sets the class name.
*
* @param className
@@ -303,6 +317,17 @@
/**
+ * Sets the flag to enable the open configuration action.
+ *
+ * @param openConfigurationActionEnabled the flag to enable the open configuration action
+ */
+ public void setOpenConfigurationActionEnabled( boolean openConfigurationActionEnabled )
+ {
+ this.openConfigurationActionEnabled = openConfigurationActionEnabled;
+ }
+
+
+ /**
* Sets the vendor.
*
* @param vendor
diff --git a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/messages.properties b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/messages.properties
index 707fd17..9d99edf 100644
--- a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/messages.properties
+++ b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/messages.properties
@@ -19,4 +19,3 @@
ServerPropertyPage.Name=Name:
ServerPropertyPage.Type=Type:
ServerPropertyPage.Vendor=Vendor:
-ServerPropertyPage.Version=Version:
diff --git a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/messages_de.properties b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/messages_de.properties
index ef61609..3d3f6b4 100644
--- a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/messages_de.properties
+++ b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/messages_de.properties
@@ -19,4 +19,3 @@
ServerPropertyPage.Name=TODO:Name:
ServerPropertyPage.Type=TODO:Type:
ServerPropertyPage.Vendor=TODO:Vendor:
-ServerPropertyPage.Version=TODO:Version:
\ No newline at end of file
diff --git a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/messages_fr.properties b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/messages_fr.properties
index f07da9f..dd12617 100644
--- a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/messages_fr.properties
+++ b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/properties/messages_fr.properties
@@ -19,4 +19,3 @@
ServerPropertyPage.Name=Nom:
ServerPropertyPage.Type=Type:
ServerPropertyPage.Vendor=Fournisseur:
-ServerPropertyPage.Version=Version:
diff --git a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersTableViewer.java b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersTableViewer.java
index 4a0f411..e54078b 100644
--- a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersTableViewer.java
+++ b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersTableViewer.java
@@ -17,20 +17,11 @@
* under the License.
*
*/
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
package org.apache.directory.studio.ldapservers.views;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import org.apache.directory.studio.ldapservers.LdapServersManager;
@@ -42,6 +33,7 @@
import org.apache.directory.studio.ldapservers.model.LdapServerStatus;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Tree;
@@ -64,6 +56,9 @@
/** The label provider */
private ServersViewLabelProvider labelProvider;
+ /** The comparator */
+ private ServersComparator comparator;
+
/** The server handler listener */
private LdapServersManagerListener serversHandlerListener;
@@ -91,7 +86,8 @@
setLabelProvider( labelProvider );
setContentProvider( new ServersViewContentProvider() );
- setComparator( new ServersViewerComparator( labelProvider ) );
+ comparator = new ServersComparator();
+ setComparator( new ViewerComparator( comparator ) );
setInput( ROOT );
@@ -147,7 +143,7 @@
LdapServer server = event.getServer();
switch ( kind )
{
- // The server status has changed
+ // The server status has changed
case STATUS_CHANGED:
// First, we refresh the server
refreshServer( server );
@@ -251,16 +247,9 @@
{
public void run()
{
- try
- {
- refresh( server );
- ISelection sel = ServersTableViewer.this.getSelection();
- ServersTableViewer.this.setSelection( sel );
- }
- catch ( Exception e )
- {
- // ignore
- }
+ refresh( server );
+ ISelection sel = ServersTableViewer.this.getSelection();
+ ServersTableViewer.this.setSelection( sel );
}
} );
}
@@ -301,23 +290,16 @@
// Checking if we need to stop the animation
if ( !stopAnimation )
{
- try
- {
- // Changing the animation state on the label provider
- labelProvider.animate();
+ // Changing the animation state on the label provider
+ labelProvider.animate();
- // Looping on the currently starting servers
- for ( LdapServer server : serversNeedingAnimation.toArray( new LdapServer[0] ) )
- {
- if ( server != null && getTree() != null && !getTree().isDisposed() )
- {
- updateAnimation( server );
- }
- }
- }
- catch ( Exception e )
+ // Looping on the currently starting servers
+ for ( LdapServer server : serversNeedingAnimation.toArray( new LdapServer[0] ) )
{
- // Trace.trace( Trace.FINEST, "Error in Servers view animation", e ); TODO
+ if ( server != null && getTree() != null && !getTree().isDisposed() )
+ {
+ updateAnimation( server );
+ }
}
// Re-launching the animation
@@ -354,59 +336,84 @@
*/
private void updateAnimation( LdapServer server )
{
- try
- {
- Widget widget = doFindItem( server );
- TreeItem item = ( TreeItem ) widget;
- item.setText( 1, labelProvider.getColumnText( server, 1 ) );
- item.setImage( 1, labelProvider.getColumnImage( server, 1 ) );
- }
- catch ( Exception e )
- {
- // Trace.trace( Trace.WARNING, "Error in optimized animation", e ); TODO
- }
+ Widget widget = doFindItem( server );
+ TreeItem item = ( TreeItem ) widget;
+ item.setText( 1, labelProvider.getColumnText( server, 1 ) );
+ item.setImage( 1, labelProvider.getColumnImage( server, 1 ) );
}
/**
- * Resorts the table based on field.
- *
- * @param column
- * the column being updated
- * @param col
- * the column
+ * Sorts the table.
+ *
+ * @param treeColumn the tree column
+ * @param column the column number
*/
- protected void resortTable( final TreeColumn column, int col )
+ public void sort( final TreeColumn treeColumn, int column )
{
- ServersViewerComparator sorter = ( ServersViewerComparator ) getComparator();
-
- if ( col == sorter.getTopPriority() )
- sorter.reverseTopPriority();
+ if ( column == comparator.column )
+ {
+ comparator.reverseOrder();
+ }
else
- sorter.setTopPriority( col );
+ {
+ comparator.column = column;
+ }
PlatformUI.getWorkbench().getDisplay().asyncExec( new Runnable()
{
public void run()
{
refresh();
- updateDirectionIndicator( column );
+
+ Tree tree = getTree();
+ tree.setSortColumn( treeColumn );
+ if ( comparator.order == ServersComparator.ASCENDING )
+ {
+ tree.setSortDirection( SWT.UP );
+ }
+ else
+ {
+ tree.setSortDirection( SWT.DOWN );
+ }
}
} );
}
-
/**
- * Updates the direction indicator as column is now the primary column.
- *
- * @param column
+ * This class implements a comparator for servers.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
- protected void updateDirectionIndicator( TreeColumn column )
+ private class ServersComparator implements Comparator<Object>
{
- getTree().setSortColumn( column );
- if ( ( ( ServersViewerComparator ) getComparator() ).getTopPriorityDirection() == ServersViewerComparator.ASCENDING )
- getTree().setSortDirection( SWT.UP );
- else
- getTree().setSortDirection( SWT.DOWN );
+ public static final int ASCENDING = 1;
+
+ /** The comparison order */
+ int order = ASCENDING;
+
+ /** The column used to compare objects */
+ int column = 0;
+
+
+ /**
+ * Reverses the order.
+ */
+ public void reverseOrder()
+ {
+ order = order * -1;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public int compare( Object o1, Object o2 )
+ {
+ String s1 = labelProvider.getColumnText( o1, column );
+ String s2 = labelProvider.getColumnText( o2, column );
+
+ return s1.compareToIgnoreCase( s2 ) * order;
+ }
}
}
\ No newline at end of file
diff --git a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersView.java b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersView.java
index 03b271c..baccf88 100644
--- a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersView.java
+++ b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersView.java
@@ -99,7 +99,6 @@
private RenameAction rename;
private StartAction start;
private StopAction stop;
- // private CreateConnectionAction createConnection;
private PropertiesAction properties;
// Listeners
@@ -141,14 +140,14 @@
TreeColumn serverColumn = new TreeColumn( tree, SWT.SINGLE );
serverColumn.setText( Messages.getString( "ServersView.server" ) ); //$NON-NLS-1$
serverColumn.setWidth( columnWidths[0] );
- serverColumn.addSelectionListener( getHeaderListener( 0 ) );
+ serverColumn.addSelectionListener( getColumnSelectionListener( 0 ) );
tree.setSortColumn( serverColumn );
tree.setSortDirection( SWT.UP );
TreeColumn stateColumn = new TreeColumn( tree, SWT.SINGLE );
stateColumn.setText( Messages.getString( "ServersView.state" ) ); //$NON-NLS-1$
stateColumn.setWidth( columnWidths[1] );
- stateColumn.addSelectionListener( getHeaderListener( 1 ) );
+ stateColumn.addSelectionListener( getColumnSelectionListener( 1 ) );
// Creating the viewer
tableViewer = new ServersTableViewer( tree );
@@ -166,32 +165,6 @@
/**
- * Gets a header listener for the given column.
- *
- * @param col
- * the column
- * @return
- * a header listener for the given column
- */
- private SelectionListener getHeaderListener( final int col )
- {
- return new SelectionAdapter()
- {
- /**
- * Handles the case of user selecting the header area.
- */
- public void widgetSelected( SelectionEvent e )
- {
- if ( tableViewer == null )
- return;
- TreeColumn column = ( TreeColumn ) e.widget;
- tableViewer.resortTable( column, col );
- }
- };
- }
-
-
- /**
* {@inheritDoc}
*/
public void init( IViewSite site, IMemento memento ) throws PartInitException
@@ -264,9 +237,6 @@
stop = new StopAction( this );
stop.setEnabled( false );
- // createConnection = new CreateConnectionAction( this );
- // createConnection.setEnabled( false );
-
properties = new PropertiesAction( this );
properties.setEnabled( false );
}
@@ -307,9 +277,6 @@
manager.add( start );
manager.add( stop );
manager.add( new Separator() );
- // MenuManager ldapBrowserManager = new MenuManager( Messages.getString( "ServersView.ldapBrowser" ) ); //$NON-NLS-1$
- // ldapBrowserManager.add( createConnection );
- // manager.add( ldapBrowserManager );
manager.add( new Separator( IWorkbenchActionConstants.MB_ADDITIONS ) );
manager.add( new Separator() );
manager.add( new Separator() );
@@ -484,20 +451,18 @@
break;
}
- // openConfiguration.setEnabled( true );
+ openConfiguration.setEnabled( server.getLdapServerAdapterExtension().isOpenConfigurationActionEnabled() );
delete.setEnabled( true );
rename.setEnabled( true );
- // createConnection.setEnabled( true );
properties.setEnabled( true );
}
else
{
- // openConfiguration.setEnabled( false );
+ openConfiguration.setEnabled( false );
delete.setEnabled( false );
rename.setEnabled( false );
start.setEnabled( false );
stop.setEnabled( false );
- // createConnection.setEnabled( false );
properties.setEnabled( false );
}
}
@@ -539,4 +504,17 @@
}
} );
}
+
+
+ private SelectionListener getColumnSelectionListener( final int column )
+ {
+ return new SelectionAdapter()
+ {
+ public void widgetSelected( SelectionEvent e )
+ {
+ TreeColumn treeColumn = ( TreeColumn ) e.widget;
+ tableViewer.sort( treeColumn, column );
+ }
+ };
+ }
}
diff --git a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersViewLabelProvider.java b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersViewLabelProvider.java
index 15d3831..611a964 100644
--- a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersViewLabelProvider.java
+++ b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersViewLabelProvider.java
@@ -77,7 +77,7 @@
}
- return null;
+ return super.getText( element );
}
@@ -155,7 +155,7 @@
}
}
- return null;
+ return super.getImage( element );
}
diff --git a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersViewerComparator.java b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersViewerComparator.java
deleted file mode 100644
index b7ca3cf..0000000
--- a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersViewerComparator.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.apache.directory.studio.ldapservers.views;
-
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-
-
-/**
- * This class implements the servers table viewer comparator.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public class ServersViewerComparator extends ViewerComparator
-{
- public static final int MAX_DEPTH = 3;
- public static final int ASCENDING = 1;
- public static final int DESCENDING = -1;
-
- protected ServersViewLabelProvider labelProvider;
-
- protected int[] priorities = new int[]
- { 0 };
-
- protected int[] directions = new int[]
- { ASCENDING };
-
-
- /**
- * Creates a new instance of ServersViewerComparator.
- *
- * @param labelProvider
- * the label provider
- */
- public ServersViewerComparator( ServersViewLabelProvider labelProvider )
- {
- this.labelProvider = labelProvider;
- }
-
-
- /**
- * Sets the top priority.
- *
- * @param priority
- * the priority
- */
- public void setTopPriority( int priority )
- {
- if ( priorities[0] == priority )
- {
- return;
- }
-
- int len = priorities.length + 1;
- if ( len > MAX_DEPTH )
- {
- len = MAX_DEPTH;
- }
-
- int[] temp = new int[len];
- System.arraycopy( priorities, 0, temp, 1, len - 1 );
- temp[0] = priority;
- priorities = temp;
-
- temp = new int[len];
- System.arraycopy( directions, 0, temp, 1, len - 1 );
- temp[0] = ASCENDING;
- directions = temp;
- }
-
-
- /**
- * Gets the top priority.
- *
- * @return
- * the top priority
- */
- public int getTopPriority()
- {
- return priorities[0];
- }
-
-
- /**
- * Sets the top priority direction
- *
- * @param direction
- * the direction
- */
- public void setTopPriorityDirection( int direction )
- {
- if ( direction == ASCENDING || direction == DESCENDING )
- {
- directions[0] = direction;
- }
- }
-
-
- /**
- * Gets the top priority direction
- *
- * @return
- * the top priority direction
- */
- public int getTopPriorityDirection()
- {
- return directions[0];
- }
-
-
- /**
- * Reverses the top priority
- */
- public void reverseTopPriority()
- {
- directions[0] *= -1;
- }
-
-
- /**
- * Returns a negative, zero, or positive number depending on whether
- * the first element is less than, equal to, or greater than
- * the second element.
- * <p>
- * The default implementation of this method is based on
- * comparing the elements' categories as computed by the <code>category</code>
- * framework method. Elements within the same category are further
- * subjected to a case insensitive compare of their label strings, either
- * as computed by the content viewer's label provider, or their
- * <code>toString</code> values in other cases. Subclasses may override.
- * </p>
- *
- * @param viewer the viewer
- * @param e1 the first element
- * @param e2 the second element
- * @param a the direction
- * @return a negative number if the first element is less than the
- * second element; the value <code>0</code> if the first element is
- * equal to the second element; and a positive number if the first
- * element is greater than the second element
- */
- public int compare( Viewer viewer, Object e1, Object e2, int a )
- {
- int col = priorities[a];
-
- String s1 = labelProvider.getColumnText( e1, col );
- String s2 = labelProvider.getColumnText( e2, col );
-
- int s = s1.compareToIgnoreCase( s2 ) * directions[a];
- if ( s == 0 )
- {
- if ( a == priorities.length - 1 )
- {
- return 0;
- }
- return compare( viewer, e1, e2, a + 1 );
- }
- return s;
- }
-
-
- /**
- * {@inheritDoc}
- */
- public int compare( Viewer viewer, Object e1, Object e2 )
- {
- return compare( viewer, e1, e2, 0 );
- }
-}
\ No newline at end of file
diff --git a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/messages.properties b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/messages.properties
index ae7ffc4..1557e07 100644
--- a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/messages.properties
+++ b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/messages.properties
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-ServersView.ldapBrowser=LDAP Browser
ServersView.new=&New
ServersView.server=Server
ServersView.state=State
diff --git a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/messages_de.properties b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/messages_de.properties
index 3d583ab..a47beae 100644
--- a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/messages_de.properties
+++ b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/messages_de.properties
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-ServersView.ldapBrowser=LDAP Browser
ServersView.new=&Neu
ServersView.server=Server
ServersView.state=Status
diff --git a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/messages_fr.properties b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/messages_fr.properties
index 3a36412..fa127d4 100644
--- a/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/messages_fr.properties
+++ b/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/messages_fr.properties
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-ServersView.ldapBrowser=Navigateur LDAP
ServersView.new=&Nouveau
ServersView.server=Serveur
ServersView.state=Etat
diff --git a/plugins/ldifeditor/pom.xml b/plugins/ldifeditor/pom.xml
index 508f4e5..b0454ed 100644
--- a/plugins/ldifeditor/pom.xml
+++ b/plugins/ldifeditor/pom.xml
@@ -130,10 +130,8 @@
org.eclipse.ui,
org.eclipse.ui.editors,
org.eclipse.ui.ide,
- org.eclipse.ui.forms,
org.eclipse.ui.views,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.search</Require-Bundle>
+ org.eclipse.ui.workbench.texteditor</Require-Bundle>
<Export-Package>org.apache.directory.studio.ldifeditor.*</Export-Package>
<Import-Package>!</Import-Package>
<Private-Package>!</Private-Package>
diff --git a/plugins/ldifeditor/src/main/appended-resources/META-INF/LICENSE.vm b/plugins/ldifeditor/src/main/appended-resources/META-INF/LICENSE.vm
index 301ab71..6c3f56c 100644
--- a/plugins/ldifeditor/src/main/appended-resources/META-INF/LICENSE.vm
+++ b/plugins/ldifeditor/src/main/appended-resources/META-INF/LICENSE.vm
@@ -7,7 +7,7 @@
code for the these subcomponents is subject to the terms and
conditions of the following licenses.
-For a few classes from Eclipse the Eclipse Public License applies:
+Apache Directory Studio is based and uses Eclipse libraries for which the Eclipse Public License applies:
-------------------------------------------------------------------------------
Eclipse Public License - v 1.0
diff --git a/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorContentAssistPreferencePage.java b/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorContentAssistPreferencePage.java
index 1eaa614..6591071 100644
--- a/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorContentAssistPreferencePage.java
+++ b/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorContentAssistPreferencePage.java
@@ -22,7 +22,6 @@
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
-import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
import org.apache.directory.studio.ldifeditor.LdifEditorActivator;
import org.apache.directory.studio.ldifeditor.LdifEditorConstants;
import org.eclipse.jface.preference.PreferencePage;
@@ -167,8 +166,6 @@
LdifEditorConstants.PREFERENCE_LDIFEDITOR_CONTENTASSIST_SMARTINSERTATTRIBUTEINMODSPEC,
this.smartInsertAttributeInModspecButton.getSelection() );
- BrowserCorePlugin.getDefault().savePluginPreferences();
-
return true;
}
diff --git a/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorPreferencePage.java b/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorPreferencePage.java
index 88b0c63..d035cb3 100644
--- a/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorPreferencePage.java
+++ b/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorPreferencePage.java
@@ -22,7 +22,6 @@
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
-import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
import org.apache.directory.studio.ldifeditor.LdifEditorActivator;
import org.apache.directory.studio.ldifeditor.LdifEditorConstants;
import org.eclipse.jface.preference.PreferencePage;
@@ -234,8 +233,6 @@
getPreferenceStore().setValue( LdifEditorConstants.PREFERENCE_LDIFEDITOR_OPTIONS_CONTINUEONERROR,
continueOnErrorButton.getSelection() );
- BrowserCorePlugin.getDefault().savePluginPreferences();
-
return true;
}
diff --git a/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java b/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java
index 079696f..716a443 100644
--- a/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java
+++ b/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java
@@ -235,7 +235,7 @@
syntaxItems[0] = new SyntaxItem(
Messages.getString( "LdifEditorSyntaxColoringPreferencePage.Comments" ), LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_COMMENT ); //$NON-NLS-1$
syntaxItems[1] = new SyntaxItem(
- Messages.getString( "LdifEditorSyntaxColoringPreferencePage.Dn" ), LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_DN ); //$NON-NLS-1$
+ Messages.getString( "LdifEditorSyntaxColoringPreferencePage.DN" ), LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_DN ); //$NON-NLS-1$
syntaxItems[2] = new SyntaxItem( Messages
.getString( "LdifEditorSyntaxColoringPreferencePage.AttributeDescriptions" ), //$NON-NLS-1$
LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_ATTRIBUTE );
diff --git a/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ExecuteLdifAction.java b/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ExecuteLdifAction.java
index 2e06d85..e3c98df 100644
--- a/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ExecuteLdifAction.java
+++ b/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/ExecuteLdifAction.java
@@ -21,6 +21,7 @@
package org.apache.directory.studio.ldifeditor.editor;
+import org.apache.directory.studio.ldapbrowser.common.dialogs.SelectBrowserConnectionDialog;
import org.apache.directory.studio.ldapbrowser.core.jobs.ExecuteLdifRunnable;
import org.apache.directory.studio.ldapbrowser.core.jobs.StudioBrowserJob;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
@@ -37,6 +38,7 @@
*/
public class ExecuteLdifAction extends Action
{
+ /** The LDIF Editor */
private LdifEditor editor;
@@ -61,6 +63,31 @@
public void run()
{
IBrowserConnection connection = editor.getConnection();
+
+ // Checking if we already have a connection
+ if ( connection == null )
+ {
+ // Requesting the user to select a connection
+ SelectBrowserConnectionDialog dialog = new SelectBrowserConnectionDialog( editor.getSite().getShell(),
+ Messages.getString( "ExecuteLdifAction.SelectConnection" ), null ); //$NON-NLS-1$
+ if ( dialog.open() == SelectBrowserConnectionDialog.OK )
+ {
+ connection = dialog.getSelectedBrowserConnection();
+
+ if ( connection != null )
+ {
+ editor.setConnection( connection, true );
+ }
+ }
+
+ // Checking a second time if we have a connection
+ if ( connection == null )
+ {
+ return;
+ }
+ }
+
+
String ldif = editor.getLdifModel().toRawString();
IPreferenceStore preferenceStore = LdifEditorActivator.getDefault().getPreferenceStore();
@@ -81,6 +108,6 @@
*/
public boolean isEnabled()
{
- return editor != null && editor.getConnection() != null;
+ return editor != null;
}
}
diff --git a/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java b/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java
index 40f2234..6fd6842 100644
--- a/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java
+++ b/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java
@@ -593,18 +593,24 @@
*/
protected void setConnection( IBrowserConnection browserConnection )
{
- this.browserConnection = browserConnection;
- getEditorSite().getActionBars().getStatusLineManager().setMessage(
- Messages.getString( "LdifEditor.UsedConnection" ) //$NON-NLS-1$
- + ( browserConnection == null || browserConnection.getConnection() == null ? "-" : browserConnection //$NON-NLS-1$
- .getConnection().getName() ) );
- // getStatusField("ldapconnection").setText();
+ setConnection( browserConnection, false );
+ }
- IAction action = getAction( LdifEditorConstants.ACTION_ID_EXECUTE_LDIF );
- if ( action != null )
+
+ /**
+ * Sets the Connection
+ *
+ * @param browserConnection the browser connection to set
+ * @param updateBrowserConnectionWidget the flag indicating if the browser connection widget
+ * should be updated
+ */
+ protected void setConnection( IBrowserConnection browserConnection, boolean updateBrowserConnectionWidget )
+ {
+ this.browserConnection = browserConnection;
+
+ if ( updateBrowserConnectionWidget && ( browserConnectionWidget != null ) )
{
- action.setEnabled( browserConnection == null );
- action.setEnabled( browserConnection != null );
+ browserConnectionWidget.setBrowserConnection( browserConnection );
}
}
@@ -755,8 +761,9 @@
final File externalFile = new File( path );
if ( externalFile.exists() )
{
- MessageDialog overwriteDialog = new MessageDialog( shell,
- Messages.getString( "LdifEditor.Overwrite" ), null, Messages.getString( "OverwriteQuestion" ), //$NON-NLS-1$ //$NON-NLS-2$
+ MessageDialog overwriteDialog = new MessageDialog(
+ shell,
+ Messages.getString( "LdifEditor.Overwrite" ), null, Messages.getString( "LdifEditor.OverwriteQuestion" ), //$NON-NLS-1$ //$NON-NLS-2$
MessageDialog.WARNING, new String[]
{ IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }, 1 ); // 'No' is the default
if ( overwriteDialog.open() != Window.OK )
diff --git a/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/messages.properties b/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/messages.properties
index d47b993..da34b5f 100644
--- a/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/messages.properties
+++ b/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/messages.properties
@@ -16,6 +16,7 @@
# under the License.
ExecuteLdifAction.ExecuteLDIF=Execute LDIF
+ExecuteLdifAction.SelectConnection=Select Connection
LdifEditor.Overwrite=Overwrite
LdifEditor.OverwriteQuestion=Overwrite?
LdifEditor.ErrorInSaveAs=Error in Save As...
diff --git a/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/messages_de.properties b/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/messages_de.properties
index a0caeb4..0f3288a 100644
--- a/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/messages_de.properties
+++ b/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/messages_de.properties
@@ -16,6 +16,7 @@
# under the License.
ExecuteLdifAction.ExecuteLDIF=LDIF ausf\u00FChren
+ExecuteLdifAction.SelectConnection=Verbindung ausw\u00E4hlen
LdifEditor.Overwrite=\u00DCberschreiben
LdifEditor.OverwriteQuestion=\u00DCberschreiben?
LdifEditor.ErrorInSaveAs=Fehler bei Speichern als...
diff --git a/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/messages_fr.properties b/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/messages_fr.properties
index 6a0102d..bd877b9 100644
--- a/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/messages_fr.properties
+++ b/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/messages_fr.properties
@@ -16,6 +16,7 @@
# under the License.
ExecuteLdifAction.ExecuteLDIF=Executer LDIF
+ExecuteLdifAction.SelectConnection=Selectionnez une connexion
LdifEditor.Overwrite=Ecraser
LdifEditor.OverwriteQuestion=Ecraser ?
LdifEditor.ErrorInSaveAs=Erreur lors de Enregistrer sous...
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java
index 46bbb2e..4576e53 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java
@@ -47,7 +47,7 @@
{
try
{
- return s.getBytes( "UTF-8" );
+ return s.getBytes( "UTF-8" ); //$NON-NLS-1$
}
catch ( UnsupportedEncodingException e )
{
@@ -67,7 +67,7 @@
{
try
{
- return URLEncoder.encode( s, "UTF-8" );
+ return URLEncoder.encode( s, "UTF-8" ); //$NON-NLS-1$
}
catch ( UnsupportedEncodingException e )
{
@@ -130,7 +130,7 @@
{
try
{
- return new String( b, "UTF-8" );
+ return new String( b, "UTF-8" ); //$NON-NLS-1$
}
catch ( UnsupportedEncodingException e )
{
@@ -181,11 +181,11 @@
return false;
}
- if ( value.startsWith( " " ) || value.startsWith( ":" ) || value.startsWith( "<" ) )
+ if ( value.startsWith( " " ) || value.startsWith( ":" ) || value.startsWith( "<" ) ) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
{
return true;
}
- if ( value.endsWith( " " ) )
+ if ( value.endsWith( " " ) ) //$NON-NLS-1$
{
return true;
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEOFPart.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEOFPart.java
index d66bbb9..68d82b8 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEOFPart.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifEOFPart.java
@@ -57,22 +57,22 @@
public final String toRawString()
{
- return "";
+ return ""; //$NON-NLS-1$
}
public final String toFormattedString( LdifFormatParameters formatParameters )
{
- return "";
+ return ""; //$NON-NLS-1$
}
public final String toString()
{
String text = toRawString();
- text = text.replaceAll( "\n", "\\\\n" );
- text = text.replaceAll( "\r", "\\\\r" );
- return getClass().getName() + " (" + getOffset() + "," + getLength() + "): '" + text + "'";
+ text = text.replaceAll( "\n", "\\\\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ text = text.replaceAll( "\r", "\\\\r" ); //$NON-NLS-1$ //$NON-NLS-2$
+ return getClass().getName() + " (" + getOffset() + "," + getLength() + "): '" + text + "'"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
@@ -84,7 +84,7 @@
public final String getInvalidString()
{
- return "";
+ return ""; //$NON-NLS-1$
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifInvalidPart.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifInvalidPart.java
index f079754..56c3d11 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifInvalidPart.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/LdifInvalidPart.java
@@ -73,9 +73,9 @@
public final String toString()
{
String text = toRawString();
- text = text.replaceAll( "\n", "\\\\n" );
- text = text.replaceAll( "\r", "\\\\r" );
- return getClass().getName() + " (" + getOffset() + "," + getLength() + "): '" + text + "'";
+ text = text.replaceAll( "\n", "\\\\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ text = text.replaceAll( "\r", "\\\\r" ); //$NON-NLS-1$ //$NON-NLS-2$
+ return getClass().getName() + " (" + getOffset() + "," + getLength() + "): '" + text + "'"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeAddRecord.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeAddRecord.java
index 9689826..84bfdb2 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeAddRecord.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeAddRecord.java
@@ -50,7 +50,7 @@
public void addAttrVal( LdifAttrValLine attrVal )
{
if ( attrVal == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( attrVal );
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModDnRecord.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModDnRecord.java
index e23ecab..9298983 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModDnRecord.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModDnRecord.java
@@ -50,7 +50,7 @@
public void setNewrdn( LdifNewrdnLine newrdn )
{
if ( newrdn == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( newrdn );
}
@@ -58,7 +58,7 @@
public void setDeloldrdn( LdifDeloldrdnLine deloldrdn )
{
if ( deloldrdn == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( deloldrdn );
}
@@ -66,7 +66,7 @@
public void setNewsuperior( LdifNewsuperiorLine newsuperior )
{
if ( newsuperior == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( newsuperior );
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModifyRecord.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModifyRecord.java
index 0fded78..e414ee3 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModifyRecord.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModifyRecord.java
@@ -49,7 +49,7 @@
public void addModSpec( LdifModSpec modSpec )
{
if ( modSpec == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( modSpec );
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeRecord.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeRecord.java
index 84cee15..3ed3f1e 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeRecord.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeRecord.java
@@ -50,7 +50,7 @@
public void addControl( LdifControlLine controlLine )
{
if ( controlLine == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( controlLine );
}
@@ -58,7 +58,7 @@
public void setChangeType( LdifChangeTypeLine changeTypeLine )
{
if ( changeTypeLine == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
if ( getChangeTypeLine() != null )
throw new IllegalArgumentException( "changetype is already set" );
this.parts.add( changeTypeLine );
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifCommentContainer.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifCommentContainer.java
index 00e7870..43ba428 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifCommentContainer.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifCommentContainer.java
@@ -44,7 +44,7 @@
public void addComment( LdifCommentLine comment )
{
if ( comment == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( comment );
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifContainer.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifContainer.java
index e32993b..f9685a3 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifContainer.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifContainer.java
@@ -48,7 +48,7 @@
{
this.parts = new ArrayList( 1 );
if ( part == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( part );
}
@@ -69,7 +69,7 @@
public final void addInvalid( LdifInvalidPart invalid )
{
if ( invalid == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( invalid );
}
@@ -92,13 +92,13 @@
StringBuffer sb = new StringBuffer();
sb.append( getClass().getName() );
- sb.append( ":" );
+ sb.append( ":" ); //$NON-NLS-1$
sb.append( LdifParserConstants.LINE_SEPARATOR );
LdifPart[] parts = this.getParts();
for ( int i = 0; i < parts.length; i++ )
{
- sb.append( " " );
+ sb.append( " " ); //$NON-NLS-1$
sb.append( parts[i].toString() );
sb.append( LdifParserConstants.LINE_SEPARATOR );
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifContentRecord.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifContentRecord.java
index 66cab31..2f6d2da 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifContentRecord.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifContentRecord.java
@@ -49,7 +49,7 @@
public void addAttrVal( LdifAttrValLine attrVal )
{
if ( attrVal == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( attrVal );
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifModSpec.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifModSpec.java
index c0af01b..b35f2be 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifModSpec.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifModSpec.java
@@ -51,7 +51,7 @@
public void addAttrVal( LdifAttrValLine attrVal )
{
if ( attrVal == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( attrVal );
}
@@ -59,7 +59,7 @@
public void finish( LdifModSpecSepLine modSpecSepLine )
{
if ( modSpecSepLine == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( modSpecSepLine );
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifRecord.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifRecord.java
index 50b7539..3c477c1 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifRecord.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifRecord.java
@@ -47,7 +47,7 @@
public void addComment( LdifCommentLine comment )
{
if ( comment == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( comment );
}
@@ -55,7 +55,7 @@
public void finish( LdifSepLine sep )
{
if ( sep == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( sep );
}
@@ -63,7 +63,7 @@
public void finish( LdifEOFPart eof )
{
if ( eof == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( eof );
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifSepContainer.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifSepContainer.java
index 6bfa91d..600d285 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifSepContainer.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifSepContainer.java
@@ -44,7 +44,7 @@
public void addSep( LdifSepLine sep )
{
if ( sep == null )
- throw new IllegalArgumentException( "null argument" );
+ throw new IllegalArgumentException( "null argument" ); //$NON-NLS-1$
this.parts.add( sep );
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifAttrValLine.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifAttrValLine.java
index 1bff5f7..2bc9c35 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifAttrValLine.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifAttrValLine.java
@@ -83,14 +83,14 @@
}
else
{
- return new LdifAttrValLine( 0, name, ":", value, LdifParserConstants.LINE_SEPARATOR );
+ return new LdifAttrValLine( 0, name, ":", value, LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$
}
}
public static LdifAttrValLine create( String name, byte[] value )
{
- return new LdifAttrValLine( 0, name, "::", LdifUtils.base64encode( value ), LdifParserConstants.LINE_SEPARATOR );
+ return new LdifAttrValLine( 0, name, "::", LdifUtils.base64encode( value ), LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$
}
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifChangeTypeLine.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifChangeTypeLine.java
index 91d202e..5fe483c 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifChangeTypeLine.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifChangeTypeLine.java
@@ -74,25 +74,25 @@
public boolean isAdd()
{
- return this.getUnfoldedChangeType().equals( "add" );
+ return this.getUnfoldedChangeType().equals( "add" ); //$NON-NLS-1$
}
public boolean isDelete()
{
- return this.getUnfoldedChangeType().equals( "delete" );
+ return this.getUnfoldedChangeType().equals( "delete" ); //$NON-NLS-1$
}
public boolean isModify()
{
- return this.getUnfoldedChangeType().equals( "modify" );
+ return this.getUnfoldedChangeType().equals( "modify" ); //$NON-NLS-1$
}
public boolean isModDn()
{
- return this.getUnfoldedChangeType().equals( "moddn" ) || this.getUnfoldedChangeType().equals( "modrdn" );
+ return this.getUnfoldedChangeType().equals( "moddn" ) || this.getUnfoldedChangeType().equals( "modrdn" ); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -121,31 +121,31 @@
public static LdifChangeTypeLine createDelete()
{
- return new LdifChangeTypeLine( 0, "changetype", ":", "delete", LdifParserConstants.LINE_SEPARATOR );
+ return new LdifChangeTypeLine( 0, "changetype", ":", "delete", LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
public static LdifChangeTypeLine createAdd()
{
- return new LdifChangeTypeLine( 0, "changetype", ":", "add", LdifParserConstants.LINE_SEPARATOR );
+ return new LdifChangeTypeLine( 0, "changetype", ":", "add", LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
public static LdifChangeTypeLine createModify()
{
- return new LdifChangeTypeLine( 0, "changetype", ":", "modify", LdifParserConstants.LINE_SEPARATOR );
+ return new LdifChangeTypeLine( 0, "changetype", ":", "modify", LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
public static LdifChangeTypeLine createModDn()
{
- return new LdifChangeTypeLine( 0, "changetype", ":", "moddn", LdifParserConstants.LINE_SEPARATOR );
+ return new LdifChangeTypeLine( 0, "changetype", ":", "moddn", LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
public static LdifChangeTypeLine createModRdn()
{
- return new LdifChangeTypeLine( 0, "changetype", ":", "modrdn", LdifParserConstants.LINE_SEPARATOR );
+ return new LdifChangeTypeLine( 0, "changetype", ":", "modrdn", LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifControlLine.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifControlLine.java
index 7d53b27..4e1e25b 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifControlLine.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifControlLine.java
@@ -102,7 +102,7 @@
public boolean isCritical()
{
- return this.getUnfoldedCriticality().endsWith( "true" );
+ return this.getUnfoldedCriticality().endsWith( "true" ); //$NON-NLS-1$
}
@@ -142,8 +142,8 @@
return this.getUnfoldedControlSpec().length() > 0
&& this.getUnfoldedControlType().length() > 0
&& this.getUnfoldedOid().length() > 0
- && ( this.rawCriticality == null || this.getUnfoldedCriticality().endsWith( "true" ) || this
- .getUnfoldedCriticality().endsWith( "false" ) )
+ && ( this.rawCriticality == null || this.getUnfoldedCriticality().endsWith( "true" ) || this //$NON-NLS-1$
+ .getUnfoldedCriticality().endsWith( "false" ) ) //$NON-NLS-1$
&& ( ( this.rawControlValueType == null && this.rawControlValue == null ) || ( this.rawControlValueType != null && this.rawControlValue != null ) )
&& this.getUnfoldedNewLine().length() > 0;
}
@@ -159,8 +159,8 @@
{
return "Missing OID";
}
- else if ( ( this.rawCriticality != null && !this.getUnfoldedCriticality().endsWith( "true" ) && !this
- .getUnfoldedCriticality().endsWith( "false" ) ) )
+ else if ( ( this.rawCriticality != null && !this.getUnfoldedCriticality().endsWith( "true" ) && !this //$NON-NLS-1$
+ .getUnfoldedCriticality().endsWith( "false" ) ) ) //$NON-NLS-1$
{
return "Invalid criticality, must be 'true' or 'false'";
}
@@ -212,13 +212,13 @@
public boolean isControlValueTypeBase64()
{
- return this.getUnfoldedControlValueType().startsWith( "::" );
+ return this.getUnfoldedControlValueType().startsWith( "::" ); //$NON-NLS-1$
}
public boolean isControlValueTypeSafe()
{
- return this.getUnfoldedControlValueType().startsWith( ":" ) && !this.isControlValueTypeBase64();
+ return this.getUnfoldedControlValueType().startsWith( ":" ) && !this.isControlValueTypeBase64(); //$NON-NLS-1$
}
@@ -230,8 +230,8 @@
}
else
{
- LdifControlLine controlLine = new LdifControlLine( 0, "control", ":", oid, criticality,
- controlValue != null ? ":" : null, controlValue != null ? controlValue : null,
+ LdifControlLine controlLine = new LdifControlLine( 0, "control", ":", oid, criticality, //$NON-NLS-1$ //$NON-NLS-2$
+ controlValue != null ? ":" : null, controlValue != null ? controlValue : null, //$NON-NLS-1$
LdifParserConstants.LINE_SEPARATOR );
return controlLine;
}
@@ -240,8 +240,8 @@
public static LdifControlLine create( String oid, String criticality, byte[] controlValue )
{
- LdifControlLine controlLine = new LdifControlLine( 0, "control", ":", oid, criticality, controlValue != null
- && controlValue.length > 0 ? "::" : null, controlValue != null && controlValue.length > 0 ? LdifUtils
+ LdifControlLine controlLine = new LdifControlLine( 0, "control", ":", oid, criticality, controlValue != null //$NON-NLS-1$ //$NON-NLS-2$
+ && controlValue.length > 0 ? "::" : null, controlValue != null && controlValue.length > 0 ? LdifUtils //$NON-NLS-1$
.base64encode( controlValue ) : null, LdifParserConstants.LINE_SEPARATOR );
return controlLine;
}
@@ -249,13 +249,13 @@
public static LdifControlLine create( String oid, boolean isCritical, String controlValue )
{
- return create( oid, isCritical ? " true" : " false", controlValue );
+ return create( oid, isCritical ? " true" : " false", controlValue ); //$NON-NLS-1$ //$NON-NLS-2$
}
public static LdifControlLine create( String oid, boolean isCritical, byte[] controlValue )
{
- return create( oid, isCritical ? " true" : " false", controlValue );
+ return create( oid, isCritical ? " true" : " false", controlValue ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDeloldrdnLine.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDeloldrdnLine.java
index d70754b..d997e5e 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDeloldrdnLine.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDeloldrdnLine.java
@@ -68,7 +68,7 @@
public boolean isDeleteOldRdn()
{
- return "1".equals( this.getUnfoldedDeleteOldrdn() );
+ return "1".equals( this.getUnfoldedDeleteOldrdn() ); //$NON-NLS-1$
}
@@ -83,7 +83,7 @@
if ( !super.isValid() )
return false;
- return ( "0".equals( getUnfoldedDeleteOldrdn() ) || "1".equals( getUnfoldedDeleteOldrdn() ) );
+ return ( "0".equals( getUnfoldedDeleteOldrdn() ) || "1".equals( getUnfoldedDeleteOldrdn() ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -93,7 +93,7 @@
{
return "Missing delete old Rdn spec 'deleteoldrdn'";
}
- else if ( !"0".equals( getUnfoldedDeleteOldrdn() ) && !"1".equals( getUnfoldedDeleteOldrdn() ) )
+ else if ( !"0".equals( getUnfoldedDeleteOldrdn() ) && !"1".equals( getUnfoldedDeleteOldrdn() ) ) //$NON-NLS-1$ //$NON-NLS-2$
{
return "Invalid value of delete old Rdn, must be '0' or '1'";
}
@@ -106,13 +106,13 @@
public static LdifDeloldrdnLine create0()
{
- return new LdifDeloldrdnLine( 0, "deleteoldrdn", ":", "0", LdifParserConstants.LINE_SEPARATOR );
+ return new LdifDeloldrdnLine( 0, "deleteoldrdn", ":", "0", LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
public static LdifDeloldrdnLine create1()
{
- return new LdifDeloldrdnLine( 0, "deleteoldrdn", ":", "1", LdifParserConstants.LINE_SEPARATOR );
+ return new LdifDeloldrdnLine( 0, "deleteoldrdn", ":", "1", LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLine.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLine.java
index 566e353..38d6955 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLine.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLine.java
@@ -104,12 +104,12 @@
{
if ( LdifUtils.mustEncode( dn ) )
{
- return new LdifDnLine( 0, "dn", "::", LdifUtils.base64encode( LdifUtils.utf8encode( dn ) ),
+ return new LdifDnLine( 0, "dn", "::", LdifUtils.base64encode( LdifUtils.utf8encode( dn ) ), //$NON-NLS-1$ //$NON-NLS-2$
LdifParserConstants.LINE_SEPARATOR );
}
else
{
- return new LdifDnLine( 0, "dn", ":", dn, LdifParserConstants.LINE_SEPARATOR );
+ return new LdifDnLine( 0, "dn", ":", dn, LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifLineBase.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifLineBase.java
index f9c735b..ee3e531 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifLineBase.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifLineBase.java
@@ -128,24 +128,24 @@
public final String toString()
{
String text = toRawString();
- text = text.replaceAll( "\n", "\\\\n" );
- text = text.replaceAll( "\r", "\\\\r" );
- return getClass().getName() + " (" + getOffset() + "," + getLength() + "): '" + text + "'";
+ text = text.replaceAll( "\n", "\\\\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ text = text.replaceAll( "\r", "\\\\r" ); //$NON-NLS-1$ //$NON-NLS-2$
+ return getClass().getName() + " (" + getOffset() + "," + getLength() + "): '" + text + "'"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
protected static String getNonNull( String s )
{
- return s != null ? s : "";
+ return s != null ? s : ""; //$NON-NLS-1$
}
protected static String unfold( String s )
{
- s = s.replaceAll( "\n\r ", "" );
- s = s.replaceAll( "\r\n ", "" );
- s = s.replaceAll( "\n ", "" );
- s = s.replaceAll( "\r ", "" );
+ s = s.replaceAll( "\n\r ", "" ); //$NON-NLS-1$ //$NON-NLS-2$
+ s = s.replaceAll( "\r\n ", "" ); //$NON-NLS-1$ //$NON-NLS-2$
+ s = s.replaceAll( "\n ", "" ); //$NON-NLS-1$ //$NON-NLS-2$
+ s = s.replaceAll( "\r ", "" ); //$NON-NLS-1$ //$NON-NLS-2$
return s;
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifModSpecSepLine.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifModSpecSepLine.java
index 34cfadd..8ccbafc 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifModSpecSepLine.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifModSpecSepLine.java
@@ -61,13 +61,13 @@
public boolean isValid()
{
- return super.isValid() && this.getUnfoldedMinus().equals( "-" );
+ return super.isValid() && this.getUnfoldedMinus().equals( "-" ); //$NON-NLS-1$
}
public String getInvalidString()
{
- if ( !this.getUnfoldedMinus().equals( "-" ) )
+ if ( !this.getUnfoldedMinus().equals( "-" ) ) //$NON-NLS-1$
{
return "Missing '-'";
}
@@ -80,7 +80,7 @@
public static LdifModSpecSepLine create()
{
- return new LdifModSpecSepLine( 0, "-", LdifParserConstants.LINE_SEPARATOR );
+ return new LdifModSpecSepLine( 0, "-", LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$
}
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifModSpecTypeLine.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifModSpecTypeLine.java
index 180a2d8..de4d4d4 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifModSpecTypeLine.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifModSpecTypeLine.java
@@ -74,19 +74,19 @@
public boolean isAdd()
{
- return this.getUnfoldedModType().equals( "add" );
+ return this.getUnfoldedModType().equals( "add" ); //$NON-NLS-1$
}
public boolean isReplace()
{
- return this.getUnfoldedModType().equals( "replace" );
+ return this.getUnfoldedModType().equals( "replace" ); //$NON-NLS-1$
}
public boolean isDelete()
{
- return this.getUnfoldedModType().equals( "delete" );
+ return this.getUnfoldedModType().equals( "delete" ); //$NON-NLS-1$
}
@@ -119,19 +119,19 @@
public static LdifModSpecTypeLine createAdd( String attributeName )
{
- return new LdifModSpecTypeLine( 0, "add", ":", attributeName, LdifParserConstants.LINE_SEPARATOR );
+ return new LdifModSpecTypeLine( 0, "add", ":", attributeName, LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$
}
public static LdifModSpecTypeLine createReplace( String attributeName )
{
- return new LdifModSpecTypeLine( 0, "replace", ":", attributeName, LdifParserConstants.LINE_SEPARATOR );
+ return new LdifModSpecTypeLine( 0, "replace", ":", attributeName, LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$
}
public static LdifModSpecTypeLine createDelete( String attributeName )
{
- return new LdifModSpecTypeLine( 0, "delete", ":", attributeName, LdifParserConstants.LINE_SEPARATOR );
+ return new LdifModSpecTypeLine( 0, "delete", ":", attributeName, LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewrdnLine.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewrdnLine.java
index 866dda4..95061a6 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewrdnLine.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewrdnLine.java
@@ -99,12 +99,12 @@
{
if ( LdifUtils.mustEncode( newrdn ) )
{
- return new LdifNewrdnLine( 0, "newrdn", "::", LdifUtils.base64encode( LdifUtils.utf8encode( newrdn ) ),
+ return new LdifNewrdnLine( 0, "newrdn", "::", LdifUtils.base64encode( LdifUtils.utf8encode( newrdn ) ), //$NON-NLS-1$ //$NON-NLS-2$
LdifParserConstants.LINE_SEPARATOR );
}
else
{
- return new LdifNewrdnLine( 0, "newrdn", ":", newrdn, LdifParserConstants.LINE_SEPARATOR );
+ return new LdifNewrdnLine( 0, "newrdn", ":", newrdn, LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewsuperiorLine.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewsuperiorLine.java
index 3da46b5..b153d18 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewsuperiorLine.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewsuperiorLine.java
@@ -100,12 +100,12 @@
{
if ( LdifUtils.mustEncode( newsuperior ) )
{
- return new LdifNewsuperiorLine( 0, "newsuperior", "::", LdifUtils.base64encode( LdifUtils
+ return new LdifNewsuperiorLine( 0, "newsuperior", "::", LdifUtils.base64encode( LdifUtils //$NON-NLS-1$ //$NON-NLS-2$
.utf8encode( newsuperior ) ), LdifParserConstants.LINE_SEPARATOR );
}
else
{
- return new LdifNewsuperiorLine( 0, "newsuperior", ":", newsuperior, LdifParserConstants.LINE_SEPARATOR );
+ return new LdifNewsuperiorLine( 0, "newsuperior", ":", newsuperior, LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNonEmptyLineBase.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNonEmptyLineBase.java
index f1e0be4..69d8215 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNonEmptyLineBase.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNonEmptyLineBase.java
@@ -79,7 +79,7 @@
public boolean isFolded()
{
String rawString = toRawString();
- return rawString.indexOf( "\n " ) > -1 || rawString.indexOf( "\r " ) > -1;
+ return rawString.indexOf( "\n " ) > -1 || rawString.indexOf( "\r " ) > -1; //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifValueLineBase.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifValueLineBase.java
index 5b53d6a..9549e73 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifValueLineBase.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifValueLineBase.java
@@ -91,21 +91,21 @@
// Fix for DIRSTUDIO-285: We must take care that we only check
// the first colon in the line. If there is another :: or :<
// in the value we must not use that as separator.
- int firstColonIndex = unfolded.indexOf( ":" );
- int firstDoubleColonIndex = unfolded.indexOf( "::" );
- int firstColonLessIndex = unfolded.indexOf( ":<" );
+ int firstColonIndex = unfolded.indexOf( ":" ); //$NON-NLS-1$
+ int firstDoubleColonIndex = unfolded.indexOf( "::" ); //$NON-NLS-1$
+ int firstColonLessIndex = unfolded.indexOf( ":<" ); //$NON-NLS-1$
if ( firstDoubleColonIndex > -1 && firstDoubleColonIndex == firstColonIndex )
{
- unfolded = unfolded.replaceFirst( "::[ ]*", formatParameters.isSpaceAfterColon() ? ":: " : "::" );
+ unfolded = unfolded.replaceFirst( "::[ ]*", formatParameters.isSpaceAfterColon() ? ":: " : "::" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
else if ( firstColonLessIndex > -1 && firstColonLessIndex == firstColonIndex )
{
- unfolded = unfolded.replaceFirst( ":<[ ]*", formatParameters.isSpaceAfterColon() ? ":< " : ":<" );
+ unfolded = unfolded.replaceFirst( ":<[ ]*", formatParameters.isSpaceAfterColon() ? ":< " : ":<" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
else if ( firstColonIndex > -1 )
{
- unfolded = unfolded.replaceFirst( ":[ ]*", formatParameters.isSpaceAfterColon() ? ": " : ":" );
+ unfolded = unfolded.replaceFirst( ":[ ]*", formatParameters.isSpaceAfterColon() ? ": " : ":" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
if ( rawNewLine != null )
@@ -162,7 +162,7 @@
}
else
{
- return "";
+ return ""; //$NON-NLS-1$
}
}
@@ -237,19 +237,19 @@
public boolean isValueTypeURL()
{
- return this.getUnfoldedValueType().startsWith( ":<" );
+ return this.getUnfoldedValueType().startsWith( ":<" ); //$NON-NLS-1$
}
public boolean isValueTypeBase64()
{
- return this.getUnfoldedValueType().startsWith( "::" );
+ return this.getUnfoldedValueType().startsWith( "::" ); //$NON-NLS-1$
}
public boolean isValueTypeSafe()
{
- return this.getUnfoldedValueType().startsWith( ":" ) && !this.isValueTypeBase64() && !this.isValueTypeURL();
+ return this.getUnfoldedValueType().startsWith( ":" ) && !this.isValueTypeBase64() && !this.isValueTypeURL(); //$NON-NLS-1$
}
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifVersionLine.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifVersionLine.java
index 13f4cfa..818eb58 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifVersionLine.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifVersionLine.java
@@ -96,7 +96,7 @@
public static LdifVersionLine create()
{
- return new LdifVersionLine( 0, "version", ":", "1", LdifParserConstants.LINE_SEPARATOR );
+ return new LdifVersionLine( 0, "version", ":", "1", LdifParserConstants.LINE_SEPARATOR ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifParser.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifParser.java
index 017dfa2..58b0d09 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifParser.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifParser.java
@@ -637,7 +637,7 @@
modSpec.addAttrVal( line );
// clean line
- if ( "".equals( line.getRawNewLine() ) )
+ if ( "".equals( line.getRawNewLine() ) ) //$NON-NLS-1$
{
this.cleanupLine( record );
}
@@ -702,7 +702,7 @@
}
// clean line
- if ( "".equals( line.getRawNewLine() ) )
+ if ( "".equals( line.getRawNewLine() ) ) //$NON-NLS-1$
{
this.cleanupLine( record );
}
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifScanner.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifScanner.java
index 8986e07..5cdfc02 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifScanner.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifScanner.java
@@ -504,7 +504,7 @@
private String getWordTillColon( String word )
{
- String wordWithColon = word + ":";
+ String wordWithColon = word + ":"; //$NON-NLS-1$
String line = getWord( wordWithColon );
if ( line != null )
{
@@ -567,7 +567,7 @@
if ( line != null || sep != null )
{
if ( line == null )
- line = "";
+ line = ""; //$NON-NLS-1$
if ( sep != null )
line += sep.getValue();
@@ -609,7 +609,7 @@
}
catch ( EOFException e )
{
- return new LdifToken( LdifToken.EOF, "", pos + 1 );
+ return new LdifToken( LdifToken.EOF, "", pos + 1 ); //$NON-NLS-1$
}
}
@@ -669,7 +669,7 @@
{
this.flushBuffer();
- String line = getFullLine( "#" );
+ String line = getFullLine( "#" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.COMMENT, line, pos - line.length() + 1 );
@@ -683,7 +683,7 @@
{
this.flushBuffer();
- String line = getWordTillColon( "version" );
+ String line = getWordTillColon( "version" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.VERSION_SPEC, line, pos - line.length() + 1 );
@@ -697,7 +697,7 @@
{
this.flushBuffer();
- String line = getWordTillColon( "dn" );
+ String line = getWordTillColon( "dn" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.DN_SPEC, line, pos - line.length() + 1 );
@@ -711,7 +711,7 @@
{
this.flushBuffer();
- String line = getWordTillColon( "control" );
+ String line = getWordTillColon( "control" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.CONTROL_SPEC, line, pos - line.length() + 1 );
@@ -725,7 +725,7 @@
{
this.flushBuffer();
- String line = getWordTillColon( "changetype" );
+ String line = getWordTillColon( "changetype" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.CHANGETYPE_SPEC, line, pos - line.length() + 1 );
@@ -739,27 +739,27 @@
{
this.flushBuffer();
- String line = getWord( "add" );
+ String line = getWord( "add" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.CHANGETYPE_ADD, line, pos - line.length() + 1 );
}
- line = getWord( "modify" );
+ line = getWord( "modify" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.CHANGETYPE_MODIFY, line, pos - line.length() + 1 );
}
- line = getWord( "delete" );
+ line = getWord( "delete" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.CHANGETYPE_DELETE, line, pos - line.length() + 1 );
}
- line = getWord( "moddn" );
+ line = getWord( "moddn" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.CHANGETYPE_MODDN, line, pos - line.length() + 1 );
}
- line = getWord( "modrdn" );
+ line = getWord( "modrdn" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.CHANGETYPE_MODDN, line, pos - line.length() + 1 );
@@ -775,20 +775,20 @@
StringBuffer sb = new StringBuffer();
- String s = getWord( " " );
+ String s = getWord( " " ); //$NON-NLS-1$
while ( s != null )
{
sb.append( s );
- s = getWord( " " );
+ s = getWord( " " ); //$NON-NLS-1$
}
- String t = getWord( "true" );
+ String t = getWord( "true" ); //$NON-NLS-1$
if ( t != null )
{
sb.append( t );
return new LdifToken( LdifToken.CONTROL_CRITICALITY_TRUE, sb.toString(), pos - sb.length() + 1 );
}
- String f = getWord( "false" );
+ String f = getWord( "false" ); //$NON-NLS-1$
if ( f != null )
{
sb.append( f );
@@ -950,17 +950,17 @@
{
this.flushBuffer();
- String line = getWord( "add" );
+ String line = getWord( "add" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.MODTYPE_ADD_SPEC, line, pos - line.length() + 1 );
}
- line = getWord( "replace" );
+ line = getWord( "replace" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.MODTYPE_REPLACE_SPEC, line, pos - line.length() + 1 );
}
- line = getWord( "delete" );
+ line = getWord( "delete" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.MODTYPE_DELETE_SPEC, line, pos - line.length() + 1 );
@@ -974,7 +974,7 @@
{
this.flushBuffer();
- String line = getWord( "-" );
+ String line = getWord( "-" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.MODTYPE_SEP, line, pos - line.length() + 1 );
@@ -1058,7 +1058,7 @@
{
this.flushBuffer();
- String line = getWordTillColon( "newrdn" );
+ String line = getWordTillColon( "newrdn" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.MODDN_NEWRDN_SPEC, line, pos - line.length() + 1 );
@@ -1072,7 +1072,7 @@
{
this.flushBuffer();
- String line = getWordTillColon( "deleteoldrdn" );
+ String line = getWordTillColon( "deleteoldrdn" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.MODDN_DELOLDRDN_SPEC, line, pos - line.length() + 1 );
@@ -1086,7 +1086,7 @@
{
this.flushBuffer();
- String line = getWordTillColon( "newsuperior" );
+ String line = getWordTillColon( "newsuperior" ); //$NON-NLS-1$
if ( line != null )
{
return new LdifToken( LdifToken.MODDN_NEWSUPERIOR_SPEC, line, pos - line.length() + 1 );
diff --git a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifToken.java b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifToken.java
index c6bbf28..ffec075 100644
--- a/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifToken.java
+++ b/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifToken.java
@@ -139,8 +139,8 @@
public String toString()
{
- return "(type=" + this.type + ") " + "(offset=" + this.offset + ") " + "(length=" + this.getLength() + ") '"
- + this.value + "'";
+ return "(type=" + this.type + ") " + "(offset=" + this.offset + ") " + "(length=" + this.getLength() + ") '" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
+ + this.value + "'"; //$NON-NLS-1$
}
diff --git a/plugins/ldifparser/src/test/java/org/apache/directory/studio/ldifparser/model/lines/LdifAttrValLineTest.java b/plugins/ldifparser/src/test/java/org/apache/directory/studio/ldifparser/model/lines/LdifAttrValLineTest.java
index 1379c9a..2cedf49 100644
--- a/plugins/ldifparser/src/test/java/org/apache/directory/studio/ldifparser/model/lines/LdifAttrValLineTest.java
+++ b/plugins/ldifparser/src/test/java/org/apache/directory/studio/ldifparser/model/lines/LdifAttrValLineTest.java
@@ -31,48 +31,48 @@
public void testToFormattedStringSimple()
{
- LdifAttrValLine line = LdifAttrValLine.create( "cn", "abc" );
- LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" );
+ LdifAttrValLine line = LdifAttrValLine.create( "cn", "abc" ); //$NON-NLS-1$ //$NON-NLS-2$
+ LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" ); //$NON-NLS-1$
String formattedString = line.toFormattedString( formatParameters );
- assertEquals( formattedString, "cn: abc\n" );
+ assertEquals( formattedString, "cn: abc\n" ); //$NON-NLS-1$
}
public void testToFormattedStringLineWrap()
{
- LdifAttrValLine line = LdifAttrValLine.create( "cn",
- "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxy" );
- LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" );
+ LdifAttrValLine line = LdifAttrValLine.create( "cn", //$NON-NLS-1$
+ "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxy" ); //$NON-NLS-1$
+ LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" ); //$NON-NLS-1$
String formattedString = line.toFormattedString( formatParameters );
assertEquals( formattedString,
- "cn: abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyabcdefghijklmnopqrstuvw\n xyzabcdefghijklmnopqrstuvwxy\n" );
+ "cn: abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyabcdefghijklmnopqrstuvw\n xyzabcdefghijklmnopqrstuvwxy\n" ); //$NON-NLS-1$
}
public void testToFormattedStringNoSpaceAfterColon()
{
- LdifAttrValLine line = LdifAttrValLine.create( "cn", "abc" );
- LdifFormatParameters formatParameters = new LdifFormatParameters( false, 78, "\n" );
+ LdifAttrValLine line = LdifAttrValLine.create( "cn", "abc" ); //$NON-NLS-1$ //$NON-NLS-2$
+ LdifFormatParameters formatParameters = new LdifFormatParameters( false, 78, "\n" ); //$NON-NLS-1$
String formattedString = line.toFormattedString( formatParameters );
- assertEquals( formattedString, "cn:abc\n" );
+ assertEquals( formattedString, "cn:abc\n" ); //$NON-NLS-1$
}
public void testToFormattedStringBase64()
{
- LdifAttrValLine line = LdifAttrValLine.create( "cn", "\u00e4\u00f6\u00fc" );
- LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" );
+ LdifAttrValLine line = LdifAttrValLine.create( "cn", "\u00e4\u00f6\u00fc" ); //$NON-NLS-1$ //$NON-NLS-2$
+ LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" ); //$NON-NLS-1$
String formattedString = line.toFormattedString( formatParameters );
- assertEquals( formattedString, "cn:: w6TDtsO8\n" );
+ assertEquals( formattedString, "cn:: w6TDtsO8\n" ); //$NON-NLS-1$
}
public void testToFormattedString_DIRSERVER_285()
{
- LdifAttrValLine line = LdifAttrValLine.create( "cn", "abc::def:<ghi" );
- LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" );
+ LdifAttrValLine line = LdifAttrValLine.create( "cn", "abc::def:<ghi" ); //$NON-NLS-1$ //$NON-NLS-2$
+ LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" ); //$NON-NLS-1$
String formattedString = line.toFormattedString( formatParameters );
- assertEquals( formattedString, "cn: abc::def:<ghi\n" );
+ assertEquals( formattedString, "cn: abc::def:<ghi\n" ); //$NON-NLS-1$
}
}
diff --git a/plugins/ldifparser/src/test/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLineTest.java b/plugins/ldifparser/src/test/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLineTest.java
index 7d2ac92..47c4ec8 100644
--- a/plugins/ldifparser/src/test/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLineTest.java
+++ b/plugins/ldifparser/src/test/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLineTest.java
@@ -31,48 +31,48 @@
public void testToFormattedStringSimple()
{
- LdifDnLine dnLine = LdifDnLine.create( "cn=abc,ou=department,o=org,dc=example,dc=com" );
- LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" );
+ LdifDnLine dnLine = LdifDnLine.create( "cn=abc,ou=department,o=org,dc=example,dc=com" ); //$NON-NLS-1$
+ LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" ); //$NON-NLS-1$
String formattedString = dnLine.toFormattedString( formatParameters );
- assertEquals( formattedString, "dn: cn=abc,ou=department,o=org,dc=example,dc=com\n" );
+ assertEquals( formattedString, "dn: cn=abc,ou=department,o=org,dc=example,dc=com\n" ); //$NON-NLS-1$
}
public void testToFormattedStringNewline()
{
- LdifDnLine dnLine = LdifDnLine.create( "cn=abc,ou=department,o=org,dc=example,dc=com" );
- LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\r\n" );
+ LdifDnLine dnLine = LdifDnLine.create( "cn=abc,ou=department,o=org,dc=example,dc=com" ); //$NON-NLS-1$
+ LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\r\n" ); //$NON-NLS-1$
String formattedString = dnLine.toFormattedString( formatParameters );
- assertEquals( formattedString, "dn: cn=abc,ou=department,o=org,dc=example,dc=com\r\n" );
+ assertEquals( formattedString, "dn: cn=abc,ou=department,o=org,dc=example,dc=com\r\n" ); //$NON-NLS-1$
}
public void testToFormattedStringLineWrap()
{
LdifDnLine dnLine = LdifDnLine
- .create( "cn=abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxy,ou=department,o=org,dc=example,dc=com" );
- LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" );
+ .create( "cn=abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxy,ou=department,o=org,dc=example,dc=com" ); //$NON-NLS-1$
+ LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" ); //$NON-NLS-1$
String formattedString = dnLine.toFormattedString( formatParameters );
- assertEquals( formattedString, "dn: cn=abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxy,ou=department,o=org"
- + "\n ,dc=example,dc=com\n" );
+ assertEquals( formattedString, "dn: cn=abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxy,ou=department,o=org" //$NON-NLS-1$
+ + "\n ,dc=example,dc=com\n" ); //$NON-NLS-1$
}
public void testToFormattedStringNoSpaceAfterColon()
{
- LdifDnLine dnLine = LdifDnLine.create( "cn=abc,ou=department,o=org,dc=example,dc=com" );
- LdifFormatParameters formatParameters = new LdifFormatParameters( false, 78, "\n" );
+ LdifDnLine dnLine = LdifDnLine.create( "cn=abc,ou=department,o=org,dc=example,dc=com" ); //$NON-NLS-1$
+ LdifFormatParameters formatParameters = new LdifFormatParameters( false, 78, "\n" ); //$NON-NLS-1$
String formattedString = dnLine.toFormattedString( formatParameters );
- assertEquals( formattedString, "dn:cn=abc,ou=department,o=org,dc=example,dc=com\n" );
+ assertEquals( formattedString, "dn:cn=abc,ou=department,o=org,dc=example,dc=com\n" ); //$NON-NLS-1$
}
public void testToFormattedStringBase64()
{
- LdifDnLine dnLine = LdifDnLine.create( "cn=\u00e4\u00f6\u00fc,ou=department,o=org,dc=example,dc=com" );
- LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" );
+ LdifDnLine dnLine = LdifDnLine.create( "cn=\u00e4\u00f6\u00fc,ou=department,o=org,dc=example,dc=com" ); //$NON-NLS-1$
+ LdifFormatParameters formatParameters = new LdifFormatParameters( true, 78, "\n" ); //$NON-NLS-1$
String formattedString = dnLine.toFormattedString( formatParameters );
- assertEquals( formattedString, "dn:: Y249w6TDtsO8LG91PWRlcGFydG1lbnQsbz1vcmcsZGM9ZXhhbXBsZSxkYz1jb20=\n" );
+ assertEquals( formattedString, "dn:: Y249w6TDtsO8LG91PWRlcGFydG1lbnQsbz1vcmcsZGM9ZXhhbXBsZSxkYz1jb20=\n" ); //$NON-NLS-1$
}
@@ -82,10 +82,10 @@
*/
public void testIsValid()
{
- LdifDnLine dnLine = LdifDnLine.create( "cn=\\#\\\\\\+\\, \\\"\u00f6\u00e9\\\",ou=users,ou=system" );
+ LdifDnLine dnLine = LdifDnLine.create( "cn=\\#\\\\\\+\\, \\\"\u00f6\u00e9\\\",ou=users,ou=system" ); //$NON-NLS-1$
assertTrue( dnLine.isValid() );
- assertEquals( "Y249XCNcXFwrXCwgXCLDtsOpXCIsb3U9dXNlcnMsb3U9c3lzdGVt", dnLine.getUnfoldedDn() );
- assertEquals( "cn=\\#\\\\\\+\\, \\\"\u00f6\u00e9\\\",ou=users,ou=system", dnLine.getValueAsString() );
+ assertEquals( "Y249XCNcXFwrXCwgXCLDtsOpXCIsb3U9dXNlcnMsb3U9c3lzdGVt", dnLine.getUnfoldedDn() ); //$NON-NLS-1$
+ assertEquals( "cn=\\#\\\\\\+\\, \\\"\u00f6\u00e9\\\",ou=users,ou=system", dnLine.getValueAsString() ); //$NON-NLS-1$
}
}
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 3c86065..ae16178 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -32,7 +32,6 @@
<modules>
<module>aciitemeditor</module>
- <module>apacheds</module>
<module>apacheds-launcher</module>
<module>apacheds.configuration</module>
<module>apacheds.configuration.v2</module>
@@ -53,7 +52,6 @@
<module>ldifeditor</module>
<module>ldifparser</module>
<module>rcp</module>
- <module>rcp.fullscreen</module>
<module>schemaeditor</module>
<module>valueeditors</module>
</modules>
@@ -97,6 +95,8 @@
<exclude>ldapbrowser.core/src/main/resources/default_schema.ldif</exclude>
<exclude>rcp/resources/icons/linux/studio.xpm</exclude>
<exclude>schemaeditor/resources/schemas/openldap/*.xml</exclude>
+ <exclude>**/*.launch</exclude>
+ <exclude>**/maven-eclipse.xml</exclude>
</excludes>
</configuration>
</plugin>
diff --git a/plugins/rcp.fullscreen/plugin.xml b/plugins/rcp.fullscreen/plugin.xml
deleted file mode 100644
index 5be0829..0000000
--- a/plugins/rcp.fullscreen/plugin.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.ui.startup">
- <startup
- class="org.apache.directory.studio.rcp.fullscreen.Startup"></startup>
- </extension>
- <extension
- point="org.eclipse.ui.commands">
- <command
- defaultHandler="org.apache.directory.studio.rcp.fullscreen.ToggleFullScreenHandler"
- id="org.apache.directory.studio.rcp.fullscreen.ToggleFullScreen"
- name="Toggle Full Screen">
- </command>
- <command
- defaultHandler="org.apache.directory.studio.rcp.fullscreen.ToggleFullScreenEscapeHandler"
- id="org.apache.directory.studio.rcp.fullscreen.ToggleFullScreenEscape"
- name="ToggleFullScreenEscape">
- </command>
- </extension>
- <extension
- point="org.eclipse.ui.menus">
- <menuContribution
- allPopups="false"
- locationURI="menu:window?after=newEditor">
- <command
- commandId="org.apache.directory.studio.rcp.fullscreen.ToggleFullScreen"
- label="Toggle Full Screen"/>
- </menuContribution>
- </extension>
- <extension
- point="org.eclipse.ui.bindings">
- <key
- commandId="org.apache.directory.studio.rcp.fullscreen.ToggleFullScreenEscape"
- contextId="org.eclipse.ui.contexts.window"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="Esc">
- </key>
- </extension>
-
-</plugin>
diff --git a/plugins/rcp.fullscreen/pom.xml b/plugins/rcp.fullscreen/pom.xml
deleted file mode 100644
index 6d9f49c..0000000
--- a/plugins/rcp.fullscreen/pom.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!--
- @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>parent-plugins</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>rcp.fullscreen</artifactId>
- <name>Apache Directory Studio RCP Fullscreen for OS X Lion</name>
- <packaging>jar</packaging>
-
- <description />
-
- <build>
- <resources>
- <resource>
- <directory>.</directory>
- <includes>
- <include>plugin.properties</include>
- <include>plugin.xml</include>
- <include>about.ini</include>
- <include>studio.png</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>resources</directory>
- <targetPath>resources</targetPath>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- <pde>true</pde>
- <projectnatures>
- <projectnature>org.eclipse.jem.workbench.JavaEMFNature</projectnature>
- <projectnature>org.eclipse.pde.PluginNature</projectnature>
- <projectnature>org.eclipse.jdt.core.javanature</projectnature>
- <projectnature>org.eclipse.jem.beaninfo.BeanInfoNature</projectnature>
- </projectnatures>
- <classpathContainers>
- <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
- <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
- </classpathContainers>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>studio-maven-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- <createManifest>true</createManifest>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>prepare-jar-package</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>META-INF/MANIFEST.MF</manifestFile>
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
- </configuration>
- </plugin>
- <!-- MANIFEST.MF Generation -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton:=true</Bundle-SymbolicName>
- <Bundle-Localization>plugin</Bundle-Localization>
- <Eclipse-LazyStart>true</Eclipse-LazyStart>
- <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
- <Embed-Directory>lib</Embed-Directory>
- <Embed-StripGroup>true</Embed-StripGroup>
- <Embed-Transitive>true</Embed-Transitive>
- <Bundle-Activator>org.apache.directory.studio.rcp.fullscreen.Activator</Bundle-Activator>
- <Require-Bundle>org.eclipse.core.runtime,
- org.eclipse.ui</Require-Bundle>
- <Export-Package>!*</Export-Package>
- <Import-Package>!</Import-Package>
- <Private-Package>!</Private-Package>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>generate-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- No tests to run -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>commands</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>common</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>jface</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.swt.cocoa.macosx</groupId>
- <artifactId>x86_64</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>ui</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>workbench</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/plugins/rcp.fullscreen/src/main/java/org/apache/directory/studio/rcp/fullscreen/Activator.java b/plugins/rcp.fullscreen/src/main/java/org/apache/directory/studio/rcp/fullscreen/Activator.java
deleted file mode 100644
index 6301f97..0000000
--- a/plugins/rcp.fullscreen/src/main/java/org/apache/directory/studio/rcp/fullscreen/Activator.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011, Alex Blewitt.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Alex Blewitt - initial API and implementation
- *******************************************************************************/
-package org.apache.directory.studio.rcp.fullscreen;
-
-
-import org.eclipse.swt.internal.cocoa.NSWindow;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWindowListener;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * Set all existing windows to have full-screen behaviour, and also permit new
- * windows to be registered with same as well.
- *
- * @author Alex Blewitt <alex.blewit@gmail.com>
- */
-@SuppressWarnings("restriction")
-public class Activator extends AbstractUIPlugin implements IWindowListener
-{
-
- public static final String PLUGIN_ID = "com.bandlem.eclipse.fullscreen.ui"; //$NON-NLS-1$
-
-
- public void start( BundleContext context ) throws Exception
- {
- super.start( context );
- PlatformUI.getWorkbench().addWindowListener( this );
- }
-
-
- public void stop( BundleContext context ) throws Exception
- {
- super.stop( context );
- }
-
-
- @Override
- public void windowActivated( IWorkbenchWindow window )
- {
- }
-
-
- @Override
- public void windowDeactivated( IWorkbenchWindow window )
- {
- }
-
-
- @Override
- public void windowClosed( IWorkbenchWindow window )
- {
- }
-
-
- @Override
- public void windowOpened( IWorkbenchWindow window )
- {
- Shell shell = window.getShell();
- setWindowFullscreen( shell );
- }
-
-
- static void setWindowFullscreen( final Shell shell )
- {
- NSWindow nswindow = shell.view.window();
- nswindow.setToolbar( null );
- SO.Reflect.executeLong( nswindow, "setCollectionBehavior",
- new Class[]
- { SO.NSUInteger }, ( int ) ( 1 << 7 ) );
- }
-}
diff --git a/plugins/rcp.fullscreen/src/main/java/org/apache/directory/studio/rcp/fullscreen/BnLWindow.java b/plugins/rcp.fullscreen/src/main/java/org/apache/directory/studio/rcp/fullscreen/BnLWindow.java
deleted file mode 100644
index eb259c0..0000000
--- a/plugins/rcp.fullscreen/src/main/java/org/apache/directory/studio/rcp/fullscreen/BnLWindow.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011, Alex Blewitt.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Alex Blewitt - initial API and implementation
- *******************************************************************************/
-package org.apache.directory.studio.rcp.fullscreen;
-
-
-import org.eclipse.swt.internal.cocoa.NSWindow;
-
-import org.apache.directory.studio.rcp.fullscreen.SO.Reflect;
-
-
-/**
- * Wrapper methods to assist with extensions to NSWindow
- *
- * @author Alex Blewitt <alex.blewitt@gmail.com>
- */
-@SuppressWarnings("restriction")
-public class BnLWindow
-{
-
- /**
- * Toggle the window in and out of fullScreen mode.
- *
- * @param window
- * the window, which must not be <code>null</code>.
- */
- public static void toggleFullScreen( NSWindow window )
- {
- long toggleFullScreen = SO.selector( "toggleFullScreen:" );
- long target = SO.getID( window );
- SO.objc_msgSend( target, toggleFullScreen, 0 );
- }
-
-
- /**
- * Returns true if the window is in fullScreen mode already.
- *
- * @param window
- * the window, which must not be null.
- * @return true if the window is in fullScreen mode, false otherwise.
- */
- public static boolean isFullScreen( NSWindow window )
- {
- long styleMask = Reflect.executeLong( window, "styleMask" );
- return ( ( ( styleMask >> 14 ) & 1 ) == 1 );
- }
-
-
- /**
- * Sets the window's fullScreen mode, regardless of current setting
- *
- * @param window
- * the window, which must not be null.
- * @param fullScreen
- * true if the window is to go into fullScreen mode, false
- * otherwise.
- */
- public static void setFullScreen( NSWindow window, boolean fullScreen )
- {
- if ( isFullScreen( window ) != fullScreen )
- toggleFullScreen( window );
- }
-}
diff --git a/plugins/rcp.fullscreen/src/main/java/org/apache/directory/studio/rcp/fullscreen/SO.java b/plugins/rcp.fullscreen/src/main/java/org/apache/directory/studio/rcp/fullscreen/SO.java
deleted file mode 100644
index a2e4140..0000000
--- a/plugins/rcp.fullscreen/src/main/java/org/apache/directory/studio/rcp/fullscreen/SO.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011, Alex Blewitt.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Alex Blewitt - initial API and implementation
- *******************************************************************************/
-package org.apache.directory.studio.rcp.fullscreen;
-
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.swt.internal.cocoa.OS;
-import org.eclipse.swt.internal.cocoa.id;
-
-
-/**
- * Handles some of the Objective-C code in a architecture neutral way.
- *
- * Since SWT is compiled for 32-bit or 64-bit access separately (and types like
- * {@link id} correspond to NSUInteger, which is 32-bit on a 32-bit system and
- * 64-bit on a 64-bit system), we can't just use the same parameter for all
- * method invocations.
- *
- * This front-end to the Objective-C runtime uses <code>long</code> for
- * everything, and maps it to <code>int</code> when running on a 32-bit system.
- * As a result, code can call this and not have to worry about the distinction
- * between the two.
- *
- * It also allows access to selectors not normally available in SWT, via the
- * {@link #selector(String)} call. For example, invoking
- * <code>selector("toggleFullScreen:")</code> allows that method to be called
- * even if {@link OS} doesn't provide a handle to that natively, which it
- * doesn't on at least Eclipse 3.6 and Eclipse 3.7 systems.
- *
- * Finally, since a lot of this uses reflection, it also provides some helper
- * methods to get a field to make the reflection API a little more sane.
- *
- * @author Alex Blewitt <alex.blewit@gmail.com>
- */
-@SuppressWarnings(
- { "rawtypes", "restriction" })
-public class SO
-{
- /**
- * Subset of helpers for reflective access to methods
- */
- public static class Reflect
- {
-
- /**
- * Executes a method, which returns a <code>long</code> (compatible)
- * value.
- *
- * @param target
- * the instance to execute against (if it is a Class, will be
- * static access)
- * @param method
- * the method name
- * @param types
- * the list of argument types (if any)
- * @param args
- * the list of arguments (if any)
- * @throws RuntimeException
- * if any reflection invocation method occurs.
- * @return the long return value
- */
- public static long executeLong( Object target, String method,
- Object... args )
- {
- Class types[] = new Class[args.length];
- for ( int i = 0; i < args.length; i++ )
- {
- types[i] = args[i].getClass();
- }
- return executeLong( target, method, types, args );
- }
-
-
- /**
- * Executes a method, which returns a <code>long</code> (compatible)
- * value.
- *
- * @param target
- * the instance to execute against (if it is a Class, will be
- * static access)
- * @param method
- * the method name
- * @param types
- * the list of argument types (if any)
- * @param args
- * the list of arguments (if any)
- * @throws RuntimeException
- * if any reflection invocation method occurs.
- * @return the long return value
- */
- @SuppressWarnings("unchecked")
- public static long executeLong( Object target, String method,
- Class[] types, Object... args )
- {
- Class clazz = ( Class ) ( target instanceof Class ? target : target
- .getClass() );
- Object[] newArgs;
- try
- {
- if ( NSUInteger == Long.TYPE )
- {
- newArgs = args;
- }
- else
- {
- newArgs = new Object[args.length];
- for ( int i = 0; i < args.length; i++ )
- {
- newArgs[i] = new Integer( ( ( Number ) args[i] ).intValue() );
- }
- }
- Method m = clazz.getMethod( method, types );
- Number n = ( ( Number ) m.invoke( target, newArgs ) );
- return n == null ? -1 : n.longValue();
- }
- catch ( Exception e )
- {
- throw new RuntimeException( e );
- }
- }
-
-
- /**
- * Gets a field from the object, which can either be a Class (for static
- * access) or an instance
- *
- * @param target
- * the object/class to obtain the field from
- * @param field
- * the field name
- * @throws RuntimeException
- * if any problems occur with reflection
- * @return the result
- */
- public static Object getField( Object target, String field )
- {
- try
- {
- return ( target instanceof Class ? ( Class ) target : target
- .getClass() ).getField( field ).get( target );
- }
- catch ( Exception e )
- {
- throw new RuntimeException( e );
- }
- }
-
- }
-
- /**
- * This represents the corresponding Java primitive type of NSUInteger, and
- * can be passed in methods that perform lookups via reflection.
- *
- * On a 32-bit system, this will have the value <code>Integer.TYPE</code>
- * whilst on a 64-bit system it will have the value <code>Long.TYPE</code>.
- *
- * This is dynamically determined based on the type of {@link OS#class_NSObjectl}
- * compiled into the SWT library.
- */
- public static final Class NSUInteger = Reflect.getField( OS.class,
- "class_NSObject" ).getClass() == Long.class ? Long.TYPE : Integer.TYPE;
-
- /**
- * Private cache of selectors-to-ids.
- */
- private static Map<String, Number> selectors = new HashMap<String, Number>();
-
-
- /**
- * Gets the id associated with an object of type id (base Cocoa SWT class).
- *
- * @param id
- * the object
- * @return the long value
- */
- public static long getID( id id )
- {
- return ( ( Number ) Reflect.getField( id, "id" ) ).longValue();
- }
-
-
- public static void objc_msgSend( long target, long sel, long arg )
- {
- Reflect.executeLong( OS.class, "objc_msgSend", new Class[]
- { NSUInteger,
- NSUInteger, NSUInteger }, target, sel, arg );
- }
-
-
- public static long selector( String sel )
- {
- try
- {
- Number selector = selectors.get( sel );
- if ( selector == null )
- {
- selector = ( Number ) ( OS.class.getMethod( "sel_registerName",
- String.class ).invoke( null, sel ) );
- selectors.put( sel, selector );
- }
- return selector.longValue();
- }
- catch ( Exception e )
- {
- throw new RuntimeException( e );
- }
- }
-}
diff --git a/plugins/rcp.fullscreen/src/main/java/org/apache/directory/studio/rcp/fullscreen/Startup.java b/plugins/rcp.fullscreen/src/main/java/org/apache/directory/studio/rcp/fullscreen/Startup.java
deleted file mode 100644
index faab979..0000000
--- a/plugins/rcp.fullscreen/src/main/java/org/apache/directory/studio/rcp/fullscreen/Startup.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.apache.directory.studio.rcp.fullscreen;
-
-
-import org.eclipse.ui.IStartup;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-
-public class Startup implements Runnable, IStartup
-{
-
- private IWorkbenchWindow[] windows;
-
-
- @Override
- public void earlyStartup()
- {
- IWorkbench workbench = PlatformUI.getWorkbench();
- windows = workbench.getWorkbenchWindows();
- workbench.getDisplay().asyncExec( this );
- }
-
-
- @Override
- public void run()
- {
- for ( int i = 0; i < windows.length; i++ )
- {
- IWorkbenchWindow iWorkbenchWindow = windows[i];
- Activator.setWindowFullscreen( iWorkbenchWindow.getShell() );
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/rcp.fullscreen/src/main/java/org/apache/directory/studio/rcp/fullscreen/ToggleFullScreenEscapeHandler.java b/plugins/rcp.fullscreen/src/main/java/org/apache/directory/studio/rcp/fullscreen/ToggleFullScreenEscapeHandler.java
deleted file mode 100644
index 535d069..0000000
--- a/plugins/rcp.fullscreen/src/main/java/org/apache/directory/studio/rcp/fullscreen/ToggleFullScreenEscapeHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011, Alex Blewitt.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Alex Blewitt - initial API and implementation
- *******************************************************************************/
-package org.apache.directory.studio.rcp.fullscreen;
-
-
-import org.eclipse.swt.internal.cocoa.NSWindow;
-
-
-/**
- * Provides mapping for the Escape key, such that it only works when the window
- * is already in fullscreen mode.
- *
- * @author Alex Blewitt <alex.blewit@gmail.com>
- */
-@SuppressWarnings("restriction")
-public class ToggleFullScreenEscapeHandler extends ToggleFullScreenHandler
-{
-
- /**
- * This is enabled when {@link ToggleFullScreenHandler#isEnabled()}, and
- * we're in fullScreen mode.
- */
- @Override
- public boolean isEnabled()
- {
- NSWindow[] windows = getWindows();
- return super.isEnabled() && windows != null && windows.length >= 1
- && BnLWindow.isFullScreen( windows[0] );
- }
-}
diff --git a/plugins/rcp.fullscreen/src/main/java/org/apache/directory/studio/rcp/fullscreen/ToggleFullScreenHandler.java b/plugins/rcp.fullscreen/src/main/java/org/apache/directory/studio/rcp/fullscreen/ToggleFullScreenHandler.java
deleted file mode 100644
index c753af5..0000000
--- a/plugins/rcp.fullscreen/src/main/java/org/apache/directory/studio/rcp/fullscreen/ToggleFullScreenHandler.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011, Alex Blewitt.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Alex Blewitt - initial API and implementation
- *******************************************************************************/
-package org.apache.directory.studio.rcp.fullscreen;
-
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.swt.internal.cocoa.NSWindow;
-import org.eclipse.swt.internal.cocoa.OS;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * Provides a handler which can be used for mapping to keystrokes as well as a
- * menu item to go into and out of fullscreen mode.
- *
- * @author Alex Blewitt <alex.blewitt@gmail.com>
- */
-@SuppressWarnings("restriction")
-public class ToggleFullScreenHandler extends AbstractHandler
-{
-
- /**
- * Toggles the window into fullScreen mode, via
- * {@link BnLWindow#toggleFullScreen(NSWindow)}.
- */
- @Override
- public Object execute( ExecutionEvent event ) throws ExecutionException
- {
- NSWindow[] windows = getWindows();
- //for (int i = 0; i < windows.length; i++)
- BnLWindow.toggleFullScreen( windows[0] );
- return null;
- }
-
-
- /**
- * Helper to get the active window. Returns the windows in the workbench's
- * array.
- *
- * @return the NSWindow to go into fullScreen mode.
- */
- protected NSWindow[] getWindows()
- {
- IWorkbenchWindow[] windows = PlatformUI.getWorkbench()
- .getWorkbenchWindows();
- NSWindow[] nsWindows = new NSWindow[windows.length];
- for ( int i = 0; i < windows.length; i++ )
- {
- nsWindows[i] = windows[i].getShell().view.window();
- }
- return nsWindows;
- }
-
-
- /**
- * This is enabled if we are on OSX 10.7 and above, and there are windows
- * present.
- */
- @Override
- public boolean isEnabled()
- {
- IWorkbenchWindow[] windows = PlatformUI.getWorkbench()
- .getWorkbenchWindows();
- return windows.length >= 1 && OS.VERSION >= 0x1070;
- }
-}
diff --git a/plugins/rcp/Eclipse.launch b/plugins/rcp/Eclipse.launch
deleted file mode 100644
index 35acef2..0000000
--- a/plugins/rcp/Eclipse.launch
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Eclipse"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-Eclipse"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -XX:MaxPermSize=256m -Xms40m -Xmx512m -Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
diff --git a/plugins/rcp/plugin.properties b/plugins/rcp/plugin.properties
index 2ded28a..253f837 100644
--- a/plugins/rcp/plugin.properties
+++ b/plugins/rcp/plugin.properties
@@ -14,10 +14,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-aboutText=Apache Directory Studio\n\n\Version: ${pom.version}\n\n\u00A9 2006-2011 Apache Software Foundation - All right reserved.\n\Visit http://directory.apache.org/studio\n\n\This product is licensed under the terms of the Apache License 2.0.\n\n\Some icons from FAMFAMFAM http://www.famfamfam.com/lab/icons/silk
+aboutText=Apache Directory Studio\n\n\Version: ${pom.version}\n\n\u00A9 2006-2012 Apache Software Foundation - All right reserved.\n\Visit http://directory.apache.org/studio\n\n\This product is licensed under the terms of the Apache License 2.0.\n\n\Some icons from FAMFAMFAM http://www.famfamfam.com/lab/icons/silk
Action_AddExtension_id=org.apache.directory.studio.newExtensions
Action_ManageConfiguration_id=org.apache.directory.studio.manageConfiguration
Action_OpenFile_id=org.apache.directory.studio.openFile
Action_ReportABug_id=org.apache.directory.studio.reportABug
Action_Update_id=org.apache.directory.studio.newUpdates
+
+Pref_StudioPage_id=org.apache.directory.studio.StudioPreferencePage
+
+PrefPage_ShutdownPreferencesPage_id=org.apache.directory.studio.preferences.ShutdownPreferencesPage
+PrefPage_ShutdownPreferencesPage_name=Shutdown
diff --git a/plugins/rcp/plugin.xml b/plugins/rcp/plugin.xml
index 95fe35a..67a37b6 100644
--- a/plugins/rcp/plugin.xml
+++ b/plugins/rcp/plugin.xml
@@ -103,5 +103,19 @@
</presentation>
</config>
</extension>
+
+ <extension
+ point="org.eclipse.core.runtime.preferences">
+ <initializer class="org.apache.directory.studio.preferences.RcpPreferencesInitializer"/>
+ </extension>
+
+ <extension
+ point="org.eclipse.ui.preferencePages">
+ <page
+ category="%Pref_StudioPage_id"
+ class="org.apache.directory.studio.preferences.ShutdownPreferencesPage"
+ id="%PrefPage_ShutdownPreferencesPage_id"
+ name="%PrefPage_ShutdownPreferencesPage_name"/>
+ </extension>
</plugin>
diff --git a/plugins/rcp/plugin_de.properties b/plugins/rcp/plugin_de.properties
new file mode 100644
index 0000000..ffaf7fa
--- /dev/null
+++ b/plugins/rcp/plugin_de.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+aboutText=TODO:Apache Directory Studio\n\n\Version: ${pom.version}\n\n\u00A9 2006-2012 Apache Software Foundation - All right reserved.\n\Visit http://directory.apache.org/studio\n\n\This product is licensed under the terms of the Apache License 2.0.\n\n\Some icons from FAMFAMFAM http://www.famfamfam.com/lab/icons/silk
+PrefPage_ShutdownPreferencesPage_name=Beendigung
diff --git a/plugins/rcp/plugin_fr.properties b/plugins/rcp/plugin_fr.properties
new file mode 100644
index 0000000..f42ca58
--- /dev/null
+++ b/plugins/rcp/plugin_fr.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+aboutText=Apache Directory Studio\n\n\Version: ${pom.version}\n\n\u00A9 2006-2012 Apache Software Foundation - Tous droits réservés.\n\Visit http://directory.apache.org/studio\n\n\Ce produit est licencié selon les termes de la Apache License 2.0.\n\n\Certaines icones sont de FAMFAMFAM http://www.famfamfam.com/lab/icons/silk
+PrefPage_ShutdownPreferencesPage_name=Extinction
diff --git a/plugins/rcp/pom.xml b/plugins/rcp/pom.xml
index c0ef07f..ddd7af7 100644
--- a/plugins/rcp/pom.xml
+++ b/plugins/rcp/pom.xml
@@ -199,6 +199,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>preferences</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.eclipse</groupId>
<artifactId>jface</artifactId>
<scope>provided</scope>
@@ -273,19 +278,6 @@
<artifactId>app</artifactId>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/plugins/rcp/src/main/java/org/apache/directory/studio/Application.java b/plugins/rcp/src/main/java/org/apache/directory/studio/Application.java
index a4edba0..8787c1c 100644
--- a/plugins/rcp/src/main/java/org/apache/directory/studio/Application.java
+++ b/plugins/rcp/src/main/java/org/apache/directory/studio/Application.java
@@ -26,8 +26,6 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.PlatformUI;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
@@ -40,16 +38,12 @@
/** The plugin ID */
public static final String PLUGIN_ID = "org.apache.directory.studio.rcp"; //$NON-NLS-1$
- /** The logger*/
- private static Logger logger = LoggerFactory.getLogger( Application.class );
-
/**
* {@inheritDoc}
*/
public Object start( IApplicationContext context ) throws Exception
{
- logger.info( "Entering Apache Directory Studio." ); //$NON-NLS-1$
Display display = PlatformUI.createDisplay();
try
@@ -67,7 +61,6 @@
finally
{
display.dispose();
- logger.info( "Exiting Apache Directory Studio." ); //$NON-NLS-1$
}
}
diff --git a/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java b/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java
index dbcdd25..1063d60 100644
--- a/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java
+++ b/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java
@@ -21,6 +21,7 @@
package org.apache.directory.studio;
+import org.apache.directory.studio.actions.AddExtensionAction;
import org.apache.directory.studio.actions.ManageConfigurationAction;
import org.apache.directory.studio.actions.OpenFileAction;
import org.apache.directory.studio.actions.ReportABugAction;
@@ -99,6 +100,7 @@
private IWorkbenchAction nextAction;
private IWorkbenchAction previousAction;
private IWorkbenchAction introAction;
+ private AddExtensionAction addExtensionAction;
/**
@@ -222,6 +224,9 @@
ImageKeys.SEARCH_UPDATES ) );
register( updateAction );
+ addExtensionAction = new AddExtensionAction( window );
+ register( addExtensionAction );
+
manageConfigurationAction = new ManageConfigurationAction( window );
manageConfigurationAction.setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin(
Application.PLUGIN_ID, ImageKeys.MANAGE_CONFIGURATION ) );
@@ -389,6 +394,7 @@
helpMenu.add( new Separator() );
MenuManager softwareUpdates = new MenuManager( Messages
.getString( "ApplicationActionBarAdvisor.Software_Updates" ), "softwareUpdates" ); //$NON-NLS-1$ //$NON-NLS-2$
+ softwareUpdates.add( addExtensionAction );
softwareUpdates.add( updateAction );
softwareUpdates.add( manageConfigurationAction );
helpMenu.add( softwareUpdates );
diff --git a/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationWorkbenchAdvisor.java b/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationWorkbenchAdvisor.java
index 91a14af..1a211ba 100644
--- a/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationWorkbenchAdvisor.java
+++ b/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationWorkbenchAdvisor.java
@@ -21,6 +21,7 @@
package org.apache.directory.studio;
+import org.apache.directory.studio.preferences.ShutdownPreferencesPage;
import org.eclipse.core.net.proxy.IProxyService;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.dialogs.Dialog;
@@ -120,7 +121,7 @@
*/
public boolean preShutdown()
{
- return true;
+ return ShutdownPreferencesPage.promptOnExit();
}
diff --git a/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationWorkbenchWindowAdvisor.java b/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationWorkbenchWindowAdvisor.java
index ed59e53..736c2c0 100644
--- a/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationWorkbenchWindowAdvisor.java
+++ b/plugins/rcp/src/main/java/org/apache/directory/studio/ApplicationWorkbenchWindowAdvisor.java
@@ -68,7 +68,6 @@
*/
public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor
{
-
private IEditorPart lastActiveEditor = null;
private IPerspectiveDescriptor lastPerspective = null;
private IWorkbenchPage lastActivePage;
@@ -372,5 +371,4 @@
recomputeTitle();
}
-
}
diff --git a/plugins/rcp/src/main/java/org/apache/directory/studio/Messages.java b/plugins/rcp/src/main/java/org/apache/directory/studio/Messages.java
index 10dbdde..5485fcc 100644
--- a/plugins/rcp/src/main/java/org/apache/directory/studio/Messages.java
+++ b/plugins/rcp/src/main/java/org/apache/directory/studio/Messages.java
@@ -24,9 +24,6 @@
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* This class is used to get Strings to display in the User Interface
@@ -35,9 +32,6 @@
*/
public class Messages
{
- // The logger
- private static Logger logger = LoggerFactory.getLogger( Messages.class );
-
private static final String BUNDLE_NAME = "org.apache.directory.studio.messages"; //$NON-NLS-1$
private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle( BUNDLE_NAME );
@@ -64,7 +58,6 @@
}
catch ( MissingResourceException e )
{
- logger.warn( "Associated ressource not found for key {}", key ); //$NON-NLS-1$
return '!' + key + '!';
}
}
diff --git a/plugins/rcp/src/main/java/org/apache/directory/studio/PluginConstants.java b/plugins/rcp/src/main/java/org/apache/directory/studio/PluginConstants.java
index 662b0fb..1961147 100644
--- a/plugins/rcp/src/main/java/org/apache/directory/studio/PluginConstants.java
+++ b/plugins/rcp/src/main/java/org/apache/directory/studio/PluginConstants.java
@@ -58,4 +58,7 @@
public static final String ACTION_UPDATE_ID = Activator.getDefault().getPluginProperties().getString(
"Action_Update_id" ); //$NON-NLS-1$
+ /** The Update ActionID */
+ public static final String PREFERENCE_EXIT_PROMPT_ON_CLOSE_LAST_WINDOW = "exitPromptOnCloseLastWindow"; //$NON-NLS-1$
+
}
diff --git a/plugins/rcp/src/main/java/org/apache/directory/studio/messages.properties b/plugins/rcp/src/main/java/org/apache/directory/studio/messages.properties
index f78fe1d..021264e 100644
--- a/plugins/rcp/src/main/java/org/apache/directory/studio/messages.properties
+++ b/plugins/rcp/src/main/java/org/apache/directory/studio/messages.properties
@@ -21,7 +21,6 @@
#
# Strings used by ApplicationActionBarAdvisor Class
-ApplicationActionBarAdvisor.Quit_LDAP_Studio=Quit Apache Directory Studio
ApplicationActionBarAdvisor.Software_Updates=Software Updates
ApplicationActionBarAdvisor.edit=&Edit
ApplicationActionBarAdvisor.showView=Show View
@@ -36,8 +35,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.Apache_Directory_Studio_Site=Apache Directory Studio Update Site
-AddExtensionAction.Apache_Directory__Home_Base=http://directory.apache.org/studio/update/1.x
+AddExtensionAction.Apache_Directory_Studio_Site=Apache Directory Studio
+AddExtensionAction.Apache_Directory_Studio_Home_Base=http://directory.apache.org/studio/update/2.x
# Strings used by ManageConfigurationAction Class
ManageConfigurationAction.Manage_Configuration=Manage Configuration
@@ -59,3 +58,10 @@
ReportABugAction.Report_a_bug=Report a bug...
ReportABugAction.Open_a_web_browser=Open a Web browser for creating a new bug report
ReportABugAction.JIRA_URL=https://issues.apache.org/jira/browse/DIRSTUDIO
+
+# Strings used by ShutdownPreferencesPage Class
+ShutdownPreferencesPage.PromptOnExitTitle=Confirm Exit
+ShutdownPreferencesPage.PromptOnExitMessage=Exit Apache Directory Studio?
+ShutdownPreferencesPage.PromptOnExitToggleMessage=&Always exit without prompt
+ShutdownPreferencesPage.PageTitle=Shutdown
+ShutdownPreferencesPage.ConfirmExitClosingLastWindow=Confirm exit when closing last window
diff --git a/plugins/rcp/src/main/java/org/apache/directory/studio/messages_de.properties b/plugins/rcp/src/main/java/org/apache/directory/studio/messages_de.properties
index 4cde5e2..b1a6505 100644
--- a/plugins/rcp/src/main/java/org/apache/directory/studio/messages_de.properties
+++ b/plugins/rcp/src/main/java/org/apache/directory/studio/messages_de.properties
@@ -21,7 +21,6 @@
#
# Strings used by ApplicationActionBarAdvisor Class
-ApplicationActionBarAdvisor.Quit_LDAP_Studio=Apache Directory Studio schliessen
ApplicationActionBarAdvisor.Software_Updates=Software Updates
ApplicationActionBarAdvisor.edit=&Bearbeiten
ApplicationActionBarAdvisor.showView=Zeige Ansicht
@@ -37,7 +36,6 @@
AddExtensionAction.Search_for_new_extensions=Suche neue Erweiterungen f\u00FCr Apache Directory Studio
AddExtensionAction.Searching_new_extensions=Suche neue Erweiterungen
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=Konfiguration verwalten
@@ -58,4 +56,10 @@
# Strings used by ReportABugAction Class
ReportABugAction.Report_a_bug=Melde einen Fehler...
ReportABugAction.Open_a_web_browser=\u00D6ffne einen Web Browser um einen neuen Fehler zu melden
-ReportABugAction.JIRA_URL=https://issues.apache.org/jira/browse/DIRSTUDIO
+
+# Strings used by ShutdownPreferencesPage Class
+ShutdownPreferencesPage.PromptOnExitTitle=Bestätigen Sie Exit
+ShutdownPreferencesPage.PromptOnExitMessage=Beenden Sie Apache Directory Studio?
+ShutdownPreferencesPage.PromptOnExitToggleMessage=&Immer ohne Aufforderung verlassen
+ShutdownPreferencesPage.PageTitle=Beendigung
+ShutdownPreferencesPage.ConfirmExitClosingLastWindow=Bestätigen Sie beenden beim Schließen letzte Fenster
diff --git a/plugins/rcp/src/main/java/org/apache/directory/studio/messages_fr.properties b/plugins/rcp/src/main/java/org/apache/directory/studio/messages_fr.properties
index e4958d6..a07970c 100644
--- a/plugins/rcp/src/main/java/org/apache/directory/studio/messages_fr.properties
+++ b/plugins/rcp/src/main/java/org/apache/directory/studio/messages_fr.properties
@@ -21,7 +21,6 @@
#
# Strings used by ApplicationActionBarAdvisor Class
-ApplicationActionBarAdvisor.Quit_LDAP_Studio=Quitter Apache Directory Studio
ApplicationActionBarAdvisor.Software_Updates=Mises \u00E0 jour
ApplicationActionBarAdvisor.edit=&Edition
ApplicationActionBarAdvisor.showView=Afficher la vue
@@ -57,3 +56,10 @@
# Strings used by ReportABugAction Class
ReportABugAction.Report_a_bug=Signaler une anomalie...
ReportABugAction.Open_a_web_browser=Ouvrir un navigateur pour cr\u00E9er un nouveau rapport d'anomalie
+
+# Strings used by ShutdownPreferencesPage Class
+ShutdownPreferencesPage.PromptOnExitTitle=Confirmer l'extinction
+ShutdownPreferencesPage.PromptOnExitMessage=Quitter Apache Directory Studio ?
+ShutdownPreferencesPage.PromptOnExitToggleMessage=&Toujours quitter sans confirmation
+ShutdownPreferencesPage.PageTitle=Extinction
+ShutdownPreferencesPage.ConfirmExitClosingLastWindow=Confirmer l'extinction lors de la fermeture de la dernière fenêtre
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/AttributeTypeAdapter.java b/plugins/rcp/src/main/java/org/apache/directory/studio/preferences/RcpPreferencesInitializer.java
similarity index 60%
copy from plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/AttributeTypeAdapter.java
copy to plugins/rcp/src/main/java/org/apache/directory/studio/preferences/RcpPreferencesInitializer.java
index 9b1b607..c1c0216 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/AttributeTypeAdapter.java
+++ b/plugins/rcp/src/main/java/org/apache/directory/studio/preferences/RcpPreferencesInitializer.java
@@ -17,32 +17,29 @@
* under the License.
*
*/
-package org.apache.directory.studio.schemaeditor.controller;
+
+package org.apache.directory.studio.preferences;
+
+
+import org.apache.directory.studio.Activator;
+import org.apache.directory.studio.PluginConstants;
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.jface.preference.IPreferenceStore;
/**
- * This adapter class provides default implementations for the methods
- * described by the AttributeTypeListener interface.
- * <p>
- * Classes that wish to deal with attribute type events can extend this class
- * and override only the methods which they are interested in.
+ * This class is used to set default preference values.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class AttributeTypeAdapter implements AttributeTypeListener
+public class RcpPreferencesInitializer extends AbstractPreferenceInitializer
{
/**
* {@inheritDoc}
*/
- public void attributeTypeModified()
+ public void initializeDefaultPreferences()
{
- }
-
-
- /**
- * {@inheritDoc}
- */
- public void attributeTypeRemoved()
- {
+ IPreferenceStore store = Activator.getDefault().getPreferenceStore();
+ store.setDefault( PluginConstants.PREFERENCE_EXIT_PROMPT_ON_CLOSE_LAST_WINDOW, true );
}
}
diff --git a/plugins/rcp/src/main/java/org/apache/directory/studio/preferences/ShutdownPreferencesPage.java b/plugins/rcp/src/main/java/org/apache/directory/studio/preferences/ShutdownPreferencesPage.java
new file mode 100644
index 0000000..ea52f98
--- /dev/null
+++ b/plugins/rcp/src/main/java/org/apache/directory/studio/preferences/ShutdownPreferencesPage.java
@@ -0,0 +1,167 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.studio.preferences;
+
+
+import org.apache.directory.studio.Activator;
+import org.apache.directory.studio.Messages;
+import org.apache.directory.studio.PluginConstants;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.MessageDialogWithToggle;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.eclipse.ui.PlatformUI;
+
+
+/**
+ * This class implements the Shutdown Preferences Page.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class ShutdownPreferencesPage extends PreferencePage implements IWorkbenchPreferencePage
+{
+ // UI fields
+ private Button confirmExitClosingLastWindowCheckbox;
+
+
+ /**
+ * Creates a new instance of EntryEditorsPreferencePage.
+ */
+ public ShutdownPreferencesPage()
+ {
+ super( Messages.getString( "ShutdownPreferencesPage.PageTitle" ) ); //$NON-NLS-1$
+ super.setPreferenceStore( Activator.getDefault().getPreferenceStore() );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void init( IWorkbench workbench )
+ {
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected Control createContents( Composite parent )
+ {
+ Composite composite = new Composite( parent, SWT.NONE );
+ GridLayout gl = new GridLayout();
+ gl.marginHeight = gl.marginWidth = 0;
+ composite.setLayout( gl );
+ composite.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
+
+ confirmExitClosingLastWindowCheckbox = new Button( composite, SWT.CHECK );
+ confirmExitClosingLastWindowCheckbox.setText( Messages
+ .getString( "ShutdownPreferencesPage.ConfirmExitClosingLastWindow" ) ); //$NON-NLS-1$
+
+ refreshUI();
+
+ return composite;
+ }
+
+
+ /**
+ * Refreshes the UI.
+ */
+ private void refreshUI()
+ {
+ confirmExitClosingLastWindowCheckbox.setSelection( getPreferenceStore().getBoolean(
+ PluginConstants.PREFERENCE_EXIT_PROMPT_ON_CLOSE_LAST_WINDOW ) );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean performOk()
+ {
+ getPreferenceStore().setValue( PluginConstants.PREFERENCE_EXIT_PROMPT_ON_CLOSE_LAST_WINDOW,
+ confirmExitClosingLastWindowCheckbox.getSelection() );
+
+ return true;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void performDefaults()
+ {
+ getPreferenceStore().setValue( PluginConstants.PREFERENCE_EXIT_PROMPT_ON_CLOSE_LAST_WINDOW,
+ getPreferenceStore().getDefaultBoolean( PluginConstants.PREFERENCE_EXIT_PROMPT_ON_CLOSE_LAST_WINDOW ) );
+
+ super.performDefaults();
+ }
+
+
+ /**
+ * Prompts the user (or not, depending on the preferences) while exiting the application.
+ *
+ * @return <code>true</code> if the application needs to be exited,
+ * <code>false</code> if not.
+ */
+ public static boolean promptOnExit()
+ {
+ // Checking for multiple workbench windows
+ if ( PlatformUI.getWorkbench().getWorkbenchWindowCount() > 1 )
+ {
+ return true;
+ }
+
+ // Getting the preferred exit mode from the preferences
+ IPreferenceStore store = Activator.getDefault().getPreferenceStore();
+ boolean promptOnExit = store.getBoolean( PluginConstants.PREFERENCE_EXIT_PROMPT_ON_CLOSE_LAST_WINDOW );
+
+ if ( promptOnExit )
+ {
+ MessageDialogWithToggle dialog = MessageDialogWithToggle.openOkCancelConfirm( PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getShell(),
+ Messages.getString( "ShutdownPreferencesPage.PromptOnExitTitle" ), //$NON-NLS-1$
+ Messages.getString( "ShutdownPreferencesPage.PromptOnExitMessage" ), //$NON-NLS-1$
+ Messages.getString( "ShutdownPreferencesPage.PromptOnExitToggleMessage" ), false, null, null ); //$NON-NLS-1$
+
+ // Checking the dialog's return code
+ if ( dialog.getReturnCode() != IDialogConstants.OK_ID )
+ {
+ return false;
+ }
+
+ // Saving the preferred exit mode value to the preferences
+ if ( dialog.getToggleState() )
+ {
+ store.setValue( PluginConstants.PREFERENCE_EXIT_PROMPT_ON_CLOSE_LAST_WINDOW, false );
+ Activator.getDefault().savePluginPreferences();
+ }
+ }
+
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/plugins/rcp/src/main/resources/splash.bmp b/plugins/rcp/src/main/resources/splash.bmp
index b0cd546..a5df3a8 100644
--- a/plugins/rcp/src/main/resources/splash.bmp
+++ b/plugins/rcp/src/main/resources/splash.bmp
Binary files differ
diff --git a/plugins/schemaeditor/plugin.properties b/plugins/schemaeditor/plugin.properties
index 510c3d0..bbdcf6a 100644
--- a/plugins/schemaeditor/plugin.properties
+++ b/plugins/schemaeditor/plugin.properties
@@ -171,6 +171,10 @@
Cmd_DeleteSchemaElement_name=Delete Schema Element
Cmd_DeleteSchemaElement_description=Delete the selected schema elements
+Cmd_RenameSchemaElement_id=org.apache.directory.studio.schemaeditor.commands.renameSchemaElement
+Cmd_RenameSchemaElement_name=Rename Schema Element
+Cmd_RenameSchemaElement_description=Renames the selected schema element
+
SchemaConnector_ApacheDS_id=org.apache.directory.studio.schemaeditor.model.io.ApacheDsSchemaConnector
SchemaConnector_ApacheDS_name=ApacheDS Schema Connector
SchemaConnector_ApacheDS_description=The ApacheDS Schema Connector is compatible with ApacheDS (version 1.5 or later)
diff --git a/plugins/schemaeditor/plugin.xml b/plugins/schemaeditor/plugin.xml
index 5491240..711e770 100644
--- a/plugins/schemaeditor/plugin.xml
+++ b/plugins/schemaeditor/plugin.xml
@@ -370,6 +370,12 @@
id="%Cmd_DeleteSchemaElement_id"
name="%Cmd_DeleteSchemaElement_name">
</command>
+ <command
+ categoryId="%Cmd_Category_id"
+ description="%Cmd_RenameSchemaElement_description"
+ id="%Cmd_RenameSchemaElement_id"
+ name="%Cmd_RenameSchemaElement_name">
+ </command>
</extension>
<extension
point="org.eclipse.ui.bindings">
@@ -427,6 +433,12 @@
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
sequence="DEL">
</key>
+ <key
+ commandId="%Cmd_RenameSchemaElement_id"
+ contextId="%Ctx_SchemaView_id"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="F2">
+ </key>
</extension>
<extension
point="org.apache.directory.studio.schemaeditor.schemaConnectors">
diff --git a/plugins/schemaeditor/plugin_de.properties b/plugins/schemaeditor/plugin_de.properties
index 1ff8846..02e0e6e 100644
--- a/plugins/schemaeditor/plugin_de.properties
+++ b/plugins/schemaeditor/plugin_de.properties
@@ -78,7 +78,7 @@
Cmd_RenameProject_description=Benennt ein Projekt um
Cmd_DeleteProject_name=Delete Project
-Cmd_DeleteProject_description=Deletes the selected project(s)
+Cmd_DeleteProject_description=TODO:Deletes the selected project(s)
Cmd_NewSchema_name=Neues Schema
Cmd_NewSchema_description=Erstellt ein neues Schema
@@ -98,6 +98,9 @@
Cmd_DeleteSchemaElement_name=Schema Element l\u00F6schen
Cmd_DeleteSchemaElement_description=L\u00F6scht das ausgew\u00E4hlte Schema Element
+Cmd_RenameProject_name=Schema Element umbenennen
+Cmd_RenameProject_description=TODO:Renames the selected schema element
+
SchemaConnector_ApacheDS_name=ApacheDS Schema Konnektor
SchemaConnector_ApacheDS_description=Der ApacheDS Schema Konnektor ist kompatibel mit ApacheDS (Version 1.5 oder h\u00F6her)
diff --git a/plugins/schemaeditor/plugin_fr.properties b/plugins/schemaeditor/plugin_fr.properties
index bb94139..24a3401 100644
--- a/plugins/schemaeditor/plugin_fr.properties
+++ b/plugins/schemaeditor/plugin_fr.properties
@@ -116,6 +116,9 @@
Cmd_DeleteSchemaElement_name=Supprimer l'\u00E9l\u00E9ment de sch\u00E9ma
Cmd_DeleteSchemaElement_description=Supprimer l'\u00E9l\u00E9ment de sch\u00E9ma s\u00E9lectionn\u00E9
+Cmd_RenameProject_name=Renommer l'\u00E9l\u00E9ment de sch\u00E9ma
+Cmd_RenameProject_description=Renommer l'\u00E9l\u00E9ment de sch\u00E9ma s\u00E9lectionn\u00E9
+
SchemaConnector_ApacheDS_name=Connecteur de sch\u00E9ma ApacheDS
SchemaConnector_ApacheDS_description=Le connecteur de sch\u00E9ma ApacheDS est compatible avec ApacheDS (version 1.5 ou ult\u00E9rieure)
diff --git a/plugins/schemaeditor/resources/schemas/apacheds/adsconfig.xml b/plugins/schemaeditor/resources/schemas/apacheds/adsconfig.xml
new file mode 100644
index 0000000..18bb5f8
--- /dev/null
+++ b/plugins/schemaeditor/resources/schemas/apacheds/adsconfig.xml
@@ -0,0 +1,1900 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<schema name="adsconfig">
+ <attributetypes>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.0" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-compositeElement</alias>
+ </aliases>
+ <description>A base AttributeType for attributeType referencing composite configuration elements</description>
+ <superior>name</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.100" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-directoryServiceId</alias>
+ </aliases>
+ <description>The DirectoryService ID</description>
+ <superior>name</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.101" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-dsAccessControlEnabled</alias>
+ </aliases>
+ <description>Tells if access control is activated or not</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.102" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-dsAllowAnonymousAccess</alias>
+ </aliases>
+ <description>Tells if anonymous access are allowed or not</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.103" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-dsDenormalizeOpAttrsEnabled</alias>
+ </aliases>
+ <description>Tells if the operational attributes are denormalized or not</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.104" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-dsPasswordHidden</alias>
+ </aliases>
+ <description>Tells if the password is stored encrypted even for PLAIN authentication</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.105" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-changeLog</alias>
+ </aliases>
+ <description>The ChangeLog system</description>
+ <superior>ads-compositeElement</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.108" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-partitions</alias>
+ </aliases>
+ <description>The set of partitions</description>
+ <superior>ads-compositeElement</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.110" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-dsMaxPDUSize</alias>
+ </aliases>
+ <description>Gives the maximum size of a PDU</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.111" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-dsSyncPeriodMillis</alias>
+ </aliases>
+ <description>Define the duration between two flushes on disk</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.112" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-dsReplicaId</alias>
+ </aliases>
+ <description>The server identifier, used for replication</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.113" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-dsTestEntries</alias>
+ </aliases>
+ <description>The set of entries to inject at startup (may be obsolete)</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.115" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-servers</alias>
+ </aliases>
+ <description>The references to the servers</description>
+ <superior>ads-compositeElement</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.116" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-interceptors</alias>
+ </aliases>
+ <description>The references to the interceptors</description>
+ <superior>ads-compositeElement</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.117" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-journal</alias>
+ </aliases>
+ <description>The reference to the Journal</description>
+ <superior>ads-compositeElement</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.120" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-changeLogId</alias>
+ </aliases>
+ <description>The ChangeLog identifier</description>
+ <superior>name</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.121" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-changeLogExposed</alias>
+ </aliases>
+ <description>Tells if the changeLog system is visible by the clients</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.130" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-interceptorId</alias>
+ </aliases>
+ <description>The Interceptor identifier</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.131" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-interceptorOrder</alias>
+ </aliases>
+ <description>The Interceptor order number</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.141" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-journalRotation</alias>
+ </aliases>
+ <description>The size before a journal rotation occurs.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.142" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-journalWorkingDir</alias>
+ </aliases>
+ <description>The place on disk where the journal is stored.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.143" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-journalFileName</alias>
+ </aliases>
+ <description>The journal file name.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.144" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-journalId</alias>
+ </aliases>
+ <description>The Journal ID</description>
+ <superior>name</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.150" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-partitionId</alias>
+ </aliases>
+ <description>The Partition identifier</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.151" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-partitionSuffix</alias>
+ </aliases>
+ <description>The partition suffix</description>
+ <superior>distinguishedName</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ <ordering>distinguishedNameMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.152" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-indexes</alias>
+ </aliases>
+ <description>A reference to the indexed attributes</description>
+ <superior>ads-compositeElement</superior>
+ <usage>USER_APPLICATIONS</usage>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.153" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-partitionCacheSize</alias>
+ </aliases>
+ <description>The number of entries in the cache for this partition</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.154" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-contextEntry</alias>
+ </aliases>
+ <description>The Partition context entry</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.160" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-indexAttributeId</alias>
+ </aliases>
+ <description>The attributeType name or OID</description>
+ <superior>name</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+ <equality>objectIdentifierMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.161" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-indexFileName</alias>
+ </aliases>
+ <description>The index file name</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.162" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-indexWorkingDir</alias>
+ </aliases>
+ <description>The place on disk where the index file is stored</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.163" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-indexNumDupLimit</alias>
+ </aliases>
+ <description>The number of duplicated element we allow before switching to a secondary tree</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.164" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-indexCacheSize</alias>
+ </aliases>
+ <description>The number of key we store in the cache for this index</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.200" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-transportId</alias>
+ </aliases>
+ <description>The transport ID</description>
+ <superior>name</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.250" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-serverId</alias>
+ </aliases>
+ <description>The server ID</description>
+ <superior>name</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.251" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-transports</alias>
+ </aliases>
+ <description>The reference to the associated transports</description>
+ <superior>ads-compositeElement</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.252" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-Id</alias>
+ </aliases>
+ <description>a generic ID which can be used in any configuration entry DN</description>
+ <superior>name</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.253" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-extendedOpId</alias>
+ </aliases>
+ <description>an ID used for ExtendeOpertion names</description>
+ <superior>name</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.300" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-confidentialityRequired</alias>
+ </aliases>
+ <description>Tells the server to accept requests using startTLS or LDAPS</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.301" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-allowAnonymousAccess</alias>
+ </aliases>
+ <description>Tells the server to accept Anynymous requests or not</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.302" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-maxSizeLimit</alias>
+ </aliases>
+ <description>The maximum number of entries to return</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.303" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-maxTimeLimit</alias>
+ </aliases>
+ <description>The maximum time before an operation is aborted (in seconds)</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.304" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-saslHost</alias>
+ </aliases>
+ <description>The name of this host, validated during SASL negotiation</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.305" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-saslPrincipal</alias>
+ </aliases>
+ <description>The service principal, used by GSSAPI</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.306" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-saslRealms</alias>
+ </aliases>
+ <description>The realms serviced by this SASL host</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.307" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-replConsumers</alias>
+ </aliases>
+ <description>The replication consumers of this server instance</description>
+ <superior>ads-compositeElement</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.308" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-keystoreFile</alias>
+ </aliases>
+ <description>The keystore file to use to store certificates</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.309" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-certificatePassword</alias>
+ </aliases>
+ <description>The certificate passord</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.310" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-replConsumerImpl</alias>
+ </aliases>
+ <description>The FQCN of the replication consumer/client handler</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.311" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-saslMechHandlers</alias>
+ </aliases>
+ <description>The reference to the SASL mechanism Handlers</description>
+ <superior>ads-compositeElement</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.312" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-extendedOpHandlers</alias>
+ </aliases>
+ <description>The reference to the extended operation Handlers</description>
+ <superior>ads-compositeElement</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.313" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-passwordPolicies</alias>
+ </aliases>
+ <description>The PasswordPolicy configuration</description>
+ <superior>ads-compositeElement</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.400" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-krbAllowableClockSkew</alias>
+ </aliases>
+ <description>The allowable clock skew</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.401" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-krbEncryptionTypes</alias>
+ </aliases>
+ <description>The encryption types</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.402" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-krbEmptyAddressesAllowed</alias>
+ </aliases>
+ <description>Whether empty addresses are allowed</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.403" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-krbForwardableAllowed</alias>
+ </aliases>
+ <description>Whether forwardable addresses are allowed</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.404" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-krbPaEncTimestampRequired</alias>
+ </aliases>
+ <description>Whether pre-authentication by encrypted timestamp is required</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.405" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-krbPostdatedAllowed</alias>
+ </aliases>
+ <description>Whether postdated tickets are allowed</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.406" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-krbProxiableAllowed</alias>
+ </aliases>
+ <description>Whether proxiable addresses are allowed</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.407" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-krbRenewableAllowed</alias>
+ </aliases>
+ <description>Whether renewable tickets are allowed</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.408" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-krbKdcPrincipal</alias>
+ </aliases>
+ <description>The service principal name</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.409" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-krbMaximumRenewableLifetime</alias>
+ </aliases>
+ <description>The maximum renewable lifetime</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.410" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-krbMaximumTicketLifetime</alias>
+ </aliases>
+ <description>The maximum ticket lifetime</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.411" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-krbPrimaryRealm</alias>
+ </aliases>
+ <description>The primary realm</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.412" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-krbBodyChecksumVerified</alias>
+ </aliases>
+ <description>Whether to verify the body checksum</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.61" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-transportAddress</alias>
+ </aliases>
+ <description>The Address to listen on.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreOrderingMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseIgnoreIA5SubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.62" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-transportBacklog</alias>
+ </aliases>
+ <description>The number of messages waiting to be processed.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.63" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-transportEnableSSL</alias>
+ </aliases>
+ <description>Tells if this transport support SSL.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.64" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-transportNbThreads</alias>
+ </aliases>
+ <description>The number of threads to use for the Acceptor</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.800" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-chgPwdPolicyCategoryCount</alias>
+ </aliases>
+ <description>The policy category count</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.801" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-chgPwdPolicyPasswordLength</alias>
+ </aliases>
+ <description>The policy minimum password length</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.802" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-chgPwdPolicyTokenSize</alias>
+ </aliases>
+ <description>The policy token size</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.803" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-chgPwdServicePrincipal</alias>
+ </aliases>
+ <description>The Change Password service principal</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.804" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-interceptorClassName</alias>
+ </aliases>
+ <description>Fully qualified class name of the interceptor</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.805" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-enabled</alias>
+ </aliases>
+ <description>specifies whether a config element is enabled or not, default is true</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.806" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-partitionSyncOnWrite</alias>
+ </aliases>
+ <description>directs a partition to synchronize the underlying storage upon a write operation</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.807" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-jdbmPartitionOptimizerEnabled</alias>
+ </aliases>
+ <description>Enables JDBM partition optimizer</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.808" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-saslMechName</alias>
+ </aliases>
+ <description>SASL mechanism name</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.809" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-ntlmMechProvider</alias>
+ </aliases>
+ <description>Fully qualified class name of SASL NTLM provider</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.810" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-saslMechClassName</alias>
+ </aliases>
+ <description>Fully qualified class name of SASL mechanism implementation</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.811" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-extendedOpHandlerClass</alias>
+ </aliases>
+ <description>Fully qualified class name of the extended operation handler</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.812" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-systemPort</alias>
+ </aliases>
+ <description>Port number on system</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.813" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-httpWarFile</alias>
+ </aliases>
+ <description>a web app archive</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <ordering>caseIgnoreOrderingMatch</ordering>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.814" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-httpAppCtxPath</alias>
+ </aliases>
+ <description>A web app context path</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <ordering>caseIgnoreOrderingMatch</ordering>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.815" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-enableReplProvider</alias>
+ </aliases>
+ <description>flag to prepare the server as a replication provider</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.816" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-httpConfFile</alias>
+ </aliases>
+ <description>Jetty web server config file path</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <ordering>caseIgnoreOrderingMatch</ordering>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.817" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-replSearchFilter</alias>
+ </aliases>
+ <description>Search filter used in replication</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ <ordering>caseIgnoreOrderingMatch</ordering>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.818" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-replLastSentCsn</alias>
+ </aliases>
+ <description>the CSN that was sent to the client as part of cookie</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.4203.666.11.2.1</syntax>
+ <equality>csnMatch</equality>
+ <ordering>csnOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.819" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-replAliasDerefMode</alias>
+ </aliases>
+ <description>the alias dereference mode of replication search</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.18060.0.4.1.0.11</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.820" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-searchBaseDN</alias>
+ </aliases>
+ <description>base DN of the DIT to be searched or replicated</description>
+ <superior>distinguishedName</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ <ordering>distinguishedNameMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.821" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-replSearchScope</alias>
+ </aliases>
+ <description>the search scope of the replication</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.18060.0.4.1.0.10</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.822" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-replRefreshNPersist</alias>
+ </aliases>
+ <description>flag indicating refreshAndPersist mode of replication</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.823" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-replProvHostName</alias>
+ </aliases>
+ <description>replication provider host name</description>
+ <superior>ads-transportAddress</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ <ordering>caseIgnoreOrderingMatch</ordering>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.824" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-replProvPort</alias>
+ </aliases>
+ <description>replication provider port number</description>
+ <superior>ads-transportId</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.825" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-replUserDn</alias>
+ </aliases>
+ <description>user DN used for authenticating with replication provider</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.826" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-replUserPassword</alias>
+ </aliases>
+ <description>replication user password</description>
+ <superior>userPassword</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
+ <equality>octetStringMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.827" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-replRefreshInterval</alias>
+ </aliases>
+ <description>time interval between two refreshOnly sessions</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.828" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-replAttributes</alias>
+ </aliases>
+ <description>the attributes to be replicated</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseIgnoreIA5SubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.829" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-replSearchSizeLimit</alias>
+ </aliases>
+ <description>size limit imposed during replication refreshOnly phase</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.830" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-replSearchTimeOut</alias>
+ </aliases>
+ <description>search timeout imposed during replication refreshOnly phase</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.831" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-replCookie</alias>
+ </aliases>
+ <description>cookie sent from the replication provider</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
+ <equality>octetStringMatch</equality>
+ <ordering>octetStringOrderingMatch</ordering>
+ <substring>octetStringSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.832" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-replReqHandler</alias>
+ </aliases>
+ <description>FQCN of the replication replication request handler on a master/provider</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.833" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-replUseTls</alias>
+ </aliases>
+ <description>flag to indicate the use of TLS</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.834" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-replStrictCertValidation</alias>
+ </aliases>
+ <description>flag to indicate strict certificate validation</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.835" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-replPeerCertificate</alias>
+ </aliases>
+ <description>X.509 certificate of the replica peer</description>
+ <superior>userCertificate</superior>
+ <usage>USER_APPLICATIONS</usage>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.837" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-replConsumerId</alias>
+ </aliases>
+ <description>The replication consumer ID</description>
+ <superior>name</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.840" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-httpWebApps</alias>
+ </aliases>
+ <description>The references to the web applications</description>
+ <superior>ads-compositeElement</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.900" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-pwdAttribute</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+ <equality>objectIdentifierMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.901" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-pwdMinAge</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.902" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-pwdMaxAge</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.903" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-pwdInHistory</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.904" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-pwdCheckQuality</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.905" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-pwdMinLength</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.906" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-pwdMaxLength</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.907" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-pwdExpireWarning</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.908" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-pwdGraceAuthNLimit</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.909" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-pwdGraceExpire</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.910" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-pwdLockout</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.911" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-pwdLockoutDuration</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.912" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-pwdMaxFailure</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.913" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-pwdFailureCountInterval</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.914" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-pwdMustChange</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.915" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-pwdAllowUserChange</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.916" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-pwdSafeModify</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.917" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-pwdMinDelay</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.918" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-pwdMaxDelay</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.919" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-pwdMaxIdle</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.921" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-pwdId</alias>
+ </aliases>
+ <description>an ID used to identify the passwordPolicy configuration</description>
+ <superior>name</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.930" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-authenticatorId</alias>
+ </aliases>
+ <description>Authenticator Id</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.931" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-delegateHost</alias>
+ </aliases>
+ <description>an external host handling delegate authentication</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.932" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-delegatePort</alias>
+ </aliases>
+ <description>Port number on system</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.933" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-authenticators</alias>
+ </aliases>
+ <description>A reference to the authenticators</description>
+ <superior>ads-compositeElement</superior>
+ <usage>USER_APPLICATIONS</usage>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.934" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ads-authenticatorClass</alias>
+ </aliases>
+ <description>the fully qualified class name of an authenticator implementation</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ <substring>caseExactSubstringsMatch</substring>
+ </attributetype>
+ </attributetypes>
+ <objectclasses>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.0" obsolete="false">
+ <aliases>
+ <alias>ads-base</alias>
+ </aliases>
+ <description>The base bean</description>
+ <type>ABSTRACT</type>
+ <optional>
+ <attributetype>ads-enabled</attributetype>
+ <attributetype>description</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.100" obsolete="false">
+ <aliases>
+ <alias>ads-directoryService</alias>
+ </aliases>
+ <description>The DirectoryService ObjectClass</description>
+ <superiors>
+ <superior>ads-base</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>ads-directoryServiceId</attributetype>
+ <attributetype>ads-dsReplicaId</attributetype>
+ <attributetype>ads-interceptors</attributetype>
+ <attributetype>ads-partitions</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>ads-servers</attributetype>
+ <attributetype>ads-dsAccessControlEnabled</attributetype>
+ <attributetype>ads-dsAllowAnonymousAccess</attributetype>
+ <attributetype>ads-changeLog</attributetype>
+ <attributetype>ads-dsDenormalizeOpAttrsEnabled</attributetype>
+ <attributetype>ads-journal</attributetype>
+ <attributetype>ads-dsMaxPDUSize</attributetype>
+ <attributetype>ads-dsPasswordHidden</attributetype>
+ <attributetype>ads-dsSyncPeriodMillis</attributetype>
+ <attributetype>ads-dsTestEntries</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.120" obsolete="false">
+ <aliases>
+ <alias>ads-changeLog</alias>
+ </aliases>
+ <description>The ChangeLog</description>
+ <superiors>
+ <superior>ads-base</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>ads-changeLogId</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>ads-changeLogExposed</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.130" obsolete="false">
+ <aliases>
+ <alias>ads-interceptor</alias>
+ </aliases>
+ <description>The Interceptor ObjectClass</description>
+ <superiors>
+ <superior>ads-base</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>ads-interceptorId</attributetype>
+ <attributetype>ads-interceptorOrder</attributetype>
+ <attributetype>ads-interceptorClassName</attributetype>
+ </mandatory>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.131" obsolete="false">
+ <aliases>
+ <alias>ads-authenticationInterceptor</alias>
+ </aliases>
+ <description>The AuthenticationInterceptor ObjectClass</description>
+ <superiors>
+ <superior>ads-interceptor</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <optional>
+ <attributetype>ads-authenticators</attributetype>
+ <attributetype>ads-passwordPolicies</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.140" obsolete="false">
+ <aliases>
+ <alias>ads-journal</alias>
+ </aliases>
+ <description>The Journal</description>
+ <superiors>
+ <superior>ads-base</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>ads-journalId</attributetype>
+ <attributetype>ads-journalFileName</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>ads-journalWorkingDir</attributetype>
+ <attributetype>ads-journalRotation</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.150" obsolete="false">
+ <aliases>
+ <alias>ads-partition</alias>
+ </aliases>
+ <description>A generic partition</description>
+ <superiors>
+ <superior>ads-base</superior>
+ </superiors>
+ <type>ABSTRACT</type>
+ <mandatory>
+ <attributetype>ads-partitionId</attributetype>
+ <attributetype>ads-partitionSuffix</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>ads-contextEntry</attributetype>
+ <attributetype>ads-partitionSyncOnWrite</attributetype>
+ <attributetype>ads-indexes</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.151" obsolete="false">
+ <aliases>
+ <alias>ads-jdbmPartition</alias>
+ </aliases>
+ <description>A JDBM partition</description>
+ <superiors>
+ <superior>ads-partition</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <optional>
+ <attributetype>ads-partitionCacheSize</attributetype>
+ <attributetype>ads-jdbmPartitionOptimizerEnabled</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.160" obsolete="false">
+ <aliases>
+ <alias>ads-index</alias>
+ </aliases>
+ <description>A generic indexed attribute</description>
+ <superiors>
+ <superior>ads-base</superior>
+ </superiors>
+ <type>ABSTRACT</type>
+ <mandatory>
+ <attributetype>ads-indexAttributeId</attributetype>
+ </mandatory>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.161" obsolete="false">
+ <aliases>
+ <alias>ads-jdbmIndex</alias>
+ </aliases>
+ <description>A JDBM indexed attribute</description>
+ <superiors>
+ <superior>ads-index</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <optional>
+ <attributetype>ads-indexFileName</attributetype>
+ <attributetype>ads-indexWorkingDir</attributetype>
+ <attributetype>ads-indexNumDupLimit</attributetype>
+ <attributetype>ads-indexCacheSize</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.18" obsolete="false">
+ <aliases>
+ <alias>ads-transport</alias>
+ </aliases>
+ <description>A transport (TCP or UDP)</description>
+ <superiors>
+ <superior>ads-base</superior>
+ </superiors>
+ <type>ABSTRACT</type>
+ <mandatory>
+ <attributetype>ads-transportId</attributetype>
+ <attributetype>ads-systemPort</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>ads-transportAddress</attributetype>
+ <attributetype>ads-transportBacklog</attributetype>
+ <attributetype>ads-transportEnableSSL</attributetype>
+ <attributetype>ads-transportNbThreads</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.19" obsolete="false">
+ <aliases>
+ <alias>ads-tcpTransport</alias>
+ </aliases>
+ <description>A TCP transport</description>
+ <superiors>
+ <superior>ads-transport</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.20" obsolete="false">
+ <aliases>
+ <alias>ads-udpTransport</alias>
+ </aliases>
+ <description>an UDP transport</description>
+ <superiors>
+ <superior>ads-transport</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.250" obsolete="false">
+ <aliases>
+ <alias>ads-server</alias>
+ </aliases>
+ <description>The server ObjectClass</description>
+ <superiors>
+ <superior>ads-base</superior>
+ </superiors>
+ <type>ABSTRACT</type>
+ <mandatory>
+ <attributetype>ads-serverId</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>ads-transports</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.260" obsolete="false">
+ <aliases>
+ <alias>ads-dsBasedServer</alias>
+ </aliases>
+ <description>The DirectoryService based server ObjectClass</description>
+ <superiors>
+ <superior>ads-server</superior>
+ </superiors>
+ <type>ABSTRACT</type>
+ <optional>
+ <attributetype>ads-searchBaseDN</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.300" obsolete="false">
+ <aliases>
+ <alias>ads-ldapServer</alias>
+ </aliases>
+ <description>The LdapServer ObjectClass</description>
+ <superiors>
+ <superior>ads-dsBasedServer</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <optional>
+ <attributetype>ads-confidentialityRequired</attributetype>
+ <attributetype>ads-maxSizeLimit</attributetype>
+ <attributetype>ads-maxTimeLimit</attributetype>
+ <attributetype>ads-saslHost</attributetype>
+ <attributetype>ads-saslPrincipal</attributetype>
+ <attributetype>ads-saslRealms</attributetype>
+ <attributetype>ads-keystoreFile</attributetype>
+ <attributetype>ads-certificatePassword</attributetype>
+ <attributetype>ads-replReqHandler</attributetype>
+ <attributetype>ads-saslMechHandlers</attributetype>
+ <attributetype>ads-extendedOpHandlers</attributetype>
+ <attributetype>ads-replConsumers</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.400" obsolete="false">
+ <aliases>
+ <alias>ads-kdcServer</alias>
+ </aliases>
+ <description>The KerberosServer ObjectClass</description>
+ <superiors>
+ <superior>ads-dsBasedServer</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <optional>
+ <attributetype>ads-krbAllowableClockSkew</attributetype>
+ <attributetype>ads-krbEncryptionTypes</attributetype>
+ <attributetype>ads-krbEmptyAddressesAllowed</attributetype>
+ <attributetype>ads-krbForwardableAllowed</attributetype>
+ <attributetype>ads-krbPaEncTimestampRequired</attributetype>
+ <attributetype>ads-krbPostdatedAllowed</attributetype>
+ <attributetype>ads-krbProxiableAllowed</attributetype>
+ <attributetype>ads-krbRenewableAllowed</attributetype>
+ <attributetype>ads-krbKdcPrincipal</attributetype>
+ <attributetype>ads-krbMaximumRenewableLifetime</attributetype>
+ <attributetype>ads-krbMaximumTicketLifetime</attributetype>
+ <attributetype>ads-krbPrimaryRealm</attributetype>
+ <attributetype>ads-krbBodyChecksumVerified</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.500" obsolete="false">
+ <aliases>
+ <alias>ads-dnsServer</alias>
+ </aliases>
+ <description>The DnsServer ObjectClass</description>
+ <superiors>
+ <superior>ads-dsBasedServer</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.600" obsolete="false">
+ <aliases>
+ <alias>ads-dhcpServer</alias>
+ </aliases>
+ <description>The DhcpServer ObjectClass</description>
+ <superiors>
+ <superior>ads-dsBasedServer</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.700" obsolete="false">
+ <aliases>
+ <alias>ads-ntpServer</alias>
+ </aliases>
+ <description>The NtpServer ObjectClass</description>
+ <superiors>
+ <superior>ads-server</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.800" obsolete="false">
+ <aliases>
+ <alias>ads-changePasswordServer</alias>
+ </aliases>
+ <description>The ChangePassword ObjectClass</description>
+ <superiors>
+ <superior>ads-dsBasedServer</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <optional>
+ <attributetype>ads-krbAllowableClockSkew</attributetype>
+ <attributetype>ads-krbEmptyAddressesAllowed</attributetype>
+ <attributetype>ads-krbEncryptionTypes</attributetype>
+ <attributetype>ads-krbPrimaryRealm</attributetype>
+ <attributetype>ads-chgPwdPolicyCategoryCount</attributetype>
+ <attributetype>ads-chgPwdPolicyPasswordLength</attributetype>
+ <attributetype>ads-chgPwdPolicyTokenSize</attributetype>
+ <attributetype>ads-chgPwdServicePrincipal</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.801" obsolete="false">
+ <aliases>
+ <alias>ads-saslMechHandler</alias>
+ </aliases>
+ <description>SASL mechanism handler</description>
+ <superiors>
+ <superior>ads-base</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>ads-saslMechName</attributetype>
+ <attributetype>ads-saslMechClassName</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>ads-ntlmMechProvider</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.802" obsolete="false">
+ <aliases>
+ <alias>ads-extendedOpHandler</alias>
+ </aliases>
+ <description>Extended operation handler</description>
+ <superiors>
+ <superior>ads-base</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>ads-extendedOpHandlerClass</attributetype>
+ <attributetype>ads-extendedOpId</attributetype>
+ </mandatory>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.803" obsolete="false">
+ <aliases>
+ <alias>ads-httpWebApp</alias>
+ </aliases>
+ <description>a web app</description>
+ <superiors>
+ <superior>ads-base</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>ads-httpWarFile</attributetype>
+ <attributetype>ads-id</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>ads-httpAppCtxPath</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.804" obsolete="false">
+ <aliases>
+ <alias>ads-httpServer</alias>
+ </aliases>
+ <description>integrated jetty http server</description>
+ <superiors>
+ <superior>ads-server</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <optional>
+ <attributetype>ads-httpConfFile</attributetype>
+ <attributetype>ads-httpwebApps</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.805" obsolete="false">
+ <aliases>
+ <alias>ads-replEventLog</alias>
+ </aliases>
+ <description>class to hold a replication consumer event log details</description>
+ <superiors>
+ <superior>ads-base</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>ads-dsReplicaId</attributetype>
+ <attributetype>ads-replAliasDerefMode</attributetype>
+ <attributetype>ads-searchBaseDN</attributetype>
+ <attributetype>ads-replSearchScope</attributetype>
+ <attributetype>ads-replSearchFilter</attributetype>
+ <attributetype>ads-replRefreshNPersist</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>ads-replLastSentCsn</attributetype>
+ <attributetype>ads-replCookie</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.806" obsolete="false">
+ <aliases>
+ <alias>ads-replConsumer</alias>
+ </aliases>
+ <description>replication consumer configuration</description>
+ <superiors>
+ <superior>ads-base</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>ads-replConsumerId</attributetype>
+ <attributetype>ads-searchBaseDN</attributetype>
+ <attributetype>ads-replProvHostName</attributetype>
+ <attributetype>ads-replProvPort</attributetype>
+ <attributetype>ads-replAliasDerefMode</attributetype>
+ <attributetype>ads-replAttributes</attributetype>
+ <attributetype>ads-replRefreshInterval</attributetype>
+ <attributetype>ads-replRefreshNPersist</attributetype>
+ <attributetype>ads-replSearchScope</attributetype>
+ <attributetype>ads-replSearchFilter</attributetype>
+ <attributetype>ads-replSearchSizeLimit</attributetype>
+ <attributetype>ads-replSearchTimeOut</attributetype>
+ <attributetype>ads-replUserDn</attributetype>
+ <attributetype>ads-replUserPassword</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>ads-replUseTls</attributetype>
+ <attributetype>ads-replStrictCertValidation</attributetype>
+ <attributetype>ads-replPeerCertificate</attributetype>
+ <attributetype>ads-replConsumerImpl</attributetype>
+ <attributetype>ads-replCookie</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.900" obsolete="false">
+ <aliases>
+ <alias>ads-passwordPolicy</alias>
+ </aliases>
+ <description>class to hold the PasswordPolicy configuration</description>
+ <superiors>
+ <superior>ads-base</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>ads-pwdId</attributetype>
+ <attributetype>ads-pwdAttribute</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>ads-pwdMinAge</attributetype>
+ <attributetype>ads-pwdMaxAge</attributetype>
+ <attributetype>ads-pwdInHistory</attributetype>
+ <attributetype>ads-pwdCheckQuality</attributetype>
+ <attributetype>ads-pwdMinLength</attributetype>
+ <attributetype>ads-pwdMaxLength</attributetype>
+ <attributetype>ads-pwdExpireWarning</attributetype>
+ <attributetype>ads-pwdGraceAuthNLimit</attributetype>
+ <attributetype>ads-pwdGraceExpire</attributetype>
+ <attributetype>ads-pwdLockout</attributetype>
+ <attributetype>ads-pwdLockoutDuration</attributetype>
+ <attributetype>ads-pwdMaxFailure</attributetype>
+ <attributetype>ads-pwdFailureCountInterval</attributetype>
+ <attributetype>ads-pwdMustChange</attributetype>
+ <attributetype>ads-pwdAllowUserChange</attributetype>
+ <attributetype>ads-pwdSafeModify</attributetype>
+ <attributetype>ads-pwdMinDelay</attributetype>
+ <attributetype>ads-pwdMaxDelay</attributetype>
+ <attributetype>ads-pwdMaxIdle</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.901" obsolete="false">
+ <aliases>
+ <alias>ads-authenticator</alias>
+ </aliases>
+ <description>A generic authenticator</description>
+ <superiors>
+ <superior>ads-base</superior>
+ </superiors>
+ <type>ABSTRACT</type>
+ <mandatory>
+ <attributetype>ads-authenticatorId</attributetype>
+ </mandatory>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.902" obsolete="false">
+ <aliases>
+ <alias>ads-authenticatorImpl</alias>
+ </aliases>
+ <description>an authenticator implementation</description>
+ <superiors>
+ <superior>ads-authenticator</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>ads-authenticatorClass</attributetype>
+ </mandatory>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.904" obsolete="false">
+ <aliases>
+ <alias>ads-delegatingAuthenticator</alias>
+ </aliases>
+ <description>delegated authentication configuration</description>
+ <superiors>
+ <superior>ads-authenticator</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>ads-delegateHost</attributetype>
+ <attributetype>ads-delegatePort</attributetype>
+ </mandatory>
+ </objectclass>
+ </objectclasses>
+ <syntaxes>
+ <syntax oid="1.3.6.1.4.1.18060.0.4.1.0.10" obsolete="false" humanreadable="true">
+ <description>Search Scope</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.18060.0.4.1.0.11" obsolete="false" humanreadable="true">
+ <description>Deref Alias</description>
+ </syntax>
+ </syntaxes>
+</schema>
diff --git a/plugins/schemaeditor/resources/schemas/apacheds/apache.xml b/plugins/schemaeditor/resources/schemas/apacheds/apache.xml
index a1e7a0b..292a315 100644
--- a/plugins/schemaeditor/resources/schemas/apacheds/apache.xml
+++ b/plugins/schemaeditor/resources/schemas/apacheds/apache.xml
@@ -19,10 +19,241 @@
-->
<schema name="apache">
<attributetypes>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.5.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.1.16.4" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
<aliases>
- <alias>storedProcUnitName</alias>
+ <alias>entryUUID</alias>
</aliases>
+ <description>UUID of the entry</description>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.1.16.1</syntax>
+ <equality>uuidMatch</equality>
+ <ordering>uuidOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.1" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <aliases>
+ <alias>apacheNdn</alias>
+ </aliases>
+ <description>Index attribute DN whose values are normalized based on schema</description>
+ <usage>DSA_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>exactDnAsStringMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.10" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <aliases>
+ <alias>autonomousAreaSubentry</alias>
+ </aliases>
+ <description>Used to track a subentry associated with an autonomousArea</description>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.11" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+ <aliases>
+ <alias>accessControlSubentries</alias>
+ </aliases>
+ <description>Used to track a subentry associated with access control areas</description>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>apacheServicePid</alias>
+ </aliases>
+ <description>A string up to 256 characters in length</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.16" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>apacheServiceFactoryPid</alias>
+ </aliases>
+ <description>A string up to 256 characters in length</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.17" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>apacheCatalogEntryName</alias>
+ </aliases>
+ <description>A string up to 256 characters in length</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.18" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>apacheCatalogEntryBaseDn</alias>
+ </aliases>
+ <description>A string up to 256 characters in length</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.19" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>windowsFilePath</alias>
+ </aliases>
+ <description>A windows file path where case does not make a difference</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.2" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <aliases>
+ <alias>apacheUpdn</alias>
+ </aliases>
+ <description>Index attribute for DN whose values are NOT normalized in any way</description>
+ <usage>DSA_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>exactDnAsStringMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.20" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>unixFilePath</alias>
+ </aliases>
+ <description>A UNIX file path where case does make a difference</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseExactIA5Match</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.21" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>fullyQualifiedJavaClassName</alias>
+ </aliases>
+ <description>The fully qualified name for a (Java) class</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseExactIA5Match</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.22" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>javaClassByteCode</alias>
+ </aliases>
+ <description>The actual byte code for a (Java) class</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.5</syntax>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.23" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>classLoaderDefaultSearchContext</alias>
+ </aliases>
+ <description>The default search context for the Ldap Class Loader</description>
+ <superior>distinguishedName</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.25" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>prescriptiveTriggerSpecification</alias>
+ </aliases>
+ <description>Trigger specification that applies to a set of entries</description>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.59</syntax>
+ <equality>directoryStringFirstComponentMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.26" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>entryTriggerSpecification</alias>
+ </aliases>
+ <description>Trigger specification that applies to a single entry</description>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.59</syntax>
+ <equality>directoryStringFirstComponentMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.27" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+ <aliases>
+ <alias>triggerExecutionSubentries</alias>
+ </aliases>
+ <description>Used to track subentries associated with a trigger area which an entry falls under</description>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.3" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+ <aliases>
+ <alias>apachePresence</alias>
+ </aliases>
+ <description>Index attribute used to track the existence of attributes</description>
+ <usage>DSA_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.31" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <aliases>
+ <alias>entryDeleted</alias>
+ </aliases>
+ <description>Whether or not an entry has been deleted.</description>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.32" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>comparators</alias>
+ </aliases>
+ <description>A multivalued comparator description attribute</description>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.33" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>normalizers</alias>
+ </aliases>
+ <description>A multivalued normalizer description attribute</description>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.34" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>syntaxCheckers</alias>
+ </aliases>
+ <description>A multivalued syntaxCheckers description attribute</description>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.35" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>schemaModifyTimestamp</alias>
+ </aliases>
+ <description>time which schema was modified</description>
+ <superior>modifyTimestamp</superior>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
+ <equality>generalizedTimeMatch</equality>
+ <ordering>generalizedTimeOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.36" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>schemaModifiersName</alias>
+ </aliases>
+ <description>the DN of the modifier of the schema</description>
+ <superior>modifiersName</superior>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.37" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>subschemaSubentryName</alias>
+ </aliases>
+ <description>the DN of the schema subentry the modification info corresponds to</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.38" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>privateKeyFormat</alias>
+ </aliases>
+ <description>The format of the private key used for TLS</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
<equality>caseExactIA5Match</equality>
@@ -36,6 +267,32 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
<equality>caseExactIA5Match</equality>
</attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.4" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+ <aliases>
+ <alias>apacheOneLevel</alias>
+ </aliases>
+ <description>Index attribute used to track one level searches</description>
+ <usage>DSA_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.40" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>privateKey</alias>
+ </aliases>
+ <description>The private key material used for TLS</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.5</syntax>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.41" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>publicKeyFormat</alias>
+ </aliases>
+ <description>The format of the public key used for TLS</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseExactIA5Match</equality>
+ </attributetype>
<attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.42" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
<alias>publicKey</alias>
@@ -44,25 +301,43 @@
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.5</syntax>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.7" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.43" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
<aliases>
- <alias>apacheAlias</alias>
+ <alias>apacheSubLevel</alias>
</aliases>
- <description>asdf</description>
- <superior>distinguishedName</superior>
+ <description>Index attribute used to track sub level searches</description>
<usage>DSA_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.11" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.44" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
<aliases>
- <alias>accessControlSubentries</alias>
+ <alias>revisions</alias>
</aliases>
- <description>Used to track a subentry associated with access control areas</description>
- <superior>distinguishedName</superior>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
+ <description>Revision numbers used in change log</description>
+ <usage>DSA_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ <ordering>integerOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.45" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <aliases>
+ <alias>changeTime</alias>
+ </aliases>
+ <description>represents the time when the change event occurred</description>
+ <usage>DSA_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
+ <equality>generalizedTimeMatch</equality>
+ <ordering>generalizedTimeOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.46" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <aliases>
+ <alias>changeType</alias>
+ </aliases>
+ <description>type of change operation</description>
+ <usage>DSA_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseIgnoreMatch</equality>
</attributetype>
<attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.47" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
<aliases>
@@ -75,96 +350,14 @@
<equality>integerMatch</equality>
<ordering>integerOrderingMatch</ordering>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.21" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.48" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
<aliases>
- <alias>fullyQualifiedJavaClassName</alias>
+ <alias>committer</alias>
</aliases>
- <description>The fully qualified name for a (Java) class</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseExactIA5Match</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.5.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>storedProcLangId</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseExactIA5Match</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.44" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
- <aliases>
- <alias>revisions</alias>
- </aliases>
- <description>Revision numbers used in change log</description>
+ <description>the principal committing the change</description>
<usage>DSA_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- <ordering>integerOrderingMatch</ordering>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.36" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>schemaModifiersName</alias>
- </aliases>
- <description>the DN of the modifier of the schema</description>
- <superior>modifiersName</superior>
- <usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.5.7" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>javaxScriptCode</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseExactIA5Match</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.41" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>publicKeyFormat</alias>
- </aliases>
- <description>The format of the public key used for TLS</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseExactIA5Match</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.27" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
- <aliases>
- <alias>triggerExecutionSubentries</alias>
- </aliases>
- <description>Used to track subentries associated with a trigger area which an entry falls under</description>
- <superior>distinguishedName</superior>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.6" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
- <aliases>
- <alias>apacheSubAlias</alias>
- </aliases>
- <description>Index attribute used to track sub level aliases</description>
- <usage>DSA_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="2.5.24.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>subentryACI</alias>
- </aliases>
- <description>Access control information that applies to a single subentry</description>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.1</syntax>
- <equality>directoryStringFirstComponentMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.17" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>apacheCatalogEntryName</alias>
- </aliases>
- <description>A string up to 256 characters in length</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
+ <equality>exactDnAsStringMatch</equality>
</attributetype>
<attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.49" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
@@ -174,33 +367,6 @@
<usage>DSA_OPERATION</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.4" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
- <aliases>
- <alias>apacheOneLevel</alias>
- </aliases>
- <description>Index attribute used to track one level searches</description>
- <usage>DSA_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="2.5.24.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>entryACI</alias>
- </aliases>
- <description>Access control information that applies to a single entry</description>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.1</syntax>
- <equality>directoryStringFirstComponentMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.43" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
- <aliases>
- <alias>apacheSubLevel</alias>
- </aliases>
- <description>Index attribute used to track sub level searches</description>
- <usage>DSA_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
<attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.5" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
<aliases>
<alias>apacheOneAlias</alias>
@@ -210,87 +376,99 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
<equality>integerMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.50" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
<aliases>
- <alias>apacheServicePid</alias>
+ <alias>apacheRdn</alias>
</aliases>
- <description>A string up to 256 characters in length</description>
+ <description>Index attribute RDN with values both user provided and normalized based on schema</description>
+ <usage>DSA_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>exactDnAsStringMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.51" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <aliases>
+ <alias>entryParentId</alias>
+ </aliases>
+ <description>attribute holding the id of parent entry</description>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseExactMatch</equality>
+ <ordering>caseExactOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.6" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+ <aliases>
+ <alias>apacheSubAlias</alias>
+ </aliases>
+ <description>Index attribute used to track sub level aliases</description>
+ <usage>DSA_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.7" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <aliases>
+ <alias>apacheAlias</alias>
+ </aliases>
+ <description>asdf</description>
+ <usage>DSA_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>prefNodeName</alias>
+ </aliases>
+ <description>Attribute to describe the name of a Java Preferences API node</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseExactMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>apacheSamType</alias>
+ </aliases>
+ <description>Single-use Authentication Mechanism type/vendor code</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.5.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>storedProcLangId</alias>
+ </aliases>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
+ <equality>caseExactIA5Match</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.22" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.5.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>javaClassByteCode</alias>
+ <alias>storedProcUnitName</alias>
</aliases>
- <description>The actual byte code for a (Java) class</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseExactIA5Match</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.5.4" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>javaByteCode</alias>
+ </aliases>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.5</syntax>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.34" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.5.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>syntaxCheckers</alias>
+ <alias>javaxScriptLangId</alias>
</aliases>
- <description>A multivalued syntaxCheckers description attribute</description>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.18" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>apacheCatalogEntryBaseDn</alias>
- </aliases>
- <description>A string up to 256 characters in length</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
+ <equality>caseExactIA5Match</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.37" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.1.5.7" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>subschemaSubentryName</alias>
+ <alias>javaxScriptCode</alias>
</aliases>
- <description>the DN of the schema subentry the modification info corresponds to</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.46" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
- <aliases>
- <alias>changeType</alias>
- </aliases>
- <description>type of change operation</description>
- <usage>DSA_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
- <equality>caseIgnoreMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.19" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>windowsFilePath</alias>
- </aliases>
- <description>A windows file path where case does not make a difference</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.3" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
- <aliases>
- <alias>apacheExistence</alias>
- </aliases>
- <description>Index attribute used to track the existence of attributes</description>
- <superior>name</superior>
- <usage>DSA_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="2.5.24.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>prescriptiveACI</alias>
- </aliases>
- <description>Access control information that applies to a set of entries</description>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.1</syntax>
- <equality>directoryStringFirstComponentMatch</equality>
+ <equality>caseExactIA5Match</equality>
</attributetype>
<attributetype oid="1.3.6.1.4.1.4203.666.1.25" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
<aliases>
@@ -302,124 +480,6 @@
<equality>csnMatch</equality>
<ordering>csnOrderingMatch</ordering>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.5.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>javaxScriptLangId</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseExactIA5Match</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.20" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>unixFilePath</alias>
- </aliases>
- <description>A UNIX file path where case does make a difference</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseExactIA5Match</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.45" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
- <aliases>
- <alias>changeTime</alias>
- </aliases>
- <description>represents the time when the change event occurred</description>
- <usage>DSA_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
- <equality>generalizedTimeMatch</equality>
- <ordering>generalizedTimeOrderingMatch</ordering>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.48" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
- <aliases>
- <alias>committer</alias>
- </aliases>
- <description>the principal committing the change</description>
- <usage>DSA_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>exactDnAsStringMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.35" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>schemaModifyTimestamp</alias>
- </aliases>
- <description>time which schema was modified</description>
- <superior>modifyTimestamp</superior>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
- <equality>generalizedTimeMatch</equality>
- <ordering>generalizedTimeOrderingMatch</ordering>
- </attributetype>
- <attributetype oid="1.3.6.1.1.16.4" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
- <aliases>
- <alias>entryUUID</alias>
- </aliases>
- <description>UUID of the entry</description>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.1.16.1</syntax>
- <equality>uuidMatch</equality>
- <ordering>uuidOrderingMatch</ordering>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.2" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
- <aliases>
- <alias>apacheUpdn</alias>
- </aliases>
- <description>Index attribute for DN whose values are NOT normalized in any way</description>
- <usage>DSA_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>exactDnAsStringMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.10" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
- <aliases>
- <alias>autonomousAreaSubentry</alias>
- </aliases>
- <description>Used to track a subentry associated with an autonomousArea</description>
- <superior>distinguishedName</superior>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.40" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>privateKey</alias>
- </aliases>
- <description>The private key material used for TLS</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.5</syntax>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.32" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>comparators</alias>
- </aliases>
- <description>A multivalued comparator description attribute</description>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>prefNodeName</alias>
- </aliases>
- <description>Attribute to describe the name of a Java Preferences API node</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseExactMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.5.4" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>javaByteCode</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.5</syntax>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.33" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>normalizers</alias>
- </aliases>
- <description>A multivalued normalizer description attribute</description>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- </attributetype>
<attributetype oid="1.3.6.1.4.1.4203.666.1.7" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
<aliases>
<alias>entryCSN</alias>
@@ -430,96 +490,72 @@
<equality>csnMatch</equality>
<ordering>csnOrderingMatch</ordering>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.1" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <attributetype oid="2.5.24.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>apacheNdn</alias>
+ <alias>prescriptiveACI</alias>
</aliases>
- <description>Index attribute DN whose values are normalized based on schema</description>
- <usage>DSA_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>exactDnAsStringMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.26" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>entryTriggerSpecification</alias>
- </aliases>
- <description>Trigger specification that applies to a single entry</description>
+ <description>Access control information that applies to a set of entries</description>
<usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.59</syntax>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.1</syntax>
<equality>directoryStringFirstComponentMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.25" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="2.5.24.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>prescriptiveTriggerSpecification</alias>
+ <alias>entryACI</alias>
</aliases>
- <description>Trigger specification that applies to a set of entries</description>
+ <description>Access control information that applies to a single entry</description>
<usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.59</syntax>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.1</syntax>
<equality>directoryStringFirstComponentMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.31" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <attributetype oid="2.5.24.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>entryDeleted</alias>
+ <alias>subentryACI</alias>
</aliases>
- <description>Whether or not an entry has been deleted.</description>
+ <description>Access control information that applies to a single subentry</description>
<usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
- <equality>booleanMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.16" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>apacheServiceFactoryPid</alias>
- </aliases>
- <description>A string up to 256 characters in length</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>apacheSamType</alias>
- </aliases>
- <description>Single-use Authentication Mechanism type/vendor code</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.23" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>classLoaderDefaultSearchContext</alias>
- </aliases>
- <description>The default search context for the Ldap Class Loader</description>
- <superior>distinguishedName</superior>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.38" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>privateKeyFormat</alias>
- </aliases>
- <description>The format of the private key used for TLS</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseExactIA5Match</equality>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.1</syntax>
+ <equality>directoryStringFirstComponentMatch</equality>
</attributetype>
</attributetypes>
<objectclasses>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.3" obsolete="false">
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.2.28" obsolete="false">
<aliases>
- <alias>apacheServiceConfiguration</alias>
+ <alias>triggerExecutionSubentry</alias>
+ </aliases>
+ <description>Used to track a subentry associated with trigger areas</description>
+ <type>AUXILIARY</type>
+ <mandatory>
+ <attributetype>prescriptiveTriggerSpecification</attributetype>
+ </mandatory>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.1" obsolete="false">
+ <aliases>
+ <alias>prefNode</alias>
</aliases>
<superiors>
<superior>top</superior>
</superiors>
<type>STRUCTURAL</type>
<mandatory>
- <attributetype>cn</attributetype>
- <attributetype>apacheServicePid</attributetype>
+ <attributetype>prefNodeName</attributetype>
</mandatory>
- <optional>
- <attributetype>apacheServiceFactoryPid</attributetype>
- </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.10" obsolete="false">
+ <aliases>
+ <alias>schemaModificationAttributes</alias>
+ </aliases>
+ <description>a special entry tracking schema modification attributes</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>ou</attributetype>
+ <attributetype>subschemaSubentryName</attributetype>
+ <attributetype>schemaModifyTimestamp</attributetype>
+ <attributetype>schemaModifiersName</attributetype>
+ </mandatory>
</objectclass>
<objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.11" obsolete="false">
<aliases>
@@ -537,143 +573,6 @@
<attributetype>publicKey</attributetype>
</mandatory>
</objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.1.2.28" obsolete="false">
- <aliases>
- <alias>triggerExecutionSubentry</alias>
- </aliases>
- <description>Used to track a subentry associated with trigger areas</description>
- <type>AUXILIARY</type>
- <mandatory>
- <attributetype>prescriptiveTriggerSpecification</attributetype>
- </mandatory>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.9" obsolete="false">
- <aliases>
- <alias>apacheSubschema</alias>
- </aliases>
- <description>RFC2252 extension for controlling subschema (sub)entry in ApacheDS</description>
- <superiors>
- <superior>subschema</superior>
- </superiors>
- <type>AUXILIARY</type>
- <optional>
- <attributetype>comparators</attributetype>
- <attributetype>normalizers</attributetype>
- <attributetype>syntaxCheckers</attributetype>
- </optional>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.10" obsolete="false">
- <aliases>
- <alias>schemaModificationAttributes</alias>
- </aliases>
- <description>a special entry tracking schema modification attributes</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>cn</attributetype>
- <attributetype>subschemaSubentryName</attributetype>
- <attributetype>schemaModifyTimestamp</attributetype>
- <attributetype>schemaModifiersName</attributetype>
- </mandatory>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.1" obsolete="false">
- <aliases>
- <alias>prefNode</alias>
- </aliases>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>prefNodeName</attributetype>
- </mandatory>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.7" obsolete="false">
- <aliases>
- <alias>unixFile</alias>
- </aliases>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>unixFilePath</attributetype>
- </mandatory>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.1.5.8" obsolete="false">
- <aliases>
- <alias>javaxScriptStoredProcUnit</alias>
- </aliases>
- <superiors>
- <superior>storedProcUnit</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>javaxScriptLangId</attributetype>
- <attributetype>javaxScriptCode</attributetype>
- </mandatory>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.8" obsolete="false">
- <aliases>
- <alias>javaClass</alias>
- </aliases>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>fullyQualifiedJavaClassName</attributetype>
- <attributetype>javaClassByteCode</attributetype>
- </mandatory>
- </objectclass>
- <objectclass oid="2.5.17.1" obsolete="false">
- <aliases>
- <alias>accessControlSubentry</alias>
- </aliases>
- <type>AUXILIARY</type>
- <mandatory>
- <attributetype>prescriptiveACI</attributetype>
- </mandatory>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.1.5.5" obsolete="false">
- <aliases>
- <alias>javaStoredProcUnit</alias>
- </aliases>
- <superiors>
- <superior>storedProcUnit</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>javaByteCode</attributetype>
- </mandatory>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.1.5.3" obsolete="false">
- <aliases>
- <alias>storedProcUnit</alias>
- </aliases>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>ABSTRACT</type>
- <mandatory>
- <attributetype>storedProcLangId</attributetype>
- <attributetype>storedProcUnitName</attributetype>
- </mandatory>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.6" obsolete="false">
- <aliases>
- <alias>windowsFile</alias>
- </aliases>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>windowsFilePath</attributetype>
- </mandatory>
- </objectclass>
<objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.12" obsolete="false">
<aliases>
<alias>changeLogEvent</alias>
@@ -687,6 +586,48 @@
<attributetype>committer</attributetype>
</mandatory>
</objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.13" obsolete="false">
+ <aliases>
+ <alias>tag</alias>
+ </aliases>
+ <description>represents a Tag in change log</description>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>rev</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>description</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.3" obsolete="false">
+ <aliases>
+ <alias>apacheServiceConfiguration</alias>
+ </aliases>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>cn</attributetype>
+ <attributetype>apacheServicePid</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>apacheServiceFactoryPid</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.4" obsolete="false">
+ <aliases>
+ <alias>apacheFactoryConfiguration</alias>
+ </aliases>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>cn</attributetype>
+ <attributetype>apacheServicePid</attributetype>
+ </mandatory>
+ </objectclass>
<objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.5" obsolete="false">
<aliases>
<alias>apacheCatalogEntry</alias>
@@ -703,39 +644,130 @@
<attributetype>apacheCatalogEntryName</attributetype>
</optional>
</objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.13" obsolete="false">
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.6" obsolete="false">
<aliases>
- <alias>tag</alias>
- </aliases>
- <description>represents a Tag in change log</description>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>rev</attributetype>
- </mandatory>
- <optional>
- <attributetype>description</attributetype>
- </optional>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.4" obsolete="false">
- <aliases>
- <alias>apacheFactoryConfiguration</alias>
+ <alias>windowsFile</alias>
</aliases>
<superiors>
<superior>top</superior>
</superiors>
<type>STRUCTURAL</type>
<mandatory>
- <attributetype>cn</attributetype>
- <attributetype>apacheServicePid</attributetype>
+ <attributetype>windowsFilePath</attributetype>
+ </mandatory>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.7" obsolete="false">
+ <aliases>
+ <alias>unixFile</alias>
+ </aliases>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>unixFilePath</attributetype>
+ </mandatory>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.8" obsolete="false">
+ <aliases>
+ <alias>javaClass</alias>
+ </aliases>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>fullyQualifiedJavaClassName</attributetype>
+ <attributetype>javaClassByteCode</attributetype>
+ </mandatory>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.9" obsolete="false">
+ <aliases>
+ <alias>apacheSubschema</alias>
+ </aliases>
+ <description>RFC2252 extension for controlling subschema (sub)entry in ApacheDS</description>
+ <superiors>
+ <superior>subschema</superior>
+ </superiors>
+ <type>AUXILIARY</type>
+ <optional>
+ <attributetype>comparators</attributetype>
+ <attributetype>normalizers</attributetype>
+ <attributetype>syntaxCheckers</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.5.3" obsolete="false">
+ <aliases>
+ <alias>storedProcUnit</alias>
+ </aliases>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>ABSTRACT</type>
+ <mandatory>
+ <attributetype>storedProcLangId</attributetype>
+ <attributetype>storedProcUnitName</attributetype>
+ </mandatory>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.5.5" obsolete="false">
+ <aliases>
+ <alias>javaStoredProcUnit</alias>
+ </aliases>
+ <superiors>
+ <superior>storedProcUnit</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>javaByteCode</attributetype>
+ </mandatory>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.1.5.8" obsolete="false">
+ <aliases>
+ <alias>javaxScriptStoredProcUnit</alias>
+ </aliases>
+ <superiors>
+ <superior>storedProcUnit</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>javaxScriptLangId</attributetype>
+ <attributetype>javaxScriptCode</attributetype>
+ </mandatory>
+ </objectclass>
+ <objectclass oid="2.5.17.1" obsolete="false">
+ <aliases>
+ <alias>accessControlSubentry</alias>
+ </aliases>
+ <type>AUXILIARY</type>
+ <mandatory>
+ <attributetype>prescriptiveACI</attributetype>
</mandatory>
</objectclass>
</objectclasses>
<matchingrules>
- <matchingrule oid="1.3.6.1.4.1.4203.666.11.2.5" obsolete="false">
+ <matchingrule oid="1.3.6.1.1.16.2" obsolete="false">
<aliases>
- <alias>csnSidMatch</alias>
+ <alias>uuidMatch</alias>
</aliases>
- <syntaxoid>1.3.6.1.4.1.4203.666.11.2.4</syntaxoid>
+ <syntaxoid>1.3.6.1.1.16.1</syntaxoid>
+ </matchingrule>
+ <matchingrule oid="1.3.6.1.1.16.3" obsolete="false">
+ <aliases>
+ <alias>uuidOrderingMatch</alias>
+ </aliases>
+ <syntaxoid>1.3.6.1.1.16.1</syntaxoid>
+ </matchingrule>
+ <matchingrule oid="1.3.6.1.4.1.18060.0.4.1.1.1" obsolete="false">
+ <aliases>
+ <alias>exactDnAsStringMatch</alias>
+ </aliases>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.12</syntaxoid>
+ </matchingrule>
+ <matchingrule oid="1.3.6.1.4.1.18060.0.4.1.1.2" obsolete="false">
+ <aliases>
+ <alias>bigIntegerMatch</alias>
+ </aliases>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.27</syntaxoid>
</matchingrule>
<matchingrule oid="1.3.6.1.4.1.18060.0.4.1.1.3" obsolete="false">
<aliases>
@@ -749,58 +781,40 @@
</aliases>
<syntaxoid>1.3.6.1.4.1.4203.666.11.2.1</syntaxoid>
</matchingrule>
- <matchingrule oid="1.3.6.1.1.16.3" obsolete="false">
- <aliases>
- <alias>uuidOrderingMatch</alias>
- </aliases>
- <syntaxoid>1.3.6.1.1.16.1</syntaxoid>
- </matchingrule>
<matchingrule oid="1.3.6.1.4.1.4203.666.11.2.3" obsolete="false">
<aliases>
<alias>csnOrderingMatch</alias>
</aliases>
<syntaxoid>1.3.6.1.4.1.4203.666.11.2.1</syntaxoid>
</matchingrule>
- <matchingrule oid="1.3.6.1.4.1.18060.0.4.1.1.2" obsolete="false">
+ <matchingrule oid="1.3.6.1.4.1.4203.666.11.2.5" obsolete="false">
<aliases>
- <alias>bigIntegerMatch</alias>
+ <alias>csnSidMatch</alias>
</aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.27</syntaxoid>
- </matchingrule>
- <matchingrule oid="1.3.6.1.1.16.2" obsolete="false">
- <aliases>
- <alias>uuidMatch</alias>
- </aliases>
- <syntaxoid>1.3.6.1.1.16.1</syntaxoid>
- </matchingrule>
- <matchingrule oid="1.3.6.1.4.1.18060.0.4.1.1.1" obsolete="false">
- <aliases>
- <alias>exactDnAsStringMatch</alias>
- </aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.12</syntaxoid>
+ <syntaxoid>1.3.6.1.4.1.4203.666.11.2.4</syntaxoid>
</matchingrule>
</matchingrules>
<syntaxes>
- <syntax oid="1.3.6.1.4.1.4203.666.11.2.4" obsolete="false" humanreadable="true">
- <description>a syntax for CSN SID values</description>
+ <syntax oid="1.3.6.1.1.16.1" obsolete="false" humanreadable="true">
+ <description>UUID</description>
</syntax>
<syntax oid="1.3.6.1.4.1.18060.0.4.1.0.0" obsolete="false" humanreadable="true">
- <description>a syntax for java byte values</description>
- </syntax>
- <syntax oid="1.3.6.1.1.16.1" obsolete="false" humanreadable="false">
- <description>a syntax for UUID values</description>
+ <description>Java Byte</description>
</syntax>
<syntax oid="1.3.6.1.4.1.18060.0.4.1.0.2" obsolete="false" humanreadable="true">
- <description>a syntax for java short values</description>
- </syntax>
- <syntax oid="1.3.6.1.4.1.4203.666.11.2.1" obsolete="false" humanreadable="true">
- <description>a syntax for CSN values</description>
- </syntax>
- <syntax oid="1.3.6.1.4.1.18060.0.4.1.0.4" obsolete="false" humanreadable="true">
- <description>a syntax for java int values</description>
+ <description>Java Short</description>
</syntax>
<syntax oid="1.3.6.1.4.1.18060.0.4.1.0.3" obsolete="false" humanreadable="true">
- <description>a syntax for java long values</description>
+ <description>Java Long</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.18060.0.4.1.0.4" obsolete="false" humanreadable="true">
+ <description>Java Int</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.4203.666.11.2.1" obsolete="false" humanreadable="true">
+ <description>CSN</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.4203.666.11.2.4" obsolete="false" humanreadable="true">
+ <description>CSN SID</description>
</syntax>
</syntaxes>
</schema>
diff --git a/plugins/schemaeditor/resources/schemas/apacheds/apachedns.xml b/plugins/schemaeditor/resources/schemas/apacheds/apachedns.xml
index 7ecd013..867a53b 100644
--- a/plugins/schemaeditor/resources/schemas/apacheds/apachedns.xml
+++ b/plugins/schemaeditor/resources/schemas/apacheds/apachedns.xml
@@ -19,47 +19,38 @@
-->
<schema name="apachedns">
<attributetypes>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.16" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>apacheDnsServicePort</alias>
+ <alias>apacheDnsClass</alias>
</aliases>
- <description>The unsigned 16 bit port on this target host of this service</description>
+ <description>The class of a resource record</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.10" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>apacheDnsSoaRetry</alias>
+ </aliases>
+ <description>A 32 bit time interval that should elapse before a failed refresh should be retired</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
<equality>integerMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.11" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>apacheDnsSoaRefresh</alias>
+ <alias>apacheDnsSoaExpire</alias>
</aliases>
- <description>A 32 bit time interval before the zone should be refreshed</description>
+ <description>A 32 bit time value that specifies the upper limit on the time interval that can elapse before the zone is no longer authoritative</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
<equality>integerMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.12" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>apacheDnsSoaSerial</alias>
+ <alias>apacheDnsSoaMinimum</alias>
</aliases>
- <description>The unsigned 32 bit version number of the original copy of the zone</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>apacheDnsTtl</alias>
- </aliases>
- <description>An integer denoting time to live</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.14" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>apacheDnsServicePriority</alias>
- </aliases>
- <description>The unsigned 16 bit priority of this target host</description>
+ <description>The unsigned 32 bit minimum TTL field that should be exported with any RR from this zone.</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
<equality>integerMatch</equality>
@@ -73,58 +64,38 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
<equality>integerMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.7" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.14" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>apacheDnsSoaRName</alias>
+ <alias>apacheDnsServicePriority</alias>
</aliases>
- <description>The domain name which specifies the mailbox of the person responsible for this zone</description>
- <superior>apacheDnsDomainName</superior>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>apacheDnsClass</alias>
- </aliases>
- <description>The class of a resource record</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.11" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>apacheDnsSoaExpire</alias>
- </aliases>
- <description>A 32 bit time value that specifies the upper limit on the time interval that can elapse before the zone is no longer authoritative</description>
+ <description>The unsigned 16 bit priority of this target host</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
<equality>integerMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>apacheDnsSoaMName</alias>
+ <alias>apacheDnsServiceWeight</alias>
</aliases>
- <description>The domain name of the name server that was the primary source of data for this zone</description>
- <superior>apacheDnsDomainName</superior>
+ <description>The unsigned 16 bit weight specifying a relative weight for entries with the same priority</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.5" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.16" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>apacheDnsIpAddress</alias>
+ <alias>apacheDnsServicePort</alias>
</aliases>
- <description>A 4 octet IP address</description>
+ <description>The unsigned 16 bit port on this target host of this service</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.12" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>apacheDnsSoaMinimum</alias>
+ <alias>apacheDnsTtl</alias>
</aliases>
- <description>The unsigned 32 bit minimum TTL field that should be exported with any RR from this zone.</description>
+ <description>An integer denoting time to live</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
<equality>integerMatch</equality>
@@ -147,20 +118,49 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
<equality>caseIgnoreIA5Match</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.10" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.5" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>apacheDnsSoaRetry</alias>
+ <alias>apacheDnsIpAddress</alias>
</aliases>
- <description>A 32 bit time interval that should elapse before a failed refresh should be retired</description>
+ <description>A 4 octet IP address</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>apacheDnsSoaMName</alias>
+ </aliases>
+ <description>The domain name of the name server that was the primary source of data for this zone</description>
+ <superior>apacheDnsDomainName</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.7" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>apacheDnsSoaRName</alias>
+ </aliases>
+ <description>The domain name which specifies the mailbox of the person responsible for this zone</description>
+ <superior>apacheDnsDomainName</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>apacheDnsSoaSerial</alias>
+ </aliases>
+ <description>The unsigned 32 bit version number of the original copy of the zone</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
<equality>integerMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>apacheDnsServiceWeight</alias>
+ <alias>apacheDnsSoaRefresh</alias>
</aliases>
- <description>The unsigned 16 bit weight specifying a relative weight for entries with the same priority</description>
+ <description>A 32 bit time interval before the zone should be refreshed</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
<equality>integerMatch</equality>
@@ -184,17 +184,70 @@
<attributetype>description</attributetype>
</optional>
</objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.8" obsolete="false">
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.10" obsolete="false">
<aliases>
- <alias>apacheDnsTextRecord</alias>
+ <alias>apacheDnsReferralNameServer</alias>
</aliases>
- <description>A text TXT record</description>
+ <description>A non-authoritative referral or delegation name server</description>
<superiors>
<superior>apacheDnsAbstractRecord</superior>
</superiors>
<type>STRUCTURAL</type>
<mandatory>
- <attributetype>apacheDnsCharacterString</attributetype>
+ <attributetype>apacheDnsDomainName</attributetype>
+ </mandatory>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.11" obsolete="false">
+ <aliases>
+ <alias>apacheDnsReferralAddress</alias>
+ </aliases>
+ <description>A non-authoritative referral or glue address record</description>
+ <superiors>
+ <superior>apacheDnsAbstractRecord</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>apacheDnsDomainName</attributetype>
+ <attributetype>apacheDnsIpAddress</attributetype>
+ </mandatory>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.2" obsolete="false">
+ <aliases>
+ <alias>apacheDnsAddressRecord</alias>
+ </aliases>
+ <description>An address A record</description>
+ <superiors>
+ <superior>apacheDnsAbstractRecord</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>apacheDnsIpAddress</attributetype>
+ </mandatory>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.3" obsolete="false">
+ <aliases>
+ <alias>apacheDnsPointerRecord</alias>
+ </aliases>
+ <description>A pointer PTR record</description>
+ <superiors>
+ <superior>apacheDnsAbstractRecord</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>apacheDnsDomainName</attributetype>
+ </mandatory>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.4" obsolete="false">
+ <aliases>
+ <alias>apacheDnsNameServerRecord</alias>
+ </aliases>
+ <description>A name server NS record</description>
+ <superiors>
+ <superior>apacheDnsAbstractRecord</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>apacheDnsDomainName</attributetype>
</mandatory>
</objectclass>
<objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.5" obsolete="false">
@@ -219,11 +272,11 @@
<attributetype>apacheDnsSoaExpire</attributetype>
</optional>
</objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.4" obsolete="false">
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.6" obsolete="false">
<aliases>
- <alias>apacheDnsNameServerRecord</alias>
+ <alias>apacheDnsCanonicalNameRecord</alias>
</aliases>
- <description>A name server NS record</description>
+ <description>A canonical name CNAME record</description>
<superiors>
<superior>apacheDnsAbstractRecord</superior>
</superiors>
@@ -232,19 +285,6 @@
<attributetype>apacheDnsDomainName</attributetype>
</mandatory>
</objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.2" obsolete="false">
- <aliases>
- <alias>apacheDnsAddressRecord</alias>
- </aliases>
- <description>An address A record</description>
- <superiors>
- <superior>apacheDnsAbstractRecord</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>apacheDnsIpAddress</attributetype>
- </mandatory>
- </objectclass>
<objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.7" obsolete="false">
<aliases>
<alias>apacheDnsMailExchangeRecord</alias>
@@ -259,57 +299,17 @@
<attributetype>apacheDnsDomainName</attributetype>
</mandatory>
</objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.11" obsolete="false">
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.8" obsolete="false">
<aliases>
- <alias>apacheDnsReferralAddress</alias>
+ <alias>apacheDnsTextRecord</alias>
</aliases>
- <description>A non-authoritative referral or glue address record</description>
+ <description>A text TXT record</description>
<superiors>
<superior>apacheDnsAbstractRecord</superior>
</superiors>
<type>STRUCTURAL</type>
<mandatory>
- <attributetype>apacheDnsDomainName</attributetype>
- <attributetype>apacheDnsIpAddress</attributetype>
- </mandatory>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.10" obsolete="false">
- <aliases>
- <alias>apacheDnsReferralNameServer</alias>
- </aliases>
- <description>A non-authoritative referral or delegation name server</description>
- <superiors>
- <superior>apacheDnsAbstractRecord</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>apacheDnsDomainName</attributetype>
- </mandatory>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.6" obsolete="false">
- <aliases>
- <alias>apacheDnsCanonicalNameRecord</alias>
- </aliases>
- <description>A canonical name CNAME record</description>
- <superiors>
- <superior>apacheDnsAbstractRecord</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>apacheDnsDomainName</attributetype>
- </mandatory>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.3" obsolete="false">
- <aliases>
- <alias>apacheDnsPointerRecord</alias>
- </aliases>
- <description>A pointer PTR record</description>
- <superiors>
- <superior>apacheDnsAbstractRecord</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>apacheDnsDomainName</attributetype>
+ <attributetype>apacheDnsCharacterString</attributetype>
</mandatory>
</objectclass>
<objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.9" obsolete="false">
diff --git a/plugins/schemaeditor/resources/schemas/apacheds/apachemeta.xml b/plugins/schemaeditor/resources/schemas/apacheds/apachemeta.xml
index 99b5d2f..49bd99f 100644
--- a/plugins/schemaeditor/resources/schemas/apacheds/apachemeta.xml
+++ b/plugins/schemaeditor/resources/schemas/apacheds/apachemeta.xml
@@ -19,14 +19,23 @@
-->
<schema name="apachemeta">
<attributetypes>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.18" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>m-usage</alias>
+ <alias>m-oid</alias>
</aliases>
- <description>Usage type of an attributeType</description>
+ <description>The Object Identifier</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreMatch</equality>
+ <syntax>1.3.6.1.4.1.18060.0.4.0.0.2</syntax>
+ <equality>objectIdentifierMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.10" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>m-supAttributeType</alias>
+ </aliases>
+ <description>The list of superior</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+ <equality>nameOrNumericIdMatch</equality>
</attributetype>
<attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.11" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
@@ -37,23 +46,14 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
<equality>nameOrNumericIdMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.21" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.12" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>m-form</alias>
+ <alias>m-ordering</alias>
</aliases>
- <description>The name form associated with this DITStructure rule</description>
+ <description>Ordering matching rule</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
- <equality>caseIgnoreMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.29" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>m-applies</alias>
- </aliases>
- <description>List of attribute types the matching rule applies to</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
- <equality>numericOidMatch</equality>
+ <equality>nameOrNumericIdMatch</equality>
</attributetype>
<attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.13" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
@@ -64,15 +64,6 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
<equality>nameOrNumericIdMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.22" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>m-supDITStructureRule</alias>
- </aliases>
- <description>The list of superiors</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.36</syntax>
- <equality>supDITStructureRuleMatch</equality>
- </attributetype>
<attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.14" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
<alias>m-syntax</alias>
@@ -82,6 +73,15 @@
<syntax>1.3.6.1.4.1.18060.0.4.0.0.2</syntax>
<equality>nameOrNumericIdMatch</equality>
</attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>m-singleValue</alias>
+ </aliases>
+ <description>The attribute is single valued</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
<attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.16" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
<alias>m-collective</alias>
@@ -91,51 +91,113 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
<equality>booleanMatch</equality>
</attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.17" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>m-noUserModification</alias>
+ </aliases>
+ <description>The attribute is protected</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.18" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>m-usage</alias>
+ </aliases>
+ <description>Usage type of an attributeType</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.2" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>m-name</alias>
+ </aliases>
+ <description>The Object name</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.18060.0.4.0.0.6</syntax>
+ <equality>caseIgnoreMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.20" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>m-ruleId</alias>
+ </aliases>
+ <description>The rule ID</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.18060.0.4.0.0.4</syntax>
+ <equality>ruleIdMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.21" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>m-form</alias>
+ </aliases>
+ <description>The name form associated with this DITStructure rule</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+ <equality>caseIgnoreMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.22" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>m-supDITStructureRule</alias>
+ </aliases>
+ <description>The list of superiors</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.36</syntax>
+ <equality>supDITStructureRuleMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.24" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>m-oc</alias>
+ </aliases>
+ <description>The structural ObjectClass</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+ <equality>numericOidMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.26" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>m-aux</alias>
+ </aliases>
+ <description>List of auxiliary ObjectClasses</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+ <equality>numericOidMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.27" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>m-not</alias>
+ </aliases>
+ <description>List of precluded attribute types</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+ <equality>numericOidMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.29" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>m-applies</alias>
+ </aliases>
+ <description>List of attribute types the matching rule applies to</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+ <equality>numericOidMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.3" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>m-description</alias>
+ </aliases>
+ <description>meta descriptive information</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ </attributetype>
<attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.31" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
<alias>m-matchingRuleSyntax</alias>
</aliases>
- <description>The matchingRule attribute syntax</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.18060.0.4.0.0.2</syntax>
<equality>numericOidMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.39" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>m-length</alias>
- </aliases>
- <description>The maximum length for an attribute value.</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.18060.0.4.0.0.4</syntax>
- <equality>caseIgnoreMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>m-may</alias>
- </aliases>
- <description>The list of authorized ATs</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
- <equality>nameOrNumericIdMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>m-oid</alias>
- </aliases>
- <description>The Object Identifier</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.18060.0.4.0.0.2</syntax>
- <equality>objectIdentifierMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.37" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>m-disabled</alias>
- </aliases>
- <description>Used as a marker for schemas to enable or disable them.</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
- <equality>booleanMatch</equality>
- </attributetype>
<attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.32" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
<alias>m-fqcn</alias>
@@ -153,33 +215,6 @@
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.5</syntax>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>m-singleValue</alias>
- </aliases>
- <description>The attribute is single valued</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
- <equality>booleanMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.24" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>m-oc</alias>
- </aliases>
- <description>The structural ObjectClass</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
- <equality>numericOidMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.3" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>m-description</alias>
- </aliases>
- <description>meta descriptive information</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- </attributetype>
<attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.34" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
<alias>x-humanReadable</alias>
@@ -189,87 +224,15 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
<equality>booleanMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.10" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.37" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>m-supAttributeType</alias>
+ <alias>m-disabled</alias>
</aliases>
- <description>The list of superior</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
- <equality>nameOrNumericIdMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.2" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>m-name</alias>
- </aliases>
- <description>The Object name</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.18060.0.4.0.0.6</syntax>
- <equality>caseIgnoreMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.27" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>m-not</alias>
- </aliases>
- <description>List of precluded attribute types</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
- <equality>numericOidMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>m-typeObjectClass</alias>
- </aliases>
- <description>The objectclass type</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.18060.0.4.0.0.1</syntax>
- <equality>objectClassTypeMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>m-supObjectClass</alias>
- </aliases>
- <description>The list of superiors</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
- <equality>nameOrNumericIdMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.26" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>m-aux</alias>
- </aliases>
- <description>List of auxiliary ObjectClasses</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
- <equality>numericOidMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.12" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>m-ordering</alias>
- </aliases>
- <description>Ordering matching rule</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
- <equality>nameOrNumericIdMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.17" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>m-noUserModification</alias>
- </aliases>
- <description>The attribute is protected</description>
+ <description>Used as a marker for schemas to enable or disable them.</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
<equality>booleanMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.20" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>m-ruleId</alias>
- </aliases>
- <description>The rule ID</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.18060.0.4.0.0.4</syntax>
- <equality>ruleIdMatch</equality>
- </attributetype>
<attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.38" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
<alias>m-dependencies</alias>
@@ -279,14 +242,14 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
<equality>caseIgnoreMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.39" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>m-must</alias>
+ <alias>m-length</alias>
</aliases>
- <description>The list of mandatory ATs</description>
+ <description>The maximum length for an attribute value.</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
- <equality>nameOrNumericIdMatch</equality>
+ <syntax>1.3.6.1.4.1.18060.0.4.0.0.4</syntax>
+ <equality>caseIgnoreMatch</equality>
</attributetype>
<attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.4" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
@@ -297,8 +260,76 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
<equality>booleanMatch</equality>
</attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>m-supObjectClass</alias>
+ </aliases>
+ <description>The list of superiors</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+ <equality>nameOrNumericIdMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>m-must</alias>
+ </aliases>
+ <description>The list of mandatory ATs</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+ <equality>nameOrNumericIdMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>m-may</alias>
+ </aliases>
+ <description>The list of authorized ATs</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+ <equality>nameOrNumericIdMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.18060.0.4.0.2.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>m-typeObjectClass</alias>
+ </aliases>
+ <description>The objectclass type</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.18060.0.4.0.0.1</syntax>
+ <equality>objectClassTypeMatch</equality>
+ </attributetype>
</attributetypes>
<objectclasses>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.0.3.1" obsolete="false">
+ <aliases>
+ <alias>metaTop</alias>
+ </aliases>
+ <description>Top level objectclass of all meta objects</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>ABSTRACT</type>
+ <mandatory>
+ <attributetype>m-oid</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>m-description</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.0.3.10" obsolete="false">
+ <aliases>
+ <alias>metaSyntaxChecker</alias>
+ </aliases>
+ <description>meta definition of the SyntaxChecker object</description>
+ <superiors>
+ <superior>metaTop</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>m-fqcn</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>m-bytecode</attributetype>
+ </optional>
+ </objectclass>
<objectclass oid="1.3.6.1.4.1.18060.0.4.0.3.11" obsolete="false">
<aliases>
<alias>metaSchema</alias>
@@ -316,6 +347,59 @@
<attributetype>m-dependencies</attributetype>
</optional>
</objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.0.3.12" obsolete="false">
+ <aliases>
+ <alias>metaNormalizer</alias>
+ </aliases>
+ <description>meta definition of a Normalizer object</description>
+ <superiors>
+ <superior>metaTop</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>m-fqcn</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>m-bytecode</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.0.3.13" obsolete="false">
+ <aliases>
+ <alias>metaComparator</alias>
+ </aliases>
+ <description>meta definition of a Comparator object</description>
+ <superiors>
+ <superior>metaTop</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>m-fqcn</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>m-bytecode</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.0.3.2" obsolete="false">
+ <aliases>
+ <alias>metaObjectClass</alias>
+ </aliases>
+ <description>meta definition of the objectclass object</description>
+ <superiors>
+ <superior>metaTop</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>m-oid</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>m-name</attributetype>
+ <attributetype>m-obsolete</attributetype>
+ <attributetype>m-supObjectClass</attributetype>
+ <attributetype>m-typeObjectClass</attributetype>
+ <attributetype>m-must</attributetype>
+ <attributetype>m-may</attributetype>
+ </optional>
+ </objectclass>
<objectclass oid="1.3.6.1.4.1.18060.0.4.0.3.3" obsolete="false">
<aliases>
<alias>metaAttributeType</alias>
@@ -340,89 +424,35 @@
<attributetype>m-length</attributetype>
</optional>
</objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.0.3.2" obsolete="false">
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.0.3.4" obsolete="false">
<aliases>
- <alias>metaObjectClass</alias>
+ <alias>metaSyntax</alias>
</aliases>
- <description>meta definition of the objectclass object</description>
+ <description>meta definition of the Syntax object</description>
+ <superiors>
+ <superior>metaTop</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <optional>
+ <attributetype>x-humanReadable</attributetype>
+ <attributetype>m-obsolete</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.0.3.5" obsolete="false">
+ <aliases>
+ <alias>metaMatchingRule</alias>
+ </aliases>
+ <description>meta definition of the MatchingRule object</description>
<superiors>
<superior>metaTop</superior>
</superiors>
<type>STRUCTURAL</type>
<mandatory>
- <attributetype>m-oid</attributetype>
+ <attributetype>m-syntax</attributetype>
</mandatory>
<optional>
<attributetype>m-name</attributetype>
<attributetype>m-obsolete</attributetype>
- <attributetype>m-supObjectClass</attributetype>
- <attributetype>m-typeObjectClass</attributetype>
- <attributetype>m-must</attributetype>
- <attributetype>m-may</attributetype>
- </optional>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.0.3.10" obsolete="false">
- <aliases>
- <alias>metaSyntaxChecker</alias>
- </aliases>
- <description>meta definition of the SyntaxChecker object</description>
- <superiors>
- <superior>metaTop</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>m-fqcn</attributetype>
- </mandatory>
- <optional>
- <attributetype>m-bytecode</attributetype>
- </optional>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.0.3.1" obsolete="false">
- <aliases>
- <alias>metaTop</alias>
- </aliases>
- <description>Top level objectclass of all meta objects</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>ABSTRACT</type>
- <mandatory>
- <attributetype>m-oid</attributetype>
- </mandatory>
- <optional>
- <attributetype>m-description</attributetype>
- </optional>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.0.3.13" obsolete="false">
- <aliases>
- <alias>metaComparator</alias>
- </aliases>
- <description>meta definition of a Comparator object</description>
- <superiors>
- <superior>metaTop</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>m-fqcn</attributetype>
- </mandatory>
- <optional>
- <attributetype>m-bytecode</attributetype>
- </optional>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.0.3.12" obsolete="false">
- <aliases>
- <alias>metaNormalizer</alias>
- </aliases>
- <description>meta definition of a Normalizer object</description>
- <superiors>
- <superior>metaTop</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>m-fqcn</attributetype>
- </mandatory>
- <optional>
- <attributetype>m-bytecode</attributetype>
</optional>
</objectclass>
<objectclass oid="1.3.6.1.4.1.18060.0.4.0.3.6" obsolete="false">
@@ -444,40 +474,6 @@
<attributetype>m-supDITStructureRule</attributetype>
</optional>
</objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.0.3.5" obsolete="false">
- <aliases>
- <alias>metaMatchingRule</alias>
- </aliases>
- <description>meta definition of the MatchingRule object</description>
- <superiors>
- <superior>metaTop</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>m-syntax</attributetype>
- </mandatory>
- <optional>
- <attributetype>m-name</attributetype>
- <attributetype>m-obsolete</attributetype>
- </optional>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.0.3.8" obsolete="false">
- <aliases>
- <alias>metaMatchingRuleUse</alias>
- </aliases>
- <description>meta definition of the MatchingRuleUse object</description>
- <superiors>
- <superior>metaTop</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>m-applies</attributetype>
- </mandatory>
- <optional>
- <attributetype>m-name</attributetype>
- <attributetype>m-obsolete</attributetype>
- </optional>
- </objectclass>
<objectclass oid="1.3.6.1.4.1.18060.0.4.0.3.7" obsolete="false">
<aliases>
<alias>metaNameForm</alias>
@@ -497,6 +493,23 @@
<attributetype>m-may</attributetype>
</optional>
</objectclass>
+ <objectclass oid="1.3.6.1.4.1.18060.0.4.0.3.8" obsolete="false">
+ <aliases>
+ <alias>metaMatchingRuleUse</alias>
+ </aliases>
+ <description>meta definition of the MatchingRuleUse object</description>
+ <superiors>
+ <superior>metaTop</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>m-applies</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>m-name</attributetype>
+ <attributetype>m-obsolete</attributetype>
+ </optional>
+ </objectclass>
<objectclass oid="1.3.6.1.4.1.18060.0.4.0.3.9" obsolete="false">
<aliases>
<alias>metaDITContentRule</alias>
@@ -515,32 +528,8 @@
<attributetype>m-not</attributetype>
</optional>
</objectclass>
- <objectclass oid="1.3.6.1.4.1.18060.0.4.0.3.4" obsolete="false">
- <aliases>
- <alias>metaSyntax</alias>
- </aliases>
- <description>meta definition of the Syntax object</description>
- <superiors>
- <superior>metaTop</superior>
- </superiors>
- <type>STRUCTURAL</type>
- </objectclass>
</objectclasses>
<matchingrules>
- <matchingrule oid="1.3.6.1.4.1.18060.0.4.0.1.4" obsolete="false">
- <aliases>
- <alias>ruleIdMatch</alias>
- </aliases>
- <description>Rule identifier of this DIT structure rule</description>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.26</syntaxoid>
- </matchingrule>
- <matchingrule oid="1.3.6.1.4.1.18060.0.4.0.1.3" obsolete="false">
- <aliases>
- <alias>supDITStructureRuleMatch</alias>
- </aliases>
- <description>A matching rule matching dit structure rule attributes</description>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.17</syntaxoid>
- </matchingrule>
<matchingrule oid="1.3.6.1.4.1.18060.0.4.0.1.0" obsolete="false">
<aliases>
<alias>nameOrNumericIdMatch</alias>
@@ -562,37 +551,36 @@
<description>a matching rule for numeric oids</description>
<syntaxoid>1.3.6.1.4.1.1466.115.121.1.38</syntaxoid>
</matchingrule>
+ <matchingrule oid="1.3.6.1.4.1.18060.0.4.0.1.3" obsolete="false">
+ <aliases>
+ <alias>supDITStructureRuleMatch</alias>
+ </aliases>
+ <description>A matching rule matching dit structure rule attributes</description>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.17</syntaxoid>
+ </matchingrule>
+ <matchingrule oid="1.3.6.1.4.1.18060.0.4.0.1.4" obsolete="false">
+ <aliases>
+ <alias>ruleIdMatch</alias>
+ </aliases>
+ <description>Rule identifier of this DIT structure rule</description>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.26</syntaxoid>
+ </matchingrule>
</matchingrules>
<syntaxes>
- <syntax oid="1.3.6.1.4.1.18060.0.4.0.0.6" obsolete="false" humanreadable="true">
- <aliases>
- <alias>objectName</alias>
- </aliases>
- <description>The syntax for object names.</description>
- </syntax>
- <syntax oid="1.3.6.1.4.1.18060.0.4.0.0.4" obsolete="false" humanreadable="true">
- <aliases>
- <alias>numeric</alias>
- </aliases>
- <description>The syntax for numeric strings.</description>
- </syntax>
<syntax oid="1.3.6.1.4.1.18060.0.4.0.0.0" obsolete="false" humanreadable="true">
- <aliases>
- <alias>nameOrOid</alias>
- </aliases>
- <description>The syntax for either numeric ids or names.</description>
+ <description>Numeric IDs Or Names</description>
</syntax>
<syntax oid="1.3.6.1.4.1.18060.0.4.0.0.1" obsolete="false" humanreadable="true">
- <aliases>
- <alias>objectClassType</alias>
- </aliases>
- <description>The syntax for either numeric ids or names.</description>
+ <description>Object Class Type</description>
</syntax>
<syntax oid="1.3.6.1.4.1.18060.0.4.0.0.2" obsolete="false" humanreadable="true">
- <aliases>
- <alias>numericOid</alias>
- </aliases>
- <description>The syntax for numericoids.</description>
+ <description>Numeric OID</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.18060.0.4.0.0.4" obsolete="false" humanreadable="true">
+ <description>Numeric String</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.18060.0.4.0.0.6" obsolete="false" humanreadable="true">
+ <description>Object Name</description>
</syntax>
</syntaxes>
</schema>
diff --git a/plugins/schemaeditor/resources/schemas/apacheds/autofs.xml b/plugins/schemaeditor/resources/schemas/apacheds/autofs.xml
index 9c96d07..57bd596 100644
--- a/plugins/schemaeditor/resources/schemas/apacheds/autofs.xml
+++ b/plugins/schemaeditor/resources/schemas/apacheds/autofs.xml
@@ -30,6 +30,19 @@
</attributetype>
</attributetypes>
<objectclasses>
+ <objectclass oid="1.3.6.1.4.1.2312.4.2.2" obsolete="false">
+ <aliases>
+ <alias>automountMap</alias>
+ </aliases>
+ <description>An group of related automount objects</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>ou</attributetype>
+ </mandatory>
+ </objectclass>
<objectclass oid="1.3.6.1.4.1.2312.4.2.3" obsolete="false">
<aliases>
<alias>automount</alias>
@@ -47,18 +60,5 @@
<attributetype>description</attributetype>
</optional>
</objectclass>
- <objectclass oid="1.3.6.1.4.1.2312.4.2.2" obsolete="false">
- <aliases>
- <alias>automountMap</alias>
- </aliases>
- <description>An group of related automount objects</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>ou</attributetype>
- </mandatory>
- </objectclass>
</objectclasses>
</schema>
diff --git a/plugins/schemaeditor/resources/schemas/apacheds/collective.xml b/plugins/schemaeditor/resources/schemas/apacheds/collective.xml
index 5956558..8104cb5 100644
--- a/plugins/schemaeditor/resources/schemas/apacheds/collective.xml
+++ b/plugins/schemaeditor/resources/schemas/apacheds/collective.xml
@@ -19,6 +19,16 @@
-->
<schema name="collective">
<attributetypes>
+ <attributetype oid="2.5.4.10.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
+ <aliases>
+ <alias>c-o</alias>
+ </aliases>
+ <superior>o</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
<attributetype oid="2.5.4.11.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
<aliases>
<alias>c-ou</alias>
@@ -29,15 +39,15 @@
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
- <attributetype oid="2.5.4.8.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
+ <attributetype oid="2.5.4.16.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
<aliases>
- <alias>c-st</alias>
+ <alias>c-PostalAddress</alias>
</aliases>
- <superior>st</superior>
+ <superior>postalAddress</superior>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.41</syntax>
+ <equality>caseIgnoreListMatch</equality>
+ <substring>caseIgnoreListSubstringsMatch</substring>
</attributetype>
<attributetype oid="2.5.4.17.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
<aliases>
@@ -49,72 +59,6 @@
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
- <attributetype oid="2.5.4.25.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
- <aliases>
- <alias>c-InternationalISDNNumber</alias>
- </aliases>
- <superior>internationaliSDNNumber</superior>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.36</syntax>
- <equality>numericStringMatch</equality>
- <substring>numericStringSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="2.5.4.21.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
- <aliases>
- <alias>c-TelexNumber</alias>
- </aliases>
- <superior>telexNumber</superior>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.52</syntax>
- </attributetype>
- <attributetype oid="2.5.4.20.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
- <aliases>
- <alias>c-TelephoneNumber</alias>
- </aliases>
- <superior>telephoneNumber</superior>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.50</syntax>
- <equality>telephoneNumberMatch</equality>
- <substring>telephoneNumberSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="2.5.4.19.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
- <aliases>
- <alias>c-PhysicalDeliveryOfficeName</alias>
- </aliases>
- <superior>physicalDeliveryOfficeName</superior>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="2.5.4.9.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
- <aliases>
- <alias>c-street</alias>
- </aliases>
- <superior>street</superior>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="2.5.4.23.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
- <aliases>
- <alias>c-FacsimileTelephoneNumber</alias>
- </aliases>
- <superior>facsimileTelephoneNumber</superior>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.22</syntax>
- </attributetype>
- <attributetype oid="2.5.4.10.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
- <aliases>
- <alias>c-o</alias>
- </aliases>
- <superior>o</superior>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
<attributetype oid="2.5.4.18.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
<aliases>
<alias>c-PostOfficeBox</alias>
@@ -125,6 +69,52 @@
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
+ <attributetype oid="2.5.4.19.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
+ <aliases>
+ <alias>c-PhysicalDeliveryOfficeName</alias>
+ </aliases>
+ <superior>physicalDeliveryOfficeName</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="2.5.4.20.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
+ <aliases>
+ <alias>c-TelephoneNumber</alias>
+ </aliases>
+ <superior>telephoneNumber</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.50</syntax>
+ <equality>telephoneNumberMatch</equality>
+ <substring>telephoneNumberSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="2.5.4.21.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
+ <aliases>
+ <alias>c-TelexNumber</alias>
+ </aliases>
+ <superior>telexNumber</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.52</syntax>
+ </attributetype>
+ <attributetype oid="2.5.4.23.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
+ <aliases>
+ <alias>c-FacsimileTelephoneNumber</alias>
+ </aliases>
+ <superior>facsimileTelephoneNumber</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.22</syntax>
+ </attributetype>
+ <attributetype oid="2.5.4.25.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
+ <aliases>
+ <alias>c-InternationalISDNNumber</alias>
+ </aliases>
+ <superior>internationaliSDNNumber</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.36</syntax>
+ <equality>numericStringMatch</equality>
+ <substring>numericStringSubstringsMatch</substring>
+ </attributetype>
<attributetype oid="2.5.4.7.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
<aliases>
<alias>c-l</alias>
@@ -135,15 +125,25 @@
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
- <attributetype oid="2.5.4.16.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
+ <attributetype oid="2.5.4.8.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
<aliases>
- <alias>c-PostalAddress</alias>
+ <alias>c-st</alias>
</aliases>
- <superior>postalAddress</superior>
+ <superior>st</superior>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.41</syntax>
- <equality>caseIgnoreListMatch</equality>
- <substring>caseIgnoreListSubstringsMatch</substring>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="2.5.4.9.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
+ <aliases>
+ <alias>c-street</alias>
+ </aliases>
+ <superior>street</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
</attributetypes>
</schema>
diff --git a/plugins/schemaeditor/resources/schemas/apacheds/corba.xml b/plugins/schemaeditor/resources/schemas/apacheds/corba.xml
index 1022c95..1d8124a 100644
--- a/plugins/schemaeditor/resources/schemas/apacheds/corba.xml
+++ b/plugins/schemaeditor/resources/schemas/apacheds/corba.xml
@@ -19,15 +19,6 @@
-->
<schema name="corba">
<attributetypes>
- <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.15" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>corbaRepositoryId</alias>
- </aliases>
- <description>Repository ids of interfaces implemented by a CORBA object</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseExactMatch</equality>
- </attributetype>
<attributetype oid="1.3.6.1.4.1.42.2.27.4.1.14" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
<alias>corbaIor</alias>
@@ -37,21 +28,29 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
<equality>caseIgnoreIA5Match</equality>
</attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.15" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>corbaRepositoryId</alias>
+ </aliases>
+ <description>Repository ids of interfaces implemented by a CORBA object</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseExactMatch</equality>
+ </attributetype>
</attributetypes>
<objectclasses>
- <objectclass oid="1.3.6.1.4.1.42.2.27.4.2.9" obsolete="false">
+ <objectclass oid="1.3.6.1.4.1.42.2.27.4.2.10" obsolete="false">
<aliases>
- <alias>corbaObject</alias>
+ <alias>corbaContainer</alias>
</aliases>
- <description>CORBA object representation</description>
+ <description>Container for a CORBA object</description>
<superiors>
<superior>top</superior>
</superiors>
- <type>ABSTRACT</type>
- <optional>
- <attributetype>corbaRepositoryId</attributetype>
- <attributetype>description</attributetype>
- </optional>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>cn</attributetype>
+ </mandatory>
</objectclass>
<objectclass oid="1.3.6.1.4.1.42.2.27.4.2.11" obsolete="false">
<aliases>
@@ -66,18 +65,19 @@
<attributetype>corbaIor</attributetype>
</mandatory>
</objectclass>
- <objectclass oid="1.3.6.1.4.1.42.2.27.4.2.10" obsolete="false">
+ <objectclass oid="1.3.6.1.4.1.42.2.27.4.2.9" obsolete="false">
<aliases>
- <alias>corbaContainer</alias>
+ <alias>corbaObject</alias>
</aliases>
- <description>Container for a CORBA object</description>
+ <description>CORBA object representation</description>
<superiors>
<superior>top</superior>
</superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>cn</attributetype>
- </mandatory>
+ <type>ABSTRACT</type>
+ <optional>
+ <attributetype>corbaRepositoryId</attributetype>
+ <attributetype>description</attributetype>
+ </optional>
</objectclass>
</objectclasses>
</schema>
diff --git a/plugins/schemaeditor/resources/schemas/apacheds/core.xml b/plugins/schemaeditor/resources/schemas/apacheds/core.xml
index 4f6602d..129fb4b 100644
--- a/plugins/schemaeditor/resources/schemas/apacheds/core.xml
+++ b/plugins/schemaeditor/resources/schemas/apacheds/core.xml
@@ -19,13 +19,16 @@
-->
<schema name="core">
<attributetypes>
- <attributetype oid="2.5.4.52" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="0.9.2342.19200300.100.1.1" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>supportedAlgorithms</alias>
+ <alias>uid</alias>
+ <alias>userid</alias>
</aliases>
- <description>RFC2256: supported algorithms</description>
+ <description>RFC1274: user identifier</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.49</syntax>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
<attributetype oid="0.9.2342.19200300.100.1.25" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
@@ -38,64 +41,6 @@
<equality>caseIgnoreIA5Match</equality>
<substring>caseIgnoreIA5SubstringsMatch</substring>
</attributetype>
- <attributetype oid="2.5.4.53" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>deltaRevocationList</alias>
- </aliases>
- <description>RFC2256: delta revocation list; use ;binary</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.9</syntax>
- </attributetype>
- <attributetype oid="2.5.4.44" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>generationQualifier</alias>
- </aliases>
- <description>RFC2256: name qualifier indicating a generation</description>
- <superior>name</superior>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="2.5.4.36" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>userCertificate</alias>
- </aliases>
- <description>RFC2256: X.509 user certificate, use ;binary</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.8</syntax>
- </attributetype>
- <attributetype oid="2.5.4.15" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>businessCategory</alias>
- </aliases>
- <description>RFC2256: business category</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="2.5.4.29" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>presentationAddress</alias>
- </aliases>
- <description>RFC2256: presentation address</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.43</syntax>
- <equality>presentationAddressMatch</equality>
- </attributetype>
- <attributetype oid="2.5.4.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>c</alias>
- <alias>countryName</alias>
- </aliases>
- <description>RFC2256: ISO-3166 country 2-letter code</description>
- <superior>name</superior>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
<attributetype oid="0.9.2342.19200300.100.1.3" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
<alias>mail</alias>
@@ -107,43 +52,15 @@
<equality>caseIgnoreIA5Match</equality>
<substring>caseIgnoreIA5SubstringsMatch</substring>
</attributetype>
- <attributetype oid="2.5.4.50" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="0.9.2342.19200300.100.1.37" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>uniqueMember</alias>
+ <alias>associatedDomain</alias>
</aliases>
- <description>RFC2256: unique member of a group</description>
+ <description>RFC1274: domain associated with object</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.34</syntax>
- <equality>uniqueMemberMatch</equality>
- </attributetype>
- <attributetype oid="2.5.4.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>serialNumber</alias>
- </aliases>
- <description>RFC2256: serial number of the entity</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="2.5.4.43" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>initials</alias>
- </aliases>
- <description>RFC2256: initials of some or all of names, but not the surname(s).</description>
- <superior>name</superior>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="2.5.4.14" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>searchGuide</alias>
- </aliases>
- <description>RFC2256: search guide, obsoleted by enhancedSearchGuide</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.25</syntax>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ <substring>caseIgnoreIA5SubstringsMatch</substring>
</attributetype>
<attributetype oid="1.2.840.113549.1.9.1" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
@@ -157,41 +74,36 @@
<equality>caseIgnoreIA5Match</equality>
<substring>caseIgnoreIA5SubstringsMatch</substring>
</attributetype>
- <attributetype oid="2.5.4.37" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="2.5.4.10" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>cACertificate</alias>
+ <alias>o</alias>
+ <alias>organizationName</alias>
</aliases>
- <description>RFC2256: X.509 CA certificate, use ;binary</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.8</syntax>
- </attributetype>
- <attributetype oid="2.5.4.34" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>seeAlso</alias>
- </aliases>
- <description>RFC2256: DN of related object</description>
- <superior>distinguishedName</superior>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
- <attributetype oid="2.5.4.42" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>givenName</alias>
- <alias>gn</alias>
- </aliases>
- <description>RFC2256: first name(s) for which the entity is known by</description>
+ <description>RFC2256: organization this object belongs to</description>
<superior>name</superior>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
- <attributetype oid="2.5.4.51" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="2.5.4.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>houseIdentifier</alias>
+ <alias>ou</alias>
+ <alias>organizationalUnitName</alias>
</aliases>
- <description>RFC2256: house identifier</description>
+ <description>RFC2256: organizational unit this object belongs to</description>
+ <superior>name</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="2.5.4.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>title</alias>
+ </aliases>
+ <description>RFC2256: title associated with the entity</description>
+ <superior>name</superior>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
<equality>caseIgnoreMatch</equality>
@@ -207,26 +119,73 @@
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
- <attributetype oid="2.5.4.28" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="2.5.4.14" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>preferredDeliveryMethod</alias>
+ <alias>searchGuide</alias>
</aliases>
- <description>RFC2256: preferred delivery method</description>
+ <description>RFC2256: search guide, obsoleted by enhancedSearchGuide</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.14</syntax>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.25</syntax>
</attributetype>
- <attributetype oid="2.5.4.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="2.5.4.15" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>sn</alias>
- <alias>surname</alias>
+ <alias>businessCategory</alias>
</aliases>
- <description>RFC2256: last (family) name(s) for which the entity is known by</description>
- <superior>name</superior>
+ <description>RFC2256: business category</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
+ <attributetype oid="2.5.4.16" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>postalAddress</alias>
+ </aliases>
+ <description>RFC2256: postal address</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.41</syntax>
+ <equality>caseIgnoreListMatch</equality>
+ <substring>caseIgnoreListSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="2.5.4.17" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>postalCode</alias>
+ </aliases>
+ <description>RFC2256: postal code</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="2.5.4.18" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>postOfficeBox</alias>
+ </aliases>
+ <description>RFC2256: Post Office Box</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="2.5.4.19" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>physicalDeliveryOfficeName</alias>
+ </aliases>
+ <description>RFC2256: Physical Delivery Office Name</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="2.5.4.2" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>knowledgeInformation</alias>
+ </aliases>
+ <description>RFC2256: knowledge information</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ </attributetype>
<attributetype oid="2.5.4.20" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
<alias>telephoneNumber</alias>
@@ -245,53 +204,6 @@
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.52</syntax>
</attributetype>
- <attributetype oid="2.5.4.27" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>destinationIndicator</alias>
- </aliases>
- <description>RFC2256: destination indicator</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="2.5.4.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>title</alias>
- </aliases>
- <description>RFC2256: title associated with the entity</description>
- <superior>name</superior>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="2.5.4.47" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>enhancedSearchGuide</alias>
- </aliases>
- <description>RFC2256: enhanced search guide</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.21</syntax>
- </attributetype>
- <attributetype oid="2.5.4.32" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>owner</alias>
- </aliases>
- <description>RFC2256: owner (of the object)</description>
- <superior>distinguishedName</superior>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
- <attributetype oid="2.5.4.40" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>crossCertificatePair</alias>
- </aliases>
- <description>RFC2256: X.509 cross certificate pair, use ;binary</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.10</syntax>
- </attributetype>
<attributetype oid="2.5.4.22" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
<alias>teletexTerminalIdentifier</alias>
@@ -300,25 +212,34 @@
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.51</syntax>
</attributetype>
- <attributetype oid="2.5.4.2" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="2.5.4.23" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>knowledgeInformation</alias>
+ <alias>facsimileTelephoneNumber</alias>
+ <alias>fax</alias>
</aliases>
- <description>RFC2256: knowledge information</description>
+ <description>RFC2256: Facsimile (Fax) Telephone Number</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.22</syntax>
</attributetype>
- <attributetype oid="2.5.4.9" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="2.5.4.24" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>street</alias>
- <alias>streetAddress</alias>
+ <alias>x121Address</alias>
</aliases>
- <description>RFC2256: street address of this object</description>
+ <description>RFC2256: X.121 Address</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.36</syntax>
+ <equality>numericStringMatch</equality>
+ <substring>numericStringSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="2.5.4.25" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>internationaliSDNNumber</alias>
+ </aliases>
+ <description>RFC2256: international ISDN number</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.36</syntax>
+ <equality>numericStringMatch</equality>
+ <substring>numericStringSubstringsMatch</substring>
</attributetype>
<attributetype oid="2.5.4.26" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
@@ -331,26 +252,195 @@
<equality>caseIgnoreListMatch</equality>
<substring>caseIgnoreListSubstringsMatch</substring>
</attributetype>
- <attributetype oid="2.5.4.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="2.5.4.27" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>ou</alias>
- <alias>organizationalUnitName</alias>
+ <alias>destinationIndicator</alias>
</aliases>
- <description>RFC2256: organizational unit this object belongs to</description>
+ <description>RFC2256: destination indicator</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="2.5.4.28" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>preferredDeliveryMethod</alias>
+ </aliases>
+ <description>RFC2256: preferred delivery method</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.14</syntax>
+ </attributetype>
+ <attributetype oid="2.5.4.29" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>presentationAddress</alias>
+ </aliases>
+ <description>RFC2256: presentation address</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.43</syntax>
+ <equality>presentationAddressMatch</equality>
+ </attributetype>
+ <attributetype oid="2.5.4.30" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>supportedApplicationContext</alias>
+ </aliases>
+ <description>RFC2256: supported application context</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+ <equality>objectIdentifierMatch</equality>
+ </attributetype>
+ <attributetype oid="2.5.4.31" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>member</alias>
+ </aliases>
+ <description>RFC2256: member of a group</description>
+ <superior>distinguishedName</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
+ <attributetype oid="2.5.4.32" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>owner</alias>
+ </aliases>
+ <description>RFC2256: owner (of the object)</description>
+ <superior>distinguishedName</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
+ <attributetype oid="2.5.4.33" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>roleOccupant</alias>
+ </aliases>
+ <description>RFC2256: occupant of role</description>
+ <superior>distinguishedName</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
+ <attributetype oid="2.5.4.34" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>seeAlso</alias>
+ </aliases>
+ <description>RFC2256: DN of related object</description>
+ <superior>distinguishedName</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
+ <attributetype oid="2.5.4.36" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>userCertificate</alias>
+ </aliases>
+ <description>RFC2256: X.509 user certificate, use ;binary</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.8</syntax>
+ </attributetype>
+ <attributetype oid="2.5.4.37" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>cACertificate</alias>
+ </aliases>
+ <description>RFC2256: X.509 CA certificate, use ;binary</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.8</syntax>
+ </attributetype>
+ <attributetype oid="2.5.4.38" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>authorityRevocationList</alias>
+ </aliases>
+ <description>RFC2256: X.509 authority revocation list, use ;binary</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.9</syntax>
+ </attributetype>
+ <attributetype oid="2.5.4.39" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>certificateRevocationList</alias>
+ </aliases>
+ <description>RFC2256: X.509 certificate revocation list, use ;binary</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.9</syntax>
+ </attributetype>
+ <attributetype oid="2.5.4.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sn</alias>
+ <alias>surname</alias>
+ </aliases>
+ <description>RFC2256: last (family) name(s) for which the entity is known by</description>
<superior>name</superior>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
- <attributetype oid="2.5.4.23" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="2.5.4.40" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>facsimileTelephoneNumber</alias>
- <alias>fax</alias>
+ <alias>crossCertificatePair</alias>
</aliases>
- <description>RFC2256: Facsimile (Fax) Telephone Number</description>
+ <description>RFC2256: X.509 cross certificate pair, use ;binary</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.22</syntax>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.10</syntax>
+ </attributetype>
+ <attributetype oid="2.5.4.42" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>givenName</alias>
+ <alias>gn</alias>
+ </aliases>
+ <description>RFC2256: first name(s) for which the entity is known by</description>
+ <superior>name</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="2.5.4.43" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>initials</alias>
+ </aliases>
+ <description>RFC2256: initials of some or all of names, but not the surname(s).</description>
+ <superior>name</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="2.5.4.44" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>generationQualifier</alias>
+ </aliases>
+ <description>RFC2256: name qualifier indicating a generation</description>
+ <superior>name</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="2.5.4.45" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>x500UniqueIdentifier</alias>
+ </aliases>
+ <description>RFC2256: X.500 unique identifier</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.6</syntax>
+ <equality>bitStringMatch</equality>
+ </attributetype>
+ <attributetype oid="2.5.4.46" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dnQualifier</alias>
+ </aliases>
+ <description>RFC2256: DN qualifier</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <ordering>caseIgnoreOrderingMatch</ordering>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="2.5.4.47" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>enhancedSearchGuide</alias>
+ </aliases>
+ <description>RFC2256: enhanced search guide</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.21</syntax>
</attributetype>
<attributetype oid="2.5.4.48" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
@@ -361,35 +451,50 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.42</syntax>
<equality>protocolInformationMatch</equality>
</attributetype>
- <attributetype oid="2.5.4.25" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="2.5.4.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>internationaliSDNNumber</alias>
+ <alias>serialNumber</alias>
</aliases>
- <description>RFC2256: international ISDN number</description>
+ <description>RFC2256: serial number of the entity</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.36</syntax>
- <equality>numericStringMatch</equality>
- <substring>numericStringSubstringsMatch</substring>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
- <attributetype oid="2.5.4.19" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="2.5.4.50" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>physicalDeliveryOfficeName</alias>
+ <alias>uniqueMember</alias>
</aliases>
- <description>RFC2256: Physical Delivery Office Name</description>
+ <description>RFC2256: unique member of a group</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.34</syntax>
+ <equality>uniqueMemberMatch</equality>
+ </attributetype>
+ <attributetype oid="2.5.4.51" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>houseIdentifier</alias>
+ </aliases>
+ <description>RFC2256: house identifier</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.37" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="2.5.4.52" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>associatedDomain</alias>
+ <alias>supportedAlgorithms</alias>
</aliases>
- <description>RFC1274: domain associated with object</description>
+ <description>RFC2256: supported algorithms</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- <substring>caseIgnoreIA5SubstringsMatch</substring>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.49</syntax>
+ </attributetype>
+ <attributetype oid="2.5.4.53" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>deltaRevocationList</alias>
+ </aliases>
+ <description>RFC2256: delta revocation list; use ;binary</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.9</syntax>
</attributetype>
<attributetype oid="2.5.4.54" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
@@ -402,69 +507,18 @@
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
- <attributetype oid="2.5.4.33" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="2.5.4.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>roleOccupant</alias>
+ <alias>c</alias>
+ <alias>countryName</alias>
</aliases>
- <description>RFC2256: occupant of role</description>
- <superior>distinguishedName</superior>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
- <attributetype oid="2.5.4.10" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>o</alias>
- <alias>organizationName</alias>
- </aliases>
- <description>RFC2256: organization this object belongs to</description>
+ <description>RFC2256: ISO-3166 country 2-letter code</description>
<superior>name</superior>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
- <attributetype oid="2.5.4.17" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>postalCode</alias>
- </aliases>
- <description>RFC2256: postal code</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.1" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>uid</alias>
- <alias>userid</alias>
- </aliases>
- <description>RFC1274: user identifier</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="2.5.4.31" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>member</alias>
- </aliases>
- <description>RFC2256: member of a group</description>
- <superior>distinguishedName</superior>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
- <attributetype oid="2.5.4.24" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>x121Address</alias>
- </aliases>
- <description>RFC2256: X.121 Address</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.36</syntax>
- <equality>numericStringMatch</equality>
- <substring>numericStringSubstringsMatch</substring>
- </attributetype>
<attributetype oid="2.5.4.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
<alias>l</alias>
@@ -477,45 +531,6 @@
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
- <attributetype oid="2.5.4.38" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>authorityRevocationList</alias>
- </aliases>
- <description>RFC2256: X.509 authority revocation list, use ;binary</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.9</syntax>
- </attributetype>
- <attributetype oid="2.5.4.18" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>postOfficeBox</alias>
- </aliases>
- <description>RFC2256: Post Office Box</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="2.5.4.46" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>dnQualifier</alias>
- </aliases>
- <description>RFC2256: DN qualifier</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
- <equality>caseIgnoreMatch</equality>
- <ordering>caseIgnoreOrderingMatch</ordering>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="2.5.4.16" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>postalAddress</alias>
- </aliases>
- <description>RFC2256: postal address</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.41</syntax>
- <equality>caseIgnoreListMatch</equality>
- <substring>caseIgnoreListSubstringsMatch</substring>
- </attributetype>
<attributetype oid="2.5.4.8" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
<alias>st</alias>
@@ -528,106 +543,57 @@
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
- <attributetype oid="2.5.4.39" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="2.5.4.9" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>certificateRevocationList</alias>
+ <alias>street</alias>
+ <alias>streetAddress</alias>
</aliases>
- <description>RFC2256: X.509 certificate revocation list, use ;binary</description>
+ <description>RFC2256: street address of this object</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.9</syntax>
- </attributetype>
- <attributetype oid="2.5.4.45" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>x500UniqueIdentifier</alias>
- </aliases>
- <description>RFC2256: X.500 unique identifier</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.6</syntax>
- <equality>bitStringMatch</equality>
- </attributetype>
- <attributetype oid="2.5.4.30" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>supportedApplicationContext</alias>
- </aliases>
- <description>RFC2256: supported application context</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
- <equality>objectIdentifierMatch</equality>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
</attributetypes>
<objectclasses>
- <objectclass oid="2.5.6.14" obsolete="false">
+ <objectclass oid="0.9.2342.19200300.100.4.19" obsolete="false">
<aliases>
- <alias>device</alias>
+ <alias>simpleSecurityObject</alias>
</aliases>
- <description>RFC2256: a device</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>cn</attributetype>
- </mandatory>
- <optional>
- <attributetype>serialNumber</attributetype>
- <attributetype>seeAlso</attributetype>
- <attributetype>owner</attributetype>
- <attributetype>ou</attributetype>
- <attributetype>o</attributetype>
- <attributetype>l</attributetype>
- <attributetype>description</attributetype>
- </optional>
- </objectclass>
- <objectclass oid="2.5.6.17" obsolete="false">
- <aliases>
- <alias>groupOfUniqueNames</alias>
- </aliases>
- <description>RFC2256: a group of unique names (DN and Unique Identifier)</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>uniqueMember</attributetype>
- <attributetype>cn</attributetype>
- </mandatory>
- <optional>
- <attributetype>businessCategory</attributetype>
- <attributetype>seeAlso</attributetype>
- <attributetype>owner</attributetype>
- <attributetype>ou</attributetype>
- <attributetype>o</attributetype>
- <attributetype>description</attributetype>
- </optional>
- </objectclass>
- <objectclass oid="2.5.6.22" obsolete="false">
- <aliases>
- <alias>pkiCA</alias>
- </aliases>
- <description>RFC2587: PKI certificate authority</description>
+ <description>RFC1274: simple security object</description>
<superiors>
<superior>top</superior>
</superiors>
<type>AUXILIARY</type>
- <optional>
- <attributetype>authorityRevocationList</attributetype>
- <attributetype>certificateRevocationList</attributetype>
- <attributetype>cACertificate</attributetype>
- <attributetype>crossCertificatePair</attributetype>
- </optional>
+ <mandatory>
+ <attributetype>userPassword</attributetype>
+ </mandatory>
</objectclass>
- <objectclass oid="2.5.6.21" obsolete="false">
+ <objectclass oid="1.3.6.1.1.3.1" obsolete="false">
<aliases>
- <alias>pkiUser</alias>
+ <alias>uidObject</alias>
</aliases>
- <description>RFC2587: a PKI user</description>
+ <description>RFC2377: uid object</description>
<superiors>
<superior>top</superior>
</superiors>
<type>AUXILIARY</type>
- <optional>
- <attributetype>userCertificate</attributetype>
- </optional>
+ <mandatory>
+ <attributetype>uid</attributetype>
+ </mandatory>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.1466.344" obsolete="false">
+ <aliases>
+ <alias>dcObject</alias>
+ </aliases>
+ <description>RFC2247: domain component object</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>AUXILIARY</type>
+ <mandatory>
+ <attributetype>dc</attributetype>
+ </mandatory>
</objectclass>
<objectclass oid="1.3.6.1.4.1.250.3.15" obsolete="false">
<aliases>
@@ -642,17 +608,20 @@
<attributetype>labeledURI</attributetype>
</optional>
</objectclass>
- <objectclass oid="2.5.6.7" obsolete="false">
+ <objectclass oid="2.5.6.10" obsolete="false">
<aliases>
- <alias>organizationalPerson</alias>
+ <alias>residentialPerson</alias>
</aliases>
- <description>RFC2256: an organizational person</description>
+ <description>RFC2256: an residential person</description>
<superiors>
<superior>person</superior>
</superiors>
<type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>l</attributetype>
+ </mandatory>
<optional>
- <attributetype>title</attributetype>
+ <attributetype>businessCategory</attributetype>
<attributetype>x121Address</attributetype>
<attributetype>registeredAddress</attributetype>
<attributetype>destinationIndicator</attributetype>
@@ -667,29 +636,14 @@
<attributetype>postalCode</attributetype>
<attributetype>postalAddress</attributetype>
<attributetype>physicalDeliveryOfficeName</attributetype>
- <attributetype>ou</attributetype>
<attributetype>st</attributetype>
- <attributetype>l</attributetype>
</optional>
</objectclass>
- <objectclass oid="0.9.2342.19200300.100.4.19" obsolete="false">
+ <objectclass oid="2.5.6.11" obsolete="false">
<aliases>
- <alias>simpleSecurityObject</alias>
+ <alias>applicationProcess</alias>
</aliases>
- <description>RFC1274: simple security object</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>AUXILIARY</type>
- <mandatory>
- <attributetype>userPassword</attributetype>
- </mandatory>
- </objectclass>
- <objectclass oid="2.5.6.8" obsolete="false">
- <aliases>
- <alias>organizationalRole</alias>
- </aliases>
- <description>RFC2256: an organizational role</description>
+ <description>RFC2256: an application process</description>
<superiors>
<superior>top</superior>
</superiors>
@@ -698,54 +652,12 @@
<attributetype>cn</attributetype>
</mandatory>
<optional>
- <attributetype>x121Address</attributetype>
- <attributetype>registeredAddress</attributetype>
- <attributetype>destinationIndicator</attributetype>
- <attributetype>preferredDeliveryMethod</attributetype>
- <attributetype>telexNumber</attributetype>
- <attributetype>teletexTerminalIdentifier</attributetype>
- <attributetype>telephoneNumber</attributetype>
- <attributetype>internationaliSDNNumber</attributetype>
- <attributetype>facsimileTelephoneNumber</attributetype>
<attributetype>seeAlso</attributetype>
- <attributetype>roleOccupant</attributetype>
- <attributetype>street</attributetype>
- <attributetype>postOfficeBox</attributetype>
- <attributetype>postalCode</attributetype>
- <attributetype>postalAddress</attributetype>
- <attributetype>physicalDeliveryOfficeName</attributetype>
<attributetype>ou</attributetype>
- <attributetype>st</attributetype>
<attributetype>l</attributetype>
<attributetype>description</attributetype>
</optional>
</objectclass>
- <objectclass oid="2.5.6.15" obsolete="false">
- <aliases>
- <alias>strongAuthenticationUser</alias>
- </aliases>
- <description>RFC2256: a strong authentication user</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>AUXILIARY</type>
- <mandatory>
- <attributetype>userCertificate</attributetype>
- </mandatory>
- </objectclass>
- <objectclass oid="2.5.6.23" obsolete="false">
- <aliases>
- <alias>deltaCRL</alias>
- </aliases>
- <description>RFC2587: PKI user</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>AUXILIARY</type>
- <optional>
- <attributetype>deltaRevocationList</attributetype>
- </optional>
- </objectclass>
<objectclass oid="2.5.6.12" obsolete="false">
<aliases>
<alias>applicationEntity</alias>
@@ -768,42 +680,103 @@
<attributetype>description</attributetype>
</optional>
</objectclass>
- <objectclass oid="2.5.6.6" obsolete="false">
+ <objectclass oid="2.5.6.13" obsolete="false">
<aliases>
- <alias>person</alias>
+ <alias>dSA</alias>
</aliases>
- <description>RFC2256: a person</description>
+ <description>RFC2256: a directory system agent (a server)</description>
+ <superiors>
+ <superior>applicationEntity</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <optional>
+ <attributetype>knowledgeInformation</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="2.5.6.14" obsolete="false">
+ <aliases>
+ <alias>device</alias>
+ </aliases>
+ <description>RFC2256: a device</description>
<superiors>
<superior>top</superior>
</superiors>
<type>STRUCTURAL</type>
<mandatory>
- <attributetype>sn</attributetype>
<attributetype>cn</attributetype>
</mandatory>
<optional>
- <attributetype>userPassword</attributetype>
- <attributetype>telephoneNumber</attributetype>
+ <attributetype>serialNumber</attributetype>
<attributetype>seeAlso</attributetype>
+ <attributetype>owner</attributetype>
+ <attributetype>ou</attributetype>
+ <attributetype>o</attributetype>
+ <attributetype>l</attributetype>
<attributetype>description</attributetype>
</optional>
</objectclass>
- <objectclass oid="2.5.6.11" obsolete="false">
+ <objectclass oid="2.5.6.15" obsolete="false">
<aliases>
- <alias>applicationProcess</alias>
+ <alias>strongAuthenticationUser</alias>
</aliases>
- <description>RFC2256: an application process</description>
+ <description>RFC2256: a strong authentication user</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>AUXILIARY</type>
+ <mandatory>
+ <attributetype>userCertificate</attributetype>
+ </mandatory>
+ </objectclass>
+ <objectclass oid="2.5.6.16.2" obsolete="false">
+ <aliases>
+ <alias>certificationAuthority-V2</alias>
+ </aliases>
+ <superiors>
+ <superior>certificationAuthority</superior>
+ </superiors>
+ <type>AUXILIARY</type>
+ <optional>
+ <attributetype>deltaRevocationList</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="2.5.6.16" obsolete="false">
+ <aliases>
+ <alias>certificationAuthority</alias>
+ </aliases>
+ <description>RFC2256: a certificate authority</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>AUXILIARY</type>
+ <mandatory>
+ <attributetype>authorityRevocationList</attributetype>
+ <attributetype>certificateRevocationList</attributetype>
+ <attributetype>cACertificate</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>crossCertificatePair</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="2.5.6.17" obsolete="false">
+ <aliases>
+ <alias>groupOfUniqueNames</alias>
+ </aliases>
+ <description>RFC2256: a group of unique names (DN and Unique Identifier)</description>
<superiors>
<superior>top</superior>
</superiors>
<type>STRUCTURAL</type>
<mandatory>
+ <attributetype>uniqueMember</attributetype>
<attributetype>cn</attributetype>
</mandatory>
<optional>
+ <attributetype>businessCategory</attributetype>
<attributetype>seeAlso</attributetype>
+ <attributetype>owner</attributetype>
<attributetype>ou</attributetype>
- <attributetype>l</attributetype>
+ <attributetype>o</attributetype>
<attributetype>description</attributetype>
</optional>
</objectclass>
@@ -820,66 +793,38 @@
<attributetype>supportedAlgorithms</attributetype>
</optional>
</objectclass>
- <objectclass oid="1.3.6.1.4.1.1466.344" obsolete="false">
+ <objectclass oid="2.5.6.19" obsolete="false">
<aliases>
- <alias>dcObject</alias>
+ <alias>cRLDistributionPoint</alias>
</aliases>
- <description>RFC2247: domain component object</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>AUXILIARY</type>
- <mandatory>
- <attributetype>dc</attributetype>
- </mandatory>
- </objectclass>
- <objectclass oid="2.5.6.5" obsolete="false">
- <aliases>
- <alias>organizationalUnit</alias>
- </aliases>
- <description>RFC2256: an organizational unit</description>
<superiors>
<superior>top</superior>
</superiors>
<type>STRUCTURAL</type>
<mandatory>
- <attributetype>ou</attributetype>
+ <attributetype>cn</attributetype>
</mandatory>
<optional>
- <attributetype>userPassword</attributetype>
- <attributetype>searchGuide</attributetype>
- <attributetype>seeAlso</attributetype>
- <attributetype>businessCategory</attributetype>
- <attributetype>x121Address</attributetype>
- <attributetype>registeredAddress</attributetype>
- <attributetype>destinationIndicator</attributetype>
- <attributetype>preferredDeliveryMethod</attributetype>
- <attributetype>telexNumber</attributetype>
- <attributetype>teletexTerminalIdentifier</attributetype>
- <attributetype>telephoneNumber</attributetype>
- <attributetype>internationaliSDNNumber</attributetype>
- <attributetype>facsimileTelephoneNumber</attributetype>
- <attributetype>street</attributetype>
- <attributetype>postOfficeBox</attributetype>
- <attributetype>postalCode</attributetype>
- <attributetype>postalAddress</attributetype>
- <attributetype>physicalDeliveryOfficeName</attributetype>
- <attributetype>st</attributetype>
- <attributetype>l</attributetype>
- <attributetype>description</attributetype>
+ <attributetype>certificateRevocationList</attributetype>
+ <attributetype>authorityRevocationList</attributetype>
+ <attributetype>deltaRevocationList</attributetype>
</optional>
</objectclass>
- <objectclass oid="2.5.6.13" obsolete="false">
+ <objectclass oid="2.5.6.2" obsolete="false">
<aliases>
- <alias>dSA</alias>
+ <alias>country</alias>
</aliases>
- <description>RFC2256: a directory system agent (a server)</description>
+ <description>RFC2256: a country</description>
<superiors>
- <superior>applicationEntity</superior>
+ <superior>top</superior>
</superiors>
<type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>c</attributetype>
+ </mandatory>
<optional>
- <attributetype>knowledgeInformation</attributetype>
+ <attributetype>searchGuide</attributetype>
+ <attributetype>description</attributetype>
</optional>
</objectclass>
<objectclass oid="2.5.6.20" obsolete="false">
@@ -917,85 +862,66 @@
<attributetype>description</attributetype>
</optional>
</objectclass>
- <objectclass oid="1.3.6.1.1.3.1" obsolete="false">
+ <objectclass oid="2.5.6.21" obsolete="false">
<aliases>
- <alias>uidObject</alias>
+ <alias>pkiUser</alias>
</aliases>
- <description>RFC2377: uid object</description>
+ <description>RFC2587: a PKI user</description>
<superiors>
<superior>top</superior>
</superiors>
<type>AUXILIARY</type>
- <mandatory>
- <attributetype>uid</attributetype>
- </mandatory>
- </objectclass>
- <objectclass oid="2.5.6.19" obsolete="false">
- <aliases>
- <alias>cRLDistributionPoint</alias>
- </aliases>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>cn</attributetype>
- </mandatory>
<optional>
- <attributetype>certificateRevocationList</attributetype>
- <attributetype>authorityRevocationList</attributetype>
- <attributetype>deltaRevocationList</attributetype>
+ <attributetype>userCertificate</attributetype>
</optional>
</objectclass>
- <objectclass oid="2.5.6.10" obsolete="false">
+ <objectclass oid="2.5.6.22" obsolete="false">
<aliases>
- <alias>residentialPerson</alias>
+ <alias>pkiCA</alias>
</aliases>
- <description>RFC2256: an residential person</description>
- <superiors>
- <superior>person</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>l</attributetype>
- </mandatory>
- <optional>
- <attributetype>businessCategory</attributetype>
- <attributetype>x121Address</attributetype>
- <attributetype>registeredAddress</attributetype>
- <attributetype>destinationIndicator</attributetype>
- <attributetype>preferredDeliveryMethod</attributetype>
- <attributetype>telexNumber</attributetype>
- <attributetype>teletexTerminalIdentifier</attributetype>
- <attributetype>telephoneNumber</attributetype>
- <attributetype>internationaliSDNNumber</attributetype>
- <attributetype>facsimileTelephoneNumber</attributetype>
- <attributetype>street</attributetype>
- <attributetype>postOfficeBox</attributetype>
- <attributetype>postalCode</attributetype>
- <attributetype>postalAddress</attributetype>
- <attributetype>physicalDeliveryOfficeName</attributetype>
- <attributetype>st</attributetype>
- </optional>
- </objectclass>
- <objectclass oid="2.5.6.16" obsolete="false">
- <aliases>
- <alias>certificationAuthority</alias>
- </aliases>
- <description>RFC2256: a certificate authority</description>
+ <description>RFC2587: PKI certificate authority</description>
<superiors>
<superior>top</superior>
</superiors>
<type>AUXILIARY</type>
- <mandatory>
+ <optional>
<attributetype>authorityRevocationList</attributetype>
<attributetype>certificateRevocationList</attributetype>
<attributetype>cACertificate</attributetype>
- </mandatory>
- <optional>
<attributetype>crossCertificatePair</attributetype>
</optional>
</objectclass>
+ <objectclass oid="2.5.6.23" obsolete="false">
+ <aliases>
+ <alias>deltaCRL</alias>
+ </aliases>
+ <description>RFC2587: PKI user</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>AUXILIARY</type>
+ <optional>
+ <attributetype>deltaRevocationList</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="2.5.6.3" obsolete="false">
+ <aliases>
+ <alias>locality</alias>
+ </aliases>
+ <description>RFC2256: a locality</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <optional>
+ <attributetype>searchGuide</attributetype>
+ <attributetype>description</attributetype>
+ <attributetype>street</attributetype>
+ <attributetype>seeAlso</attributetype>
+ <attributetype>st</attributetype>
+ <attributetype>l</attributetype>
+ </optional>
+ </objectclass>
<objectclass oid="2.5.6.4" obsolete="false">
<aliases>
<alias>organization</alias>
@@ -1032,34 +958,125 @@
<attributetype>description</attributetype>
</optional>
</objectclass>
- <objectclass oid="2.5.6.3" obsolete="false">
+ <objectclass oid="2.5.6.5" obsolete="false">
<aliases>
- <alias>locality</alias>
+ <alias>organizationalUnit</alias>
</aliases>
- <description>RFC2256: a locality</description>
+ <description>RFC2256: an organizational unit</description>
<superiors>
<superior>top</superior>
</superiors>
<type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>ou</attributetype>
+ </mandatory>
<optional>
- <attributetype>street</attributetype>
- <attributetype>seeAlso</attributetype>
+ <attributetype>userPassword</attributetype>
<attributetype>searchGuide</attributetype>
+ <attributetype>seeAlso</attributetype>
+ <attributetype>businessCategory</attributetype>
+ <attributetype>x121Address</attributetype>
+ <attributetype>registeredAddress</attributetype>
+ <attributetype>destinationIndicator</attributetype>
+ <attributetype>preferredDeliveryMethod</attributetype>
+ <attributetype>telexNumber</attributetype>
+ <attributetype>teletexTerminalIdentifier</attributetype>
+ <attributetype>telephoneNumber</attributetype>
+ <attributetype>internationaliSDNNumber</attributetype>
+ <attributetype>facsimileTelephoneNumber</attributetype>
+ <attributetype>street</attributetype>
+ <attributetype>postOfficeBox</attributetype>
+ <attributetype>postalCode</attributetype>
+ <attributetype>postalAddress</attributetype>
+ <attributetype>physicalDeliveryOfficeName</attributetype>
<attributetype>st</attributetype>
<attributetype>l</attributetype>
<attributetype>description</attributetype>
</optional>
</objectclass>
- <objectclass oid="2.5.6.16.2" obsolete="false">
+ <objectclass oid="2.5.6.6" obsolete="false">
<aliases>
- <alias>certificationAuthority-V2</alias>
+ <alias>person</alias>
</aliases>
+ <description>RFC2256: a person</description>
<superiors>
- <superior>certificationAuthority</superior>
+ <superior>top</superior>
</superiors>
- <type>AUXILIARY</type>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>sn</attributetype>
+ <attributetype>cn</attributetype>
+ </mandatory>
<optional>
- <attributetype>deltaRevocationList</attributetype>
+ <attributetype>userPassword</attributetype>
+ <attributetype>telephoneNumber</attributetype>
+ <attributetype>seeAlso</attributetype>
+ <attributetype>description</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="2.5.6.7" obsolete="false">
+ <aliases>
+ <alias>organizationalPerson</alias>
+ </aliases>
+ <description>RFC2256: an organizational person</description>
+ <superiors>
+ <superior>person</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <optional>
+ <attributetype>title</attributetype>
+ <attributetype>x121Address</attributetype>
+ <attributetype>registeredAddress</attributetype>
+ <attributetype>destinationIndicator</attributetype>
+ <attributetype>preferredDeliveryMethod</attributetype>
+ <attributetype>telexNumber</attributetype>
+ <attributetype>teletexTerminalIdentifier</attributetype>
+ <attributetype>telephoneNumber</attributetype>
+ <attributetype>internationaliSDNNumber</attributetype>
+ <attributetype>facsimileTelephoneNumber</attributetype>
+ <attributetype>street</attributetype>
+ <attributetype>postOfficeBox</attributetype>
+ <attributetype>postalCode</attributetype>
+ <attributetype>postalAddress</attributetype>
+ <attributetype>physicalDeliveryOfficeName</attributetype>
+ <attributetype>ou</attributetype>
+ <attributetype>st</attributetype>
+ <attributetype>l</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="2.5.6.8" obsolete="false">
+ <aliases>
+ <alias>organizationalRole</alias>
+ </aliases>
+ <description>RFC2256: an organizational role</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>cn</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>x121Address</attributetype>
+ <attributetype>registeredAddress</attributetype>
+ <attributetype>destinationIndicator</attributetype>
+ <attributetype>preferredDeliveryMethod</attributetype>
+ <attributetype>telexNumber</attributetype>
+ <attributetype>teletexTerminalIdentifier</attributetype>
+ <attributetype>telephoneNumber</attributetype>
+ <attributetype>internationaliSDNNumber</attributetype>
+ <attributetype>facsimileTelephoneNumber</attributetype>
+ <attributetype>seeAlso</attributetype>
+ <attributetype>roleOccupant</attributetype>
+ <attributetype>street</attributetype>
+ <attributetype>postOfficeBox</attributetype>
+ <attributetype>postalCode</attributetype>
+ <attributetype>postalAddress</attributetype>
+ <attributetype>physicalDeliveryOfficeName</attributetype>
+ <attributetype>ou</attributetype>
+ <attributetype>st</attributetype>
+ <attributetype>l</attributetype>
+ <attributetype>description</attributetype>
</optional>
</objectclass>
<objectclass oid="2.5.6.9" obsolete="false">
@@ -1072,8 +1089,8 @@
</superiors>
<type>STRUCTURAL</type>
<mandatory>
- <attributetype>member</attributetype>
<attributetype>cn</attributetype>
+ <attributetype>member</attributetype>
</mandatory>
<optional>
<attributetype>businessCategory</attributetype>
@@ -1084,22 +1101,5 @@
<attributetype>description</attributetype>
</optional>
</objectclass>
- <objectclass oid="2.5.6.2" obsolete="false">
- <aliases>
- <alias>country</alias>
- </aliases>
- <description>RFC2256: a country</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>c</attributetype>
- </mandatory>
- <optional>
- <attributetype>searchGuide</attributetype>
- <attributetype>description</attributetype>
- </optional>
- </objectclass>
</objectclasses>
</schema>
diff --git a/plugins/schemaeditor/resources/schemas/apacheds/cosine.xml b/plugins/schemaeditor/resources/schemas/apacheds/cosine.xml
index b40c125..380620a 100644
--- a/plugins/schemaeditor/resources/schemas/apacheds/cosine.xml
+++ b/plugins/schemaeditor/resources/schemas/apacheds/cosine.xml
@@ -19,23 +19,6 @@
-->
<schema name="cosine">
<attributetypes>
- <attributetype oid="0.9.2342.19200300.100.1.54" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>dITRedirect</alias>
- </aliases>
- <description>RFC1274: DIT Redirect</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.53" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>personalSignature</alias>
- </aliases>
- <description>RFC1274: Personal Signature (G3 fax)</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.23</syntax>
- </attributetype>
<attributetype oid="0.9.2342.19200300.100.1.10" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
<alias>manager</alias>
@@ -45,39 +28,6 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
<equality>distinguishedNameMatch</equality>
</attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.31" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>cNAMERecord</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.44" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>uniqueIdentifier</alias>
- </aliases>
- <description>RFC1274: unique identifer</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.50" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>singleLevelQuality</alias>
- </aliases>
- <description>RFC1274: Single Level Quality</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.13</syntax>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.55" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>audio</alias>
- </aliases>
- <description>RFC1274: audio (u-law)</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.4</syntax>
- </attributetype>
<attributetype oid="0.9.2342.19200300.100.1.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
<alias>documentIdentifier</alias>
@@ -88,137 +38,6 @@
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.9" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>host</alias>
- </aliases>
- <description>RFC1274: host computer</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>roomNumber</alias>
- </aliases>
- <description>RFC1274: room number</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.56" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>documentPublisher</alias>
- </aliases>
- <description>RFC1274: publisher of document</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>drink</alias>
- <alias>favouriteDrink</alias>
- </aliases>
- <description>RFC1274: favorite drink</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.41" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>mobile</alias>
- <alias>mobileTelephoneNumber</alias>
- </aliases>
- <description>RFC1274: mobile telephone number</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.50</syntax>
- <equality>telephoneNumberMatch</equality>
- <substring>telephoneNumberSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.15" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>documentLocation</alias>
- </aliases>
- <description>RFC1274: location of document original</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.27" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>mDRecord</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.43" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>co</alias>
- <alias>friendlyCountryName</alias>
- </aliases>
- <description>RFC1274: friendly country name</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.8" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>userClass</alias>
- </aliases>
- <description>RFC1274: categorory of user</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.21" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>secretary</alias>
- </aliases>
- <description>RFC1274: DN of secretary</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.29" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>nSRecord</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.28" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>mXRecord</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>photo</alias>
- </aliases>
- <description>RFC1274: photo (G3 fax)</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.23</syntax>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.22" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>otherMailbox</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.39</syntax>
- </attributetype>
<attributetype oid="0.9.2342.19200300.100.1.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
<alias>documentTitle</alias>
@@ -229,31 +48,11 @@
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.48" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="0.9.2342.19200300.100.1.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>buildingName</alias>
+ <alias>documentVersion</alias>
</aliases>
- <description>RFC1274: name of building</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.42" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>pager</alias>
- <alias>pagerTelephoneNumber</alias>
- </aliases>
- <description>RFC1274: pager telephone number</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.50</syntax>
- <equality>telephoneNumberMatch</equality>
- <substring>telephoneNumberSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.2" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>textEncodedORAddress</alias>
- </aliases>
+ <description>RFC1274: version of document</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
<equality>caseIgnoreMatch</equality>
@@ -268,13 +67,24 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
<equality>distinguishedNameMatch</equality>
</attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.47" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="0.9.2342.19200300.100.1.15" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>mailPreferenceOption</alias>
+ <alias>documentLocation</alias>
</aliases>
- <description>RFC1274: mail preference option</description>
+ <description>RFC1274: location of document original</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.2" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>textEncodedORAddress</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
<attributetype oid="0.9.2342.19200300.100.1.20" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
@@ -287,57 +97,21 @@
<equality>telephoneNumberMatch</equality>
<substring>telephoneNumberSubstringsMatch</substring>
</attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.49" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="0.9.2342.19200300.100.1.21" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>dSAQuality</alias>
+ <alias>secretary</alias>
</aliases>
- <description>RFC1274: DSA Quality</description>
+ <description>RFC1274: DN of secretary</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.19</syntax>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
</attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.39" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="0.9.2342.19200300.100.1.22" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>homePostalAddress</alias>
- </aliases>
- <description>RFC1274: home postal address</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.41</syntax>
- <equality>caseIgnoreListMatch</equality>
- <substring>caseIgnoreListSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.52" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>subtreeMaximumQuality</alias>
- </aliases>
- <description>RFC1274: Subtree Maximun Quality</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.13</syntax>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.46" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>janetMailbox</alias>
- </aliases>
- <description>RFC1274: Janet mailbox</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- <substring>caseIgnoreIA5SubstringsMatch</substring>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.30" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>sOARecord</alias>
+ <alias>otherMailbox</alias>
</aliases>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.51" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>subtreeMinimumQuality</alias>
- </aliases>
- <description>RFC1274: Subtree Mininum Quality</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.13</syntax>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.39</syntax>
</attributetype>
<attributetype oid="0.9.2342.19200300.100.1.26" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
@@ -347,15 +121,45 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
<equality>caseIgnoreIA5Match</equality>
</attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.45" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="0.9.2342.19200300.100.1.27" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>organizationalStatus</alias>
+ <alias>mDRecord</alias>
</aliases>
- <description>RFC1274: organizational status</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.28" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>mXRecord</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.29" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>nSRecord</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.30" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sOARecord</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.31" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>cNAMERecord</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
</attributetype>
<attributetype oid="0.9.2342.19200300.100.1.38" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
@@ -366,15 +170,15 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
<equality>distinguishedNameMatch</equality>
</attributetype>
- <attributetype oid="0.9.2342.19200300.100.1.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="0.9.2342.19200300.100.1.39" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>documentVersion</alias>
+ <alias>homePostalAddress</alias>
</aliases>
- <description>RFC1274: version of document</description>
+ <description>RFC1274: home postal address</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.41</syntax>
+ <equality>caseIgnoreListMatch</equality>
+ <substring>caseIgnoreListSubstringsMatch</substring>
</attributetype>
<attributetype oid="0.9.2342.19200300.100.1.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
@@ -396,28 +200,204 @@
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.41" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>mobile</alias>
+ <alias>mobileTelephoneNumber</alias>
+ </aliases>
+ <description>RFC1274: mobile telephone number</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.50</syntax>
+ <equality>telephoneNumberMatch</equality>
+ <substring>telephoneNumberSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.42" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>pager</alias>
+ <alias>pagerTelephoneNumber</alias>
+ </aliases>
+ <description>RFC1274: pager telephone number</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.50</syntax>
+ <equality>telephoneNumberMatch</equality>
+ <substring>telephoneNumberSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.43" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>co</alias>
+ <alias>friendlyCountryName</alias>
+ </aliases>
+ <description>RFC1274: friendly country name</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.44" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>uniqueIdentifier</alias>
+ </aliases>
+ <description>RFC1274: unique identifer</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.45" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>organizationalStatus</alias>
+ </aliases>
+ <description>RFC1274: organizational status</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.46" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>janetMailbox</alias>
+ </aliases>
+ <description>RFC1274: Janet mailbox</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ <substring>caseIgnoreIA5SubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.47" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>mailPreferenceOption</alias>
+ </aliases>
+ <description>RFC1274: mail preference option</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.48" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>buildingName</alias>
+ </aliases>
+ <description>RFC1274: name of building</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.49" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dSAQuality</alias>
+ </aliases>
+ <description>RFC1274: DSA Quality</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.19</syntax>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>drink</alias>
+ <alias>favouriteDrink</alias>
+ </aliases>
+ <description>RFC1274: favorite drink</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.50" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>singleLevelQuality</alias>
+ </aliases>
+ <description>RFC1274: Single Level Quality</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.13</syntax>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.51" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>subtreeMinimumQuality</alias>
+ </aliases>
+ <description>RFC1274: Subtree Mininum Quality</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.13</syntax>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.52" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>subtreeMaximumQuality</alias>
+ </aliases>
+ <description>RFC1274: Subtree Maximun Quality</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.13</syntax>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.53" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>personalSignature</alias>
+ </aliases>
+ <description>RFC1274: Personal Signature (G3 fax)</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.23</syntax>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.54" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dITRedirect</alias>
+ </aliases>
+ <description>RFC1274: DIT Redirect</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.55" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>audio</alias>
+ </aliases>
+ <description>RFC1274: audio (u-law)</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.4</syntax>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.56" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>documentPublisher</alias>
+ </aliases>
+ <description>RFC1274: publisher of document</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>roomNumber</alias>
+ </aliases>
+ <description>RFC1274: room number</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>photo</alias>
+ </aliases>
+ <description>RFC1274: photo (G3 fax)</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.23</syntax>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.8" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>userClass</alias>
+ </aliases>
+ <description>RFC1274: categorory of user</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="0.9.2342.19200300.100.1.9" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>host</alias>
+ </aliases>
+ <description>RFC1274: host computer</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
</attributetypes>
<objectclasses>
- <objectclass oid="0.9.2342.19200300.100.4.5" obsolete="false">
- <aliases>
- <alias>account</alias>
- </aliases>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>uid</attributetype>
- </mandatory>
- <optional>
- <attributetype>description</attributetype>
- <attributetype>seeAlso</attributetype>
- <attributetype>l</attributetype>
- <attributetype>o</attributetype>
- <attributetype>ou</attributetype>
- <attributetype>host</attributetype>
- </optional>
- </objectclass>
<objectclass oid="0.9.2342.19200300.100.4.13" obsolete="false">
<aliases>
<alias>domain</alias>
@@ -455,29 +435,88 @@
<attributetype>x121Address</attributetype>
</optional>
</objectclass>
- <objectclass oid="0.9.2342.19200300.100.4.6" obsolete="false">
+ <objectclass oid="0.9.2342.19200300.100.4.14" obsolete="false">
<aliases>
- <alias>document</alias>
+ <alias>RFC822localPart</alias>
</aliases>
<superiors>
+ <superior>domain</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <optional>
+ <attributetype>cn</attributetype>
+ <attributetype>sn</attributetype>
+ <attributetype>description</attributetype>
+ <attributetype>seeAlso</attributetype>
+ <attributetype>telephoneNumber</attributetype>
+ <attributetype>physicalDeliveryOfficeName</attributetype>
+ <attributetype>postalAddress</attributetype>
+ <attributetype>postalCode</attributetype>
+ <attributetype>postOfficeBox</attributetype>
+ <attributetype>street</attributetype>
+ <attributetype>facsimileTelephoneNumber</attributetype>
+ <attributetype>internationaliSDNNumber</attributetype>
+ <attributetype>teletexTerminalIdentifier</attributetype>
+ <attributetype>telexNumber</attributetype>
+ <attributetype>preferredDeliveryMethod</attributetype>
+ <attributetype>destinationIndicator</attributetype>
+ <attributetype>registeredAddress</attributetype>
+ <attributetype>x121Address</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="0.9.2342.19200300.100.4.15" obsolete="false">
+ <aliases>
+ <alias>dNSDomain</alias>
+ </aliases>
+ <superiors>
+ <superior>domain</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <optional>
+ <attributetype>aRecord</attributetype>
+ <attributetype>mDRecord</attributetype>
+ <attributetype>mXRecord</attributetype>
+ <attributetype>nSRecord</attributetype>
+ <attributetype>sOARecord</attributetype>
+ <attributetype>cNAMERecord</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="0.9.2342.19200300.100.4.17" obsolete="false">
+ <aliases>
+ <alias>domainRelatedObject</alias>
+ </aliases>
+ <description>RFC1274: an object related to an domain</description>
+ <superiors>
<superior>top</superior>
</superiors>
+ <type>AUXILIARY</type>
+ <mandatory>
+ <attributetype>associatedDomain</attributetype>
+ </mandatory>
+ </objectclass>
+ <objectclass oid="0.9.2342.19200300.100.4.18" obsolete="false">
+ <aliases>
+ <alias>friendlyCountry</alias>
+ </aliases>
+ <superiors>
+ <superior>country</superior>
+ </superiors>
<type>STRUCTURAL</type>
<mandatory>
- <attributetype>documentIdentifier</attributetype>
+ <attributetype>co</attributetype>
</mandatory>
+ </objectclass>
+ <objectclass oid="0.9.2342.19200300.100.4.20" obsolete="false">
+ <aliases>
+ <alias>pilotOrganization</alias>
+ </aliases>
+ <superiors>
+ <superior>organization</superior>
+ <superior>organizationalUnit</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
<optional>
- <attributetype>cn</attributetype>
- <attributetype>description</attributetype>
- <attributetype>seeAlso</attributetype>
- <attributetype>l</attributetype>
- <attributetype>o</attributetype>
- <attributetype>ou</attributetype>
- <attributetype>documentTitle</attributetype>
- <attributetype>documentVersion</attributetype>
- <attributetype>documentAuthor</attributetype>
- <attributetype>documentLocation</attributetype>
- <attributetype>documentPublisher</attributetype>
+ <attributetype>buildingName</attributetype>
</optional>
</objectclass>
<objectclass oid="0.9.2342.19200300.100.4.21" obsolete="false">
@@ -508,18 +547,6 @@
<attributetype>subtreeMaximumQuality</attributetype>
</optional>
</objectclass>
- <objectclass oid="0.9.2342.19200300.100.4.18" obsolete="false">
- <aliases>
- <alias>friendlyCountry</alias>
- </aliases>
- <superiors>
- <superior>country</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>co</attributetype>
- </mandatory>
- </objectclass>
<objectclass oid="0.9.2342.19200300.100.4.4" obsolete="false">
<aliases>
<alias>pilotPerson</alias>
@@ -551,47 +578,67 @@
<attributetype>personalSignature</attributetype>
</optional>
</objectclass>
- <objectclass oid="0.9.2342.19200300.100.4.17" obsolete="false">
+ <objectclass oid="0.9.2342.19200300.100.4.5" obsolete="false">
<aliases>
- <alias>domainRelatedObject</alias>
+ <alias>account</alias>
</aliases>
- <description>RFC1274: an object related to an domain</description>
<superiors>
<superior>top</superior>
</superiors>
- <type>AUXILIARY</type>
- <mandatory>
- <attributetype>associatedDomain</attributetype>
- </mandatory>
- </objectclass>
- <objectclass oid="0.9.2342.19200300.100.4.20" obsolete="false">
- <aliases>
- <alias>pilotOrganization</alias>
- </aliases>
- <superiors>
- <superior>organization</superior>
- <superior>organizationalUnit</superior>
- </superiors>
<type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>uid</attributetype>
+ </mandatory>
<optional>
- <attributetype>buildingName</attributetype>
+ <attributetype>description</attributetype>
+ <attributetype>seeAlso</attributetype>
+ <attributetype>l</attributetype>
+ <attributetype>o</attributetype>
+ <attributetype>ou</attributetype>
+ <attributetype>host</attributetype>
</optional>
</objectclass>
- <objectclass oid="0.9.2342.19200300.100.4.15" obsolete="false">
+ <objectclass oid="0.9.2342.19200300.100.4.6" obsolete="false">
<aliases>
- <alias>dNSDomain</alias>
+ <alias>document</alias>
</aliases>
<superiors>
- <superior>domain</superior>
+ <superior>top</superior>
</superiors>
<type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>documentIdentifier</attributetype>
+ </mandatory>
<optional>
- <attributetype>aRecord</attributetype>
- <attributetype>mDRecord</attributetype>
- <attributetype>mXRecord</attributetype>
- <attributetype>nSRecord</attributetype>
- <attributetype>sOARecord</attributetype>
- <attributetype>cNAMERecord</attributetype>
+ <attributetype>cn</attributetype>
+ <attributetype>description</attributetype>
+ <attributetype>seeAlso</attributetype>
+ <attributetype>l</attributetype>
+ <attributetype>o</attributetype>
+ <attributetype>ou</attributetype>
+ <attributetype>documentTitle</attributetype>
+ <attributetype>documentVersion</attributetype>
+ <attributetype>documentAuthor</attributetype>
+ <attributetype>documentLocation</attributetype>
+ <attributetype>documentPublisher</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="0.9.2342.19200300.100.4.7" obsolete="false">
+ <aliases>
+ <alias>room</alias>
+ </aliases>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>cn</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>roomNumber</attributetype>
+ <attributetype>description</attributetype>
+ <attributetype>seeAlso</attributetype>
+ <attributetype>telephoneNumber</attributetype>
</optional>
</objectclass>
<objectclass oid="0.9.2342.19200300.100.4.9" obsolete="false">
@@ -614,52 +661,5 @@
<attributetype>ou</attributetype>
</optional>
</objectclass>
- <objectclass oid="0.9.2342.19200300.100.4.14" obsolete="false">
- <aliases>
- <alias>RFC822localPart</alias>
- </aliases>
- <superiors>
- <superior>domain</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <optional>
- <attributetype>cn</attributetype>
- <attributetype>sn</attributetype>
- <attributetype>description</attributetype>
- <attributetype>seeAlso</attributetype>
- <attributetype>telephoneNumber</attributetype>
- <attributetype>physicalDeliveryOfficeName</attributetype>
- <attributetype>postalAddress</attributetype>
- <attributetype>postalCode</attributetype>
- <attributetype>postOfficeBox</attributetype>
- <attributetype>street</attributetype>
- <attributetype>facsimileTelephoneNumber</attributetype>
- <attributetype>internationaliSDNNumber</attributetype>
- <attributetype>teletexTerminalIdentifier</attributetype>
- <attributetype>telexNumber</attributetype>
- <attributetype>preferredDeliveryMethod</attributetype>
- <attributetype>destinationIndicator</attributetype>
- <attributetype>registeredAddress</attributetype>
- <attributetype>x121Address</attributetype>
- </optional>
- </objectclass>
- <objectclass oid="0.9.2342.19200300.100.4.7" obsolete="false">
- <aliases>
- <alias>room</alias>
- </aliases>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>cn</attributetype>
- </mandatory>
- <optional>
- <attributetype>roomNumber</attributetype>
- <attributetype>description</attributetype>
- <attributetype>seeAlso</attributetype>
- <attributetype>telephoneNumber</attributetype>
- </optional>
- </objectclass>
</objectclasses>
</schema>
diff --git a/plugins/schemaeditor/resources/schemas/apacheds/dhcp.xml b/plugins/schemaeditor/resources/schemas/apacheds/dhcp.xml
index 464f034..ac571b3 100644
--- a/plugins/schemaeditor/resources/schemas/apacheds/dhcp.xml
+++ b/plugins/schemaeditor/resources/schemas/apacheds/dhcp.xml
@@ -19,42 +19,6 @@
-->
<schema name="dhcp">
<attributetypes>
- <attributetype oid="2.16.840.1.113719.1.203.4.15" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>dhcpLeasesDN</alias>
- </aliases>
- <description>The distinguished name(s) client addresses.</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.34" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>dhcpHWAddress</alias>
- </aliases>
- <description>The clients hardware address that requested this IP address.</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.22" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>dhcpAddressState</alias>
- </aliases>
- <description>This stores information about the current binding-status of an address. For dynamic addresses managed by DHCP, the values should be restricted to the following: "FREE", "ACTIVE", "EXPIRED", "RELEASED", "RESET", "ABANDONED", "BACKUP". For other addresses, it SHOULD be one of the following: "UNKNOWN", "RESERVED" (an address that is managed by DHCP that is reserved for a specific client), "RESERVED-ACTIVE" (same as reserved, but address is currently in use), "ASSIGNED" (assigned manually or by some other mechanism), "UNASSIGNED", "NOTASSIGNABLE".</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.21" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>dhcpImplementation</alias>
- </aliases>
- <description>Description of the DHCP Server implementation e.g. DHCP Servers vendor.</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
<attributetype oid="2.16.840.1.113719.1.203.4.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
<alias>dhcpPrimaryDN</alias>
@@ -64,23 +28,41 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
<equality>distinguishedNameMatch</equality>
</attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="2.16.840.1.113719.1.203.4.10" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>dhcpOption</alias>
+ <alias>dhcpHostDN</alias>
</aliases>
- <description>Encoded option values to be sent to clients. Each value represents a single option and contains (OptionTag, Length, OptionValue) encoded in the format used by DHCP.</description>
+ <description>the distinguished name(s) of the dhcpHost objects.</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
- <equality>caseIgnoreIA5Match</equality>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
</attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.35" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="2.16.840.1.113719.1.203.4.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>dhcpHashBucketAssignment</alias>
+ <alias>dhcpPoolDN</alias>
</aliases>
- <description>HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load Balancing Algorithm [RFC 3074].</description>
+ <description>The distinguished name(s) of pools.</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
- <equality>caseIgnoreIA5Match</equality>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
+ <attributetype oid="2.16.840.1.113719.1.203.4.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dhcpGroupDN</alias>
+ </aliases>
+ <description>The distinguished name(s) of the groups.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
+ <attributetype oid="2.16.840.1.113719.1.203.4.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dhcpSubnetDN</alias>
+ </aliases>
+ <description>The distinguished name(s) of the subnets.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
</attributetype>
<attributetype oid="2.16.840.1.113719.1.203.4.14" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
@@ -91,29 +73,20 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
<equality>distinguishedNameMatch</equality>
</attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.24" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="2.16.840.1.113719.1.203.4.15" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>dhcpStartTimeOfState</alias>
+ <alias>dhcpLeasesDN</alias>
</aliases>
- <description>This is the time of the last state change for a leased address.</description>
+ <description>The distinguished name(s) client addresses.</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
- <equality>integerMatch</equality>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
</attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.27" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="2.16.840.1.113719.1.203.4.16" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>dhcpDomainName</alias>
+ <alias>dhcpClassesDN</alias>
</aliases>
- <description>This is the name of the domain sent to the client by the server. It is essentially the same as the value for DHCP option 15 sent to the client, and represents only the domain - not the full FQDN. To obtain the full FQDN assigned to the client you must prepend the "dhcpAssignedHostName" to this value with a ".".</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.9" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>dhcpOptionsDN</alias>
- </aliases>
- <description>The distinguished name(s) of the dhcpOption objects containing the configuration options provided by the server.</description>
+ <description>The distinguished name(s) of a class(es) in a subclass.</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
<equality>distinguishedNameMatch</equality>
@@ -127,78 +100,6 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
<equality>distinguishedNameMatch</equality>
</attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.32" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>dhcpAssignedToClient</alias>
- </aliases>
- <description>This is the distinguished name of a "dhcpClient" that an address is currently assigned to. This attribute is only present in the class when the address is leased.</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.28" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>dhcpDnsStatus</alias>
- </aliases>
- <description>This indicates the status of updating DNS resource records on behalf of the client by the DHCP server for this address. The value is a 16-bit bitmask.</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.31" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>dhcpReservedForClient</alias>
- </aliases>
- <description>The distinguished name of a "dhcpClient" that an address is reserved for. This may not be the same as the "dhcpAssignedToClient" attribute if the address is being reassigned but the current lease has not yet expired.</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.2" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>dhcpSecondaryDN</alias>
- </aliases>
- <description>The DN of dhcpServer(s) which provide backup service for the configuration.</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.23" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>dhcpExpirationTime</alias>
- </aliases>
- <description>This is the time the current lease for an address expires.</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>dhcpRange</alias>
- </aliases>
- <description>The starting & ending IP Addresses in the range (inclusive), separated by a hyphen; if the range only contains one address, then just the address can be specified with no hyphen. Each range is defined as a separate value.</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.16" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>dhcpClassesDN</alias>
- </aliases>
- <description>The distinguished name(s) of a class(es) in a subclass.</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.25" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>dhcpLastTransactionTime</alias>
- </aliases>
- <description>This is the last time a valid DHCP packet was received from the client.</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
- <equality>integerMatch</equality>
- </attributetype>
<attributetype oid="2.16.840.1.113719.1.203.4.18" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
<alias>dhcpSharedNetworkDN</alias>
@@ -217,60 +118,15 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
<equality>distinguishedNameMatch</equality>
</attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.30" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="2.16.840.1.113719.1.203.4.2" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>dhcpAssignedHostName</alias>
+ <alias>dhcpSecondaryDN</alias>
</aliases>
- <description>This is the actual hostname that was assigned to a client. It may not be the name that was requested by the client. The fully qualified domain name can be determined by appending the value of "dhcpDomainName" (with a dot separator) to this name.</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.26" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>dhcpBootpFlag</alias>
- </aliases>
- <description>This indicates whether the address was assigned via BOOTP.</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.3" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>dhcpStatements</alias>
- </aliases>
- <description>Flexible storage for specific data depending on what object this exists in. Like conditional statements, server parameters, etc. This allows the standard to evolve without needing to adjust the schema.</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.33" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>dhcpRelayAgentInfo</alias>
- </aliases>
- <description>If the client request was received via a relay agent, this contains information about the relay agent that was available from the DHCP request. This is a hex-encoded option value.</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>dhcpPoolDN</alias>
- </aliases>
- <description>The distinguished name(s) of pools.</description>
+ <description>The DN of dhcpServer(s) which provide backup service for the configuration.</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
<equality>distinguishedNameMatch</equality>
</attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>dhcpNetMask</alias>
- </aliases>
- <description>The subnet mask length for the subnet. The mask can be easily computed from this length.</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
<attributetype oid="2.16.840.1.113719.1.203.4.20" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
<alias>dhcpVersion</alias>
@@ -280,65 +136,74 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
<equality>caseIgnoreIA5Match</equality>
</attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.38" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="2.16.840.1.113719.1.203.4.21" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>dhcpFailOverEndpointState</alias>
+ <alias>dhcpImplementation</alias>
</aliases>
- <description>Server (Failover Endpoint) state, as defined in DHCP Failover Protocol [FAILOVR]</description>
+ <description>Description of the DHCP Server implementation e.g. DHCP Servers vendor.</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="2.16.840.1.113719.1.203.4.22" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dhcpAddressState</alias>
+ </aliases>
+ <description>This stores information about the current binding-status of an address. For dynamic addresses managed by DHCP, the values should be restricted to the following: "FREE", "ACTIVE", "EXPIRED", "RELEASED", "RESET", "ABANDONED", "BACKUP". For other addresses, it SHOULD be one of the following: "UNKNOWN", "RESERVED" (an address that is managed by DHCP that is reserved for a specific client), "RESERVED-ACTIVE" (same as reserved, but address is currently in use), "ASSIGNED" (assigned manually or by some other mechanism), "UNASSIGNED", "NOTASSIGNABLE".</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="2.16.840.1.113719.1.203.4.23" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dhcpExpirationTime</alias>
+ </aliases>
+ <description>This is the time the current lease for an address expires.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
<equality>integerMatch</equality>
</attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="2.16.840.1.113719.1.203.4.24" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>dhcpClassData</alias>
+ <alias>dhcpStartTimeOfState</alias>
</aliases>
- <description>Encoded text string or list of bytes expressed in hexadecimal, separated by colons. Clients match subclasses based on matching the class data with the results of match or spawn with statements in the class name declarations.</description>
+ <description>This is the time of the last state change for a leased address.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="2.16.840.1.113719.1.203.4.25" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dhcpLastTransactionTime</alias>
+ </aliases>
+ <description>This is the last time a valid DHCP packet was received from the client.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="2.16.840.1.113719.1.203.4.26" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dhcpBootpFlag</alias>
+ </aliases>
+ <description>This indicates whether the address was assigned via BOOTP.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="2.16.840.1.113719.1.203.4.27" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dhcpDomainName</alias>
+ </aliases>
+ <description>This is the name of the domain sent to the client by the server. It is essentially the same as the value for DHCP option 15 sent to the client, and represents only the domain - not the full FQDN. To obtain the full FQDN assigned to the client you must prepend the "dhcpAssignedHostName" to this value with a ".".</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
<equality>caseIgnoreIA5Match</equality>
</attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.10" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="2.16.840.1.113719.1.203.4.28" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>dhcpHostDN</alias>
+ <alias>dhcpDnsStatus</alias>
</aliases>
- <description>the distinguished name(s) of the dhcpHost objects.</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.39" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>dhcpErrorLog</alias>
- </aliases>
- <description>Generic error log attribute that allows logging error conditions within a dhcpService or a dhcpSubnet, like no IP addresses available for lease.</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>dhcpSubnetDN</alias>
- </aliases>
- <description>The distinguished name(s) of the subnets.</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>dhcpPermitList</alias>
- </aliases>
- <description>This attribute contains the permit lists associated with a pool. Each permit list is defined as a separate value.</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.36" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>dhcpDelayedServiceParameter</alias>
- </aliases>
- <description>Delay in seconds corresponding to Delayed Service Parameter configuration, as defined in DHC Load Balancing Algorithm [RFC 3074].</description>
+ <description>This indicates the status of updating DNS resource records on behalf of the client by the DHCP server for this address. The value is a 16-bit bitmask.</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
<equality>integerMatch</equality>
@@ -352,15 +217,77 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
<equality>caseIgnoreIA5Match</equality>
</attributetype>
- <attributetype oid="2.16.840.1.113719.1.203.4.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="2.16.840.1.113719.1.203.4.3" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>dhcpGroupDN</alias>
+ <alias>dhcpStatements</alias>
</aliases>
- <description>The distinguished name(s) of the groups.</description>
+ <description>Flexible storage for specific data depending on what object this exists in. Like conditional statements, server parameters, etc. This allows the standard to evolve without needing to adjust the schema.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="2.16.840.1.113719.1.203.4.30" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dhcpAssignedHostName</alias>
+ </aliases>
+ <description>This is the actual hostname that was assigned to a client. It may not be the name that was requested by the client. The fully qualified domain name can be determined by appending the value of "dhcpDomainName" (with a dot separator) to this name.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="2.16.840.1.113719.1.203.4.31" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dhcpReservedForClient</alias>
+ </aliases>
+ <description>The distinguished name of a "dhcpClient" that an address is reserved for. This may not be the same as the "dhcpAssignedToClient" attribute if the address is being reassigned but the current lease has not yet expired.</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
<equality>distinguishedNameMatch</equality>
</attributetype>
+ <attributetype oid="2.16.840.1.113719.1.203.4.32" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dhcpAssignedToClient</alias>
+ </aliases>
+ <description>This is the distinguished name of a "dhcpClient" that an address is currently assigned to. This attribute is only present in the class when the address is leased.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
+ <attributetype oid="2.16.840.1.113719.1.203.4.33" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dhcpRelayAgentInfo</alias>
+ </aliases>
+ <description>If the client request was received via a relay agent, this contains information about the relay agent that was available from the DHCP request. This is a hex-encoded option value.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="2.16.840.1.113719.1.203.4.34" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dhcpHWAddress</alias>
+ </aliases>
+ <description>The clients hardware address that requested this IP address.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="2.16.840.1.113719.1.203.4.35" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dhcpHashBucketAssignment</alias>
+ </aliases>
+ <description>HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load Balancing Algorithm [RFC 3074].</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="2.16.840.1.113719.1.203.4.36" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dhcpDelayedServiceParameter</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
<attributetype oid="2.16.840.1.113719.1.203.4.37" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
<alias>dhcpMaxClientLeadTime</alias>
@@ -370,8 +297,161 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
<equality>integerMatch</equality>
</attributetype>
+ <attributetype oid="2.16.840.1.113719.1.203.4.38" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dhcpFailOverEndpointState</alias>
+ </aliases>
+ <description>Server (Failover Endpoint) state, as defined in DHCP Failover Protocol [FAILOVR]</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="2.16.840.1.113719.1.203.4.39" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dhcpErrorLog</alias>
+ </aliases>
+ <description>Generic error log attribute that allows logging error conditions within a dhcpService or a dhcpSubnet, like no IP addresses available for lease.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="2.16.840.1.113719.1.203.4.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dhcpRange</alias>
+ </aliases>
+ <description>The starting & ending IP Addresses in the range (inclusive), separated by a hyphen; if the range only contains one address, then just the address can be specified with no hyphen. Each range is defined as a separate value.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="2.16.840.1.113719.1.203.4.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dhcpPermitList</alias>
+ </aliases>
+ <description>This attribute contains the permit lists associated with a pool. Each permit list is defined as a separate value.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="2.16.840.1.113719.1.203.4.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dhcpNetMask</alias>
+ </aliases>
+ <description>The subnet mask length for the subnet. The mask can be easily computed from this length.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="2.16.840.1.113719.1.203.4.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dhcpOption</alias>
+ </aliases>
+ <description>Encoded option values to be sent to clients. Each value represents a single option and contains (OptionTag, Length, OptionValue) encoded in the format used by DHCP.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="2.16.840.1.113719.1.203.4.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dhcpClassData</alias>
+ </aliases>
+ <description>Encoded text string or list of bytes expressed in hexadecimal, separated by colons. Clients match subclasses based on matching the class data with the results of match or spawn with statements in the class name declarations.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="2.16.840.1.113719.1.203.4.9" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>dhcpOptionsDN</alias>
+ </aliases>
+ <description>The distinguished name(s) of the dhcpOption objects containing the configuration options provided by the server.</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
</attributetypes>
<objectclasses>
+ <objectclass oid="2.16.840.1.113719.1.203.6.1" obsolete="false">
+ <aliases>
+ <alias>dhcpService</alias>
+ </aliases>
+ <description>Service object that represents the actual DHCP Service configuration. This is a container object.</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>cn</attributetype>
+ <attributetype>dhcpPrimaryDN</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>dhcpSecondaryDN</attributetype>
+ <attributetype>dhcpSharedNetworkDN</attributetype>
+ <attributetype>dhcpSubnetDN</attributetype>
+ <attributetype>dhcpGroupDN</attributetype>
+ <attributetype>dhcpHostDN</attributetype>
+ <attributetype>dhcpClassesDN</attributetype>
+ <attributetype>dhcpOptionsDN</attributetype>
+ <attributetype>dhcpStatements</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="2.16.840.1.113719.1.203.6.10" obsolete="false">
+ <aliases>
+ <alias>dhcpLeases</alias>
+ </aliases>
+ <description>This class represents an IP Address, which may or may not have been leased.</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>cn</attributetype>
+ <attributetype>dhcpAddressState</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>dhcpExpirationTime</attributetype>
+ <attributetype>dhcpStartTimeOfState</attributetype>
+ <attributetype>dhcpLastTransactionTime</attributetype>
+ <attributetype>dhcpBootpFlag</attributetype>
+ <attributetype>dhcpDomainName</attributetype>
+ <attributetype>dhcpDnsStatus</attributetype>
+ <attributetype>dhcpRequestedHostName</attributetype>
+ <attributetype>dhcpAssignedHostName</attributetype>
+ <attributetype>dhcpReservedForClient</attributetype>
+ <attributetype>dhcpAssignedToClient</attributetype>
+ <attributetype>dhcpRelayAgentInfo</attributetype>
+ <attributetype>dhcpHWAddress</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="2.16.840.1.113719.1.203.6.11" obsolete="false">
+ <aliases>
+ <alias>dhcpLog</alias>
+ </aliases>
+ <description>This is the object that holds past information about the IP address. The cn is the time/date stamp when the address was assigned or released, the address state at the time, if the address was assigned or released.</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>cn</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>dhcpAddressState</attributetype>
+ <attributetype>dhcpExpirationTime</attributetype>
+ <attributetype>dhcpStartTimeOfState</attributetype>
+ <attributetype>dhcpLastTransactionTime</attributetype>
+ <attributetype>dhcpBootpFlag</attributetype>
+ <attributetype>dhcpDomainName</attributetype>
+ <attributetype>dhcpDnsStatus</attributetype>
+ <attributetype>dhcpRequestedHostName</attributetype>
+ <attributetype>dhcpAssignedHostName</attributetype>
+ <attributetype>dhcpReservedForClient</attributetype>
+ <attributetype>dhcpAssignedToClient</attributetype>
+ <attributetype>dhcpRelayAgentInfo</attributetype>
+ <attributetype>dhcpHWAddress</attributetype>
+ <attributetype>dhcpErrorLog</attributetype>
+ </optional>
+ </objectclass>
<objectclass oid="2.16.840.1.113719.1.203.6.12" obsolete="false">
<aliases>
<alias>dhcpServer</alias>
@@ -395,6 +475,70 @@
<attributetype>dhcpStatements</attributetype>
</optional>
</objectclass>
+ <objectclass oid="2.16.840.1.113719.1.203.6.2" obsolete="false">
+ <aliases>
+ <alias>dhcpSharedNetwork</alias>
+ </aliases>
+ <description>This stores configuration information for a shared network.</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>cn</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>dhcpSubnetDN</attributetype>
+ <attributetype>dhcpPoolDN</attributetype>
+ <attributetype>dhcpOptionsDN</attributetype>
+ <attributetype>dhcpStatements</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="2.16.840.1.113719.1.203.6.3" obsolete="false">
+ <aliases>
+ <alias>dhcpSubnet</alias>
+ </aliases>
+ <description>This class defines a subnet. This is a container object.</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>cn</attributetype>
+ <attributetype>dhcpNetMask</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>dhcpRange</attributetype>
+ <attributetype>dhcpPoolDN</attributetype>
+ <attributetype>dhcpGroupDN</attributetype>
+ <attributetype>dhcpHostDN</attributetype>
+ <attributetype>dhcpClassesDN</attributetype>
+ <attributetype>dhcpLeasesDN</attributetype>
+ <attributetype>dhcpOptionsDN</attributetype>
+ <attributetype>dhcpStatements</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="2.16.840.1.113719.1.203.6.4" obsolete="false">
+ <aliases>
+ <alias>dhcpPool</alias>
+ </aliases>
+ <description>This stores configuration information about a pool.</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>cn</attributetype>
+ <attributetype>dhcpRange</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>dhcpClassesDN</attributetype>
+ <attributetype>dhcpPermitList</attributetype>
+ <attributetype>dhcpLeasesDN</attributetype>
+ <attributetype>dhcpOptionsDN</attributetype>
+ <attributetype>dhcpStatements</attributetype>
+ </optional>
+ </objectclass>
<objectclass oid="2.16.840.1.113719.1.203.6.5" obsolete="false">
<aliases>
<alias>dhcpGroup</alias>
@@ -484,150 +628,5 @@
<attributetype>dhcpOption</attributetype>
</optional>
</objectclass>
- <objectclass oid="2.16.840.1.113719.1.203.6.2" obsolete="false">
- <aliases>
- <alias>dhcpSharedNetwork</alias>
- </aliases>
- <description>This stores configuration information for a shared network.</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>cn</attributetype>
- </mandatory>
- <optional>
- <attributetype>dhcpSubnetDN</attributetype>
- <attributetype>dhcpPoolDN</attributetype>
- <attributetype>dhcpOptionsDN</attributetype>
- <attributetype>dhcpStatements</attributetype>
- </optional>
- </objectclass>
- <objectclass oid="2.16.840.1.113719.1.203.6.1" obsolete="false">
- <aliases>
- <alias>dhcpService</alias>
- </aliases>
- <description>Service object that represents the actual DHCP Service configuration. This is a container object.</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>cn</attributetype>
- <attributetype>dhcpPrimaryDN</attributetype>
- </mandatory>
- <optional>
- <attributetype>dhcpSecondaryDN</attributetype>
- <attributetype>dhcpSharedNetworkDN</attributetype>
- <attributetype>dhcpSubnetDN</attributetype>
- <attributetype>dhcpGroupDN</attributetype>
- <attributetype>dhcpHostDN</attributetype>
- <attributetype>dhcpClassesDN</attributetype>
- <attributetype>dhcpOptionsDN</attributetype>
- <attributetype>dhcpStatements</attributetype>
- </optional>
- </objectclass>
- <objectclass oid="2.16.840.1.113719.1.203.6.10" obsolete="false">
- <aliases>
- <alias>dhcpLeases</alias>
- </aliases>
- <description>This class represents an IP Address, which may or may not have been leased.</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>cn</attributetype>
- <attributetype>dhcpAddressState</attributetype>
- </mandatory>
- <optional>
- <attributetype>dhcpExpirationTime</attributetype>
- <attributetype>dhcpStartTimeOfState</attributetype>
- <attributetype>dhcpLastTransactionTime</attributetype>
- <attributetype>dhcpBootpFlag</attributetype>
- <attributetype>dhcpDomainName</attributetype>
- <attributetype>dhcpDnsStatus</attributetype>
- <attributetype>dhcpRequestedHostName</attributetype>
- <attributetype>dhcpAssignedHostName</attributetype>
- <attributetype>dhcpReservedForClient</attributetype>
- <attributetype>dhcpAssignedToClient</attributetype>
- <attributetype>dhcpRelayAgentInfo</attributetype>
- <attributetype>dhcpHWAddress</attributetype>
- </optional>
- </objectclass>
- <objectclass oid="2.16.840.1.113719.1.203.6.4" obsolete="false">
- <aliases>
- <alias>dhcpPool</alias>
- </aliases>
- <description>This stores configuration information about a pool.</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>cn</attributetype>
- <attributetype>dhcpRange</attributetype>
- </mandatory>
- <optional>
- <attributetype>dhcpClassesDN</attributetype>
- <attributetype>dhcpPermitList</attributetype>
- <attributetype>dhcpLeasesDN</attributetype>
- <attributetype>dhcpOptionsDN</attributetype>
- <attributetype>dhcpStatements</attributetype>
- </optional>
- </objectclass>
- <objectclass oid="2.16.840.1.113719.1.203.6.3" obsolete="false">
- <aliases>
- <alias>dhcpSubnet</alias>
- </aliases>
- <description>This class defines a subnet. This is a container object.</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>cn</attributetype>
- <attributetype>dhcpNetMask</attributetype>
- </mandatory>
- <optional>
- <attributetype>dhcpRange</attributetype>
- <attributetype>dhcpPoolDN</attributetype>
- <attributetype>dhcpGroupDN</attributetype>
- <attributetype>dhcpHostDN</attributetype>
- <attributetype>dhcpClassesDN</attributetype>
- <attributetype>dhcpLeasesDN</attributetype>
- <attributetype>dhcpOptionsDN</attributetype>
- <attributetype>dhcpStatements</attributetype>
- </optional>
- </objectclass>
- <objectclass oid="2.16.840.1.113719.1.203.6.11" obsolete="false">
- <aliases>
- <alias>dhcpLog</alias>
- </aliases>
- <description>This is the object that holds past information about the IP address. The cn is the time/date stamp when the address was assigned or released, the address state at the time, if the address was assigned or released.</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>cn</attributetype>
- </mandatory>
- <optional>
- <attributetype>dhcpAddressState</attributetype>
- <attributetype>dhcpExpirationTime</attributetype>
- <attributetype>dhcpStartTimeOfState</attributetype>
- <attributetype>dhcpLastTransactionTime</attributetype>
- <attributetype>dhcpBootpFlag</attributetype>
- <attributetype>dhcpDomainName</attributetype>
- <attributetype>dhcpDnsStatus</attributetype>
- <attributetype>dhcpRequestedHostName</attributetype>
- <attributetype>dhcpAssignedHostName</attributetype>
- <attributetype>dhcpReservedForClient</attributetype>
- <attributetype>dhcpAssignedToClient</attributetype>
- <attributetype>dhcpRelayAgentInfo</attributetype>
- <attributetype>dhcpHWAddress</attributetype>
- <attributetype>dhcpErrorLog</attributetype>
- </optional>
- </objectclass>
</objectclasses>
</schema>
diff --git a/plugins/schemaeditor/resources/schemas/apacheds/java.xml b/plugins/schemaeditor/resources/schemas/apacheds/java.xml
index b63f9db..0a05f3f 100644
--- a/plugins/schemaeditor/resources/schemas/apacheds/java.xml
+++ b/plugins/schemaeditor/resources/schemas/apacheds/java.xml
@@ -19,37 +19,20 @@
-->
<schema name="java">
<attributetypes>
- <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.10" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>javaClassName</alias>
+ <alias>javaFactory</alias>
</aliases>
- <description>Fully qualified name of distinguished Java class or interface</description>
+ <description>Fully qualified Java class name of a JNDI object factory</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
<equality>caseExactMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>javaSerializedData</alias>
+ <alias>javaReferenceAddress</alias>
</aliases>
- <description>Serialized form of a Java object</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>javaCodebase</alias>
- </aliases>
- <description>URL(s) specifying the location of class definition</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseExactIA5Match</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>javaClassNames</alias>
- </aliases>
- <description>Fully qualified Java class or interface name</description>
+ <description>Addresses associated with a JNDI Reference</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
<equality>caseExactMatch</equality>
@@ -63,26 +46,56 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
<equality>caseExactIA5Match</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>javaReferenceAddress</alias>
+ <alias>javaClassNames</alias>
</aliases>
- <description>Addresses associated with a JNDI Reference</description>
+ <description>Fully qualified Java class or interface name</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
<equality>caseExactMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.10" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>javaFactory</alias>
+ <alias>javaClassName</alias>
</aliases>
- <description>Fully qualified Java class name of a JNDI object factory</description>
+ <description>Fully qualified name of distinguished Java class or interface</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
<equality>caseExactMatch</equality>
</attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>javaCodebase</alias>
+ </aliases>
+ <description>URL(s) specifying the location of class definition</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseExactIA5Match</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.4.1.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>javaSerializedData</alias>
+ </aliases>
+ <description>Serialized form of a Java object</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
+ </attributetype>
</attributetypes>
<objectclasses>
+ <objectclass oid="1.3.6.1.4.1.42.2.27.4.2.1" obsolete="false">
+ <aliases>
+ <alias>javaContainer</alias>
+ </aliases>
+ <description>Container for a Java object</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>cn</attributetype>
+ </mandatory>
+ </objectclass>
<objectclass oid="1.3.6.1.4.1.42.2.27.4.2.4" obsolete="false">
<aliases>
<alias>javaObject</alias>
@@ -102,19 +115,6 @@
<attributetype>description</attributetype>
</optional>
</objectclass>
- <objectclass oid="1.3.6.1.4.1.42.2.27.4.2.1" obsolete="false">
- <aliases>
- <alias>javaContainer</alias>
- </aliases>
- <description>Container for a Java object</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>cn</attributetype>
- </mandatory>
- </objectclass>
<objectclass oid="1.3.6.1.4.1.42.2.27.4.2.5" obsolete="false">
<aliases>
<alias>javaSerializedObject</alias>
diff --git a/plugins/schemaeditor/resources/schemas/apacheds/krb5kdc.xml b/plugins/schemaeditor/resources/schemas/apacheds/krb5kdc.xml
index 64a6819..936adda 100644
--- a/plugins/schemaeditor/resources/schemas/apacheds/krb5kdc.xml
+++ b/plugins/schemaeditor/resources/schemas/apacheds/krb5kdc.xml
@@ -19,10 +19,11 @@
-->
<schema name="krb5kdc">
<attributetypes>
- <attributetype oid="1.3.6.1.4.1.5322.10.1.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.5322.10.1.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>krb5RealmName</alias>
+ <alias>krb5PrincipalName</alias>
</aliases>
+ <description>The unparsed Kerberos principal name</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
<equality>caseExactIA5Match</equality>
@@ -35,6 +36,24 @@
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.5</syntax>
</attributetype>
+ <attributetype oid="1.3.6.1.4.1.5322.10.1.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>krb5PrincipalRealm</alias>
+ </aliases>
+ <description>Distinguished name of krb5Realm entry</description>
+ <superior>distinguishedName</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.5322.10.1.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>krb5RealmName</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseExactIA5Match</equality>
+ </attributetype>
<attributetype oid="1.3.6.1.4.1.5322.10.1.13" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
<alias>krb5AccountDisabled</alias>
@@ -43,14 +62,45 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
<equality>booleanMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.5322.10.1.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.5322.10.1.14" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>krb5PrincipalName</alias>
+ <alias>krb5AccountLockedOut</alias>
</aliases>
- <description>The unparsed Kerberos principal name</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseExactIA5Match</equality>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.5322.10.1.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>krb5AccountExpirationTime</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
+ <equality>generalizedTimeMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.5322.10.1.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>krb5KeyVersionNumber</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.5322.10.1.3" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>krb5MaxLife</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.5322.10.1.4" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>krb5MaxRenew</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
</attributetype>
<attributetype oid="1.3.6.1.4.1.5322.10.1.5" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
@@ -68,24 +118,6 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
<equality>integerMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.5322.10.1.4" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>krb5MaxRenew</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.5322.10.1.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>krb5PrincipalRealm</alias>
- </aliases>
- <description>Distinguished name of krb5Realm entry</description>
- <superior>distinguishedName</superior>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
<attributetype oid="1.3.6.1.4.1.5322.10.1.7" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
<alias>krb5ValidStart</alias>
@@ -95,14 +127,6 @@
<equality>generalizedTimeMatch</equality>
<ordering>generalizedTimeOrderingMatch</ordering>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.5322.10.1.3" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>krb5MaxLife</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
<attributetype oid="1.3.6.1.4.1.5322.10.1.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
<alias>krb5ValidEnd</alias>
@@ -112,22 +136,6 @@
<equality>generalizedTimeMatch</equality>
<ordering>generalizedTimeOrderingMatch</ordering>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.5322.10.1.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>krb5KeyVersionNumber</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.5322.10.1.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>krb5AccountExpirationTime</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
- <equality>generalizedTimeMatch</equality>
- </attributetype>
<attributetype oid="1.3.6.1.4.1.5322.10.1.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
<alias>krb5PasswordEnd</alias>
@@ -137,27 +145,23 @@
<equality>generalizedTimeMatch</equality>
<ordering>generalizedTimeOrderingMatch</ordering>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.5322.10.1.14" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>krb5AccountLockedOut</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
- <equality>booleanMatch</equality>
- </attributetype>
</attributetypes>
<objectclasses>
- <objectclass oid="1.3.6.1.4.1.5322.10.2.3" obsolete="false">
+ <objectclass oid="1.3.6.1.4.1.5322.10.2.1" obsolete="false">
<aliases>
- <alias>krb5Realm</alias>
+ <alias>krb5Principal</alias>
</aliases>
<superiors>
<superior>top</superior>
</superiors>
<type>AUXILIARY</type>
<mandatory>
- <attributetype>krb5RealmName</attributetype>
+ <attributetype>krb5PrincipalName</attributetype>
</mandatory>
+ <optional>
+ <attributetype>cn</attributetype>
+ <attributetype>krb5PrincipalRealm</attributetype>
+ </optional>
</objectclass>
<objectclass oid="1.3.6.1.4.1.5322.10.2.2" obsolete="false">
<aliases>
@@ -184,21 +188,17 @@
<attributetype>krb5AccountExpirationTime</attributetype>
</optional>
</objectclass>
- <objectclass oid="1.3.6.1.4.1.5322.10.2.1" obsolete="false">
+ <objectclass oid="1.3.6.1.4.1.5322.10.2.3" obsolete="false">
<aliases>
- <alias>krb5Principal</alias>
+ <alias>krb5Realm</alias>
</aliases>
<superiors>
<superior>top</superior>
</superiors>
<type>AUXILIARY</type>
<mandatory>
- <attributetype>krb5PrincipalName</attributetype>
+ <attributetype>krb5RealmName</attributetype>
</mandatory>
- <optional>
- <attributetype>cn</attributetype>
- <attributetype>krb5PrincipalRealm</attributetype>
- </optional>
</objectclass>
</objectclasses>
</schema>
diff --git a/plugins/schemaeditor/resources/schemas/apacheds/mozilla.xml b/plugins/schemaeditor/resources/schemas/apacheds/mozilla.xml
index 7c93ee7..2e76aa4 100644
--- a/plugins/schemaeditor/resources/schemas/apacheds/mozilla.xml
+++ b/plugins/schemaeditor/resources/schemas/apacheds/mozilla.xml
@@ -19,52 +19,6 @@
-->
<schema name="mozilla">
<attributetypes>
- <attributetype oid="1.3.6.1.4.1.13769.2.1.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>nsAIMid</alias>
- </aliases>
- <description>AOL Instant Messenger (AIM) Identity</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.50</syntax>
- <equality>telephoneNumberMatch</equality>
- <substring>telephoneNumberSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.13769.2.1.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>mozillaHomeState</alias>
- </aliases>
- <superior>name</superior>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.13769.2.1.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>workurl</alias>
- <alias>mozillaWorkUrl</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- <substring>caseIgnoreIA5SubstringsMatch</substring>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.13769.2.1.96" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>custom1</alias>
- <alias>mozillaCustom1</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.13769.2.1.97" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>custom2</alias>
- <alias>mozillaCustom2</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- </attributetype>
<attributetype oid="1.3.6.1.4.1.13769.2.1.1" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
<alias>xmozillanickname</alias>
@@ -76,16 +30,45 @@
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.13769.2.1.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.13769.2.1.10" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>mozillaHomeCountryName</alias>
+ <alias>mozillaHomeFriendlyCountryName</alias>
</aliases>
- <superior>name</superior>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
+ <attributetype oid="1.3.6.1.4.1.13769.2.1.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>homeurl</alias>
+ <alias>mozillaHomeUrl</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ <substring>caseIgnoreIA5SubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.13769.2.1.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>workurl</alias>
+ <alias>mozillaWorkUrl</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ <substring>caseIgnoreIA5SubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.13769.2.1.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>nsAIMid</alias>
+ </aliases>
+ <description>AOL Instant Messenger (AIM) Identity</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.50</syntax>
+ <equality>telephoneNumberMatch</equality>
+ <substring>telephoneNumberSubstringsMatch</substring>
+ </attributetype>
<attributetype oid="1.3.6.1.4.1.13769.2.1.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
<alias>xmozillausehtmlmail</alias>
@@ -103,14 +86,6 @@
<equality>caseIgnoreIA5Match</equality>
<substring>caseIgnoreIA5SubstringsMatch</substring>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.13769.2.1.98" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>custom3</alias>
- <alias>mozillaCustom3</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- </attributetype>
<attributetype oid="1.3.6.1.4.1.13769.2.1.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
<alias>mozillaHomeLocalityName</alias>
@@ -120,32 +95,6 @@
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.13769.2.1.99" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>custom4</alias>
- <alias>mozillaCustom4</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.13769.2.1.10" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>mozillaHomeFriendlyCountryName</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.13769.2.1.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>mozillaHomePostalAddress2</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.41</syntax>
- <equality>caseIgnoreListMatch</equality>
- <substring>caseIgnoreListSubstringsMatch</substring>
- </attributetype>
<attributetype oid="1.3.6.1.4.1.13769.2.1.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
<alias>mozillaPostalAddress2</alias>
@@ -155,15 +104,24 @@
<equality>caseIgnoreListMatch</equality>
<substring>caseIgnoreListSubstringsMatch</substring>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.13769.2.1.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.13769.2.1.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>homeurl</alias>
- <alias>mozillaHomeUrl</alias>
+ <alias>mozillaHomePostalAddress2</alias>
</aliases>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- <substring>caseIgnoreIA5SubstringsMatch</substring>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.41</syntax>
+ <equality>caseIgnoreListMatch</equality>
+ <substring>caseIgnoreListSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.13769.2.1.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>mozillaHomeState</alias>
+ </aliases>
+ <superior>name</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
<attributetype oid="1.3.6.1.4.1.13769.2.1.8" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
@@ -174,6 +132,48 @@
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
+ <attributetype oid="1.3.6.1.4.1.13769.2.1.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>mozillaHomeCountryName</alias>
+ </aliases>
+ <superior>name</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.13769.2.1.96" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>custom1</alias>
+ <alias>mozillaCustom1</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.13769.2.1.97" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>custom2</alias>
+ <alias>mozillaCustom2</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.13769.2.1.98" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>custom3</alias>
+ <alias>mozillaCustom3</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.13769.2.1.99" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>custom4</alias>
+ <alias>mozillaCustom4</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ </attributetype>
</attributetypes>
<objectclasses>
<objectclass oid="1.3.6.1.4.1.13769.2.2.1" obsolete="false">
diff --git a/plugins/schemaeditor/resources/schemas/apacheds/nis.xml b/plugins/schemaeditor/resources/schemas/apacheds/nis.xml
index e704ce6..ecfca76 100644
--- a/plugins/schemaeditor/resources/schemas/apacheds/nis.xml
+++ b/plugins/schemaeditor/resources/schemas/apacheds/nis.xml
@@ -19,10 +19,20 @@
-->
<schema name="nis">
<attributetypes>
- <attributetype oid="1.3.6.1.1.1.1.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.1.1.1.0" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>shadowMin</alias>
+ <alias>uidNumber</alias>
</aliases>
+ <description>An integer uniquely identifying a user in an administrative domain</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.1.1.1.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>gidNumber</alias>
+ </aliases>
+ <description>An integer uniquely identifying a group in an administrative domain</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
<equality>integerMatch</equality>
@@ -35,6 +45,66 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
<equality>integerMatch</equality>
</attributetype>
+ <attributetype oid="1.3.6.1.1.1.1.11" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>shadowFlag</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.1.1.1.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>memberUid</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseExactIA5Match</equality>
+ <substring>caseExactIA5SubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.1.1.1.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>memberNisNetgroup</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseExactIA5Match</equality>
+ <substring>caseExactIA5SubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.1.1.1.14" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>nisNetgroupTriple</alias>
+ </aliases>
+ <description>Netgroup triple</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.1.1.0.0</syntax>
+ </attributetype>
+ <attributetype oid="1.3.6.1.1.1.1.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ipServicePort</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.1.1.1.16" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ipServiceProtocol</alias>
+ </aliases>
+ <superior>name</superior>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ <substring>caseIgnoreSubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.1.1.1.17" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ipProtocolNumber</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
<attributetype oid="1.3.6.1.1.1.1.18" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
<alias>oncRpcNumber</alias>
@@ -52,13 +122,59 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
<equality>caseIgnoreIA5Match</equality>
</attributetype>
- <attributetype oid="1.3.6.1.1.1.1.7" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.1.1.1.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>shadowMax</alias>
+ <alias>gecos</alias>
</aliases>
+ <description>The GECOS field; the common name</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ <substring>caseIgnoreIA5SubstringsMatch</substring>
+ </attributetype>
+ <attributetype oid="1.3.6.1.1.1.1.20" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ipNetworkNumber</alias>
+ </aliases>
+ <description>IP network</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.1.1.1.21" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ipNetmaskNumber</alias>
+ </aliases>
+ <description>IP netmask</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.1.1.1.22" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>macAddress</alias>
+ </aliases>
+ <description>MAC address</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.1.1.1.23" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>bootParameter</alias>
+ </aliases>
+ <description>rpc.bootparamd parameter</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.1.1.0.1</syntax>
+ </attributetype>
+ <attributetype oid="1.3.6.1.1.1.1.24" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>bootFile</alias>
+ </aliases>
+ <description>Boot image name</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseExactIA5Match</equality>
</attributetype>
<attributetype oid="1.3.6.1.1.1.1.26" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
@@ -70,40 +186,6 @@
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
- <attributetype oid="1.3.6.1.1.1.1.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>shadowWarning</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.1.1.1.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>memberNisNetgroup</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseExactIA5Match</equality>
- <substring>caseExactIA5SubstringsMatch</substring>
- </attributetype>
- <attributetype oid="1.3.6.1.1.1.1.20" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>ipNetworkNumber</alias>
- </aliases>
- <description>IP network</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.1.1.1.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>shadowInactive</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
<attributetype oid="1.3.6.1.1.1.1.27" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
<alias>nisMapEntry</alias>
@@ -113,33 +195,6 @@
<equality>caseExactIA5Match</equality>
<substring>caseExactIA5SubstringsMatch</substring>
</attributetype>
- <attributetype oid="1.3.6.1.1.1.1.0" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>uidNumber</alias>
- </aliases>
- <description>An integer uniquely identifying a user in an administrative domain</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.1.1.1.12" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>memberUid</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseExactIA5Match</equality>
- <substring>caseExactIA5SubstringsMatch</substring>
- </attributetype>
- <attributetype oid="1.3.6.1.1.1.1.22" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>macAddress</alias>
- </aliases>
- <description>MAC address</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
<attributetype oid="1.3.6.1.1.1.1.3" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
<alias>homeDirectory</alias>
@@ -149,57 +204,6 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
<equality>caseExactIA5Match</equality>
</attributetype>
- <attributetype oid="1.3.6.1.1.1.1.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>gidNumber</alias>
- </aliases>
- <description>An integer uniquely identifying a group in an administrative domain</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.1.1.1.14" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>nisNetgroupTriple</alias>
- </aliases>
- <description>Netgroup triple</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.1.1.0.0</syntax>
- </attributetype>
- <attributetype oid="1.3.6.1.1.1.1.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>ipServicePort</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.1.1.1.21" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>ipNetmaskNumber</alias>
- </aliases>
- <description>IP netmask</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.1.1.1.17" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>ipProtocolNumber</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.1.1.1.24" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>bootFile</alias>
- </aliases>
- <description>Boot image name</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseExactIA5Match</equality>
- </attributetype>
<attributetype oid="1.3.6.1.1.1.1.4" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
<alias>loginShell</alias>
@@ -209,34 +213,6 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
<equality>caseExactIA5Match</equality>
</attributetype>
- <attributetype oid="1.3.6.1.1.1.1.23" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>bootParameter</alias>
- </aliases>
- <description>rpc.bootparamd parameter</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.1.1.0.1</syntax>
- </attributetype>
- <attributetype oid="1.3.6.1.1.1.1.16" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>ipServiceProtocol</alias>
- </aliases>
- <superior>name</superior>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- <substring>caseIgnoreSubstringsMatch</substring>
- </attributetype>
- <attributetype oid="1.3.6.1.1.1.1.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>gecos</alias>
- </aliases>
- <description>The GECOS field; the common name</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- <substring>caseIgnoreIA5SubstringsMatch</substring>
- </attributetype>
<attributetype oid="1.3.6.1.1.1.1.5" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
<alias>shadowLastChange</alias>
@@ -245,9 +221,33 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
<equality>integerMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.1.1.1.11" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.1.1.1.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>shadowFlag</alias>
+ <alias>shadowMin</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.1.1.1.7" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>shadowMax</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.1.1.1.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>shadowWarning</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.1.1.1.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>shadowInactive</alias>
</aliases>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
@@ -278,6 +278,75 @@
<attributetype>description</attributetype>
</optional>
</objectclass>
+ <objectclass oid="1.3.6.1.1.1.2.1" obsolete="false">
+ <aliases>
+ <alias>shadowAccount</alias>
+ </aliases>
+ <description>Additional attributes for shadow passwords</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>AUXILIARY</type>
+ <mandatory>
+ <attributetype>uid</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>userPassword</attributetype>
+ <attributetype>shadowLastChange</attributetype>
+ <attributetype>shadowMin</attributetype>
+ <attributetype>shadowMax</attributetype>
+ <attributetype>shadowWarning</attributetype>
+ <attributetype>shadowInactive</attributetype>
+ <attributetype>shadowExpire</attributetype>
+ <attributetype>shadowFlag</attributetype>
+ <attributetype>description</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.1.1.2.10" obsolete="false">
+ <aliases>
+ <alias>nisObject</alias>
+ </aliases>
+ <description>An entry in a NIS map</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>cn</attributetype>
+ <attributetype>nisMapEntry</attributetype>
+ <attributetype>nisMapName</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>description</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.1.1.2.11" obsolete="false">
+ <aliases>
+ <alias>ieee802Device</alias>
+ </aliases>
+ <description>A device with a MAC address</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>AUXILIARY</type>
+ <optional>
+ <attributetype>macAddress</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.1.1.2.12" obsolete="false">
+ <aliases>
+ <alias>bootableDevice</alias>
+ </aliases>
+ <description>A device with boot parameters</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>AUXILIARY</type>
+ <optional>
+ <attributetype>bootFile</attributetype>
+ <attributetype>bootParameter</attributetype>
+ </optional>
+ </objectclass>
<objectclass oid="1.3.6.1.1.1.2.2" obsolete="false">
<aliases>
<alias>posixGroup</alias>
@@ -297,20 +366,6 @@
<attributetype>description</attributetype>
</optional>
</objectclass>
- <objectclass oid="1.3.6.1.1.1.2.12" obsolete="false">
- <aliases>
- <alias>bootableDevice</alias>
- </aliases>
- <description>A device with boot parameters</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>AUXILIARY</type>
- <optional>
- <attributetype>bootFile</attributetype>
- <attributetype>bootParameter</attributetype>
- </optional>
- </objectclass>
<objectclass oid="1.3.6.1.1.1.2.3" obsolete="false">
<aliases>
<alias>ipService</alias>
@@ -346,24 +401,6 @@
<attributetype>description</attributetype>
</optional>
</objectclass>
- <objectclass oid="1.3.6.1.1.1.2.10" obsolete="false">
- <aliases>
- <alias>nisObject</alias>
- </aliases>
- <description>An entry in a NIS map</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>cn</attributetype>
- <attributetype>nisMapEntry</attributetype>
- <attributetype>nisMapName</attributetype>
- </mandatory>
- <optional>
- <attributetype>description</attributetype>
- </optional>
- </objectclass>
<objectclass oid="1.3.6.1.1.1.2.5" obsolete="false">
<aliases>
<alias>oncRpc</alias>
@@ -400,19 +437,6 @@
<attributetype>manager</attributetype>
</optional>
</objectclass>
- <objectclass oid="1.3.6.1.1.1.2.11" obsolete="false">
- <aliases>
- <alias>ieee802Device</alias>
- </aliases>
- <description>A device with a MAC address</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>AUXILIARY</type>
- <optional>
- <attributetype>macAddress</attributetype>
- </optional>
- </objectclass>
<objectclass oid="1.3.6.1.1.1.2.7" obsolete="false">
<aliases>
<alias>ipNetwork</alias>
@@ -451,30 +475,6 @@
<attributetype>description</attributetype>
</optional>
</objectclass>
- <objectclass oid="1.3.6.1.1.1.2.1" obsolete="false">
- <aliases>
- <alias>shadowAccount</alias>
- </aliases>
- <description>Additional attributes for shadow passwords</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>AUXILIARY</type>
- <mandatory>
- <attributetype>uid</attributetype>
- </mandatory>
- <optional>
- <attributetype>userPassword</attributetype>
- <attributetype>shadowLastChange</attributetype>
- <attributetype>shadowMin</attributetype>
- <attributetype>shadowMax</attributetype>
- <attributetype>shadowWarning</attributetype>
- <attributetype>shadowInactive</attributetype>
- <attributetype>shadowExpire</attributetype>
- <attributetype>shadowFlag</attributetype>
- <attributetype>description</attributetype>
- </optional>
- </objectclass>
<objectclass oid="1.3.6.1.1.1.2.9" obsolete="false">
<aliases>
<alias>nisMap</alias>
@@ -501,16 +501,11 @@
</matchingrule>
</matchingrules>
<syntaxes>
- <syntax oid="1.3.6.1.1.1.0.1" obsolete="false" humanreadable="true">
- <aliases>
- <alias>NIS Boot Parameter</alias>
- </aliases>
- </syntax>
<syntax oid="1.3.6.1.1.1.0.0" obsolete="false" humanreadable="true">
- <aliases>
- <alias>NIS Netgroup Triple</alias>
- </aliases>
<description>RFC2307 NIS Netgroup Triple</description>
</syntax>
+ <syntax oid="1.3.6.1.1.1.0.1" obsolete="false" humanreadable="true">
+ <description>NIS Boot Parameter</description>
+ </syntax>
</syntaxes>
</schema>
diff --git a/plugins/schemaeditor/resources/schemas/apacheds/pwdpolicy.xml b/plugins/schemaeditor/resources/schemas/apacheds/pwdpolicy.xml
new file mode 100644
index 0000000..cd7e0b4
--- /dev/null
+++ b/plugins/schemaeditor/resources/schemas/apacheds/pwdpolicy.xml
@@ -0,0 +1,315 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<schema name="pwdpolicy">
+ <attributetypes>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.1" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>pwdAttribute</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+ <equality>objectIdentifierMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.10" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>pwdLockoutDuration</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.11" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>pwdMaxFailure</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.12" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>pwdFailureCountInterval</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.13" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>pwdMustChange</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.14" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>pwdAllowUserChange</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>pwdSafeModify</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.16" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <aliases>
+ <alias>pwdChangedTime</alias>
+ </aliases>
+ <description>The time the password was last changed</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
+ <equality>generalizedTimeMatch</equality>
+ <ordering>generalizedTimeOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.17" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <aliases>
+ <alias>pwdAccountLockedTime</alias>
+ </aliases>
+ <description>The time an user account was locked</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
+ <equality>generalizedTimeMatch</equality>
+ <ordering>generalizedTimeOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.19" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+ <aliases>
+ <alias>pwdFailureTime</alias>
+ </aliases>
+ <description>The timestamps of the last consecutive authentication failures</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
+ <equality>generalizedTimeMatch</equality>
+ <ordering>generalizedTimeOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>pwdMinAge</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.20" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+ <aliases>
+ <alias>pwdHistory</alias>
+ </aliases>
+ <description>The history of user s passwords</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
+ <equality>octetStringMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.21" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+ <aliases>
+ <alias>pwdGraceUseTime</alias>
+ </aliases>
+ <description>The timestamps of the grace authentication after the password has expired</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
+ <equality>generalizedTimeMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.22" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>pwdReset</alias>
+ </aliases>
+ <description>The indication that the password has been reset</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.23" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <aliases>
+ <alias>pwdPolicySubentry</alias>
+ </aliases>
+ <description>The pwdPolicy subentry in effect for this object</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.24" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>pwdMinDelay</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.25" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>pwdMaxDelay</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.26" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>pwdMaxIdle</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.27" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <aliases>
+ <alias>pwdStartTime</alias>
+ </aliases>
+ <description>The time the password becomes enabled</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
+ <equality>generalizedTimeMatch</equality>
+ <ordering>generalizedTimeOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.28" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <aliases>
+ <alias>pwdEndTime</alias>
+ </aliases>
+ <description>The time the password becomes disabled</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
+ <equality>generalizedTimeMatch</equality>
+ <ordering>generalizedTimeOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.29" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <aliases>
+ <alias>pwdLastSuccess</alias>
+ </aliases>
+ <description>The timestamp of the last successful authentication</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
+ <equality>generalizedTimeMatch</equality>
+ <ordering>generalizedTimeOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.3" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>pwdMaxAge</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.30" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>pwdGraceExpire</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.31" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>pwdMaxLength</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.4" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>pwdInHistory</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.5" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>pwdCheckQuality</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>pwdMinLength</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.7" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>pwdExpireWarning</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>pwdGraceAuthNLimit</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.42.2.27.8.1.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>pwdLockout</alias>
+ </aliases>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
+ </attributetype>
+ </attributetypes>
+ <objectclasses>
+ <objectclass oid="1.3.6.1.4.1.42.2.27.8.2.1" obsolete="false">
+ <aliases>
+ <alias>pwdPolicy</alias>
+ </aliases>
+ <description>class to hold the PasswordPolicy parameters</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>AUXILIARY</type>
+ <mandatory>
+ <attributetype>pwdAttribute</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>pwdMinAge</attributetype>
+ <attributetype>pwdMaxAge</attributetype>
+ <attributetype>pwdInHistory</attributetype>
+ <attributetype>pwdCheckQuality</attributetype>
+ <attributetype>pwdMinLength</attributetype>
+ <attributetype>pwdMaxLength</attributetype>
+ <attributetype>pwdExpireWarning</attributetype>
+ <attributetype>pwdGraceAuthNLimit</attributetype>
+ <attributetype>pwdGraceExpire</attributetype>
+ <attributetype>pwdLockout</attributetype>
+ <attributetype>pwdLockoutDuration</attributetype>
+ <attributetype>pwdMaxFailure</attributetype>
+ <attributetype>pwdFailureCountInterval</attributetype>
+ <attributetype>pwdMustChange</attributetype>
+ <attributetype>pwdAllowUserChange</attributetype>
+ <attributetype>pwdSafeModify</attributetype>
+ <attributetype>pwdMinDelay</attributetype>
+ <attributetype>pwdMaxDelay</attributetype>
+ <attributetype>pwdMaxIdle</attributetype>
+ </optional>
+ </objectclass>
+ </objectclasses>
+</schema>
diff --git a/plugins/schemaeditor/resources/schemas/apacheds/samba.xml b/plugins/schemaeditor/resources/schemas/apacheds/samba.xml
index bbd45bc..12c50d1 100644
--- a/plugins/schemaeditor/resources/schemas/apacheds/samba.xml
+++ b/plugins/schemaeditor/resources/schemas/apacheds/samba.xml
@@ -19,77 +19,6 @@
-->
<schema name="samba">
<attributetypes>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.48" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>sambaBadPasswordCount</alias>
- </aliases>
- <description>Bad password attempt count</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.44" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>sambaIntegerOption</alias>
- </aliases>
- <description>An integer option</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.35" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>sambaProfilePath</alias>
- </aliases>
- <description>Roaming profile path</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.34" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>sambaLogonScript</alias>
- </aliases>
- <description>Logon script path</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.51" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>sambaSIDList</alias>
- </aliases>
- <description>Security ID List</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.47" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>sambaMungedDial</alias>
- </aliases>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseExactMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.43" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>sambaBoolOption</alias>
- </aliases>
- <description>A boolean option</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
- <equality>booleanMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.38" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>sambaDomainName</alias>
- </aliases>
- <description>Windows NT domain to which the user belongs</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- </attributetype>
<attributetype oid="1.3.6.1.4.1.7165.2.1.19" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
<alias>sambaGroupType</alias>
@@ -99,38 +28,11 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
<equality>integerMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.26" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.20" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>sambaAcctFlags</alias>
+ <alias>sambaSID</alias>
</aliases>
- <description>Account Flags</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.22" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>sambaNextGroupRid</alias>
- </aliases>
- <description>Next NT rid to give out for groups</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.31" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>sambaLogoffTime</alias>
- </aliases>
- <description>Timestamp of last logoff</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.25" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>sambaNTPassword</alias>
- </aliases>
- <description>MD4 hash of the unicode password</description>
+ <description>Security ID</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
<equality>caseIgnoreIA5Match</equality>
@@ -144,74 +46,11 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
<equality>integerMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.30" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.22" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>sambaLogonTime</alias>
+ <alias>sambaNextGroupRid</alias>
</aliases>
- <description>Timestamp of last logon</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.40" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>sambaAlgorithmicRidBase</alias>
- </aliases>
- <description>Base at which the samba RID generation algorithm should operate</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.28" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>sambaPwdCanChange</alias>
- </aliases>
- <description>Timestamp of when the user is allowed to update the password</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.24" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>sambaLMPassword</alias>
- </aliases>
- <description>LanManager Password</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.41" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>sambaShareName</alias>
- </aliases>
- <description>Share Name</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.55" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>sambaLogonHours</alias>
- </aliases>
- <description>Logon Hours</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.33" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>sambaHomeDrive</alias>
- </aliases>
- <description>Driver letter of home directory mapping</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.27" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>sambaPwdLastSet</alias>
- </aliases>
- <description>Timestamp of the last password update</description>
+ <description>Next NT rid to give out for groups</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
<equality>integerMatch</equality>
@@ -225,6 +64,123 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
<equality>caseIgnoreIA5Match</equality>
</attributetype>
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.24" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sambaLMPassword</alias>
+ </aliases>
+ <description>LanManager Password</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.25" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sambaNTPassword</alias>
+ </aliases>
+ <description>MD4 hash of the unicode password</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.26" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sambaAcctFlags</alias>
+ </aliases>
+ <description>Account Flags</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.27" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sambaPwdLastSet</alias>
+ </aliases>
+ <description>Timestamp of the last password update</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.28" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sambaPwdCanChange</alias>
+ </aliases>
+ <description>Timestamp of when the user is allowed to update the password</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.29" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sambaPwdMustChange</alias>
+ </aliases>
+ <description>Timestamp of when the password will expire</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.30" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sambaLogonTime</alias>
+ </aliases>
+ <description>Timestamp of last logon</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.31" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sambaLogoffTime</alias>
+ </aliases>
+ <description>Timestamp of last logoff</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.32" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sambaKickoffTime</alias>
+ </aliases>
+ <description>Timestamp of when the user will be logged off automatically</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.33" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sambaHomeDrive</alias>
+ </aliases>
+ <description>Driver letter of home directory mapping</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.34" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sambaLogonScript</alias>
+ </aliases>
+ <description>Logon script path</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.35" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sambaProfilePath</alias>
+ </aliases>
+ <description>Roaming profile path</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.36" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sambaUserWorkstations</alias>
+ </aliases>
+ <description>List of user workstations the user is allowed to logon to</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ </attributetype>
<attributetype oid="1.3.6.1.4.1.7165.2.1.37" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
<alias>sambaHomePath</alias>
@@ -234,11 +190,38 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
<equality>caseIgnoreMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.46" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.38" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>sambaStringListOption</alias>
+ <alias>sambaDomainName</alias>
</aliases>
- <description>A string list option</description>
+ <description>Windows NT domain to which the user belongs</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.39" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sambaNextRid</alias>
+ </aliases>
+ <description>Next NT rid to give out for anything</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.40" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sambaAlgorithmicRidBase</alias>
+ </aliases>
+ <description>Base at which the samba RID generation algorithm should operate</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.41" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sambaShareName</alias>
+ </aliases>
+ <description>Share Name</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
<equality>caseIgnoreMatch</equality>
@@ -253,42 +236,24 @@
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.54" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.43" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>sambaPasswordHistory</alias>
+ <alias>sambaBoolOption</alias>
</aliases>
- <description>Concatenated MD4 hashes of the unicode passwords used on this account</description>
+ <description>A boolean option</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+ <equality>booleanMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.32" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.44" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
- <alias>sambaKickoffTime</alias>
+ <alias>sambaIntegerOption</alias>
</aliases>
- <description>Timestamp of when the user will be logged off automatically</description>
+ <description>An integer option</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
<equality>integerMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.53" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>sambaTrustFlags</alias>
- </aliases>
- <description>Trust Password Flags</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.36" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>sambaUserWorkstations</alias>
- </aliases>
- <description>List of user workstations the user is allowed to logon to</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseIgnoreMatch</equality>
- </attributetype>
<attributetype oid="1.3.6.1.4.1.7165.2.1.45" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
<aliases>
<alias>sambaStringOption</alias>
@@ -298,20 +263,37 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
<equality>caseExactIA5Match</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.20" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.46" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>sambaSID</alias>
+ <alias>sambaStringListOption</alias>
</aliases>
- <description>Security ID</description>
+ <description>A string list option</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
- <equality>caseIgnoreIA5Match</equality>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseIgnoreMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.29" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.47" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>sambaPwdMustChange</alias>
+ <alias>sambaMungedDial</alias>
</aliases>
- <description>Timestamp of when the password will expire</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseExactMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.48" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sambaBadPasswordCount</alias>
+ </aliases>
+ <description>Bad password attempt count</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ <equality>integerMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.49" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sambaBadPasswordTime</alias>
+ </aliases>
+ <description>Time of the last bad password attempt</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
<equality>integerMatch</equality>
@@ -326,23 +308,14 @@
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.49" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.51" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>sambaBadPasswordTime</alias>
+ <alias>sambaSIDList</alias>
</aliases>
- <description>Time of the last bad password attempt</description>
+ <description>Security ID List</description>
<usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.7165.2.1.39" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>sambaNextRid</alias>
- </aliases>
- <description>Next NT rid to give out for anything</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- <equality>integerMatch</equality>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
</attributetype>
<attributetype oid="1.3.6.1.4.1.7165.2.1.52" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
@@ -353,8 +326,139 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
<equality>caseIgnoreIA5Match</equality>
</attributetype>
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.53" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sambaTrustFlags</alias>
+ </aliases>
+ <description>Trust Password Flags</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.54" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sambaPasswordHistory</alias>
+ </aliases>
+ <description>Concatenated MD4 hashes of the unicode passwords used on this account</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.7165.2.1.55" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>sambaLogonHours</alias>
+ </aliases>
+ <description>Logon Hours</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <equality>caseIgnoreIA5Match</equality>
+ </attributetype>
</attributetypes>
<objectclasses>
+ <objectclass oid="1.3.6.1.4.1.7165.1.2.2.10" obsolete="false">
+ <aliases>
+ <alias>sambaConfig</alias>
+ </aliases>
+ <description>Samba Configuration Section</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>AUXILIARY</type>
+ <optional>
+ <attributetype>description</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.7165.2.2.11" obsolete="false">
+ <aliases>
+ <alias>sambaShare</alias>
+ </aliases>
+ <description>Samba Share Section</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>sambaShareName</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>description</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.7165.2.2.12" obsolete="false">
+ <aliases>
+ <alias>sambaConfigOption</alias>
+ </aliases>
+ <description>Samba Configuration Option</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>sambaOptionName</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>sambaBoolOption</attributetype>
+ <attributetype>sambaIntegerOption</attributetype>
+ <attributetype>sambaStringOption</attributetype>
+ <attributetype>sambaStringListOption</attributetype>
+ <attributetype>description</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.7165.2.2.13" obsolete="false">
+ <aliases>
+ <alias>sambaPrivilege</alias>
+ </aliases>
+ <description>Samba Privilege</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>AUXILIARY</type>
+ <mandatory>
+ <attributetype>sambaSID</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>sambaPrivilegeList</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.7165.2.2.14" obsolete="false">
+ <aliases>
+ <alias>sambaTrustPassword</alias>
+ </aliases>
+ <description>Samba Trust Password</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>sambaDomainName</attributetype>
+ <attributetype>sambaNTPassword</attributetype>
+ <attributetype>sambaTrustFlags</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>sambaSID</attributetype>
+ <attributetype>sambaPwdLastSet</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.7165.2.2.4" obsolete="false">
+ <aliases>
+ <alias>sambaGroupMapping</alias>
+ </aliases>
+ <description>Samba Group Mapping</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>AUXILIARY</type>
+ <mandatory>
+ <attributetype>gidNumber</attributetype>
+ <attributetype>sambaSID</attributetype>
+ <attributetype>sambaGroupType</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>displayName</attributetype>
+ <attributetype>description</attributetype>
+ <attributetype>sambaSIDList</attributetype>
+ </optional>
+ </objectclass>
<objectclass oid="1.3.6.1.4.1.7165.2.2.5" obsolete="false">
<aliases>
<alias>sambaDomain</alias>
@@ -375,23 +479,6 @@
<attributetype>sambaAlgorithmicRidBase</attributetype>
</optional>
</objectclass>
- <objectclass oid="1.3.6.1.4.1.7165.2.2.8" obsolete="false">
- <aliases>
- <alias>sambaIdmapEntry</alias>
- </aliases>
- <description>Mapping from a SID to an ID</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>AUXILIARY</type>
- <mandatory>
- <attributetype>sambaSID</attributetype>
- </mandatory>
- <optional>
- <attributetype>uidNumber</attributetype>
- <attributetype>gidNumber</attributetype>
- </optional>
- </objectclass>
<objectclass oid="1.3.6.1.4.1.7165.2.2.6" obsolete="false">
<aliases>
<alias>sambaSamAccount</alias>
@@ -432,104 +519,6 @@
<attributetype>sambaLogonHours</attributetype>
</optional>
</objectclass>
- <objectclass oid="1.3.6.1.4.1.7165.2.2.11" obsolete="false">
- <aliases>
- <alias>sambaShare</alias>
- </aliases>
- <description>Samba Share Section</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>sambaShareName</attributetype>
- </mandatory>
- <optional>
- <attributetype>description</attributetype>
- </optional>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.7165.2.2.13" obsolete="false">
- <aliases>
- <alias>sambaPrivilege</alias>
- </aliases>
- <description>Samba Privilege</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>AUXILIARY</type>
- <mandatory>
- <attributetype>sambaSID</attributetype>
- </mandatory>
- <optional>
- <attributetype>sambaPrivilegeList</attributetype>
- </optional>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.7165.2.2.9" obsolete="false">
- <aliases>
- <alias>sambaSidEntry</alias>
- </aliases>
- <description>Structural Class for a SID</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>sambaSID</attributetype>
- </mandatory>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.7165.2.2.12" obsolete="false">
- <aliases>
- <alias>sambaConfigOption</alias>
- </aliases>
- <description>Samba Configuration Option</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <mandatory>
- <attributetype>sambaOptionName</attributetype>
- </mandatory>
- <optional>
- <attributetype>sambaBoolOption</attributetype>
- <attributetype>sambaIntegerOption</attributetype>
- <attributetype>sambaStringOption</attributetype>
- <attributetype>sambaStringListOption</attributetype>
- <attributetype>description</attributetype>
- </optional>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.7165.1.2.2.10" obsolete="false">
- <aliases>
- <alias>sambaConfig</alias>
- </aliases>
- <description>Samba Configuration Section</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>AUXILIARY</type>
- <optional>
- <attributetype>description</attributetype>
- </optional>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.7165.2.2.4" obsolete="false">
- <aliases>
- <alias>sambaGroupMapping</alias>
- </aliases>
- <description>Samba Group Mapping</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>AUXILIARY</type>
- <mandatory>
- <attributetype>gidNumber</attributetype>
- <attributetype>sambaSID</attributetype>
- <attributetype>sambaGroupType</attributetype>
- </mandatory>
- <optional>
- <attributetype>displayName</attributetype>
- <attributetype>description</attributetype>
- <attributetype>sambaSIDList</attributetype>
- </optional>
- </objectclass>
<objectclass oid="1.3.6.1.4.1.7165.2.2.7" obsolete="false">
<aliases>
<alias>sambaUnixIdPool</alias>
@@ -544,24 +533,35 @@
<attributetype>gidNumber</attributetype>
</mandatory>
</objectclass>
- <objectclass oid="1.3.6.1.4.1.7165.2.2.14" obsolete="false">
+ <objectclass oid="1.3.6.1.4.1.7165.2.2.8" obsolete="false">
<aliases>
- <alias>sambaTrustPassword</alias>
+ <alias>sambaIdmapEntry</alias>
</aliases>
- <description>Samba Trust Password</description>
+ <description>Mapping from a SID to an ID</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>AUXILIARY</type>
+ <mandatory>
+ <attributetype>sambaSID</attributetype>
+ </mandatory>
+ <optional>
+ <attributetype>uidNumber</attributetype>
+ <attributetype>gidNumber</attributetype>
+ </optional>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.7165.2.2.9" obsolete="false">
+ <aliases>
+ <alias>sambaSidEntry</alias>
+ </aliases>
+ <description>Structural Class for a SID</description>
<superiors>
<superior>top</superior>
</superiors>
<type>STRUCTURAL</type>
<mandatory>
- <attributetype>sambaDomainName</attributetype>
- <attributetype>sambaNTPassword</attributetype>
- <attributetype>sambaTrustFlags</attributetype>
- </mandatory>
- <optional>
<attributetype>sambaSID</attributetype>
- <attributetype>sambaPwdLastSet</attributetype>
- </optional>
+ </mandatory>
</objectclass>
</objectclasses>
</schema>
diff --git a/plugins/schemaeditor/resources/schemas/apacheds/system.xml b/plugins/schemaeditor/resources/schemas/apacheds/system.xml
index 0193523..c6077d1 100644
--- a/plugins/schemaeditor/resources/schemas/apacheds/system.xml
+++ b/plugins/schemaeditor/resources/schemas/apacheds/system.xml
@@ -19,6 +19,15 @@
-->
<schema name="system">
<attributetypes>
+ <attributetype oid="1.3.6.1.1.4" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <aliases>
+ <alias>vendorName</alias>
+ </aliases>
+ <description>RFC3045: name of implementation vendor</description>
+ <usage>DSA_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseExactMatch</equality>
+ </attributetype>
<attributetype oid="1.3.6.1.1.5" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
<aliases>
<alias>vendorVersion</alias>
@@ -28,6 +37,22 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
<equality>caseExactMatch</equality>
</attributetype>
+ <attributetype oid="1.3.6.1.4.1.1466.101.119.3" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <aliases>
+ <alias>entryTtl</alias>
+ </aliases>
+ <description>RFC2589: entry time-to-live</description>
+ <usage>DSA_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.1466.101.119.4" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+ <aliases>
+ <alias>dynamicSubtrees</alias>
+ </aliases>
+ <description>RFC2589: dynamic subtrees</description>
+ <usage>DSA_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ </attributetype>
<attributetype oid="1.3.6.1.4.1.1466.101.120.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
<alias>supportedControl</alias>
@@ -36,12 +61,46 @@
<usage>DSA_OPERATION</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
</attributetype>
- <attributetype oid="2.5.18.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <attributetype oid="1.3.6.1.4.1.1466.101.120.14" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>subtreeSpecification</alias>
+ <alias>supportedSASLMechanisms</alias>
</aliases>
+ <description>RFC2252: supported SASL mechanisms</description>
+ <usage>DSA_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.1466.101.120.15" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>supportedLDAPVersion</alias>
+ </aliases>
+ <description>RFC2252: supported LDAP versions</description>
+ <usage>DSA_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.1466.101.120.16" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ldapSyntaxes</alias>
+ </aliases>
+ <description>RFC2252: LDAP syntaxes</description>
<usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.45</syntax>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.54</syntax>
+ <equality>objectIdentifierFirstComponentMatch</equality>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.1466.101.120.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>namingContexts</alias>
+ </aliases>
+ <description>RFC2252: naming contexts</description>
+ <usage>DSA_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ </attributetype>
+ <attributetype oid="1.3.6.1.4.1.1466.101.120.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>altServer</alias>
+ </aliases>
+ <description>RFC2252: alternative servers</description>
+ <usage>DSA_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
</attributetype>
<attributetype oid="1.3.6.1.4.1.1466.101.120.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
@@ -51,6 +110,15 @@
<usage>DSA_OPERATION</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
</attributetype>
+ <attributetype oid="1.3.6.1.4.1.250.1.57" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>labeledURI</alias>
+ </aliases>
+ <description>RFC2079: Uniform Resource Identifier with optional label</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseExactMatch</equality>
+ </attributetype>
<attributetype oid="1.3.6.1.4.1.4203.1.3.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
<alias>supportedFeatures</alias>
@@ -59,6 +127,93 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
<equality>objectIdentifierMatch</equality>
</attributetype>
+ <attributetype oid="2.16.840.1.113730.3.1.34" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>ref</alias>
+ </aliases>
+ <description>namedref: subordinate referral URL</description>
+ <usage>DISTRIBUTED_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <equality>caseExactMatch</equality>
+ </attributetype>
+ <attributetype oid="2.5.18.1" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <aliases>
+ <alias>createTimestamp</alias>
+ </aliases>
+ <description>RFC2252: time which object was created</description>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
+ <equality>generalizedTimeMatch</equality>
+ <ordering>generalizedTimeOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="2.5.18.10" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <aliases>
+ <alias>subschemaSubentry</alias>
+ </aliases>
+ <description>RFC2252: name of controlling subschema entry</description>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
+ <attributetype oid="2.5.18.12" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+ <aliases>
+ <alias>collectiveAttributeSubentries</alias>
+ </aliases>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
+ <attributetype oid="2.5.18.2" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <aliases>
+ <alias>modifyTimestamp</alias>
+ </aliases>
+ <description>RFC2252: time which object was last modified</description>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
+ <equality>generalizedTimeMatch</equality>
+ <ordering>generalizedTimeOrderingMatch</ordering>
+ </attributetype>
+ <attributetype oid="2.5.18.3" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <aliases>
+ <alias>creatorsName</alias>
+ </aliases>
+ <description>RFC2252: name of creator</description>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
+ <attributetype oid="2.5.18.4" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <aliases>
+ <alias>modifiersName</alias>
+ </aliases>
+ <description>RFC2252: name of last modifier</description>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
+ </attributetype>
+ <attributetype oid="2.5.18.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>administrativeRole</alias>
+ </aliases>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+ <equality>objectIdentifierMatch</equality>
+ </attributetype>
+ <attributetype oid="2.5.18.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>subtreeSpecification</alias>
+ </aliases>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.45</syntax>
+ </attributetype>
+ <attributetype oid="2.5.18.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>collectiveExclusions</alias>
+ </aliases>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+ <equality>objectIdentifierMatch</equality>
+ </attributetype>
<attributetype oid="2.5.18.9" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
<aliases>
<alias>hasSubordinates</alias>
@@ -68,31 +223,32 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
<equality>booleanMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.250.1.57" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="2.5.21.1" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>labeledURI</alias>
+ <alias>dITStructureRules</alias>
</aliases>
- <description>RFC2079: Uniform Resource Identifier with optional label</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseExactMatch</equality>
+ <description>RFC2252: DIT structure rules</description>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.17</syntax>
+ <equality>integerFirstComponentMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.1466.101.120.14" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="2.5.21.2" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>supportedSASLMechanisms</alias>
+ <alias>dITContentRules</alias>
</aliases>
- <description>RFC2252: supported SASL mechanisms</description>
- <usage>DSA_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+ <description>RFC2252: DIT content rules</description>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.16</syntax>
+ <equality>objectIdentifierFirstComponentMatch</equality>
</attributetype>
- <attributetype oid="2.5.4.49" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="2.5.21.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>distinguishedName</alias>
+ <alias>matchingRules</alias>
</aliases>
- <description>RFC2256: common supertype of DN attributes</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
+ <description>RFC2252: matching rules</description>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.30</syntax>
+ <equality>objectIdentifierFirstComponentMatch</equality>
</attributetype>
<attributetype oid="2.5.21.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
@@ -103,35 +259,67 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.3</syntax>
<equality>objectIdentifierFirstComponentMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.1466.101.120.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="2.5.21.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>altServer</alias>
+ <alias>objectClasses</alias>
</aliases>
- <description>RFC2252: alternative servers</description>
- <usage>DSA_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+ <description>RFC2252: object classes</description>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.37</syntax>
+ <equality>objectIdentifierFirstComponentMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.1466.101.119.4" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+ <attributetype oid="2.5.21.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>dynamicSubtrees</alias>
+ <alias>nameForms</alias>
</aliases>
- <description>RFC2589: dynamic subtrees</description>
- <usage>DSA_OPERATION</usage>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.35</syntax>
+ <equality>objectIdentifierFirstComponentMatch</equality>
+ </attributetype>
+ <attributetype oid="2.5.21.8" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>matchingRuleUse</alias>
+ </aliases>
+ <description>RFC2252: matching rule uses</description>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.31</syntax>
+ <equality>objectIdentifierFirstComponentMatch</equality>
+ </attributetype>
+ <attributetype oid="2.5.21.9" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <aliases>
+ <alias>structuralObjectClass</alias>
+ </aliases>
+ <description>X.500(93): structural object class of entry</description>
+ <usage>DIRECTORY_OPERATION</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+ <equality>objectIdentifierMatch</equality>
+ </attributetype>
+ <attributetype oid="2.5.4.0" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <aliases>
+ <alias>objectClass</alias>
+ </aliases>
+ <description>RFC2256: object classes of the entity</description>
+ <usage>USER_APPLICATIONS</usage>
+ <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+ <equality>objectIdentifierMatch</equality>
+ </attributetype>
+ <attributetype oid="2.5.4.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+ <aliases>
+ <alias>aliasedObjectName</alias>
+ <alias>aliasedEntryName</alias>
+ </aliases>
+ <description>RFC2256: name of aliased object</description>
+ <usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+ <equality>distinguishedNameMatch</equality>
</attributetype>
- <attributetype oid="1.3.6.1.4.1.1466.101.120.15" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="2.5.4.3" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>supportedLDAPVersion</alias>
+ <alias>cn</alias>
+ <alias>commonName</alias>
</aliases>
- <description>RFC2252: supported LDAP versions</description>
- <usage>DSA_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- </attributetype>
- <attributetype oid="2.5.4.41" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>name</alias>
- </aliases>
- <description>RFC2256: common supertype of name attributes</description>
+ <description>RFC2256: common name(s) for which the entity is known by</description>
+ <superior>name</superior>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
<equality>caseIgnoreMatch</equality>
@@ -146,228 +334,60 @@
<syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
<equality>octetStringMatch</equality>
</attributetype>
- <attributetype oid="2.5.18.10" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+ <attributetype oid="2.5.4.41" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>subschemaSubentry</alias>
+ <alias>name</alias>
</aliases>
- <description>RFC2252: name of controlling subschema entry</description>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
- <attributetype oid="2.5.21.9" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
- <aliases>
- <alias>structuralObjectClass</alias>
- </aliases>
- <description>X.500(93): structural object class of entry</description>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
- <equality>objectIdentifierMatch</equality>
- </attributetype>
- <attributetype oid="2.5.18.1" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
- <aliases>
- <alias>createTimestamp</alias>
- </aliases>
- <description>RFC2252: time which object was created</description>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
- <equality>generalizedTimeMatch</equality>
- <ordering>generalizedTimeOrderingMatch</ordering>
- </attributetype>
- <attributetype oid="2.5.4.3" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>cn</alias>
- <alias>commonName</alias>
- </aliases>
- <description>RFC2256: common name(s) for which the entity is known by</description>
- <superior>name</superior>
+ <description>RFC2256: common supertype of name attributes</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
<equality>caseIgnoreMatch</equality>
<substring>caseIgnoreSubstringsMatch</substring>
</attributetype>
- <attributetype oid="2.5.18.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+ <attributetype oid="2.5.4.49" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
<aliases>
- <alias>administrativeRole</alias>
+ <alias>distinguishedName</alias>
</aliases>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
- <equality>objectIdentifierMatch</equality>
- </attributetype>
- <attributetype oid="2.5.18.2" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
- <aliases>
- <alias>modifyTimestamp</alias>
- </aliases>
- <description>RFC2252: time which object was last modified</description>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
- <equality>generalizedTimeMatch</equality>
- <ordering>generalizedTimeOrderingMatch</ordering>
- </attributetype>
- <attributetype oid="1.3.6.1.1.4" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
- <aliases>
- <alias>vendorName</alias>
- </aliases>
- <description>RFC3045: name of implementation vendor</description>
- <usage>DSA_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseExactMatch</equality>
- </attributetype>
- <attributetype oid="2.5.18.3" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
- <aliases>
- <alias>creatorsName</alias>
- </aliases>
- <description>RFC2252: name of creator</description>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
- <attributetype oid="2.5.4.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
- <aliases>
- <alias>aliasedObjectName</alias>
- <alias>aliasedEntryName</alias>
- </aliases>
- <description>RFC2256: name of aliased object</description>
+ <description>RFC2256: common supertype of DN attributes</description>
<usage>USER_APPLICATIONS</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
<equality>distinguishedNameMatch</equality>
</attributetype>
- <attributetype oid="2.5.21.8" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>matchingRuleUse</alias>
- </aliases>
- <description>RFC2252: matching rule uses</description>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.31</syntax>
- <equality>objectIdentifierFirstComponentMatch</equality>
- </attributetype>
- <attributetype oid="2.5.21.2" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>dITContentRules</alias>
- </aliases>
- <description>RFC2252: DIT content rules</description>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.16</syntax>
- <equality>objectIdentifierFirstComponentMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.1466.101.119.3" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
- <aliases>
- <alias>entryTtl</alias>
- </aliases>
- <description>RFC2589: entry time-to-live</description>
- <usage>DSA_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
- </attributetype>
- <attributetype oid="2.16.840.1.113730.3.1.34" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>ref</alias>
- </aliases>
- <description>namedref: subordinate referral URL</description>
- <usage>DISTRIBUTED_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
- <equality>caseExactMatch</equality>
- </attributetype>
- <attributetype oid="2.5.21.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>nameForms</alias>
- </aliases>
- <description>RFC2252: name forms</description>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.35</syntax>
- <equality>objectIdentifierFirstComponentMatch</equality>
- </attributetype>
- <attributetype oid="2.5.18.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>collectiveExclusions</alias>
- </aliases>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
- <equality>objectIdentifierMatch</equality>
- </attributetype>
- <attributetype oid="2.5.21.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>objectClasses</alias>
- </aliases>
- <description>RFC2252: object classes</description>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.37</syntax>
- <equality>objectIdentifierFirstComponentMatch</equality>
- </attributetype>
- <attributetype oid="2.5.18.12" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
- <aliases>
- <alias>collectiveAttributeSubentries</alias>
- </aliases>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
- <attributetype oid="2.5.21.1" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>dITStructureRules</alias>
- </aliases>
- <description>RFC2252: DIT structure rules</description>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.17</syntax>
- <equality>integerFirstComponentMatch</equality>
- </attributetype>
- <attributetype oid="2.5.21.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>matchingRules</alias>
- </aliases>
- <description>RFC2252: matching rules</description>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.30</syntax>
- <equality>objectIdentifierFirstComponentMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.1466.101.120.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>namingContexts</alias>
- </aliases>
- <description>RFC2252: naming contexts</description>
- <usage>DSA_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- </attributetype>
- <attributetype oid="2.5.4.0" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>objectClass</alias>
- </aliases>
- <description>RFC2256: object classes of the entity</description>
- <usage>USER_APPLICATIONS</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
- <equality>objectIdentifierMatch</equality>
- </attributetype>
- <attributetype oid="2.5.18.4" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
- <aliases>
- <alias>modifiersName</alias>
- </aliases>
- <description>RFC2252: name of last modifier</description>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
- <equality>distinguishedNameMatch</equality>
- </attributetype>
- <attributetype oid="1.3.6.1.4.1.1466.101.120.16" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
- <aliases>
- <alias>ldapSyntaxes</alias>
- </aliases>
- <description>RFC2252: LDAP syntaxes</description>
- <usage>DIRECTORY_OPERATION</usage>
- <syntax>1.3.6.1.4.1.1466.115.121.1.54</syntax>
- <equality>objectIdentifierFirstComponentMatch</equality>
- </attributetype>
</attributetypes>
<objectclasses>
- <objectclass oid="2.5.6.1" obsolete="false">
+ <objectclass oid="1.3.6.1.4.1.1466.101.119.2" obsolete="false">
<aliases>
- <alias>alias</alias>
+ <alias>dynamicObject</alias>
</aliases>
- <description>RFC2256: an alias</description>
+ <description>RFC2589: Dynamic Object</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>AUXILIARY</type>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.1466.101.120.111" obsolete="false">
+ <aliases>
+ <alias>extensibleObject</alias>
+ </aliases>
+ <description>RFC2252: extensible object</description>
+ <superiors>
+ <superior>top</superior>
+ </superiors>
+ <type>AUXILIARY</type>
+ </objectclass>
+ <objectclass oid="1.3.6.1.4.1.4203.1.4.1" obsolete="false">
+ <aliases>
+ <alias>OpenLDAProotDSE</alias>
+ <alias>LDAProotDSE</alias>
+ </aliases>
+ <description>OpenLDAP Root DSE object</description>
<superiors>
<superior>top</superior>
</superiors>
<type>STRUCTURAL</type>
- <mandatory>
- <attributetype>aliasedObjectName</attributetype>
- </mandatory>
+ <optional>
+ <attributetype>cn</attributetype>
+ </optional>
</objectclass>
<objectclass oid="2.16.840.1.113730.3.2.6" obsolete="false">
<aliases>
@@ -382,25 +402,18 @@
<attributetype>ref</attributetype>
</mandatory>
</objectclass>
- <objectclass oid="2.5.6.0" obsolete="false">
+ <objectclass oid="2.5.17.0" obsolete="false">
<aliases>
- <alias>top</alias>
+ <alias>subentry</alias>
</aliases>
- <description>top of the superclass chain</description>
- <type>ABSTRACT</type>
- <mandatory>
- <attributetype>objectClass</attributetype>
- </mandatory>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.1466.101.120.111" obsolete="false">
- <aliases>
- <alias>extensibleObject</alias>
- </aliases>
- <description>RFC2252: extensible object</description>
<superiors>
<superior>top</superior>
</superiors>
- <type>AUXILIARY</type>
+ <type>STRUCTURAL</type>
+ <mandatory>
+ <attributetype>cn</attributetype>
+ <attributetype>subtreeSpecification</attributetype>
+ </mandatory>
</objectclass>
<objectclass oid="2.5.17.2" obsolete="false">
<aliases>
@@ -424,86 +437,36 @@
<attributetype>matchingRuleUse</attributetype>
</optional>
</objectclass>
- <objectclass oid="2.5.17.0" obsolete="false">
+ <objectclass oid="2.5.6.0" obsolete="false">
<aliases>
- <alias>subentry</alias>
+ <alias>top</alias>
</aliases>
+ <description>top of the superclass chain</description>
+ <type>ABSTRACT</type>
+ <mandatory>
+ <attributetype>objectClass</attributetype>
+ </mandatory>
+ </objectclass>
+ <objectclass oid="2.5.6.1" obsolete="false">
+ <aliases>
+ <alias>alias</alias>
+ </aliases>
+ <description>RFC2256: an alias</description>
<superiors>
<superior>top</superior>
</superiors>
<type>STRUCTURAL</type>
<mandatory>
- <attributetype>cn</attributetype>
- <attributetype>subtreeSpecification</attributetype>
+ <attributetype>aliasedObjectName</attributetype>
</mandatory>
</objectclass>
- <objectclass oid="1.3.6.1.4.1.4203.1.4.1" obsolete="false">
- <aliases>
- <alias>OpenLDAProotDSE</alias>
- <alias>LDAProotDSE</alias>
- </aliases>
- <description>OpenLDAP Root DSE object</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>STRUCTURAL</type>
- <optional>
- <attributetype>cn</attributetype>
- </optional>
- </objectclass>
- <objectclass oid="1.3.6.1.4.1.1466.101.119.2" obsolete="false">
- <aliases>
- <alias>dynamicObject</alias>
- </aliases>
- <description>RFC2589: Dynamic Object</description>
- <superiors>
- <superior>top</superior>
- </superiors>
- <type>AUXILIARY</type>
- </objectclass>
</objectclasses>
<matchingrules>
- <matchingrule oid="2.5.13.18" obsolete="false">
+ <matchingrule oid="1.3.6.1.4.1.1466.109.114.1" obsolete="false">
<aliases>
- <alias>octetStringOrderingMatch</alias>
+ <alias>caseExactIA5Match</alias>
</aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.40</syntaxoid>
- </matchingrule>
- <matchingrule oid="2.5.13.33" obsolete="false">
- <aliases>
- <alias>keywordMatch</alias>
- </aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
- </matchingrule>
- <matchingrule oid="2.5.13.17" obsolete="false">
- <aliases>
- <alias>octetStringMatch</alias>
- </aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.40</syntaxoid>
- </matchingrule>
- <matchingrule oid="2.5.13.3" obsolete="false">
- <aliases>
- <alias>caseIgnoreOrderingMatch</alias>
- </aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
- </matchingrule>
- <matchingrule oid="2.5.13.8" obsolete="false">
- <aliases>
- <alias>numericStringMatch</alias>
- </aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.36</syntaxoid>
- </matchingrule>
- <matchingrule oid="2.5.13.21" obsolete="false">
- <aliases>
- <alias>telephoneNumberSubstringsMatch</alias>
- </aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.58</syntaxoid>
- </matchingrule>
- <matchingrule oid="2.5.13.15" obsolete="false">
- <aliases>
- <alias>integerOrderingMatch</alias>
- </aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.27</syntaxoid>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.26</syntaxoid>
</matchingrule>
<matchingrule oid="1.3.6.1.4.1.1466.109.114.2" obsolete="false">
<aliases>
@@ -511,101 +474,23 @@
</aliases>
<syntaxoid>1.3.6.1.4.1.1466.115.121.1.26</syntaxoid>
</matchingrule>
- <matchingrule oid="2.5.13.16" obsolete="false">
- <aliases>
- <alias>bitStringMatch</alias>
- </aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.6</syntaxoid>
- </matchingrule>
- <matchingrule oid="2.5.13.20" obsolete="false">
- <aliases>
- <alias>telephoneNumberMatch</alias>
- </aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.50</syntaxoid>
- </matchingrule>
- <matchingrule oid="2.5.13.9" obsolete="false">
- <aliases>
- <alias>numericStringOrderingMatch</alias>
- </aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.36</syntaxoid>
- </matchingrule>
- <matchingrule oid="1.3.6.1.4.1.1466.109.114.1" obsolete="false">
- <aliases>
- <alias>caseExactIA5Match</alias>
- </aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.26</syntaxoid>
- </matchingrule>
- <matchingrule oid="2.5.13.13" obsolete="false">
- <aliases>
- <alias>booleanMatch</alias>
- </aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.7</syntaxoid>
- </matchingrule>
- <matchingrule oid="2.5.13.1" obsolete="false">
- <aliases>
- <alias>distinguishedNameMatch</alias>
- </aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.12</syntaxoid>
- </matchingrule>
- <matchingrule oid="2.5.13.6" obsolete="false">
- <aliases>
- <alias>caseExactOrderingMatch</alias>
- </aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
- </matchingrule>
<matchingrule oid="1.3.6.1.4.1.1466.109.114.3" obsolete="false">
<aliases>
<alias>caseIgnoreIA5SubstringsMatch</alias>
</aliases>
<syntaxoid>1.3.6.1.4.1.1466.115.121.1.58</syntaxoid>
</matchingrule>
- <matchingrule oid="2.5.13.28" obsolete="false">
+ <matchingrule oid="2.5.13.0" obsolete="false">
<aliases>
- <alias>generalizedTimeOrderingMatch</alias>
- </aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.24</syntaxoid>
- </matchingrule>
- <matchingrule oid="2.5.13.29" obsolete="false">
- <aliases>
- <alias>integerFirstComponentMatch</alias>
- </aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.27</syntaxoid>
- </matchingrule>
- <matchingrule oid="2.5.13.23" obsolete="false">
- <aliases>
- <alias>uniqueMemberMatch</alias>
- </aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.34</syntaxoid>
- </matchingrule>
- <matchingrule oid="2.5.13.4" obsolete="false">
- <aliases>
- <alias>caseIgnoreSubstringsMatch</alias>
- </aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.58</syntaxoid>
- </matchingrule>
- <matchingrule oid="2.5.13.7" obsolete="false">
- <aliases>
- <alias>caseExactSubstringsMatch</alias>
- </aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.58</syntaxoid>
- </matchingrule>
- <matchingrule oid="2.5.13.30" obsolete="false">
- <aliases>
- <alias>objectIdentifierFirstComponentMatch</alias>
+ <alias>objectIdentifierMatch</alias>
</aliases>
<syntaxoid>1.3.6.1.4.1.1466.115.121.1.38</syntaxoid>
</matchingrule>
- <matchingrule oid="2.5.13.22" obsolete="false">
+ <matchingrule oid="2.5.13.1" obsolete="false">
<aliases>
- <alias>presentationAddressMatch</alias>
+ <alias>distinguishedNameMatch</alias>
</aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.43</syntaxoid>
- </matchingrule>
- <matchingrule oid="2.5.13.14" obsolete="false">
- <aliases>
- <alias>integerMatch</alias>
- </aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.27</syntaxoid>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.12</syntaxoid>
</matchingrule>
<matchingrule oid="2.5.13.10" obsolete="false">
<aliases>
@@ -619,17 +504,47 @@
</aliases>
<syntaxoid>1.3.6.1.4.1.1466.115.121.1.41</syntaxoid>
</matchingrule>
- <matchingrule oid="2.5.13.2" obsolete="false">
+ <matchingrule oid="2.5.13.12" obsolete="false">
<aliases>
- <alias>caseIgnoreMatch</alias>
+ <alias>caseIgnoreListSubstringsMatch</alias>
</aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.58</syntaxoid>
</matchingrule>
- <matchingrule oid="2.5.13.31" obsolete="false">
+ <matchingrule oid="2.5.13.13" obsolete="false">
<aliases>
- <alias>directoryStringFirstComponentMatch</alias>
+ <alias>booleanMatch</alias>
</aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.7</syntaxoid>
+ </matchingrule>
+ <matchingrule oid="2.5.13.14" obsolete="false">
+ <aliases>
+ <alias>integerMatch</alias>
+ </aliases>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.27</syntaxoid>
+ </matchingrule>
+ <matchingrule oid="2.5.13.15" obsolete="false">
+ <aliases>
+ <alias>integerOrderingMatch</alias>
+ </aliases>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.27</syntaxoid>
+ </matchingrule>
+ <matchingrule oid="2.5.13.16" obsolete="false">
+ <aliases>
+ <alias>bitStringMatch</alias>
+ </aliases>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.6</syntaxoid>
+ </matchingrule>
+ <matchingrule oid="2.5.13.17" obsolete="false">
+ <aliases>
+ <alias>octetStringMatch</alias>
+ </aliases>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.40</syntaxoid>
+ </matchingrule>
+ <matchingrule oid="2.5.13.18" obsolete="false">
+ <aliases>
+ <alias>octetStringOrderingMatch</alias>
+ </aliases>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.40</syntaxoid>
</matchingrule>
<matchingrule oid="2.5.13.19" obsolete="false">
<aliases>
@@ -637,29 +552,35 @@
</aliases>
<syntaxoid>1.3.6.1.4.1.1466.115.121.1.40</syntaxoid>
</matchingrule>
- <matchingrule oid="2.5.13.27" obsolete="false">
+ <matchingrule oid="2.5.13.2" obsolete="false">
<aliases>
- <alias>generalizedTimeMatch</alias>
+ <alias>caseIgnoreMatch</alias>
</aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.24</syntaxoid>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
</matchingrule>
- <matchingrule oid="2.5.13.12" obsolete="false">
+ <matchingrule oid="2.5.13.20" obsolete="false">
<aliases>
- <alias>caseIgnoreListSubstringsMatch</alias>
+ <alias>telephoneNumberMatch</alias>
+ </aliases>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.50</syntaxoid>
+ </matchingrule>
+ <matchingrule oid="2.5.13.21" obsolete="false">
+ <aliases>
+ <alias>telephoneNumberSubstringsMatch</alias>
</aliases>
<syntaxoid>1.3.6.1.4.1.1466.115.121.1.58</syntaxoid>
</matchingrule>
- <matchingrule oid="2.5.13.0" obsolete="false">
+ <matchingrule oid="2.5.13.22" obsolete="false">
<aliases>
- <alias>objectIdentifierMatch</alias>
+ <alias>presentationAddressMatch</alias>
</aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.38</syntaxoid>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.43</syntaxoid>
</matchingrule>
- <matchingrule oid="2.5.13.5" obsolete="false">
+ <matchingrule oid="2.5.13.23" obsolete="false">
<aliases>
- <alias>caseExactMatch</alias>
+ <alias>uniqueMemberMatch</alias>
</aliases>
- <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.34</syntaxoid>
</matchingrule>
<matchingrule oid="2.5.13.24" obsolete="false">
<aliases>
@@ -667,308 +588,268 @@
</aliases>
<syntaxoid>1.3.6.1.4.1.1466.115.121.1.42</syntaxoid>
</matchingrule>
+ <matchingrule oid="2.5.13.27" obsolete="false">
+ <aliases>
+ <alias>generalizedTimeMatch</alias>
+ </aliases>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.24</syntaxoid>
+ </matchingrule>
+ <matchingrule oid="2.5.13.28" obsolete="false">
+ <aliases>
+ <alias>generalizedTimeOrderingMatch</alias>
+ </aliases>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.24</syntaxoid>
+ </matchingrule>
+ <matchingrule oid="2.5.13.29" obsolete="false">
+ <aliases>
+ <alias>integerFirstComponentMatch</alias>
+ </aliases>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.27</syntaxoid>
+ </matchingrule>
+ <matchingrule oid="2.5.13.3" obsolete="false">
+ <aliases>
+ <alias>caseIgnoreOrderingMatch</alias>
+ </aliases>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
+ </matchingrule>
+ <matchingrule oid="2.5.13.30" obsolete="false">
+ <aliases>
+ <alias>objectIdentifierFirstComponentMatch</alias>
+ </aliases>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.38</syntaxoid>
+ </matchingrule>
+ <matchingrule oid="2.5.13.31" obsolete="false">
+ <aliases>
+ <alias>directoryStringFirstComponentMatch</alias>
+ </aliases>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
+ </matchingrule>
<matchingrule oid="2.5.13.32" obsolete="false">
<aliases>
<alias>wordMatch</alias>
</aliases>
<syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
</matchingrule>
+ <matchingrule oid="2.5.13.33" obsolete="false">
+ <aliases>
+ <alias>keywordMatch</alias>
+ </aliases>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
+ </matchingrule>
+ <matchingrule oid="2.5.13.4" obsolete="false">
+ <aliases>
+ <alias>caseIgnoreSubstringsMatch</alias>
+ </aliases>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.58</syntaxoid>
+ </matchingrule>
+ <matchingrule oid="2.5.13.5" obsolete="false">
+ <aliases>
+ <alias>caseExactMatch</alias>
+ </aliases>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
+ </matchingrule>
+ <matchingrule oid="2.5.13.6" obsolete="false">
+ <aliases>
+ <alias>caseExactOrderingMatch</alias>
+ </aliases>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
+ </matchingrule>
+ <matchingrule oid="2.5.13.7" obsolete="false">
+ <aliases>
+ <alias>caseExactSubstringsMatch</alias>
+ </aliases>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.58</syntaxoid>
+ </matchingrule>
+ <matchingrule oid="2.5.13.8" obsolete="false">
+ <aliases>
+ <alias>numericStringMatch</alias>
+ </aliases>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.36</syntaxoid>
+ </matchingrule>
+ <matchingrule oid="2.5.13.9" obsolete="false">
+ <aliases>
+ <alias>numericStringOrderingMatch</alias>
+ </aliases>
+ <syntaxoid>1.3.6.1.4.1.1466.115.121.1.36</syntaxoid>
+ </matchingrule>
</matchingrules>
<syntaxes>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.1" obsolete="false" humanreadable="true">
+ <description>ACI Item</description>
+ </syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.10" obsolete="false" humanreadable="false">
- <aliases>
- <alias>Certificate Pair</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.49" obsolete="false" humanreadable="false">
- <aliases>
- <alias>Supported Algorithm</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.48" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Supplier And Consumer</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.9" obsolete="false" humanreadable="false">
- <aliases>
- <alias>Certificate List</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.20" obsolete="false" humanreadable="true">
- <aliases>
- <alias>DSE Type</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.56" obsolete="false" humanreadable="true">
- <aliases>
- <alias>LDAP BootstrapSchema Definition</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.33" obsolete="false" humanreadable="true">
- <aliases>
- <alias>MHS OR Address</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.12" obsolete="false" humanreadable="true">
- <aliases>
- <alias>DN</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.43" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Presentation Address</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.40" obsolete="false" humanreadable="false">
- <aliases>
- <alias>Octet String</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.21" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Enhanced Guide</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.36" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Numeric String</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.7" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Boolean</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.55" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Modify Rights</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.22" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Facsimile Telephone Number</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.54" obsolete="false" humanreadable="true">
- <aliases>
- <alias>LDAP Syntax Description</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.42" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Protocol Information</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.41" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Postal Address</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.29" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Master And Shadow Access Points</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.35" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Name Form Description</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.13" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Data Quality Syntax</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.6" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Bit String</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.38" obsolete="false" humanreadable="true">
- <aliases>
- <alias>OID</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.31" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Matching Rule Use Description</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.14" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Delivery Method</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.53" obsolete="false" humanreadable="true">
- <aliases>
- <alias>UTC Time</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.28" obsolete="false" humanreadable="false">
- <aliases>
- <alias>JPEG</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.15" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Directory String</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.44" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Printable String</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.45" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Subtree Specification</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.32" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Mail Preference</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.5" obsolete="false" humanreadable="false">
- <aliases>
- <alias>Binary</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.27" obsolete="false" humanreadable="true">
- <aliases>
- <alias>INTEGER</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.23" obsolete="false" humanreadable="false">
- <aliases>
- <alias>Fax</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.16" obsolete="false" humanreadable="true">
- <aliases>
- <alias>DIT Content Rule Description</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.59" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Trigger Specification</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.52" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Telex Number</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.37" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Object Class Description</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.24" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Generalized Time</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.4" obsolete="false" humanreadable="false">
- <aliases>
- <alias>Audio</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.17" obsolete="false" humanreadable="true">
- <aliases>
- <alias>DIT Structure Rule Description</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.51" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Teletex Terminal Identifier</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.47" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Supplier Or Consumer</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.39" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Other Mailbox</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.50" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Telephone Number</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.25" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Guide</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.19" obsolete="false" humanreadable="true">
- <aliases>
- <alias>DSA Quality Syntax</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.3" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Attribute Type Description</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.26" obsolete="false" humanreadable="true">
- <aliases>
- <alias>IA5 String</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.57" obsolete="false" humanreadable="true">
- <aliases>
- <alias>LDAP BootstrapSchema Description</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.18" obsolete="false" humanreadable="true">
- <aliases>
- <alias>DL Submit Permission</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.2" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Access Point</alias>
- </aliases>
- </syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.30" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Matching Rule Description</alias>
- </aliases>
+ <description>Certificate Pair</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.11" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Country String</alias>
- </aliases>
+ <description>Country String</description>
</syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.46" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Supplier Information</alias>
- </aliases>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.12" obsolete="false" humanreadable="true">
+ <description>DN</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.13" obsolete="false" humanreadable="true">
+ <description>Data Quality Syntax</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.14" obsolete="false" humanreadable="true">
+ <description>Delivery Method</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.15" obsolete="false" humanreadable="true">
+ <description>Directory String</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.16" obsolete="false" humanreadable="true">
+ <description>DIT Content Rule Description</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.17" obsolete="false" humanreadable="true">
+ <description>DIT Structure Rule Description</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.18" obsolete="false" humanreadable="true">
+ <description>DL Submit Permission</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.19" obsolete="false" humanreadable="true">
+ <description>DSA Quality Syntax</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.2" obsolete="false" humanreadable="true">
+ <description>Access Point</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.20" obsolete="false" humanreadable="true">
+ <description>DSE Type</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.21" obsolete="false" humanreadable="true">
+ <description>Enhanced Guide</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.22" obsolete="false" humanreadable="true">
+ <description>Facsimile Telephone Number</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.23" obsolete="false" humanreadable="false">
+ <description>Fax</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.24" obsolete="false" humanreadable="true">
+ <description>Generalized Time</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.25" obsolete="false" humanreadable="true">
+ <description>Guide</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.26" obsolete="false" humanreadable="true">
+ <description>IA5 String</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.27" obsolete="false" humanreadable="true">
+ <description>INTEGER</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.28" obsolete="false" humanreadable="false">
+ <description>JPEG</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.29" obsolete="false" humanreadable="true">
+ <description>Master And Shadow Access Points</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.3" obsolete="false" humanreadable="true">
+ <description>Attribute Type Description</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.30" obsolete="false" humanreadable="true">
+ <description>Matching Rule Description</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.31" obsolete="false" humanreadable="true">
+ <description>Matching Rule Use Description</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.32" obsolete="false" humanreadable="true">
+ <description>Mail Preference</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.33" obsolete="false" humanreadable="true">
+ <description>MHS OR Address</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.34" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Name And Optional UID</alias>
- </aliases>
+ <description>Name And Optional UID</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.35" obsolete="false" humanreadable="true">
+ <description>Name Form Description</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.36" obsolete="false" humanreadable="true">
+ <description>Numeric String</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.37" obsolete="false" humanreadable="true">
+ <description>Object Class Description</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.38" obsolete="false" humanreadable="true">
+ <description>OID</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.39" obsolete="false" humanreadable="true">
+ <description>Other Mailbox</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.4" obsolete="false" humanreadable="false">
+ <description>Audio</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.40" obsolete="false" humanreadable="false">
+ <description>Octet String</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.41" obsolete="false" humanreadable="true">
+ <description>Postal Address</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.42" obsolete="false" humanreadable="true">
+ <description>Protocol Information</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.43" obsolete="false" humanreadable="true">
+ <description>Presentation Address</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.44" obsolete="false" humanreadable="true">
+ <description>Printable String</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.45" obsolete="false" humanreadable="true">
+ <description>Subtree Specification</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.46" obsolete="false" humanreadable="true">
+ <description>Supplier Information</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.47" obsolete="false" humanreadable="true">
+ <description>Supplier Or Consumer</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.48" obsolete="false" humanreadable="true">
+ <description>Supplier And Consumer</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.49" obsolete="false" humanreadable="false">
+ <description>Supported Algorithm</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.5" obsolete="false" humanreadable="false">
+ <description>Binary</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.50" obsolete="false" humanreadable="true">
+ <description>Telephone Number</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.51" obsolete="false" humanreadable="true">
+ <description>Teletex Terminal Identifier</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.52" obsolete="false" humanreadable="true">
+ <description>Telex Number</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.53" obsolete="false" humanreadable="true">
+ <description>UTC Time</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.54" obsolete="false" humanreadable="true">
+ <description>LDAP Syntax Description</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.55" obsolete="false" humanreadable="true">
+ <description>Modify Rights</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.56" obsolete="false" humanreadable="true">
+ <description>LDAP BootstrapSchema Definition</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.57" obsolete="false" humanreadable="true">
+ <description>LDAP BootstrapSchema Description</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.58" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Substring Assertion</alias>
- </aliases>
+ <description>Substring Assertion</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.59" obsolete="false" humanreadable="true">
+ <description>Trigger Specification</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.6" obsolete="false" humanreadable="true">
+ <description>Bit String</description>
+ </syntax>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.7" obsolete="false" humanreadable="true">
+ <description>Boolean</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.8" obsolete="false" humanreadable="false">
- <aliases>
- <alias>Certificate</alias>
- </aliases>
+ <description>Certificate</description>
</syntax>
- <syntax oid="1.3.6.1.4.1.1466.115.121.1.1" obsolete="false" humanreadable="true">
- <aliases>
- <alias>ACI Item</alias>
- </aliases>
+ <syntax oid="1.3.6.1.4.1.1466.115.121.1.9" obsolete="false" humanreadable="false">
+ <description>Certificate List</description>
</syntax>
</syntaxes>
</schema>
diff --git a/plugins/schemaeditor/resources/schemas/openldap/system.xml b/plugins/schemaeditor/resources/schemas/openldap/system.xml
index 44d26bd..864abd6 100644
--- a/plugins/schemaeditor/resources/schemas/openldap/system.xml
+++ b/plugins/schemaeditor/resources/schemas/openldap/system.xml
@@ -385,273 +385,138 @@
</matchingrules>
<syntaxes>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.4" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Audio</alias>
- </aliases>
<description>Audio</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.5" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Binary</alias>
- </aliases>
<description>Binary</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.6" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Bit String</alias>
- </aliases>
<description>Bit String</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.7" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Boolean</alias>
- </aliases>
<description>Boolean</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.8" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Certificate</alias>
- </aliases>
<description>Certificate</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.9" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Certificate List</alias>
- </aliases>
<description>Certificate List</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.10" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Certificate Pair</alias>
- </aliases>
<description>Certificate Pair</description>
</syntax>
<syntax oid="1.3.6.1.4.1.4203.666.11.10.2.1" obsolete="false" humanreadable="true">
- <aliases>
- <alias>X.509 AttributeCertificate</alias>
- </aliases>
<description>X.509 AttributeCertificate</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.12" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Distinguished Name</alias>
- </aliases>
<description>Distinguished Name</description>
</syntax>
<syntax oid="1.2.36.79672281.1.5.0" obsolete="false" humanreadable="true">
- <aliases>
- <alias>RDN</alias>
- </aliases>
<description>RDN</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.14" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Delivery Method</alias>
- </aliases>
<description>Delivery Method</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.15" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Directory String</alias>
- </aliases>
<description>Directory String</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.22" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Facsimile Telephone Number</alias>
- </aliases>
<description>Facsimile Telephone Number</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.24" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Generalized Time</alias>
- </aliases>
<description>Generalized Time</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.26" obsolete="false" humanreadable="true">
- <aliases>
- <alias>IA5 String</alias>
- </aliases>
<description>IA5 String</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.27" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Integer</alias>
- </aliases>
<description>Integer</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.28" obsolete="false" humanreadable="true">
- <aliases>
- <alias>JPEG</alias>
- </aliases>
<description>JPEG</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.34" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Name And Optional UID</alias>
- </aliases>
<description>Name And Optional UID</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.36" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Numeric String</alias>
- </aliases>
<description>Numeric String</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.38" obsolete="false" humanreadable="true">
- <aliases>
- <alias>OID</alias>
- </aliases>
<description>OID</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.39" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Other Mailbox</alias>
- </aliases>
<description>Other Mailbox</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.40" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Octet String</alias>
- </aliases>
<description>Octet String</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.41" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Postal Address</alias>
- </aliases>
<description>Postal Address</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.44" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Printable String</alias>
- </aliases>
<description>Printable String</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.11" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Country String</alias>
- </aliases>
<description>Country String</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.45" obsolete="false" humanreadable="true">
- <aliases>
- <alias>SubtreeSpecification</alias>
- </aliases>
<description>SubtreeSpecification</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.49" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Supported Algorithm</alias>
- </aliases>
<description>Supported Algorithm</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.50" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Telephone Number</alias>
- </aliases>
<description>Telephone Number</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.52" obsolete="false" humanreadable="true">
- <aliases>
- <alias>Telex Number</alias>
- </aliases>
<description>Telex Number</description>
</syntax>
<syntax oid="1.3.6.1.1.1.0.0" obsolete="false" humanreadable="true">
- <aliases>
- <alias>RFC2307 NIS Netgroup Triple</alias>
- </aliases>
<description>RFC2307 NIS Netgroup Triple</description>
</syntax>
<syntax oid="1.3.6.1.1.1.0.1" obsolete="false" humanreadable="true">
- <aliases>
- <alias>RFC2307 Boot Parameter</alias>
- </aliases>
<description>RFC2307 Boot Parameter</description>
</syntax>
<syntax oid="1.3.6.1.1.16.1" obsolete="false" humanreadable="true">
- <aliases>
- <alias>UUID</alias>
- </aliases>
<description>UUID</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.30" obsolete="false" humanreadable="false">
- <aliases>
- <alias>Matching Rule Description</alias>
- </aliases>
<description>Matching Rule Description</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.3" obsolete="false" humanreadable="false">
- <aliases>
- <alias>Attribute Type Description</alias>
- </aliases>
<description>Attribute Type Description</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.37" obsolete="false" humanreadable="false">
- <aliases>
- <alias>Object Class Description</alias>
- </aliases>
<description>Object Class Description</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.31" obsolete="false" humanreadable="false">
- <aliases>
- <alias>Matching Rule Use Description</alias>
- </aliases>
<description>Matching Rule Use Description</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.54" obsolete="false" humanreadable="false">
- <aliases>
- <alias>LDAP Syntax Description</alias>
- </aliases>
<description>LDAP Syntax Description</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.25" obsolete="false" humanreadable="false">
- <aliases>
- <alias>Guide</alias>
- </aliases>
<description>Guide</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.51" obsolete="false" humanreadable="false">
- <aliases>
- <alias>Teletex Terminal Identifier</alias>
- </aliases>
<description>Teletex Terminal Identifier</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.43" obsolete="false" humanreadable="false">
- <aliases>
- <alias>Presentation Address</alias>
- </aliases>
<description>Presentation Address</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.21" obsolete="false" humanreadable="false">
- <aliases>
- <alias>Enhanced Guide</alias>
- </aliases>
<description>Enhanced Guide</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.42" obsolete="false" humanreadable="false">
- <aliases>
- <alias>Protocol Information</alias>
- </aliases>
<description>Protocol Information</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.23" obsolete="false" humanreadable="false">
- <aliases>
- <alias>Fax</alias>
- </aliases>
<description>Fax</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.19" obsolete="false" humanreadable="false">
- <aliases>
- <alias>DSA Quality Syntax</alias>
- </aliases>
<description>DSA Quality Syntax</description>
</syntax>
<syntax oid="1.3.6.1.4.1.1466.115.121.1.13" obsolete="false" humanreadable="false">
- <aliases>
- <alias>Data Quality Syntax</alias>
- </aliases>
<description>Data Quality Syntax</description>
</syntax>
</syntaxes>
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java
index dde1890..7328604 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java
@@ -216,6 +216,8 @@
"Cmd_NewSchema_id" );
public static final String CMD_RENAME_PROJECT = Activator.getDefault().getPluginProperties().getString(
"Cmd_RenameProject_id" );
+ public static final String CMD_RENAME_SCHEMA_ELEMENT = Activator.getDefault().getPluginProperties().getString(
+ "Cmd_RenameSchemaElement_id" );
// Preferences - DifferencesWidget
/** The preferences ID for DifferencesWidget Grouping */
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java
index 72252dd..66ff6f8 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor;
@@ -34,6 +34,8 @@
import org.apache.commons.io.FileUtils;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
@@ -65,7 +67,7 @@
public class PluginUtils
{
/**
- * Verifies that the given name is syntaxely correct according to the RFC 2252
+ * Verifies that the given name is syntaxely correct according to the RFC 2252
* (Lightweight Directory Access Protocol (v3): Attribute Syntax Definitions).
*
* @param name
@@ -87,9 +89,9 @@
* @return
* a clone of the given attribute type
*/
- public static AttributeType getClone( AttributeType at )
+ public static MutableAttributeType getClone( AttributeType at )
{
- AttributeType clone = new AttributeType( at.getOid() );
+ MutableAttributeType clone = new MutableAttributeType( at.getOid() );
clone.setNames( at.getNames() );
clone.setSchemaName( at.getSchemaName() );
clone.setDescription( at.getDescription() );
@@ -117,9 +119,9 @@
* @return
* a clone of the given object class
*/
- public static ObjectClass getClone( ObjectClass oc )
+ public static MutableObjectClass getClone( ObjectClass oc )
{
- ObjectClass clone = new ObjectClass( oc.getOid() );
+ MutableObjectClass clone = new MutableObjectClass( oc.getOid() );
clone.setNames( oc.getNames() );
clone.setSchemaName( oc.getSchemaName() );
clone.setDescription( oc.getDescription() );
@@ -186,7 +188,7 @@
if ( !loadFailed )
{
- // If everything went fine, we add the projects
+ // If everything went fine, we add the projects
for ( Project project : projects )
{
projectsHandler.addProject( project );
@@ -221,7 +223,7 @@
return;
}
- // We add the projects
+ // We add the projects
for ( Project project : projects )
{
projectsHandler.addProject( project );
@@ -405,7 +407,7 @@
if ( dialogMessage != null )
{
- ViewUtils.displayErrorMessageBox( ( ( dialogTitle == null ) ? "" : dialogTitle ), dialogMessage ); //$NON-NLS-1$
+ ViewUtils.displayErrorMessageDialog( ( ( dialogTitle == null ) ? "" : dialogTitle ), dialogMessage ); //$NON-NLS-1$
}
}
@@ -487,7 +489,7 @@
catch ( CoreException e )
{
PluginUtils.logError( Messages.getString( "PluginUtils.ConnectorsLoadingError" ), e );
- ViewUtils.displayErrorMessageBox( Messages.getString( "PluginUtils.Error" ), Messages
+ ViewUtils.displayErrorMessageDialog( Messages.getString( "PluginUtils.Error" ), Messages
.getString( "PluginUtils.ConnectorsLoadingError" ) );
}
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/AttributeTypeListener.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/AttributeTypeListener.java
deleted file mode 100644
index a56ebb5..0000000
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/AttributeTypeListener.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.directory.studio.schemaeditor.controller;
-
-
-/**
- * Classes which implement this interface provide methods that deal with the
- * events that are generated when an event occurs on an attribute type.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public interface AttributeTypeListener
-{
- /**
- * Sent when the attribute type is modified.
- */
- public void attributeTypeModified();
-
-
- /**
- * Sent when the attribute type is removed.
- */
- public void attributeTypeRemoved();
-}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/HierarchyViewController.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/HierarchyViewController.java
index 2a89ff6..338ad3c 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/HierarchyViewController.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/HierarchyViewController.java
@@ -134,7 +134,7 @@
catch ( PartInitException e )
{
PluginUtils.logError( Messages.getString( "HierarchyViewController.ErrorOpeningEditor" ), e ); //$NON-NLS-1$
- ViewUtils.displayErrorMessageBox( Messages.getString( "HierarchyViewController.Error" ), Messages //$NON-NLS-1$
+ ViewUtils.displayErrorMessageDialog( Messages.getString( "HierarchyViewController.Error" ), Messages //$NON-NLS-1$
.getString( "HierarchyViewController.ErrorOpeningEditor" ) ); //$NON-NLS-1$
}
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ObjectClassAdapter.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ObjectClassAdapter.java
deleted file mode 100644
index 8246768..0000000
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ObjectClassAdapter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.directory.studio.schemaeditor.controller;
-
-
-/**
- * This adapter class provides default implementations for the methods
- * described by the ObjectChangeListener interface.
- * <p>
- * Classes that wish to deal with object class events can extend this class
- * and override only the methods which they are interested in.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public abstract class ObjectClassAdapter implements ObjectClassListener
-{
- /**
- * {@inheritDoc}
- */
- public void objectClassModified()
- {
- }
-
-
- /**
- * {@inheritDoc}
- */
- public void objectClassRemoved()
- {
- }
-}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ObjectClassListener.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ObjectClassListener.java
deleted file mode 100644
index 60677c6..0000000
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ObjectClassListener.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.directory.studio.schemaeditor.controller;
-
-
-/**
- * Classes which implement this interface provide methods that deal with the
- * events that are generated when an event occurs on an object class.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public interface ObjectClassListener
-{
- /**
- * Sent when the object class is modified.
- */
- public void objectClassModified();
-
-
- /**
- * Sent when the object class is removed.
- */
- public void objectClassRemoved();
-}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java
index 3d60458..039fbff 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java
@@ -6,21 +6,22 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.controller;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.SchemaObject;
import org.apache.directory.studio.schemaeditor.Activator;
@@ -131,19 +132,18 @@
}
else if ( objectSelection instanceof SchemaWarningWrapper )
{
- // TODO
- // SchemaObject object = ( ( SchemaWarningWrapper ) objectSelection ).getSchemaWarning().getSource();
- //
- // if ( object instanceof AttributeType )
- // {
- // input = new AttributeTypeEditorInput( ( AttributeType ) object );
- // editorId = AttributeTypeEditor.ID;
- // }
- // else if ( object instanceof ObjectClass )
- // {
- // input = new ObjectClassEditorInput( ( ObjectClass ) object );
- // editorId = ObjectClassEditor.ID;
- // }
+ SchemaObject object = ( ( SchemaWarningWrapper ) objectSelection ).getSchemaWarning().getSource();
+
+ if ( object instanceof AttributeType )
+ {
+ input = new AttributeTypeEditorInput( ( AttributeType ) object );
+ editorId = AttributeTypeEditor.ID;
+ }
+ else if ( object instanceof ObjectClass )
+ {
+ input = new ObjectClassEditorInput( ( MutableObjectClass ) object );
+ editorId = ObjectClassEditor.ID;
+ }
}
else if ( ( objectSelection instanceof Folder ) )
{
@@ -161,7 +161,7 @@
catch ( PartInitException e )
{
PluginUtils.logError( Messages.getString( "ProblemsViewController.ErrorOpeningEditor" ), e ); //$NON-NLS-1$
- ViewUtils.displayErrorMessageBox( Messages.getString( "ProblemsViewController.Error" ), //$NON-NLS-1$
+ ViewUtils.displayErrorMessageDialog( Messages.getString( "ProblemsViewController.Error" ), //$NON-NLS-1$
Messages.getString( "ProblemsViewController.ErrorOpeningEditor" ) ); //$NON-NLS-1$
}
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaAdapter.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaAdapter.java
deleted file mode 100644
index 4adf05a..0000000
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaAdapter.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.directory.studio.schemaeditor.controller;
-
-
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
-import org.apache.directory.shared.ldap.model.schema.ObjectClass;
-
-
-/**
- * This adapter class provides default implementations for the methods
- * described by the SchemaListener interface.
- * <p>
- * Classes that wish to deal with schema events can extend this class
- * and override only the methods which they are interested in.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public abstract class SchemaAdapter implements SchemaListener
-{
- /**
- * {@inheritDoc}
- */
- public void attributeTypeAdded( AttributeType at )
- {
- }
-
-
- /**
- * {@inheritDoc}
- */
- public void attributeTypeModified( AttributeType at )
- {
- }
-
-
- /**
- * {@inheritDoc}
- */
- public void attributeTypeRemoved( AttributeType at )
- {
- }
-
-
- /**
- * {@inheritDoc}
- */
- public void matchingRuleAdded( MatchingRule mr )
- {
- }
-
-
- /**
- * {@inheritDoc}
- */
- public void matchingRuleModified( MatchingRule mr )
- {
- }
-
-
- /**
- * {@inheritDoc}
- */
- public void matchingRuleRemoved( MatchingRule mr )
- {
- }
-
-
- /**
- * {@inheritDoc}
- */
- public void objectClassAdded( ObjectClass oc )
- {
- }
-
-
- /**
- * {@inheritDoc}
- */
- public void objectClassModified( ObjectClass oc )
- {
- }
-
-
- /**
- * {@inheritDoc}
- */
- public void objectClassRemoved( ObjectClass oc )
- {
- }
-
-
- /**
- * {@inheritDoc}
- */
- public void syntaxAdded( LdapSyntax syntax )
- {
- }
-
-
- /**
- * {@inheritDoc}
- */
- public void syntaxModified( LdapSyntax syntax )
- {
- }
-
-
- /**
- * {@inheritDoc}
- */
- public void syntaxRemoved( LdapSyntax syntax )
- {
- }
-}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java
index 50b4b64..ab4227e 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.controller;
@@ -28,6 +28,8 @@
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.SchemaObject;
import org.apache.directory.shared.util.Strings;
@@ -37,7 +39,7 @@
/**
* This class represents the SchemaHandler.
* <p>
- * It used to handle the whole Schema (including schemas, attribute types,
+ * It used to handle the whole Schema (including schemas, attribute types,
* object classes, matching rules and syntaxes).
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -76,9 +78,6 @@
// The Listeners Lists
//
private List<SchemaHandlerListener> schemaHandlerListeners;
- private MultiValueMap schemaListeners;
- private MultiValueMap attributeTypeListeners;
- private MultiValueMap objectClassListeners;
/**
@@ -102,9 +101,6 @@
// Listeners
schemaHandlerListeners = new ArrayList<SchemaHandlerListener>();
- schemaListeners = new MultiValueMap();
- attributeTypeListeners = new MultiValueMap();
- objectClassListeners = new MultiValueMap();
}
@@ -250,13 +246,13 @@
* @return
* the corresponding object class, or null if no one is found
*/
- public ObjectClass getObjectClass( String id )
+ public MutableObjectClass getObjectClass( String id )
{
List<?> list = getObjectClassList( Strings.toLowerCase( id ) );
if ( ( list != null ) && ( list.size() >= 1 ) )
{
- return ( ObjectClass ) list.get( 0 );
+ return ( MutableObjectClass ) list.get( 0 );
}
else
{
@@ -381,99 +377,6 @@
/**
- * Adds a SchemaListener to the given schema.
- *
- * @param schema
- * the schema
- * @param listener
- * the listener
- */
- public void addListener( Schema schema, SchemaListener listener )
- {
- if ( !schemaListeners.containsValue( schema, listener ) )
- {
- schemaListeners.put( schema, listener );
- }
- }
-
-
- /**
- * Removes a SchemaListener to the given schema.
- *
- * @param schema
- * the schema
- * @param listener
- * the listener
- */
- public void removeListener( Schema schema, SchemaListener listener )
- {
- schemaListeners.remove( schema, listener );
- }
-
-
- /**
- * Adds an AttributeTypeListener to the given attribute type.
- *
- * @param at
- * the attribute type
- * @param listener
- * the listener
- */
- public void addListener( AttributeType at, AttributeTypeListener listener )
- {
- if ( !attributeTypeListeners.containsValue( at, listener ) )
- {
- attributeTypeListeners.put( at, listener );
- }
- }
-
-
- /**
- * Removes an AttributeTypeListener to the given attribute type.
- *
- * @param at
- * the attribute type
- * @param listener
- * the listener
- */
- public void removeListener( AttributeType at, AttributeTypeListener listener )
- {
- attributeTypeListeners.remove( at, listener );
- }
-
-
- /**
- * Adds an ObjectClassListener to the given object class.
- *
- * @param oc
- * the object class
- * @param listener
- * the listener
- */
- public void addListener( ObjectClass oc, ObjectClassListener listener )
- {
- if ( !objectClassListeners.containsValue( oc, listener ) )
- {
- objectClassListeners.put( oc, listener );
- }
- }
-
-
- /**
- * Removes an ObjectClassListener to the given object class.
- *
- * @param oc
- * the object class
- * @param listener
- * the listener
- */
- public void removeListener( ObjectClass oc, ObjectClassListener listener )
- {
- objectClassListeners.remove( oc, listener );
- }
-
-
- /**
* Adds a schema
*
* @param schema
@@ -581,7 +484,7 @@
/**
- * Removes the given schema.
+ * Removes the given schema.
*
* @param schema
* the schema
@@ -688,6 +591,46 @@
/**
+ * Renames the given schema.
+ *
+ * @param schema the schema
+ * @param newName the new name
+ */
+ public void renameSchema( Schema schema, String newName )
+ {
+ schemasMap.remove( Strings.toLowerCase( schema.getSchemaName() ) );
+ schema.setSchemaName( newName );
+ schemasMap.put( Strings.toLowerCase( schema.getSchemaName() ), schema );
+
+ // Removing its attribute types
+ for ( AttributeType at : schema.getAttributeTypes() )
+ {
+ at.setSchemaName( newName );
+ }
+
+ // Removing its matching rules
+ for ( MatchingRule mr : schema.getMatchingRules() )
+ {
+ mr.setSchemaName( newName );
+ }
+
+ // Removing its object classes
+ for ( ObjectClass oc : schema.getObjectClasses() )
+ {
+ oc.setSchemaName( newName );
+ }
+
+ // Removing its syntaxes
+ for ( LdapSyntax syntax : schema.getSyntaxes() )
+ {
+ syntax.setSchemaName( newName );
+ }
+
+ notifySchemaRenamed( schema );
+ }
+
+
+ /**
* Adds the given attribute type.
*
* @param at
@@ -697,11 +640,6 @@
{
Schema schema = getSchema( at.getSchemaName() );
- if ( schema == null )
- {
- // TODO Throw an exception
- }
-
schema.addAttributeType( at );
addSchemaObject( at );
@@ -711,7 +649,7 @@
/**
- * Update the source attribute type with the values of the
+ * Update the source attribute type with the values of the
* destination attribute type.
*
* @param at1
@@ -719,7 +657,7 @@
* @param at2
* the destination attribute type
*/
- public void modifyAttributeType( AttributeType at1, AttributeType at2 )
+ public void modifyAttributeType( MutableAttributeType at1, MutableAttributeType at2 )
{
// Removing the references (in case of the names or oid have changed)
removeSchemaObject( at1 );
@@ -758,11 +696,6 @@
{
Schema schema = getSchema( at.getSchemaName() );
- if ( schema == null )
- {
- // TODO Throw an exception
- }
-
schema.removeAttributeType( at );
removeSchemaObject( at );
@@ -777,15 +710,10 @@
* @param oc
* the object class
*/
- public void addObjectClass( ObjectClass oc )
+ public void addObjectClass( MutableObjectClass oc )
{
Schema schema = getSchema( oc.getSchemaName() );
- if ( schema == null )
- {
- // TODO Throw an exception
- }
-
schema.addObjectClass( oc );
addSchemaObject( oc );
@@ -795,15 +723,15 @@
/**
- * Update the source object class with the values of the
+ * Update the source object class with the values of the
* destination object class.
*
* @param oc1
* the source object class
* @param oc2
- * the destination object class
+ * the destination object class
*/
- public void modifyObjectClass( ObjectClass oc1, ObjectClass oc2 )
+ public void modifyObjectClass( MutableObjectClass oc1, ObjectClass oc2 )
{
// Removing the references (in case of the names or oid have changed)
removeSchemaObject( oc1 );
@@ -836,11 +764,6 @@
{
Schema schema = getSchema( oc.getSchemaName() );
- if ( schema == null )
- {
- // TODO Throw an exception
- }
-
schema.removeObjectClass( oc );
removeSchemaObject( oc );
@@ -867,7 +790,7 @@
* Notifies the given listeners that a schema has been removed.
*
* @param schema
- * the added schema
+ * the removed schema
*/
private void notifySchemaRemoved( Schema schema )
{
@@ -879,6 +802,21 @@
/**
+ * Notifies the given listeners that a schema has been renamed.
+ *
+ * @param schema
+ * the renamed schema
+ */
+ private void notifySchemaRenamed( Schema schema )
+ {
+ for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
+ {
+ listener.schemaRenamed( schema );
+ }
+ }
+
+
+ /**
* Notifies the SchemaHandler listeners that an attribute type has been added.
*
* @param at
@@ -891,16 +829,6 @@
{
listener.attributeTypeAdded( at );
}
-
- // Schema Listeners
- List<?> listeners = ( List<?> ) schemaListeners.get( getSchema( at.getSchemaName() ) );
- if ( listeners != null )
- {
- for ( Object object : listeners.toArray() )
- {
- ( ( SchemaListener ) object ).attributeTypeAdded( at );
- }
- }
}
@@ -917,16 +845,6 @@
{
listener.attributeTypeModified( at );
}
-
- // Schema Listeners
- List<?> listeners = ( List<?> ) schemaListeners.get( getSchema( at.getSchemaName() ) );
- if ( listeners != null )
- {
- for ( Object object : listeners.toArray() )
- {
- ( ( SchemaListener ) object ).attributeTypeModified( at );
- }
- }
}
@@ -943,26 +861,6 @@
{
listener.attributeTypeRemoved( at );
}
-
- // Schema Listeners
- List<?> listeners = ( List<?> ) schemaListeners.get( getSchema( at.getSchemaName() ) );
- if ( listeners != null )
- {
- for ( Object object : listeners.toArray() )
- {
- ( ( SchemaListener ) object ).attributeTypeRemoved( at );
- }
- }
-
- // Attribute Type Listeners
- List<?> atListeners = ( List<?> ) attributeTypeListeners.get( at );
- if ( atListeners != null )
- {
- for ( Object object : atListeners.toArray() )
- {
- ( ( AttributeTypeListener ) object ).attributeTypeRemoved();
- }
- }
}
@@ -979,16 +877,6 @@
{
listener.objectClassAdded( oc );
}
-
- // Schema Listeners
- List<?> listeners = ( List<?> ) schemaListeners.get( getSchema( oc.getSchemaName() ) );
- if ( listeners != null )
- {
- for ( Object object : listeners.toArray() )
- {
- ( ( SchemaListener ) object ).objectClassAdded( oc );
- }
- }
}
@@ -1005,16 +893,6 @@
{
listener.objectClassModified( oc );
}
-
- // Schema Listeners
- List<?> listeners = ( List<?> ) schemaListeners.get( getSchema( oc.getSchemaName() ) );
- if ( listeners != null )
- {
- for ( Object object : listeners.toArray() )
- {
- ( ( SchemaListener ) object ).objectClassModified( oc );
- }
- }
}
@@ -1031,209 +909,31 @@
{
listener.objectClassRemoved( oc );
}
-
- // Schema Listeners
- List<?> listeners = ( List<?> ) schemaListeners.get( getSchema( oc.getSchemaName() ) );
- if ( listeners != null )
- {
- for ( Object object : listeners.toArray() )
- {
- ( ( SchemaListener ) object ).objectClassModified( oc );
- }
- }
-
- // Object Class Listeners
- List<?> ocListeners = ( List<?> ) objectClassListeners.get( oc );
- if ( ocListeners != null )
- {
- for ( Object object : ocListeners.toArray() )
- {
- ( ( ObjectClassListener ) object ).objectClassRemoved();
- }
- }
}
/**
- * Notifies the SchemaHandler listeners that a matching rule has been added.
+ * Verifies if the given oid is already taken by a schema object.
*
- * @param mr
- * the added matching rule
+ * @param oid the oid
+ * @return <code>true</code> if the the oid is already taken
*/
- private void notifyMatchingRuleAdded( MatchingRule mr )
+ public boolean isOidAlreadyTaken( String oid )
{
- // SchemaHandler Listeners
- for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
- {
- listener.matchingRuleAdded( mr );
- }
-
- // Schema Listeners
- List<?> listeners = ( List<?> ) schemaListeners.get( getSchema( mr.getSchemaName() ) );
- if ( listeners != null )
- {
- for ( Object object : listeners.toArray() )
- {
- ( ( SchemaListener ) object ).matchingRuleAdded( mr );
- }
- }
- }
-
-
- /**
- * Notifies the SchemaHandler listeners that a matching rule has been modified.
- *
- * @param mr
- * the modified matching rule
- */
- private void notifyMatchingRuleModified( MatchingRule mr )
- {
- // SchemaHandler Listeners
- for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
- {
- listener.matchingRuleModified( mr );
- }
-
- // Schema Listeners
- List<?> listeners = ( List<?> ) schemaListeners.get( getSchema( mr.getSchemaName() ) );
- if ( listeners != null )
- {
- for ( Object object : listeners.toArray() )
- {
- ( ( SchemaListener ) object ).matchingRuleModified( mr );
- }
- }
- }
-
-
- /**
- * Notifies the SchemaHandler listeners that a matching rule has been removed.
- *
- * @param mr
- * the removed matching rule
- */
- private void notifyMatchingRuleRemoved( MatchingRule mr )
- {
- // SchemaHandler Listeners
- for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
- {
- listener.matchingRuleRemoved( mr );
- }
-
- // Schema Listeners
- List<?> listeners = ( List<?> ) schemaListeners.get( getSchema( mr.getSchemaName() ) );
- if ( listeners != null )
- {
- for ( Object object : listeners.toArray() )
- {
- ( ( SchemaListener ) object ).matchingRuleRemoved( mr );
- }
- }
- }
-
-
- /**
- * Notifies the SchemaHandler listeners that a syntax has been added.
- *
- * @param syntax
- * the added syntax
- */
- private void notifySyntaxRuleAdded( LdapSyntax syntax )
- {
- // SchemaHandler Listeners
- for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
- {
- listener.syntaxAdded( syntax );
- }
-
- // Schema Listeners
- List<?> listeners = ( List<?> ) schemaListeners.get( getSchema( syntax.getSchemaName() ) );
- if ( listeners != null )
- {
- for ( Object object : listeners.toArray() )
- {
- ( ( SchemaListener ) object ).syntaxAdded( syntax );
- }
- }
- }
-
-
- /**
- * Notifies the SchemaHandler listeners that a syntax has been modified.
- *
- * @param syntax
- * the modified syntax
- */
- private void notifySyntaxRuleModified( LdapSyntax syntax )
- {
- // SchemaHandler Listeners
- for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
- {
- listener.syntaxModified( syntax );
- }
-
- // Schema Listeners
- List<?> listeners = ( List<?> ) schemaListeners.get( getSchema( syntax.getSchemaName() ) );
- if ( listeners != null )
- {
- for ( Object object : listeners.toArray() )
- {
- ( ( SchemaListener ) object ).syntaxModified( syntax );
- }
- }
- }
-
-
- /**
- * Notifies the SchemaHandler listeners that a syntax has been removed.
- *
- * @param syntax
- * the removed syntax
- */
- private void notifySyntaxRemoved( LdapSyntax syntax )
- {
- // SchemaHandler Listeners
- for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
- {
- listener.syntaxRemoved( syntax );
- }
-
- // Schema Listeners
- List<?> listeners = ( List<?> ) schemaListeners.get( getSchema( syntax.getSchemaName() ) );
- if ( listeners != null )
- {
- for ( Object object : listeners.toArray() )
- {
- ( ( SchemaListener ) object ).syntaxRemoved( syntax );
- }
- }
- }
-
-
- /**
- * Verifies if the given alias or oid is already taken by a schema object
- *
- * @param id
- * the alias or oid
- * @return
- * true if the the alias or oid is already taken
- */
- public boolean isAliasOrOidAlreadyTaken( String id )
- {
- String lowerCasedId = Strings.toLowerCase( id );
- if ( attributeTypesMap.containsKey( lowerCasedId ) )
+ String lowerCasedOid = Strings.toLowerCase( oid );
+ if ( attributeTypesMap.containsKey( lowerCasedOid ) )
{
return true;
}
- else if ( objectClassesMap.containsKey( lowerCasedId ) )
+ else if ( objectClassesMap.containsKey( lowerCasedOid ) )
{
return true;
}
- else if ( matchingRulesMap.containsKey( lowerCasedId ) )
+ else if ( matchingRulesMap.containsKey( lowerCasedOid ) )
{
return true;
}
- else if ( syntaxesMap.containsKey( lowerCasedId ) )
+ else if ( syntaxesMap.containsKey( lowerCasedOid ) )
{
return true;
}
@@ -1243,6 +943,30 @@
/**
+ * Verifies if the given alias is already taken by an attribute type.
+ *
+ * @param alias the alias
+ * @return <code>true</code> if the the alias is already taken
+ */
+ public boolean isAliasAlreadyTakenForAttributeType( String alias )
+ {
+ return attributeTypesMap.containsKey( Strings.toLowerCase( alias ) );
+ }
+
+
+ /**
+ * Verifies if the given alias is already taken by an object class.
+ *
+ * @param alias the alias
+ * @return <code>true</code> if the the alias is already taken
+ */
+ public boolean isAliasAlreadyTakenForObjectClass( String alias )
+ {
+ return objectClassesMap.containsKey( Strings.toLowerCase( alias ) );
+ }
+
+
+ /**
* Verifies if the given name for a schema is already taken by another schema.
*
* @param name
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerAdapter.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerAdapter.java
index 5b1b544..9121694 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerAdapter.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerAdapter.java
@@ -129,6 +129,14 @@
/**
* {@inheritDoc}
*/
+ public void schemaRenamed( Schema schema )
+ {
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
public void syntaxAdded( LdapSyntax syntax )
{
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerListener.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerListener.java
index 82796aa..9a9ced6 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerListener.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerListener.java
@@ -135,6 +135,15 @@
/**
+ * Sent when a schema is renamed.
+ *
+ * @param schema
+ * the removed syntax
+ */
+ public void schemaRenamed( Schema schema );
+
+
+ /**
* Sent when a syntax is added.
*
* @param syntax
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaListener.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaListener.java
deleted file mode 100644
index 03c4fec..0000000
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaListener.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.directory.studio.schemaeditor.controller;
-
-
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
-import org.apache.directory.shared.ldap.model.schema.ObjectClass;
-
-
-/**
- * Classes which implement this interface provide methods that deal with the
- * events that are generated when an event occurs on a schema.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public interface SchemaListener
-{
- /**
- * Sent when the attribute type is added.
- *
- * @param at
- * the added attribute type
- */
- public void attributeTypeAdded( AttributeType at );
-
-
- /**
- * Sent when the attribute type is modified.
- *
- * @param at
- * the modified attribute type
- */
- public void attributeTypeModified( AttributeType at );
-
-
- /**
- * Sent when an attribute type is removed.
- *
- * @param at
- * the removed attribute type
- */
- public void attributeTypeRemoved( AttributeType at );
-
-
- /**
- * Sent when a matching rule is added.
- *
- * @param mr
- * the added matching rule
- */
- public void matchingRuleAdded( MatchingRule mr );
-
-
- /**
- * Sent when a matching rule is modified.
- *
- * @param mr
- * the modified matching rule
- */
- public void matchingRuleModified( MatchingRule mr );
-
-
- /**
- * Sent when a matching rule is removed.
- *
- * @param mr
- * the removed matching rule
- */
- public void matchingRuleRemoved( MatchingRule mr );
-
-
- /**
- * Sent when an object class is added.
- *
- * @param oc
- * the added object class
- */
- public void objectClassAdded( ObjectClass oc );
-
-
- /**
- * Sent when an object class is modified.
- *
- * @param oc
- * the modified object class
- */
- public void objectClassModified( ObjectClass oc );
-
-
- /**
- * Sent when an object class is removed.
- *
- * @param oc
- * the removed attribute type
- */
- public void objectClassRemoved( ObjectClass oc );
-
-
- /**
- * Sent when a syntax is added.
- *
- * @param syntax
- * the added syntax
- */
- public void syntaxAdded( LdapSyntax syntax );
-
-
- /**
- * Sent when a syntax is modified.
- *
- * @param syntax
- * the modified syntax
- */
- public void syntaxModified( LdapSyntax syntax );
-
-
- /**
- * Sent when a syntax is removed.
- *
- * @param syntax
- * the removed syntax
- */
- public void syntaxRemoved( LdapSyntax syntax );
-}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java
index 1ce9763..7ed7562 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.controller;
@@ -24,6 +24,7 @@
import java.util.List;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
@@ -45,10 +46,12 @@
import org.apache.directory.studio.schemaeditor.controller.actions.OpenSchemaViewPreferenceAction;
import org.apache.directory.studio.schemaeditor.controller.actions.OpenSchemaViewSortingDialogAction;
import org.apache.directory.studio.schemaeditor.controller.actions.OpenTypeHierarchyAction;
+import org.apache.directory.studio.schemaeditor.controller.actions.RenameSchemaElementAction;
import org.apache.directory.studio.schemaeditor.controller.actions.SwitchSchemaPresentationToFlatAction;
import org.apache.directory.studio.schemaeditor.controller.actions.SwitchSchemaPresentationToHierarchicalAction;
import org.apache.directory.studio.schemaeditor.model.Project;
import org.apache.directory.studio.schemaeditor.model.Schema;
+import org.apache.directory.studio.schemaeditor.model.schemachecker.SchemaCheckerListener;
import org.apache.directory.studio.schemaeditor.view.ViewUtils;
import org.apache.directory.studio.schemaeditor.view.editors.attributetype.AttributeTypeEditor;
import org.apache.directory.studio.schemaeditor.view.editors.attributetype.AttributeTypeEditorInput;
@@ -71,6 +74,7 @@
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.widgets.Display;
@@ -105,6 +109,9 @@
/** The Context Menu */
private MenuManager contextMenu;
+ /** The selection */
+ private ISelection selection;
+
/** The SchemaHandlerListener */
private SchemaHandlerListener schemaHandlerListener = new SchemaHandlerAdapter()
{
@@ -116,12 +123,11 @@
{
SchemaViewContentProvider contentProvider = ( SchemaViewContentProvider ) viewer.getContentProvider();
contentProvider.attributeTypeAdded( at );
- view.refresh();
TreeNode wrapper = contentProvider.getWrapper( at );
if ( wrapper != null )
{
- viewer.setSelection( new StructuredSelection( wrapper ) );
+ selection = new StructuredSelection( wrapper );
}
}
@@ -132,7 +138,6 @@
public void attributeTypeModified( AttributeType at )
{
( ( SchemaViewContentProvider ) viewer.getContentProvider() ).attributeTypeModified( at );
- view.refresh();
}
@@ -142,23 +147,21 @@
public void attributeTypeRemoved( AttributeType at )
{
( ( SchemaViewContentProvider ) viewer.getContentProvider() ).attributeTypeRemoved( at );
- view.refresh();
}
/**
* {@inheritDoc}
*/
- public void objectClassAdded( ObjectClass oc )
+ public void objectClassAdded( MutableObjectClass oc )
{
SchemaViewContentProvider contentProvider = ( SchemaViewContentProvider ) viewer.getContentProvider();
contentProvider.objectClassAdded( oc );
- view.refresh();
TreeNode wrapper = contentProvider.getWrapper( oc );
if ( wrapper != null )
{
- viewer.setSelection( new StructuredSelection( wrapper ) );
+ selection = new StructuredSelection( wrapper );
}
}
@@ -166,10 +169,9 @@
/**
* {@inheritDoc}
*/
- public void objectClassModified( ObjectClass oc )
+ public void objectClassModified( MutableObjectClass oc )
{
( ( SchemaViewContentProvider ) viewer.getContentProvider() ).objectClassModified( oc );
- view.refresh();
}
@@ -179,7 +181,6 @@
public void objectClassRemoved( ObjectClass oc )
{
( ( SchemaViewContentProvider ) viewer.getContentProvider() ).objectClassRemoved( oc );
- view.refresh();
}
@@ -191,20 +192,11 @@
SchemaViewContentProvider contentProvider = ( SchemaViewContentProvider ) viewer.getContentProvider();
contentProvider.schemaAdded( schema );
- final TreeNode wrapper = contentProvider.getWrapper( schema );
-
- Display.getDefault().asyncExec( new Runnable()
+ TreeNode wrapper = contentProvider.getWrapper( schema );
+ if ( wrapper != null )
{
- public void run()
- {
- view.refresh();
-
- if ( wrapper != null )
- {
- viewer.setSelection( new StructuredSelection( wrapper ) );
- }
- }
- } );
+ selection = new StructuredSelection( wrapper );
+ }
}
@@ -214,8 +206,41 @@
public void schemaRemoved( Schema schema )
{
( ( SchemaViewContentProvider ) viewer.getContentProvider() ).schemaRemoved( schema );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void schemaRenamed( Schema schema )
+ {
+
view.refresh();
}
+
+ };
+
+ /** The SchemaCheckerListener */
+ private SchemaCheckerListener schemaCheckerListener = new SchemaCheckerListener()
+ {
+ public void schemaCheckerUpdated()
+ {
+ Display.getDefault().asyncExec( new Runnable()
+ {
+ public void run()
+ {
+ if ( selection != null )
+ {
+ view.refresh( selection );
+ selection = null;
+ }
+ else
+ {
+ view.refresh();
+ }
+ }
+ } );
+ }
};
/** Token used to activate and deactivate shortcuts in the view */
@@ -228,6 +253,7 @@
private OpenElementAction openElement;
private OpenTypeHierarchyAction openTypeHierarchy;
private DeleteSchemaElementAction deleteSchemaElement;
+ private RenameSchemaElementAction renameSchemaElement;
private ImportCoreSchemasAction importCoreSchemas;
private ImportSchemasFromOpenLdapAction importSchemasFromOpenLdap;
private ImportSchemasFromXmlAction importSchemasFromXml;
@@ -261,6 +287,7 @@
initMenu();
initContextMenu();
initProjectsHandlerListener();
+ initSchemaCheckerListener();
initDoubleClickListener();
initAuthorizedPrefs();
initPreferencesListener();
@@ -280,6 +307,7 @@
openElement = new OpenElementAction( viewer );
openTypeHierarchy = new OpenTypeHierarchyAction( viewer );
deleteSchemaElement = new DeleteSchemaElementAction( viewer );
+ renameSchemaElement = new RenameSchemaElementAction( viewer );
importCoreSchemas = new ImportCoreSchemasAction();
importSchemasFromOpenLdap = new ImportSchemasFromOpenLdapAction();
importSchemasFromXml = new ImportSchemasFromXmlAction();
@@ -358,6 +386,8 @@
manager.add( new Separator() );
manager.add( deleteSchemaElement );
manager.add( new Separator() );
+ manager.add( renameSchemaElement );
+ manager.add( new Separator() );
manager.add( importManager );
importManager.add( importCoreSchemas );
importManager.add( new Separator() );
@@ -467,6 +497,15 @@
/**
+ * Intializes the schema checker listener.
+ */
+ private void initSchemaCheckerListener()
+ {
+ Activator.getDefault().getSchemaChecker().addListener( schemaCheckerListener );
+ }
+
+
+ /**
* Initializes the DoubleClickListener.
*/
private void initDoubleClickListener()
@@ -515,8 +554,9 @@
catch ( PartInitException e )
{
PluginUtils.logError( Messages.getString( "SchemaViewController.ErrorOpeningEditor" ), e ); //$NON-NLS-1$
- ViewUtils.displayErrorMessageBox( Messages.getString( "SchemaViewController.error" ), Messages //$NON-NLS-1$
- .getString( "SchemaViewController.ErrorOpeningEditor" ) ); //$NON-NLS-1$
+ ViewUtils.displayErrorMessageDialog(
+ Messages.getString( "SchemaViewController.error" ), Messages //$NON-NLS-1$
+ .getString( "SchemaViewController.ErrorOpeningEditor" ) ); //$NON-NLS-1$
}
}
}
@@ -638,6 +678,7 @@
commandService.getCommand( openElement.getActionDefinitionId() ).setHandler( null );
commandService.getCommand( openTypeHierarchy.getActionDefinitionId() ).setHandler( null );
commandService.getCommand( deleteSchemaElement.getActionDefinitionId() ).setHandler( null );
+ commandService.getCommand( renameSchemaElement.getActionDefinitionId() ).setHandler( null );
}
IContextService contextService = ( IContextService ) PlatformUI.getWorkbench().getAdapter(
@@ -675,6 +716,8 @@
new ActionHandler( openTypeHierarchy ) );
commandService.getCommand( deleteSchemaElement.getActionDefinitionId() ).setHandler(
new ActionHandler( deleteSchemaElement ) );
+ commandService.getCommand( renameSchemaElement.getActionDefinitionId() ).setHandler(
+ new ActionHandler( renameSchemaElement ) );
}
}
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteProjectAction.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteProjectAction.java
index 9cd9167..7fec9a0 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteProjectAction.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteProjectAction.java
@@ -22,6 +22,7 @@
import java.util.Iterator;
+import org.apache.directory.studio.connection.core.ConnectionCoreConstants;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.controller.ProjectsHandler;
@@ -30,17 +31,14 @@
import org.apache.directory.studio.schemaeditor.view.wrappers.ProjectWrapper;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PlatformUI;
/**
@@ -104,23 +102,43 @@
if ( !selection.isEmpty() )
{
- MessageBox messageBox = new MessageBox( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- SWT.YES | SWT.NO | SWT.ICON_QUESTION );
+ StringBuilder title = new StringBuilder();
+ StringBuilder message = new StringBuilder();
+
int count = selection.size();
- if ( count == 1 )
+
+ if ( count <= 5 )
{
- ProjectWrapper wrapper = ( ProjectWrapper ) selection.getFirstElement();
- messageBox
- .setMessage( NLS
- .bind(
- Messages.getString( "DeleteProjectAction.SureToDeleteProject" ), new String[] { wrapper.getProject().getName() } ) ); //$NON-NLS-1$
+ if ( count == 1 )
+ {
+ // Only 1 project to delete
+ title.append( Messages.getString( "DeleteProjectAction.DeleteProjectTitle" ) ); //$NON-NLS-1$
+ message.append( Messages.getString( "DeleteProjectAction.SureDeleteFollowingProject" ) ); //$NON-NLS-1$
+ }
+ else
+ {
+ // Between 2 to 5 projects to delete
+ title.append( Messages.getString( "DeleteProjectAction.DeleteProjectsTitle" ) ); //$NON-NLS-1$
+ message.append( Messages.getString( "DeleteProjectAction.SureDeleteFollowingProjects" ) ); //$NON-NLS-1$
+ }
+
+ // Appending the projects names
+ for ( Iterator<?> iterator = selection.iterator(); iterator.hasNext(); )
+ {
+ message.append( ConnectionCoreConstants.LINE_SEPARATOR );
+ message.append( " - " ); //$NON-NLS-1$
+ message.append( ( ( ProjectWrapper ) iterator.next() ).getProject().getName() );
+ }
}
else
{
- messageBox.setMessage( NLS.bind(
- Messages.getString( "DeleteProjectAction.SureToDeleteProjects" ), new Object[] { count } ) ); //$NON-NLS-1$
+ // More than 5 projects to delete
+ title.append( Messages.getString( "DeleteProjectAction.DeleteProjectsTitle" ) ); //$NON-NLS-1$
+ message.append( Messages.getString( "DeleteProjectAction.SureDeleteSelectedProjects" ) ); //$NON-NLS-1$
}
- if ( messageBox.open() == SWT.YES )
+
+ // Showing the confirmation window
+ if ( MessageDialog.openConfirm( viewer.getControl().getShell(), title.toString(), message.toString() ) )
{
for ( Iterator<?> iterator = selection.iterator(); iterator.hasNext(); )
{
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteSchemaElementAction.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteSchemaElementAction.java
index c5f76b7..f9b79af 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteSchemaElementAction.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteSchemaElementAction.java
@@ -39,17 +39,15 @@
import org.apache.directory.studio.schemaeditor.view.wrappers.SchemaWrapper;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PlatformUI;
/**
@@ -80,24 +78,21 @@
public void selectionChanged( SelectionChangedEvent event )
{
StructuredSelection selection = ( StructuredSelection ) event.getSelection();
+
if ( selection.size() > 0 )
{
- boolean enabled = false;
+ boolean enabled = true;
for ( Iterator<?> iterator = selection.iterator(); iterator.hasNext(); )
{
Object selectedItem = iterator.next();
- if ( selectedItem instanceof SchemaWrapper )
+
+ if ( !( selectedItem instanceof SchemaWrapper )
+ && !( selectedItem instanceof AttributeTypeWrapper )
+ && !( selectedItem instanceof ObjectClassWrapper ) )
{
- enabled = true;
- }
- else if ( selectedItem instanceof AttributeTypeWrapper )
- {
- enabled = true;
- }
- else if ( selectedItem instanceof ObjectClassWrapper )
- {
- enabled = true;
+ enabled = false;
+ break;
}
}
@@ -121,38 +116,40 @@
if ( !selection.isEmpty() )
{
- MessageBox messageBox = new MessageBox( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- SWT.YES | SWT.NO | SWT.ICON_QUESTION );
+ StringBuilder message = new StringBuilder();
+
int count = selection.size();
+
if ( count == 1 )
{
Object firstElement = selection.getFirstElement();
if ( firstElement instanceof AttributeTypeWrapper )
{
- messageBox.setMessage( Messages.getString( "DeleteSchemaElementAction.SureToDeleteAttributeType" ) ); //$NON-NLS-1$
+ message.append( Messages.getString( "DeleteSchemaElementAction.SureDeleteAttributeType" ) ); //$NON-NLS-1$
}
else if ( firstElement instanceof ObjectClassWrapper )
{
- messageBox.setMessage( Messages.getString( "DeleteSchemaElementAction.SureToDeleteObjectClass" ) ); //$NON-NLS-1$
+ message.append( Messages.getString( "DeleteSchemaElementAction.SureDeleteObjectClass" ) ); //$NON-NLS-1$
}
else if ( firstElement instanceof SchemaWrapper )
{
- messageBox.setMessage( Messages.getString( "DeleteSchemaElementAction.SureToDeleteSchema" ) ); //$NON-NLS-1$
+ message.append( Messages.getString( "DeleteSchemaElementAction.SureDeleteSchema" ) ); //$NON-NLS-1$
}
else
{
- messageBox.setMessage( Messages.getString( "DeleteSchemaElementAction.SureToDeleteItem" ) ); //$NON-NLS-1$
+ message.append( Messages.getString( "DeleteSchemaElementAction.SureDeleteItem" ) ); //$NON-NLS-1$
}
-
}
else
{
- messageBox.setMessage( NLS.bind(
- Messages.getString( "DeleteSchemaElementAction.SureToDeleteItems" ), new Object[] { count } ) ); //$NON-NLS-1$
+ message.append( NLS.bind(
+ Messages.getString( "DeleteSchemaElementAction.SureDeleteItems" ), new Object[] { count } ) ); //$NON-NLS-1$
}
- if ( messageBox.open() == SWT.YES )
- {
+ // Showing the confirmation window
+ if ( MessageDialog.openConfirm( viewer.getControl().getShell(),
+ Messages.getString( "DeleteSchemaElementAction.DeleteTitle" ), message.toString() ) ) //$NON-NLS-1$
+ {
Map<String, Schema> schemasMap = new HashMap<String, Schema>();
List<SchemaObject> schemaObjectsList = new ArrayList<SchemaObject>();
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenElementAction.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenElementAction.java
index 3e6c5ca..d9067f8 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenElementAction.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenElementAction.java
@@ -38,6 +38,8 @@
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.ui.IWorkbenchWindow;
@@ -66,8 +68,39 @@
setToolTipText( Messages.getString( "OpenElementAction.OpenToolTip" ) ); //$NON-NLS-1$
setId( PluginConstants.CMD_OPEN_ELEMENT );
setActionDefinitionId( PluginConstants.CMD_OPEN_ELEMENT );
- setEnabled( true );
+ setEnabled( false );
this.viewer = viewer;
+ this.viewer.addSelectionChangedListener( new ISelectionChangedListener()
+ {
+ public void selectionChanged( SelectionChangedEvent event )
+ {
+ StructuredSelection selection = ( StructuredSelection ) event.getSelection();
+
+ if ( selection.size() > 0 )
+ {
+ boolean enabled = true;
+
+ for ( Iterator<?> iterator = selection.iterator(); iterator.hasNext(); )
+ {
+ Object selectedItem = iterator.next();
+
+ if ( !( selectedItem instanceof SchemaWrapper )
+ && !( selectedItem instanceof AttributeTypeWrapper )
+ && !( selectedItem instanceof ObjectClassWrapper ) )
+ {
+ enabled = false;
+ break;
+ }
+ }
+
+ setEnabled( enabled );
+ }
+ else
+ {
+ setEnabled( false );
+ }
+ }
+ } );
}
@@ -92,7 +125,7 @@
{
PluginUtils.logError( Messages.getString( "OpenElementAction.ErrorOpeningEditor" ), e ); //$NON-NLS-1$
ViewUtils
- .displayErrorMessageBox(
+ .displayErrorMessageDialog(
Messages.getString( "OpenElementAction.Error" ), Messages.getString( "OpenElementAction.ErrorOpeningEditor" ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -108,7 +141,7 @@
{
PluginUtils.logError( Messages.getString( "OpenElementAction.ErrorOpeningEditor" ), e ); //$NON-NLS-1$
ViewUtils
- .displayErrorMessageBox(
+ .displayErrorMessageDialog(
Messages.getString( "OpenElementAction.Error" ), Messages.getString( "OpenElementAction.ErrorOpeningEditor" ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -123,7 +156,7 @@
{
PluginUtils.logError( Messages.getString( "OpenElementAction.ErrorOpeningEditor" ), e ); //$NON-NLS-1$
ViewUtils
- .displayErrorMessageBox(
+ .displayErrorMessageDialog(
Messages.getString( "OpenElementAction.Error" ), Messages.getString( "OpenElementAction.ErrorOpeningEditor" ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenTypeHierarchyAction.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenTypeHierarchyAction.java
index d9fe35a..3394ccc 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenTypeHierarchyAction.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenTypeHierarchyAction.java
@@ -64,33 +64,16 @@
setToolTipText( Messages.getString( "OpenTypeHierarchyAction.OpenTypeToolTip" ) ); //$NON-NLS-1$
setId( PluginConstants.CMD_OPEN_TYPE_HIERARCHY );
setActionDefinitionId( PluginConstants.CMD_OPEN_TYPE_HIERARCHY );
- setEnabled( true );
+ setEnabled( false );
this.viewer = viewer;
this.viewer.addSelectionChangedListener( new ISelectionChangedListener()
{
public void selectionChanged( SelectionChangedEvent event )
{
StructuredSelection selection = ( StructuredSelection ) event.getSelection();
- if ( selection.size() == 1 )
- {
- Object obj = selection.getFirstElement();
- if ( obj instanceof AttributeTypeWrapper )
- {
- setEnabled( true );
- }
- else if ( obj instanceof ObjectClassWrapper )
- {
- setEnabled( true );
- }
- else
- {
- setEnabled( false );
- }
- }
- else
- {
- setEnabled( false );
- }
+ setEnabled( ( selection.size() == 1 )
+ && ( ( selection.getFirstElement() instanceof AttributeTypeWrapper )
+ || ( selection.getFirstElement() instanceof ObjectClassWrapper ) ) );
}
} );
}
@@ -167,7 +150,7 @@
{
PluginUtils.logError( Messages.getString( "OpenTypeHierarchyAction.ErrorOpeningView" ), e ); //$NON-NLS-1$
ViewUtils
- .displayErrorMessageBox(
+ .displayErrorMessageDialog(
Messages.getString( "OpenTypeHierarchyAction.Error" ), Messages.getString( "OpenTypeHierarchyAction.ErrorOpeningView" ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RenameSchemaElementAction.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RenameSchemaElementAction.java
new file mode 100644
index 0000000..36d330d
--- /dev/null
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RenameSchemaElementAction.java
@@ -0,0 +1,179 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.studio.schemaeditor.controller.actions;
+
+
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
+import org.apache.directory.studio.schemaeditor.Activator;
+import org.apache.directory.studio.schemaeditor.PluginConstants;
+import org.apache.directory.studio.schemaeditor.PluginUtils;
+import org.apache.directory.studio.schemaeditor.model.Schema;
+import org.apache.directory.studio.schemaeditor.view.dialogs.RenameAttributeTypeDialog;
+import org.apache.directory.studio.schemaeditor.view.dialogs.RenameObjectClassDialog;
+import org.apache.directory.studio.schemaeditor.view.dialogs.RenameSchemaDialog;
+import org.apache.directory.studio.schemaeditor.view.editors.EditorsUtils;
+import org.apache.directory.studio.schemaeditor.view.wrappers.AttributeTypeWrapper;
+import org.apache.directory.studio.schemaeditor.view.wrappers.ObjectClassWrapper;
+import org.apache.directory.studio.schemaeditor.view.wrappers.SchemaWrapper;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+
+
+/**
+ * This action launches a rename dialog for schema elements (schema, attribute type and object class).
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class RenameSchemaElementAction extends Action implements IWorkbenchWindowActionDelegate
+{
+ /** The associated viewer */
+ private TreeViewer viewer;
+
+
+ /**
+ * Creates a new instance of RenameProjectAction.
+ *
+ * @param viewer
+ * the associated viewer
+ */
+ public RenameSchemaElementAction( TreeViewer viewer )
+ {
+ super( Messages.getString( "RenameSchemaElementAction.RenameSchemaElementAction" ) ); //$NON-NLS-1$
+ setToolTipText( getText() );
+ setId( PluginConstants.CMD_RENAME_SCHEMA_ELEMENT );
+ setActionDefinitionId( PluginConstants.CMD_RENAME_SCHEMA_ELEMENT );
+ setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_RENAME ) );
+ setEnabled( false );
+ this.viewer = viewer;
+ this.viewer.addSelectionChangedListener( new ISelectionChangedListener()
+ {
+ public void selectionChanged( SelectionChangedEvent event )
+ {
+ StructuredSelection selection = ( StructuredSelection ) event.getSelection();
+ setEnabled( ( selection.size() == 1 )
+ && ( ( selection.getFirstElement() instanceof SchemaWrapper )
+ || ( selection.getFirstElement() instanceof AttributeTypeWrapper )
+ || ( selection.getFirstElement() instanceof ObjectClassWrapper ) ) );
+ }
+ } );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ StructuredSelection selection = ( StructuredSelection ) viewer.getSelection();
+ if ( ( !selection.isEmpty() ) && ( selection.size() == 1 ) )
+ {
+ Object selectedElement = selection.getFirstElement();
+
+ // Saving all dirty editors before processing the renaming
+ if ( EditorsUtils.saveAllDirtyEditors() )
+ {
+ // SCHEMA
+ if ( selectedElement instanceof SchemaWrapper )
+ {
+ Schema schema = ( ( SchemaWrapper ) selectedElement ).getSchema();
+
+ RenameSchemaDialog dialog = new RenameSchemaDialog( schema.getSchemaName() );
+ if ( dialog.open() == RenameSchemaDialog.OK )
+ {
+ Activator.getDefault().getSchemaHandler().renameSchema( schema, dialog.getNewName() );
+ }
+ }
+ // ATTRIBUTE TYPE
+ else if ( selectedElement instanceof AttributeTypeWrapper )
+ {
+ MutableAttributeType attributeType = (MutableAttributeType)( ( AttributeTypeWrapper ) selectedElement ).getAttributeType();
+
+ RenameAttributeTypeDialog dialog = new RenameAttributeTypeDialog( attributeType.getNames() );
+ if ( dialog.open() == RenameAttributeTypeDialog.OK )
+ {
+ MutableAttributeType modifiedAttributeType = PluginUtils.getClone( attributeType );
+ modifiedAttributeType.setNames( dialog.getAliases() );
+ Activator.getDefault().getSchemaHandler()
+ .modifyAttributeType( attributeType, modifiedAttributeType );
+ }
+ }
+ // OBJECT CLASS
+ else if ( selectedElement instanceof ObjectClassWrapper )
+ {
+ MutableObjectClass objectClass = ( ( ObjectClassWrapper ) selectedElement ).getObjectClass();
+
+ RenameObjectClassDialog dialog = new RenameObjectClassDialog( objectClass.getNames() );
+ if ( dialog.open() == RenameObjectClassDialog.OK )
+ {
+ ObjectClass modifiedObjectClass = PluginUtils.getClone( objectClass );
+ modifiedObjectClass.setNames( dialog.getAliases() );
+ Activator.getDefault().getSchemaHandler()
+ .modifyObjectClass( objectClass, modifiedObjectClass );
+ }
+ }
+ }
+ }
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void run( IAction action )
+ {
+ run();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void dispose()
+ {
+ // Nothing to do
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void init( IWorkbenchWindow window )
+ {
+ // Nothing to do
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void selectionChanged( IAction action, ISelection selection )
+ {
+ // Nothing to do
+ }
+}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages.properties
index 512d891..d827d3f 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages.properties
@@ -22,15 +22,19 @@
DeleteProjectAction.DeleteProjectAction=&Delete Project
DeleteProjectAction.DeleteProjectsAction=&Delete Projects
DeleteProjectAction.DeleteProjectToolTip=Delete Project
-DeleteProjectAction.SureToDeleteProject=Are you sure you want to delete project "{0}"?
-DeleteProjectAction.SureToDeleteProjects=Are you sure you want to delete these {0} projects?
+DeleteProjectAction.DeleteProjectTitle=Delete Project
+DeleteProjectAction.DeleteProjectsTitle=Delete Projects
+DeleteProjectAction.SureDeleteFollowingProject=Are you sure to delete the following project?
+DeleteProjectAction.SureDeleteFollowingProjects=Are you sure to delete these projects?
+DeleteProjectAction.SureDeleteSelectedProjects=Are you sure to delete the selected projects?
DeleteSchemaElementAction.DeleteAction=&Delete
DeleteSchemaElementAction.DeleteToolTip=Delete
-DeleteSchemaElementAction.SureToDeleteAttributeType=Are you sure you want to delete this attribute type?
-DeleteSchemaElementAction.SureToDeleteItem=Are you sure you want to delete this item?
-DeleteSchemaElementAction.SureToDeleteItems=Are you sure you want to delete these {0} items?
-DeleteSchemaElementAction.SureToDeleteObjectClass=Are you sure you want to delete this object class?
-DeleteSchemaElementAction.SureToDeleteSchema=Are you sure you want to delete this schema?
+DeleteSchemaElementAction.DeleteTitle=Delete
+DeleteSchemaElementAction.SureDeleteAttributeType=Are you sure you want to delete this attribute type?
+DeleteSchemaElementAction.SureDeleteItem=Are you sure you want to delete this item?
+DeleteSchemaElementAction.SureDeleteItems=Are you sure you want to delete these {0} items?
+DeleteSchemaElementAction.SureDeleteObjectClass=Are you sure you want to delete this object class?
+DeleteSchemaElementAction.SureDeleteSchema=Are you sure you want to delete this schema?
ExportProjectsAction.SchemaProjectsAction=Schema Projects
ExportSchemasAsOpenLdapAction.SchemaAsOpenLDAPFilesAction=Schemas as OpenLDAP files
ExportSchemasAsXmlAction.SchemaAsXMLFileAction=Schemas as XML file(s)
@@ -68,10 +72,11 @@
OpenSearchViewSortingDialogAction.SortingAction=&Sorting...
OpenSearchViewSortingDialogAction.SortingToolTip=Sorting...
OpenTypeHierarchyAction.Error=Error
-OpenTypeHierarchyAction.ErrorOpeningView=An error occured when opening the view.
+OpenTypeHierarchyAction.ErrorOpeningView=An error occurred when opening the view.
OpenTypeHierarchyAction.OpenTypeAction=Ope&n Type Hierarchy
OpenTypeHierarchyAction.OpenTypeToolTip=Open Type Hierarchy
RenameProjectAction.RenameProjectAction=Re&name Project...
+RenameSchemaElementAction.RenameSchemaElementAction=Re&name...
RunCurrentSearchAgainAction.RerunSearchAction=Run the Current Search Again
ShowSearchFieldAction.ShowSearchFieldAction=Show Search Field
ShowSearchHistoryAction.ClearHistory=Clear History
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages_de.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages_de.properties
index ebb647a..99afd15 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages_de.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages_de.properties
@@ -22,15 +22,19 @@
DeleteProjectAction.DeleteProjectAction=Projekt &L\u00F6schen
DeleteProjectAction.DeleteProjectsAction=Projekte &L\u00F6schen
DeleteProjectAction.DeleteProjectToolTip=Projekt l\u00F6schen
-DeleteProjectAction.SureToDeleteProject=Wollen Sie das Projekt "{0}" wirklich l\u00F6schen?
-DeleteProjectAction.SureToDeleteProjects=Wollen Sie diese Projekte "{0}" wirklich l\u00F6schen?
+DeleteProjectAction.DeleteProjectTitle=Projekt L\u00F6schen
+DeleteProjectAction.DeleteProjectsTitle=Projekte L\u00F6schen
+DeleteProjectAction.SureDeleteFollowingProject=Wollen Sie folgende Projekt wirklich l\u00F6schen?
+DeleteProjectAction.SureDeleteFollowingProjects=Wollen Sie folgende Projekte wirklich l\u00F6schen?
+DeleteProjectAction.SureDeleteSelectedProjects=Wollen Sie die ausgew\u00E4hlten Projekte wirklich l\u00F6schen?
DeleteSchemaElementAction.DeleteAction=&L\u00F6schen
DeleteSchemaElementAction.DeleteToolTip=L\u00F6schen
-DeleteSchemaElementAction.SureToDeleteAttributeType=Wollen Sie diesen Attribut Typ wirklich l\u00F6schen?
-DeleteSchemaElementAction.SureToDeleteItem=Wollen Sie dieses Element wirklich l\u00F6schen?
-DeleteSchemaElementAction.SureToDeleteItems=Wollen Sie diese Elemente {0} wirklich l\u00F6schen?
-DeleteSchemaElementAction.SureToDeleteObjectClass=Wollen Sie diese Objektklasse wirklich l\u00F6schen?
-DeleteSchemaElementAction.SureToDeleteSchema=Wollen Sie diese Schema wirklich l\u00F6schen?
+DeleteSchemaElementAction.DeleteTitle=L\u00F6schen
+DeleteSchemaElementAction.SureDeleteAttributeType=Wollen Sie diesen Attribut Typ wirklich l\u00F6schen?
+DeleteSchemaElementAction.SureDeleteItem=Wollen Sie dieses Element wirklich l\u00F6schen?
+DeleteSchemaElementAction.SureDeleteItems=Wollen Sie diese Elemente {0} wirklich l\u00F6schen?
+DeleteSchemaElementAction.SureDeleteObjectClass=Wollen Sie diese Objektklasse wirklich l\u00F6schen?
+DeleteSchemaElementAction.SureDeleteSchema=Wollen Sie diese Schema wirklich l\u00F6schen?
ExportProjectsAction.SchemaProjectsAction=Schema Projekte
ExportSchemasAsOpenLdapAction.SchemaAsOpenLDAPFilesAction=Schemas im OpenLDAP Format
ExportSchemasAsXmlAction.SchemaAsXMLFileAction=Schemas als XML Datei(en)
@@ -72,6 +76,7 @@
OpenTypeHierarchyAction.OpenTypeAction=\u00D6ffnen der Type&n Hierarchie
OpenTypeHierarchyAction.OpenTypeToolTip=\u00D6ffnen der Typen Hierarchie
RenameProjectAction.RenameProjectAction=Projekt umbe&nennen
+RenameSchemaElementAction.RenameSchemaElementAction=Umbe&nennen
RunCurrentSearchAgainAction.RerunSearchAction=Suche erneut ausf\u00FChren
ShowSearchFieldAction.ShowSearchFieldAction=Suchfeld anzeigen
ShowSearchHistoryAction.ClearHistory=Vergangenheit l\u00F6schen
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages_fr.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages_fr.properties
index 59c3043..dc2646b 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages_fr.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/messages_fr.properties
@@ -22,23 +22,27 @@
DeleteProjectAction.DeleteProjectAction=&Supprimer le projet
DeleteProjectAction.DeleteProjectsAction=&Supprimer les projets
DeleteProjectAction.DeleteProjectToolTip=Supprime le projet
-DeleteProjectAction.SureToDeleteProject=Etes-vous s\u00FBr de vouloir supprimer le projet "{0}"?
-DeleteProjectAction.SureToDeleteProjects=Etes-vous s\u00FBr de vouloir supprimer ces projets {0}?
+DeleteProjectAction.DeleteProjectTitle=Supprimer le projet
+DeleteProjectAction.DeleteProjectsTitle=Supprimer les projets
+DeleteProjectAction.SureDeleteFollowingProject=Etes-vous s\u00FBr de vouloir supprimer le projet suivant ?
+DeleteProjectAction.SureDeleteFollowingProjects=Etes-vous s\u00FBr de vouloir supprimer les projets suivants ?
+DeleteProjectAction.SureDeleteSelectedProjects=Etes-vous s\u00FBr de vouloir supprimer les projets s\u00E9lectionn\u00E9s ?
DeleteSchemaElementAction.DeleteAction=&Supprimer
DeleteSchemaElementAction.DeleteToolTip=Supprime
-DeleteSchemaElementAction.SureToDeleteAttributeType=Etes-vous s\u00FBr de vouloir supprimer ce type d'attribut?
-DeleteSchemaElementAction.SureToDeleteItem=Etes-vous s\u00FBr de vouloir supprimer cet \u00E9l\u00E9ment ?
-DeleteSchemaElementAction.SureToDeleteItems=Etes-vous s\u00FBr de vouloir supprimer ces {0} \u00E9l\u00E9ments?
-DeleteSchemaElementAction.SureToDeleteObjectClass=Etes-vous s\u00FBr de vouloir supprimer cette classe d'objet?
-DeleteSchemaElementAction.SureToDeleteSchema=Etes-vous s\u00FBr de vouloir supprimer ce sch\u00E9ma?
+DeleteSchemaElementAction.DeleteTitle=Supprimer
+DeleteSchemaElementAction.SureDeleteAttributeType=Etes-vous s\u00FBr de vouloir supprimer ce type d'attribut?
+DeleteSchemaElementAction.SureDeleteItem=Etes-vous s\u00FBr de vouloir supprimer cet \u00E9l\u00E9ment ?
+DeleteSchemaElementAction.SureDeleteItems=Etes-vous s\u00FBr de vouloir supprimer ces {0} \u00E9l\u00E9ments?
+DeleteSchemaElementAction.SureDeleteObjectClass=Etes-vous s\u00FBr de vouloir supprimer cette classe d'objet?
+DeleteSchemaElementAction.SureDeleteSchema=Etes-vous s\u00FBr de vouloir supprimer ce sch\u00E9ma?
ExportProjectsAction.SchemaProjectsAction=Projets de sch\u00E9ma
ExportSchemasAsOpenLdapAction.SchemaAsOpenLDAPFilesAction=Sch\u00E9ma(s) au format OpenLDAP
ExportSchemasAsXmlAction.SchemaAsXMLFileAction=Sch\u00E9ma(s) au format XML
ExportSchemasForADSAction.SchemaForADSAction=Sch\u00E9ma(s) au format ApacheDS
ImportCoreSchemasAction.CoreSchemaFilesAction=Sch\u00E9mas de base (core)
ImportProjectsAction.SchemaProjectsAction=Projets de sch\u00E9ma
-ImportSchemasFromOpenLdapAction.SchemaFromOpenLDAPFilesAction=Sch\u00E9ma(s) en provenance de fichiers OpenLDAP
-ImportSchemasFromXmlAction.SchemasFromXMLFilesAction=Sch\u00E9ma(s) en provenance de fichiers XML
+ImportSchemasFromOpenLdapAction.SchemaFromOpenLDAPFilesAction=Sch\u00E9mas \u00E0 partir de fichiers OpenLDAP
+ImportSchemasFromXmlAction.SchemasFromXMLFilesAction=Sch\u00E9mas \u00E0 partir de fichiers XML
LinkWithEditorHierarchyViewAction.LinkEditorAction=&Lien avec l'\u00E9diteur
LinkWithEditorHierarchyViewAction.LinkEditorToolTip=Lien avec l'\u00E9diteur
LinkWithEditorSchemaViewAction.LinkEditorAction=&Lien avec l'\u00E9diteur
@@ -72,6 +76,7 @@
OpenTypeHierarchyAction.OpenTypeAction=Ouvri&r la hi\u00E9rarchie des types
OpenTypeHierarchyAction.OpenTypeToolTip=Ouvrir la hi\u00E9rarchie des types
RenameProjectAction.RenameProjectAction=Re&nommer le projet...
+RenameSchemaElementAction.RenameSchemaElementAction=Re&nommer...
RunCurrentSearchAgainAction.RerunSearchAction=Lancer la recherche courante \u00E0 nouveau
ShowSearchFieldAction.ShowSearchFieldAction=Montrer les champs de recherche
ShowSearchHistoryAction.ClearHistory=Effacer l'historique
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/messages.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/messages.properties
index 9de6642..52edac3 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/messages.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/messages.properties
@@ -16,13 +16,13 @@
# under the License.
HierarchyViewController.Error=Error
-HierarchyViewController.ErrorOpeningEditor=An error occured when opening the editor.
+HierarchyViewController.ErrorOpeningEditor=An error occurred when opening the editor.
ProblemsViewController.Error=Error
-ProblemsViewController.ErrorOpeningEditor=An error occured when opening the editor.
+ProblemsViewController.ErrorOpeningEditor=An error occurred when opening the editor.
ProjectsViewController.ExportAction=Exp&ort...
ProjectsViewController.ImportAction=&Import...
SchemaViewController.error=Error
-SchemaViewController.ErrorOpeningEditor=An error occured when opening the editor.
+SchemaViewController.ErrorOpeningEditor=An error occurred when opening the editor.
SchemaViewController.ExportAction=Exp&ort...
SchemaViewController.ImportAction=&Import...
SchemaViewController.NewAction=Ne&w
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/messages.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/messages.properties
index 097a122..10f65a2 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/messages.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/messages.properties
@@ -16,10 +16,10 @@
# under the License.
Activator.UnablePluginProperties=Unable to get the plugin properties.
-PluginUtils.ConnectorsLoadingError=An error occured when loading the schema connectors.
+PluginUtils.ConnectorsLoadingError=An error occurred when loading the schema connectors.
PluginUtils.Error=Error
-PluginUtils.ErrorLoadingProject=An error occured when loading the projects.
-PluginUtils.ErrorSavingProject=An error occured when saving the projects.
+PluginUtils.ErrorLoadingProject=An error occurred when loading the projects.
+PluginUtils.ErrorSavingProject=An error occurred when saving the projects.
PluginUtils.ProjectsLoadingError=Projects Loading Error
PluginUtils.ProjectsSavingError=Projects Saving Error
-PluginUtils.SchemaLoadingError=An error occured when loading the schema
+PluginUtils.SchemaLoadingError=An error occurred when loading the schema
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java
index 7d05e52..07cbbe0 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.model;
@@ -30,6 +30,7 @@
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.SchemaObject;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
@@ -63,7 +64,7 @@
*
* @param schemasList
* the schemasList
- * @throws DependencyComputerException
+ * @throws DependencyComputerException
*/
public DependenciesComputer( List<Schema> schemas ) throws DependencyComputerException
{
@@ -97,7 +98,7 @@
}
}
- List<ObjectClass> objectClasses = schema.getObjectClasses();
+ List<MutableObjectClass> objectClasses = schema.getObjectClasses();
if ( objectClasses != null )
{
for ( ObjectClass objectClass : objectClasses )
@@ -120,7 +121,7 @@
* the schema
* @param attributeType
* the attribute type
- * @throws DependencyComputerException
+ * @throws DependencyComputerException
*/
private void computeDependencies( Schema schema, AttributeType attributeType )
throws DependencyComputerException
@@ -234,7 +235,7 @@
* the schema
* @param objectClass
* the object class
- * @throws DependencyComputerException
+ * @throws DependencyComputerException
*/
private void computeDependencies( Schema schema, ObjectClass objectClass ) throws DependencyComputerException
{
@@ -295,7 +296,7 @@
{
throw new DependencyComputerException( NLS.bind( Messages
.getString( "DependenciesComputer.Mandatory" ), new String[] //$NON-NLS-1$
- { mandatoryAttributeTypeName } ) ); //$NON-NLS-1$
+ { mandatoryAttributeTypeName } ) );
}
else
{
@@ -317,7 +318,7 @@
* the schema
* @param object
* the SchemaObject
- * @throws DependencyComputerException
+ * @throws DependencyComputerException
*/
private void computeSchemaDependency( Schema schema, SchemaObject object ) throws DependencyComputerException
{
@@ -328,7 +329,7 @@
if ( schemaFromSuperiorAT == null )
{
throw new DependencyComputerException( NLS.bind(
- Messages.getString( "DependenciesComputer.Schema" ), new String[] { schemaName } ) ); //$NON-NLS-1$ //$NON-NLS-2$
+ Messages.getString( "DependenciesComputer.Schema" ), new String[] { schemaName } ) ); //$NON-NLS-1$
}
else
{
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Project.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Project.java
index 26c0d25..ec54996 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Project.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Project.java
@@ -26,6 +26,7 @@
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
import org.apache.directory.studio.schemaeditor.model.io.SchemaConnector;
+import org.apache.directory.studio.schemaeditor.model.io.SchemaConnectorException;
/**
@@ -66,8 +67,8 @@
/** The SchemaHandler */
private SchemaHandler schemaHandler;
- /** The backup of the Online Schema */
- private List<Schema> schemaBackup;
+ /** The initial schema of the Online Schema */
+ private List<Schema> initialSchema;
/** The flag for Online Schema Fetch */
private boolean hasOnlineSchemaBeenFetched = false;
@@ -246,24 +247,27 @@
{
if ( ( !hasOnlineSchemaBeenFetched ) && ( connection != null ) && ( schemaConnector != null ) )
{
- schemaBackup = schemaConnector.importSchema( connection, monitor );
- for ( Schema schema : schemaBackup )
+ try
{
- schema.setProject( this );
+ schemaConnector.importSchema( this, monitor );
+ }
+ catch ( SchemaConnectorException e )
+ {
+ monitor.reportError( e );
}
- if ( schemaBackup != null )
+ // Adding each schema to the schema handler
+ if ( initialSchema != null )
{
- monitor.beginTask( Messages.getString( "Project.AddingSchemaToProject" ), schemaBackup.size() ); //$NON-NLS-1$
- for ( Schema schema : schemaBackup )
+ monitor.beginTask( Messages.getString( "Project.AddingSchemaToProject" ), initialSchema.size() ); //$NON-NLS-1$
+ for ( Schema schema : initialSchema )
{
getSchemaHandler().addSchema( schema );
}
}
- // TODO Add error Handling
- monitor.done();
hasOnlineSchemaBeenFetched = true;
+ monitor.done();
}
}
@@ -281,26 +285,24 @@
/**
- * Gets the Schema Backup.
+ * Gets the initial schema.
*
- * @return
- * the Schema Backup
+ * @return the initial schema
*/
- public List<Schema> getSchemaBackup()
+ public List<Schema> getInitialSchema()
{
- return schemaBackup;
+ return initialSchema;
}
/**
- * Sets the Schema Backup
+ * Sets the initial schema.
*
- * @param schemaBackup
- * the Schema Backup
+ * @param initialSchema the initial schema
*/
- public void setSchemaBackup( List<Schema> schemaBackup )
+ public void setInitialSchema( List<Schema> initialSchema )
{
- this.schemaBackup = schemaBackup;
+ this.initialSchema = initialSchema;
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Schema.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Schema.java
index 3100773..83d66fb 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Schema.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Schema.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.model;
@@ -26,6 +26,7 @@
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.registries.DefaultSchema;
@@ -44,7 +45,7 @@
private List<AttributeType> attributeTypes = new ArrayList<AttributeType>();
/** The ObjectClass List */
- private List<ObjectClass> objectClasses = new ArrayList<ObjectClass>();
+ private List<MutableObjectClass> objectClasses = new ArrayList<MutableObjectClass>();
/** The MatchingRule List */
private List<MatchingRule> matchingRules = new ArrayList<MatchingRule>();
@@ -95,7 +96,7 @@
* @param oc
* the ObjectClass
*/
- public boolean addObjectClass( ObjectClass oc )
+ public boolean addObjectClass( MutableObjectClass oc )
{
return objectClasses.add( oc );
}
@@ -119,7 +120,7 @@
* @param id
* the name or the oid of the AttributeType
* @return
- * the AttributeType identified by the given id, or null if the
+ * the AttributeType identified by the given id, or null if the
* AttributeType has not been found
*/
public AttributeType getAttributeType( String id )
@@ -165,7 +166,7 @@
* @param id
* the name or the oid of the MatchingRule
* @return
- * the MatchingRule identified by the given id, or null if the
+ * the MatchingRule identified by the given id, or null if the
* MatchingRule has not been found
*/
public MatchingRule getMatchingRule( String id )
@@ -223,7 +224,7 @@
* @param id
* the name or the oid of the ObjectClass
* @return
- * the ObjectClass identified by the given id, or null if the
+ * the ObjectClass identified by the given id, or null if the
* ObjectClass has not been found
*/
public ObjectClass getObjectClass( String id )
@@ -257,7 +258,7 @@
* @return
* all the ObjectClass objects contained in the Schema
*/
- public List<ObjectClass> getObjectClasses()
+ public List<MutableObjectClass> getObjectClasses()
{
return objectClasses;
}
@@ -269,7 +270,7 @@
* @param id
* the name or the oid of the Syntax
* @return
- * the Syntax identified by the given id, or null if the
+ * the Syntax identified by the given id, or null if the
* Syntax has not been found
*/
public LdapSyntax getSyntax( String id )
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java
index 1066bfe..7ea9636 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.model.io;
@@ -29,10 +29,14 @@
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
+import org.apache.directory.shared.ldap.model.constants.MetaSchemaConstants;
+import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
-import org.apache.directory.shared.ldap.model.schema.ObjectClass;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
import org.apache.directory.shared.ldap.model.schema.UsageEnum;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
@@ -40,6 +44,7 @@
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
import org.apache.directory.studio.connection.core.Connection.ReferralHandlingMethod;
import org.apache.directory.studio.connection.core.io.ConnectionWrapper;
+import org.apache.directory.studio.schemaeditor.model.Project;
import org.apache.directory.studio.schemaeditor.model.Schema;
@@ -79,23 +84,13 @@
/**
* {@inheritDoc}
*/
- public void exportSchema( Connection connection, StudioProgressMonitor monitor )
+ public void importSchema( Project project, StudioProgressMonitor monitor )
+ throws SchemaConnectorException
{
- // TODO Auto-generated method stub
-
- }
-
-
- /**
- * {@inheritDoc}
- */
- public List<Schema> importSchema( Connection connection, StudioProgressMonitor monitor )
- {
+ monitor.beginTask( Messages.getString( "ApacheDsSchemaConnector.FetchingSchema" ), 1 ); //$NON-NLS-1$
List<Schema> schemas = new ArrayList<Schema>();
-
- ConnectionWrapper wrapper = connection.getConnectionWrapper();
-
- monitor.beginTask( Messages.getString( "GenericSchemaConnector.FetchingSchema" ), 1 ); //$NON-NLS-1$
+ project.setInitialSchema( schemas );
+ ConnectionWrapper wrapper = project.getConnection().getConnectionWrapper();
// Looking for all the defined schemas
SearchControls constraintSearch = new SearchControls();
@@ -103,17 +98,17 @@
NamingEnumeration<SearchResult> answer = wrapper
.search( "ou=schema", "(objectclass=metaSchema)", constraintSearch, DEREF_ALIAS_METHOD,
- HANDLE_REFERALS_METHOD, null, ( StudioProgressMonitor ) monitor, null );
+ HANDLE_REFERALS_METHOD, null, monitor, null );
if ( answer != null )
{
try
{
while ( answer.hasMore() )
{
- SearchResult searchResult = ( SearchResult ) answer.next();
+ SearchResult searchResult = answer.next();
// Getting the 'cn' Attribute
- Attribute cnAttribute = searchResult.getAttributes().get( "cn" );
+ Attribute cnAttribute = searchResult.getAttributes().get( SchemaConstants.CN_AT );
// Looping on the values
NamingEnumeration<?> ne = null;
@@ -122,21 +117,20 @@
{
while ( ne.hasMore() )
{
- String value = ( String ) ne.next();
- schemas.add( getSchema( wrapper, value, monitor ) );
+ Schema schema = getSchema( wrapper, ( String ) ne.next(), monitor );
+ schema.setProject( project );
+ schemas.add( schema );
}
}
}
}
- catch ( NamingException e )
+ catch ( Exception e )
{
- monitor.reportError( e );
+ throw new SchemaConnectorException( e );
}
}
monitor.worked( 1 );
-
- return schemas;
}
@@ -150,7 +144,7 @@
SearchControls constraintSearch = new SearchControls();
constraintSearch.setSearchScope( SearchControls.OBJECT_SCOPE );
constraintSearch.setReturningAttributes( new String[]
- { "+" } );
+ { SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES } );
NamingEnumeration<SearchResult> answer = wrapper.search( "", "(objectclass=*)", constraintSearch,
DEREF_ALIAS_METHOD, HANDLE_REFERALS_METHOD, null, monitor, null );
@@ -161,9 +155,9 @@
{
if ( answer.hasMore() )
{
- SearchResult searchResult = ( SearchResult ) answer.next();
+ SearchResult searchResult = answer.next();
- Attribute vendorNameAttribute = searchResult.getAttributes().get( "vendorName" );
+ Attribute vendorNameAttribute = searchResult.getAttributes().get( SchemaConstants.VENDOR_NAME_AT );
if ( vendorNameAttribute == null )
{
return false;
@@ -200,7 +194,7 @@
private static Schema getSchema( ConnectionWrapper wrapper, String name, StudioProgressMonitor monitor )
throws NamingException
{
- monitor.subTask( name ); //$NON-NLS-1$
+ monitor.subTask( name );
// Creating the schema
Schema schema = new Schema( name );
@@ -217,7 +211,7 @@
{
while ( answer.hasMore() )
{
- SearchResult searchResult = ( SearchResult ) answer.next();
+ SearchResult searchResult = answer.next();
switch ( getNodeType( searchResult ) )
{
case ATTRIBUTE_TYPE:
@@ -226,7 +220,7 @@
schema.addAttributeType( at );
break;
case OBJECT_CLASS:
- ObjectClass oc = createObjectClass( searchResult );
+ MutableObjectClass oc = createObjectClass( searchResult );
oc.setSchemaName( name );
schema.addObjectClass( oc );
break;
@@ -268,7 +262,7 @@
private static SchemaNodeTypes getNodeType( SearchResult sr ) throws NamingException
{
// Getting the 'ObjectClass' Attribute
- Attribute objectClassAttribute = sr.getAttributes().get( "objectClass" );
+ Attribute objectClassAttribute = sr.getAttributes().get( SchemaConstants.OBJECT_CLASS_AT );
// Looping on the values
NamingEnumeration<?> ne = objectClassAttribute.getAll();
@@ -303,13 +297,13 @@
* @param sr
* the SearchResult
* @return
- * the AttributeTypeImpl associated with the SearchResult, or null if no
+ * the AttributeTypeImpl associated with the SearchResult, or null if no
* AttributeTypeImpl could be created
- * @throws NamingException
+ * @throws NamingException
*/
private static AttributeType createAttributeType( SearchResult sr ) throws NamingException
{
- AttributeType at = new AttributeType( getOid( sr ) );
+ MutableAttributeType at = new MutableAttributeType( getOid( sr ) );
at.setNames( getNames( sr ) );
at.setDescription( getDescription( sr ) );
at.setObsolete( isObsolete( sr ) );
@@ -333,13 +327,13 @@
* @param sr
* the SearchResult
* @return
- * the ObjectClassImpl associated with the SearchResult, or null if no
+ * the ObjectClassImpl associated with the SearchResult, or null if no
* ObjectClassImpl could be created
- * @throws NamingException
+ * @throws NamingException
*/
- private static ObjectClass createObjectClass( SearchResult sr ) throws NamingException
+ private static MutableObjectClass createObjectClass( SearchResult sr ) throws NamingException
{
- ObjectClass oc = new ObjectClass( getOid( sr ) );
+ MutableObjectClass oc = new MutableObjectClass( getOid( sr ) );
oc.setNames( getNames( sr ) );
oc.setDescription( getDescription( sr ) );
oc.setObsolete( isObsolete( sr ) );
@@ -357,13 +351,13 @@
* @param sr
* the SearchResult
* @return
- * the MatchingRule associated with the SearchResult, or null if no
+ * the MatchingRule associated with the SearchResult, or null if no
* ObjectClass could be created
- * @throws NamingException
+ * @throws NamingException
*/
private static MatchingRule createMatchingRule( SearchResult sr ) throws NamingException
{
- MatchingRule mr = new MatchingRule( getOid( sr ) );
+ MutableMatchingRule mr = new MutableMatchingRule( getOid( sr ) );
mr.setNames( getNames( sr ) );
mr.setDescription( getDescription( sr ) );
mr.setObsolete( isObsolete( sr ) );
@@ -378,9 +372,9 @@
* @param sr
* the SearchResult
* @return
- * the MatchingRule associated with the SearchResult, or null if no
+ * the MatchingRule associated with the SearchResult, or null if no
* ObjectClass could be created
- * @throws NamingException
+ * @throws NamingException
*/
private static LdapSyntax createSyntax( SearchResult sr ) throws NamingException
{
@@ -405,7 +399,7 @@
*/
private static String getOid( SearchResult sr ) throws NamingException
{
- Attribute at = sr.getAttributes().get( "m-oid" );
+ Attribute at = sr.getAttributes().get( MetaSchemaConstants.M_OID_AT );
if ( at == null )
{
return null;
@@ -431,7 +425,7 @@
{
List<String> names = new ArrayList<String>();
- Attribute at = sr.getAttributes().get( "m-name" );
+ Attribute at = sr.getAttributes().get( MetaSchemaConstants.M_NAME_AT );
if ( at != null )
{
NamingEnumeration<?> ne = at.getAll();
@@ -457,7 +451,7 @@
*/
private static String getDescription( SearchResult sr ) throws NamingException
{
- Attribute at = sr.getAttributes().get( "m-description" );
+ Attribute at = sr.getAttributes().get( MetaSchemaConstants.M_DESCRIPTION_AT );
if ( at == null )
{
@@ -482,7 +476,7 @@
*/
private static String getSuperior( SearchResult sr ) throws NamingException
{
- Attribute at = sr.getAttributes().get( "m-supAttributeType" );
+ Attribute at = sr.getAttributes().get( MetaSchemaConstants.M_SUP_ATTRIBUTE_TYPE_AT );
if ( at == null )
{
@@ -507,7 +501,7 @@
*/
private static UsageEnum getUsage( SearchResult sr ) throws NamingException
{
- Attribute at = sr.getAttributes().get( "m-usage" );
+ Attribute at = sr.getAttributes().get( MetaSchemaConstants.M_USAGE_AT );
if ( at == null )
{
@@ -543,7 +537,7 @@
*/
private static String getSyntax( SearchResult sr ) throws NamingException
{
- Attribute at = sr.getAttributes().get( "m-syntax" );
+ Attribute at = sr.getAttributes().get( MetaSchemaConstants.M_SYNTAX_AT );
if ( at == null )
{
@@ -568,7 +562,7 @@
*/
private static int getSyntaxLength( SearchResult sr ) throws NamingException
{
- Attribute at = sr.getAttributes().get( "m-length" );
+ Attribute at = sr.getAttributes().get( MetaSchemaConstants.M_LENGTH_AT );
if ( at == null )
{
@@ -600,7 +594,7 @@
*/
private static boolean isObsolete( SearchResult sr ) throws NamingException
{
- Attribute at = sr.getAttributes().get( "m-obsolete" );
+ Attribute at = sr.getAttributes().get( MetaSchemaConstants.M_OBSOLETE_AT );
if ( at == null )
{
@@ -625,7 +619,7 @@
*/
private static boolean isCollective( SearchResult sr ) throws NamingException
{
- Attribute at = sr.getAttributes().get( "m-collective" );
+ Attribute at = sr.getAttributes().get( MetaSchemaConstants.M_COLLECTIVE_AT );
if ( at == null )
{
@@ -650,7 +644,7 @@
*/
private static boolean isSingleValued( SearchResult sr ) throws NamingException
{
- Attribute at = sr.getAttributes().get( "m-singleValue" );
+ Attribute at = sr.getAttributes().get( MetaSchemaConstants.M_SINGLE_VALUE_AT );
if ( at == null )
{
@@ -675,7 +669,7 @@
*/
private static boolean isUserModifiable( SearchResult sr ) throws NamingException
{
- Attribute at = sr.getAttributes().get( "m-noUserModification" );
+ Attribute at = sr.getAttributes().get( MetaSchemaConstants.M_NO_USER_MODIFICATION_AT );
if ( at == null )
{
@@ -700,7 +694,7 @@
*/
private static String getEquality( SearchResult sr ) throws NamingException
{
- Attribute at = sr.getAttributes().get( "m-equality" );
+ Attribute at = sr.getAttributes().get( MetaSchemaConstants.M_EQUALITY_AT );
if ( at == null )
{
@@ -725,7 +719,7 @@
*/
private static String getOrdering( SearchResult sr ) throws NamingException
{
- Attribute at = sr.getAttributes().get( "m-ordering" );
+ Attribute at = sr.getAttributes().get( MetaSchemaConstants.M_ORDERING_AT );
if ( at == null )
{
@@ -750,7 +744,7 @@
*/
private static String getSubstring( SearchResult sr ) throws NamingException
{
- Attribute at = sr.getAttributes().get( "m-substr" );
+ Attribute at = sr.getAttributes().get( MetaSchemaConstants.M_SUBSTR_AT );
if ( at == null )
{
@@ -777,7 +771,7 @@
{
List<String> names = new ArrayList<String>();
- Attribute at = sr.getAttributes().get( "m-supObjectClass" );
+ Attribute at = sr.getAttributes().get( MetaSchemaConstants.M_SUP_OBJECT_CLASS_AT );
if ( at != null )
{
NamingEnumeration<?> ne = at.getAll();
@@ -803,7 +797,7 @@
*/
private static ObjectClassTypeEnum getType( SearchResult sr ) throws NamingException
{
- Attribute at = sr.getAttributes().get( "m-typeObjectClass" );
+ Attribute at = sr.getAttributes().get( MetaSchemaConstants.M_TYPE_OBJECT_CLASS_AT );
if ( at == null )
{
@@ -841,7 +835,7 @@
{
List<String> names = new ArrayList<String>();
- Attribute at = sr.getAttributes().get( "m-may" );
+ Attribute at = sr.getAttributes().get( MetaSchemaConstants.M_MAY_AT );
if ( at != null )
{
NamingEnumeration<?> ne = at.getAll();
@@ -869,7 +863,7 @@
{
List<String> names = new ArrayList<String>();
- Attribute at = sr.getAttributes().get( "m-must" );
+ Attribute at = sr.getAttributes().get( MetaSchemaConstants.M_MUST_AT );
if ( at != null )
{
NamingEnumeration<?> ne = at.getAll();
@@ -895,7 +889,7 @@
*/
private static boolean isHumanReadable( SearchResult sr ) throws NamingException
{
- Attribute at = sr.getAttributes().get( "x-humanReadable" );
+ Attribute at = sr.getAttributes().get( MetaSchemaConstants.X_NOT_HUMAN_READABLE_AT );
if ( at == null )
{
@@ -903,7 +897,17 @@
}
else
{
- return Boolean.parseBoolean( ( String ) at.get() );
+ return !Boolean.parseBoolean( ( String ) at.get() );
}
}
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void exportSchema( Project project, StudioProgressMonitor monitor )
+ throws SchemaConnectorException
+ {
+ // TODO Auto-generated method stub
+ }
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
index f9528b8..c0dba33 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.model.io;
@@ -30,9 +30,13 @@
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
+import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.parsers.AttributeTypeDescriptionSchemaParser;
import org.apache.directory.shared.ldap.model.schema.parsers.LdapSyntaxDescriptionSchemaParser;
@@ -44,7 +48,10 @@
import org.apache.directory.studio.connection.core.Connection.ReferralHandlingMethod;
import org.apache.directory.studio.connection.core.Utils;
import org.apache.directory.studio.connection.core.io.ConnectionWrapper;
+import org.apache.directory.studio.schemaeditor.PluginUtils;
+import org.apache.directory.studio.schemaeditor.model.Project;
import org.apache.directory.studio.schemaeditor.model.Schema;
+import org.eclipse.osgi.util.NLS;
/**
@@ -61,56 +68,60 @@
/**
* {@inheritDoc}
*/
- public void exportSchema( Connection connection, StudioProgressMonitor monitor )
+ public void importSchema( Project project, StudioProgressMonitor monitor )
+ throws SchemaConnectorException
{
- // TODO Auto-generated method stub
- }
-
-
- /**
- * {@inheritDoc}
- */
- public List<Schema> importSchema( Connection connection, StudioProgressMonitor monitor )
- {
- List<Schema> schemas = new ArrayList<Schema>();
-
- ConnectionWrapper wrapper = connection.getConnectionWrapper();
-
monitor.beginTask( Messages.getString( "GenericSchemaConnector.FetchingSchema" ), 1 ); //$NON-NLS-1$
+ List<Schema> schemas = new ArrayList<Schema>();
+ project.setInitialSchema( schemas );
+ ConnectionWrapper wrapper = project.getConnection().getConnectionWrapper();
SearchControls constraintSearch = new SearchControls();
constraintSearch.setSearchScope( SearchControls.OBJECT_SCOPE );
constraintSearch.setReturningAttributes( new String[]
- { "attributeTypes", "objectClasses", "ldapSyntaxes", "matchingRules" } );
- String schemaDn = getSubschemaSubentry( connection, monitor );
+ {
+ SchemaConstants.ATTRIBUTE_TYPES_AT,
+ SchemaConstants.COMPARATORS_AT,
+ SchemaConstants.DIT_CONTENT_RULES_AT,
+ SchemaConstants.DIT_STRUCTURE_RULES_AT,
+ SchemaConstants.LDAP_SYNTAXES_AT,
+ SchemaConstants.MATCHING_RULES_AT,
+ SchemaConstants.MATCHING_RULE_USE_AT,
+ SchemaConstants.NAME_FORMS_AT,
+ SchemaConstants.NORMALIZERS_AT,
+ SchemaConstants.OBJECT_CLASSES_AT,
+ SchemaConstants.SYNTAX_CHECKERS_AT
+ } );
+ String schemaDn = getSubschemaSubentry( wrapper, monitor );
NamingEnumeration<SearchResult> answer = wrapper.search( schemaDn, "(objectclass=subschema)", constraintSearch,
- DEREF_ALIAS_METHOD, HANDLE_REFERALS_METHOD, null, ( StudioProgressMonitor ) monitor, null );
+ DEREF_ALIAS_METHOD, HANDLE_REFERALS_METHOD, null, monitor, null );
if ( answer != null )
{
try
{
+ // Looping the results
while ( answer.hasMore() )
{
- SearchResult searchResult = ( SearchResult ) answer.next();
- try
- {
- schemas.add( getSchema( wrapper, searchResult, monitor ) );
- }
- catch ( Exception e )
- {
- monitor.reportError( e );
- }
+ // Creating the schema
+ Schema schema = new Schema( "schema" ); //$NON-NLS-1$
+ schema.setProject( project );
+ schemas.add( schema );
+
+ getSchema( schema, wrapper, answer.next(), monitor );
}
+
}
- catch ( NamingException e )
+ catch ( SchemaConnectorException e )
{
- monitor.reportError( e );
+ throw e;
+ }
+ catch ( Exception e )
+ {
+ throw new SchemaConnectorException( e );
}
}
monitor.worked( 1 );
-
- return schemas;
}
@@ -119,14 +130,12 @@
*/
public boolean isSuitableConnector( Connection connection, StudioProgressMonitor monitor )
{
- return getSubschemaSubentry( connection, monitor ) != null;
+ return getSubschemaSubentry( connection.getConnectionWrapper(), monitor ) != null;
}
- private static String getSubschemaSubentry( Connection connection, StudioProgressMonitor monitor )
+ private static String getSubschemaSubentry( ConnectionWrapper wrapper, StudioProgressMonitor monitor )
{
- ConnectionWrapper wrapper = connection.getConnectionWrapper();
-
SearchControls constraintSearch = new SearchControls();
constraintSearch.setSearchScope( SearchControls.OBJECT_SCOPE );
constraintSearch.setReturningAttributes( new String[]
@@ -141,7 +150,7 @@
{
if ( answer.hasMore() )
{
- SearchResult searchResult = ( SearchResult ) answer.next();
+ SearchResult searchResult = answer.next();
Attribute subschemaSubentryAttribute = searchResult.getAttributes().get( "subschemaSubentry" );
if ( subschemaSubentryAttribute == null )
@@ -177,11 +186,11 @@
}
- private static Schema getSchema( ConnectionWrapper wrapper, SearchResult searchResult,
- StudioProgressMonitor monitor ) throws NamingException, ParseException
+ private static void getSchema( Schema schema, ConnectionWrapper wrapper, SearchResult searchResult,
+ StudioProgressMonitor monitor ) throws NamingException, SchemaConnectorException
{
- // Creating the schema
- Schema schema = new Schema( "schema" ); //$NON-NLS-1$
+ // The counter for parser exceptions
+ int parseErrorCount = 0;
Attribute attributeTypesAttribute = searchResult.getAttributes().get( "attributeTypes" );
if ( attributeTypesAttribute != null )
@@ -192,33 +201,44 @@
while ( ne.hasMoreElements() )
{
String value = ( String ) ne.nextElement();
- AttributeTypeDescriptionSchemaParser parser = new AttributeTypeDescriptionSchemaParser();
- parser.setQuirksMode( true );
- AttributeType atd = parser.parseAttributeTypeDescription( value );
- AttributeType impl = new AttributeType( atd.getOid() );
- impl.setNames( atd.getNames().toArray( new String[0] ) );
- impl.setDescription( atd.getDescription() );
- impl.setSuperiorOid( atd.getSuperiorOid() );
- impl.setUsage( atd.getUsage() );
- impl.setSyntaxOid( atd.getSyntaxOid() );
- impl.setSyntaxLength( atd.getSyntaxLength() );
- impl.setObsolete( atd.isObsolete() );
- impl.setCollective( atd.isCollective() );
- impl.setSingleValued( atd.isSingleValued() );
- impl.setUserModifiable( atd.isUserModifiable() );
- impl.setEqualityOid( atd.getEqualityOid() );
- impl.setOrderingOid( atd.getOrderingOid() );
- impl.setSubstringOid( atd.getSubstringOid() );
- impl.setSchemaName( schema.getSchemaName() );
-
- // Active Directory hack
- if ( impl.getSyntaxOid() != null && "OctetString".equalsIgnoreCase( impl.getSyntaxOid() ) ) //$NON-NLS-1$
+ try
{
- impl.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.40" );
- }
+ AttributeTypeDescriptionSchemaParser parser = new AttributeTypeDescriptionSchemaParser();
+ parser.setQuirksMode( true );
- schema.addAttributeType( impl );
+ AttributeType atd = parser.parseAttributeTypeDescription( value );
+
+ MutableAttributeType impl = new MutableAttributeType( atd.getOid() );
+ impl.setNames( atd.getNames().toArray( new String[0] ) );
+ impl.setDescription( atd.getDescription() );
+ impl.setSuperiorOid( atd.getSuperiorOid() );
+ impl.setUsage( atd.getUsage() );
+ impl.setSyntaxOid( atd.getSyntaxOid() );
+ impl.setSyntaxLength( atd.getSyntaxLength() );
+ impl.setObsolete( atd.isObsolete() );
+ impl.setCollective( atd.isCollective() );
+ impl.setSingleValued( atd.isSingleValued() );
+ impl.setUserModifiable( atd.isUserModifiable() );
+ impl.setEqualityOid( atd.getEqualityOid() );
+ impl.setOrderingOid( atd.getOrderingOid() );
+ impl.setSubstringOid( atd.getSubstringOid() );
+ impl.setSchemaName( schema.getSchemaName() );
+
+ // Active Directory hack
+ if ( impl.getSyntaxOid() != null && "OctetString".equalsIgnoreCase( impl.getSyntaxOid() ) ) //$NON-NLS-1$
+ {
+ impl.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.40" );
+ }
+
+ schema.addAttributeType( impl );
+ }
+ catch ( ParseException e )
+ {
+ // Logging the exception and incrementing the counter
+ PluginUtils.logError( "Unable to parse the attribute type.", e );
+ parseErrorCount++;
+ }
}
}
}
@@ -232,21 +252,31 @@
while ( ne.hasMoreElements() )
{
String value = ( String ) ne.nextElement();
- ObjectClassDescriptionSchemaParser parser = new ObjectClassDescriptionSchemaParser();
- parser.setQuirksMode( true );
- ObjectClass ocd = parser.parseObjectClassDescription( value );
- ObjectClass impl = new ObjectClass( ocd.getOid() );
- impl.setNames( ocd.getNames().toArray( new String[0] ) );
- impl.setDescription( ocd.getDescription() );
- impl.setSuperiorOids( ocd.getSuperiorOids() );
- impl.setType( ocd.getType() );
- impl.setObsolete( ocd.isObsolete() );
- impl.setMustAttributeTypeOids( ocd.getMustAttributeTypeOids() );
- impl.setMayAttributeTypeOids( ocd.getMayAttributeTypeOids() );
- impl.setSchemaName( schema.getSchemaName() );
+ try
+ {
+ ObjectClassDescriptionSchemaParser parser = new ObjectClassDescriptionSchemaParser();
+ parser.setQuirksMode( true );
+ ObjectClass ocd = parser.parseObjectClassDescription( value );
- schema.addObjectClass( impl );
+ MutableObjectClass impl = new MutableObjectClass( ocd.getOid() );
+ impl.setNames( ocd.getNames().toArray( new String[0] ) );
+ impl.setDescription( ocd.getDescription() );
+ impl.setSuperiorOids( ocd.getSuperiorOids() );
+ impl.setType( ocd.getType() );
+ impl.setObsolete( ocd.isObsolete() );
+ impl.setMustAttributeTypeOids( ocd.getMustAttributeTypeOids() );
+ impl.setMayAttributeTypeOids( ocd.getMayAttributeTypeOids() );
+ impl.setSchemaName( schema.getSchemaName() );
+
+ schema.addObjectClass( impl );
+ }
+ catch ( ParseException e )
+ {
+ // Logging the exception and incrementing the counter
+ PluginUtils.logError( "Unable to parse the object class.", e );
+ parseErrorCount++;
+ }
}
}
}
@@ -260,22 +290,33 @@
while ( ne.hasMoreElements() )
{
String value = ( String ) ne.nextElement();
- LdapSyntaxDescriptionSchemaParser parser = new LdapSyntaxDescriptionSchemaParser();
- parser.setQuirksMode( true );
- LdapSyntax lsd = parser.parseLdapSyntaxDescription( value );
- LdapSyntax impl = new LdapSyntax( lsd.getOid() );
- impl.setDescription( lsd.getDescription() );
- impl.setNames( new String[]
- { lsd.getDescription() } );
- //impl.setObsolete( lsd.isObsolete() );
- impl.setHumanReadable( true );
- impl.setSchemaName( schema.getSchemaName() );
+ try
+ {
+ LdapSyntaxDescriptionSchemaParser parser = new LdapSyntaxDescriptionSchemaParser();
+ parser.setQuirksMode( true );
+ LdapSyntax lsd = parser.parseLdapSyntaxDescription( value );
- schema.addSyntax( impl );
+ LdapSyntax impl = new LdapSyntax( lsd.getOid() );
+ impl.setDescription( lsd.getDescription() );
+ impl.setNames( new String[]
+ { lsd.getDescription() } );
+ //impl.setObsolete( lsd.isObsolete() );
+ impl.setHumanReadable( true );
+ impl.setSchemaName( schema.getSchemaName() );
+
+ schema.addSyntax( impl );
+ }
+ catch ( ParseException e )
+ {
+ // Logging the exception and incrementing the counter
+ PluginUtils.logError( "Unable to parse the syntax.", e );
+ parseErrorCount++;
+ }
}
}
}
+
// if online: assume all received syntaxes in attributes are valid -> create dummy syntaxes if missing
for ( AttributeType at : schema.getAttributeTypes() )
{
@@ -301,21 +342,32 @@
while ( ne.hasMoreElements() )
{
String value = ( String ) ne.nextElement();
- MatchingRuleDescriptionSchemaParser parser = new MatchingRuleDescriptionSchemaParser();
- parser.setQuirksMode( true );
- MatchingRule mrd = parser.parseMatchingRuleDescription( value );
- MatchingRule impl = new MatchingRule( mrd.getOid() );
- impl.setDescription( mrd.getDescription() );
- impl.setNames( mrd.getNames().toArray( new String[0] ) );
- impl.setObsolete( mrd.isObsolete() );
- impl.setSyntaxOid( mrd.getSyntaxOid() );
- impl.setSchemaName( schema.getSchemaName() );
+ try
+ {
+ MatchingRuleDescriptionSchemaParser parser = new MatchingRuleDescriptionSchemaParser();
+ parser.setQuirksMode( true );
+ MatchingRule mrd = parser.parseMatchingRuleDescription( value );
- schema.addMatchingRule( impl );
+ MutableMatchingRule impl = new MutableMatchingRule( mrd.getOid() );
+ impl.setDescription( mrd.getDescription() );
+ impl.setNames( mrd.getNames().toArray( new String[0] ) );
+ impl.setObsolete( mrd.isObsolete() );
+ impl.setSyntaxOid( mrd.getSyntaxOid() );
+ impl.setSchemaName( schema.getSchemaName() );
+
+ schema.addMatchingRule( impl );
+ }
+ catch ( ParseException e )
+ {
+ // Logging the exception and incrementing the counter
+ PluginUtils.logError( "Unable to parse the matching rule.", e );
+ parseErrorCount++;
+ }
}
}
}
+
// if online: assume all received matching rules in attributes are valid -> create dummy matching rules if missing
for ( AttributeType at : schema.getAttributeTypes() )
{
@@ -325,7 +377,22 @@
checkMatchingRules( schema, equalityName, orderingName, substrName );
}
- return schema;
+ // Showing an error
+ if ( parseErrorCount > 0 )
+ {
+ if ( parseErrorCount == 1 )
+ {
+ throw new SchemaConnectorException(
+ Messages.getString( "GenericSchemaConnector.OneSchemaElementCouldNotBeParsedError" ) ); //$NON-NLS-1$
+
+ }
+ else
+ {
+ throw new SchemaConnectorException( NLS.bind(
+ Messages.getString( "GenericSchemaConnector.MultipleSchemaElementsCouldNotBeParsedError" ), //$NON-NLS-1$
+ parseErrorCount ) );
+ }
+ }
}
@@ -345,4 +412,13 @@
}
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public void exportSchema( Project project, StudioProgressMonitor monitor )
+ throws SchemaConnectorException
+ {
+ // TODO Auto-generated method stub
+ }
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java
index f110119..4920424 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.model.io;
@@ -30,6 +30,8 @@
import java.util.regex.MatchResult;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.parsers.OpenLdapSchemaParser;
import org.apache.directory.studio.schemaeditor.model.Schema;
@@ -103,7 +105,7 @@
List<?> ocs = parser.getObjectClassTypes();
for ( int i = 0; i < ocs.size(); i++ )
{
- ObjectClass oc = convertObjectClass( ( ObjectClass ) ocs.get( i ) );
+ MutableObjectClass oc = convertObjectClass( ( ObjectClass ) ocs.get( i ) );
oc.setSchemaName( schemaName );
schema.addObjectClass( oc );
}
@@ -144,7 +146,7 @@
*/
private static final AttributeType convertAttributeType( AttributeType at )
{
- AttributeType newAT = new AttributeType( at.getOid() );
+ MutableAttributeType newAT = new MutableAttributeType( at.getOid() );
newAT.setNames( at.getNames() );
newAT.setDescription( at.getDescription() );
newAT.setSuperiorOid( at.getSuperiorOid() );
@@ -171,9 +173,9 @@
* @return
* the corresponding ObjectClassImpl
*/
- private static final ObjectClass convertObjectClass( ObjectClass oc )
+ private static final MutableObjectClass convertObjectClass( ObjectClass oc )
{
- ObjectClass newOC = new ObjectClass( oc.getOid() );
+ MutableObjectClass newOC = new MutableObjectClass( oc.getOid() );
newOC.setNames( oc.getNames() );
newOC.setDescription( oc.getDescription() );
newOC.setSuperiorOids( oc.getSuperiorOids() );
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsExporter.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsExporter.java
index e1ed601..7985609 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsExporter.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsExporter.java
@@ -136,7 +136,7 @@
// Schema Backup
Element schemaBackupElement = element.addElement( SCHEMA_BACKUP_TAG );
- List<Schema> backupSchemas = project.getSchemaBackup();
+ List<Schema> backupSchemas = project.getInitialSchema();
if ( backupSchemas != null )
{
XMLSchemaFileExporter.addSchemas( backupSchemas.toArray( new Schema[0] ), schemaBackupElement );
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsImporter.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsImporter.java
index f96fe72..f6413ea 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsImporter.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsImporter.java
@@ -242,7 +242,7 @@
throw new ProjectsImportException( Messages.getString( "ProjectsImporter.NotConvertableSchema" ) ); //$NON-NLS-1$
}
- project.setSchemaBackup( Arrays.asList( schemas ) );
+ project.setInitialSchema( Arrays.asList( schemas ) );
}
}
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/SchemaConnector.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/SchemaConnector.java
index b14e8f7..f41d9c7 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/SchemaConnector.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/SchemaConnector.java
@@ -20,11 +20,9 @@
package org.apache.directory.studio.schemaeditor.model.io;
-import java.util.List;
-
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
-import org.apache.directory.studio.schemaeditor.model.Schema;
+import org.apache.directory.studio.schemaeditor.model.Project;
/**
@@ -50,29 +48,31 @@
/**
- * Imports the Schema of the LDAP Server using the given connection and
+ * Imports the Schema of the LDAP Server using the given project and
* progress monitor.
*
- * @param connection
- * the connection
+ * @param project
+ * the project
* @param monitor
* the progress monitor
- * @return
- * the list of schemas of the LDAP Server
+ * @throws SchemaConnectorException
*/
- public List<Schema> importSchema( Connection connection, StudioProgressMonitor monitor );
+ public void importSchema( Project project, StudioProgressMonitor monitor )
+ throws SchemaConnectorException;
/**
* Exports the Schema to the LDAP Server using the given connection and
* progress monitor.
*
- * @param connection
- * the connection
+ * @param project
+ * the project
* @param monitor
* the progress monitor
+ * @throws SchemaConnectorException
*/
- public void exportSchema( Connection connection, StudioProgressMonitor monitor );
+ public void exportSchema( Project project, StudioProgressMonitor monitor )
+ throws SchemaConnectorException;
/**
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/AttributeTypeAdapter.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/SchemaConnectorException.java
similarity index 61%
rename from plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/AttributeTypeAdapter.java
rename to plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/SchemaConnectorException.java
index 9b1b607..cfaba7f 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/AttributeTypeAdapter.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/SchemaConnectorException.java
@@ -17,32 +17,39 @@
* under the License.
*
*/
-package org.apache.directory.studio.schemaeditor.controller;
+package org.apache.directory.studio.schemaeditor.model.io;
/**
- * This adapter class provides default implementations for the methods
- * described by the AttributeTypeListener interface.
- * <p>
- * Classes that wish to deal with attribute type events can extend this class
- * and override only the methods which they are interested in.
+ * This class represents the SchemaConnectorException.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class AttributeTypeAdapter implements AttributeTypeListener
+public class SchemaConnectorException extends Exception
{
- /**
- * {@inheritDoc}
- */
- public void attributeTypeModified()
+ private static final long serialVersionUID = 1L;
+
+
+ public SchemaConnectorException()
{
+ super();
}
- /**
- * {@inheritDoc}
- */
- public void attributeTypeRemoved()
+ public SchemaConnectorException( String message, Throwable throwable )
{
+ super( message, throwable );
+ }
+
+
+ public SchemaConnectorException( String message )
+ {
+ super( message );
+ }
+
+
+ public SchemaConnectorException( Throwable throwable )
+ {
+ super( throwable );
}
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
index 4a5d07a..7a72d0e 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.model.io;
@@ -28,6 +28,7 @@
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
import org.apache.directory.shared.ldap.model.schema.UsageEnum;
@@ -91,7 +92,7 @@
* the schema to convert
* @return
* the corresponding source code representation
- * @throws IOException
+ * @throws IOException
*/
public static String toXml( Schema schema ) throws IOException
{
@@ -124,7 +125,7 @@
* the array of schemas to convert
* @return
* the corresponding source code representation
- * @throws IOException
+ * @throws IOException
*/
public static String toXml( Schema[] schemas ) throws IOException
{
@@ -185,7 +186,7 @@
Element element = branch.addElement( SCHEMA_TAG );
if ( schema != null )
{
- // Name
+ // Name
String name = schema.getSchemaName();
if ( ( name != null ) && ( !name.equals( "" ) ) ) //$NON-NLS-1$
{
@@ -204,7 +205,7 @@
}
// Object Classes
- List<ObjectClass> ocs = schema.getObjectClasses();
+ List<MutableObjectClass> ocs = schema.getObjectClasses();
if ( ( ocs != null ) && ( ocs.size() >= 1 ) )
{
Element objectClassesNode = element.addElement( OBJECT_CLASSES_TAG );
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java
index 63cbd80..31d6f0e 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.model.io;
@@ -26,10 +26,10 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
-import org.apache.directory.shared.ldap.model.schema.ObjectClass;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
import org.apache.directory.shared.ldap.model.schema.UsageEnum;
import org.apache.directory.studio.schemaeditor.model.Schema;
@@ -279,7 +279,7 @@
* the element
* @param schema
* the schema
- * @throws XMLSchemaFileImportException
+ * @throws XMLSchemaFileImportException
*/
private static void readAttributeTypes( Element element, Schema schema ) throws XMLSchemaFileImportException
{
@@ -304,13 +304,13 @@
*/
private static void readAttributeType( Element element, Schema schema ) throws XMLSchemaFileImportException
{
- AttributeType at = null;
+ MutableAttributeType at = null;
// OID
Attribute oidAttribute = element.attribute( OID_TAG );
if ( ( oidAttribute != null ) && ( !oidAttribute.getValue().equals( "" ) ) ) //$NON-NLS-1$
{
- at = new AttributeType( oidAttribute.getValue() );
+ at = new MutableAttributeType( oidAttribute.getValue() );
}
else
{
@@ -448,7 +448,7 @@
* the element
* @param schema
* the schema
- * @throws XMLSchemaFileImportException
+ * @throws XMLSchemaFileImportException
*/
private static void readObjectClasses( Element element, Schema schema ) throws XMLSchemaFileImportException
{
@@ -470,17 +470,17 @@
* the element
* @param schema
* the schema
- * @throws XMLSchemaFileImportException
+ * @throws XMLSchemaFileImportException
*/
private static void readObjectClass( Element element, Schema schema ) throws XMLSchemaFileImportException
{
- ObjectClass oc = null;
+ MutableObjectClass oc = null;
// OID
Attribute oidAttribute = element.attribute( OID_TAG );
if ( ( oidAttribute != null ) && ( !oidAttribute.getValue().equals( "" ) ) ) //$NON-NLS-1$
{
- oc = new ObjectClass( oidAttribute.getValue() );
+ oc = new MutableObjectClass( oidAttribute.getValue() );
}
else
{
@@ -595,7 +595,7 @@
* the element
* @param schema
* the schema
- * @throws XMLSchemaFileImportException
+ * @throws XMLSchemaFileImportException
*/
private static void readMatchingRules( Element element, Schema schema ) throws XMLSchemaFileImportException
{
@@ -621,13 +621,13 @@
*/
private static void readMatchingRule( Element element, Schema schema ) throws XMLSchemaFileImportException
{
- MatchingRule mr = null;
+ MutableMatchingRule mr = null;
// OID
Attribute oidAttribute = element.attribute( OID_TAG );
if ( ( oidAttribute != null ) && ( !oidAttribute.getValue().equals( "" ) ) ) //$NON-NLS-1$
{
- mr = new MatchingRule( oidAttribute.getValue() );
+ mr = new MutableMatchingRule( oidAttribute.getValue() );
}
else
{
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages.properties
index e22235a..c6d1585 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages.properties
@@ -15,7 +15,10 @@
# specific language governing permissions and limitations
# under the License.
+ApacheDsSchemaConnector.FetchingSchema=Fetching Schema
GenericSchemaConnector.FetchingSchema=Fetching Schema
+GenericSchemaConnector.OneSchemaElementCouldNotBeParsedError=One schema element could not be parsed correctly and has been ignored.
+GenericSchemaConnector.MultipleSchemaElementsCouldNotBeParsedError={0} schema elements could not be parsed correctly and have been ignored.
OpenLdapSchemaFileImporter.ErrorMessage=Line\: {0}, column\: {1}, cause\: {2}
OpenLdapSchemaFileImporter.NotReadCorrectly=The file "{0}" can not be read correctly.
ProjectsImporter.NoSchemaConnectorIDFound=The parser was not able to find the SchemaConnector with ID "{0}".
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages_de.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages_de.properties
index c865879..071f3c0 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages_de.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages_de.properties
@@ -15,7 +15,10 @@
# specific language governing permissions and limitations
# under the License.
+ApacheDsSchemaConnector.FetchingSchema=Lese Schema
GenericSchemaConnector.FetchingSchema=Lese Schema
+GenericSchemaConnector.OneSchemaElementCouldNotBeParsedError=TODO:One schema element could not be parsed correctly and has been ignored.
+GenericSchemaConnector.MultipleSchemaElementsCouldNotBeParsedError=TODO:{0} schema elements could not be parsed correctly and have been ignored.
OpenLdapSchemaFileImporter.ErrorMessage=Zeile\: {0}, Spalte\: {1}, Grund\: {2}
OpenLdapSchemaFileImporter.NotReadCorrectlyBegin=Die Datei "{0}" konnte nicht korrekt gelesen werden.
ProjectsImporter.NoSchemaConnectorIDFound=Der Parser war nicht in der Lage, den SchemaConnector mit der OID "{0}" zu finden.
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages_fr.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages_fr.properties
index 80c3e62..9fe9e25 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages_fr.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages_fr.properties
@@ -15,7 +15,10 @@
# specific language governing permissions and limitations
# under the License.
+ApacheDsSchemaConnector.FetchingSchema=R\u00E9cup\u00E9ration du sch\u00E9ma
GenericSchemaConnector.FetchingSchema=R\u00E9cup\u00E9ration du sch\u00E9ma
+GenericSchemaConnector.OneSchemaElementCouldNotBeParsedError=Un \u00E9l\u00E9ment de sch\u00E9ma n'a pu \u00EAtre correctement lu et a \u00E9t\u00E9 ignor\u00E9.
+GenericSchemaConnector.MultipleSchemaElementsCouldNotBeParsedError={0} \u00E9l\u00E9ments de sch\u00E9ma n'ont pu \u00EAtre correctement lus et ont \u00E9t\u00E9 ignor\u00E9s.
OpenLdapSchemaFileImporter.ErrorMessage=Ligne : {0}, colonne : {1}, cause : {2}
OpenLdapSchemaFileImporter.NotReadCorrectly=Le fichier "{0}" ne peut pas \u00EAtre lu.
ProjectsImporter.NoSchemaConnectorIDFound=Le parseur n'a pas \u00E9t\u00E9 capable de trouver le SchemaConnector avec l'ID "{0}".
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaCheckerElement.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NoAliasWarning.java
similarity index 71%
copy from plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaCheckerElement.java
copy to plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NoAliasWarning.java
index fd255ba..32c5124 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaCheckerElement.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NoAliasWarning.java
@@ -24,17 +24,33 @@
/**
- * Common interface for the all the schema errors.
+ * This class represents the NoAliasWarning.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface SchemaCheckerElement
+public class NoAliasWarning implements SchemaWarning
{
+ /** The source object */
+ private SchemaObject source;
+
+
/**
- * Gets the source object.
- *
- * @return
+ * Creates a new instance of NoAliasWarning.
+ *
+ * @param source
* the source object
*/
- public SchemaObject getSource();
+ public NoAliasWarning( SchemaObject source )
+ {
+ this.source = source;
+ }
+
+
+ /**
+ * {@inheritDoc
+ */
+ public SchemaObject getSource()
+ {
+ return source;
+ }
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
index ef080b6..9f0f457 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
@@ -62,17 +62,20 @@
/** The schema manager */
private SchemaManager schemaManager;
- /** The errors List */
- private List<Throwable> errorsList;
+ /** The errors map */
+ private MultiMap errorsMap = new MultiValueMap();;
- /** The errors MultiMap */
- private MultiMap errorsMap;
+ /** The warnings list */
+ private List<SchemaWarning> warningsList = new ArrayList<SchemaWarning>();
+
+ /** The warnings map */
+ private MultiMap warningsMap = new MultiValueMap();;
/** The 'listening to modifications' flag*/
private boolean listeningToModifications = false;
/** The listeners List */
- private List<SchemaCheckerListener> listeners;
+ private List<SchemaCheckerListener> listeners = new ArrayList<SchemaCheckerListener>();
/** The SchemaHandlerListener */
private SchemaHandlerListener schemaHandlerListener = new SchemaHandlerAdapter()
@@ -147,6 +150,12 @@
recheckWholeSchema();
}
}
+
+
+ public void schemaRenamed( Schema schema )
+ {
+ // Nothing to do, this is a simple renaming
+ }
};
@@ -155,11 +164,6 @@
*/
private SchemaChecker()
{
- listeners = new ArrayList<SchemaCheckerListener>();
-
- schemaManager = new DefaultSchemaManager( new SchemaEditorSchemaLoader() );
- errorsMap = new MultiValueMap();
-
Activator.getDefault().getProjectsHandler().addListener( new ProjectsHandlerAdapter()
{
public void openProjectChanged( Project oldProject, Project newProject )
@@ -263,6 +267,7 @@
{
protected IStatus run( IProgressMonitor monitor )
{
+ // Checks the whole schema via the schema manager
try
{
schemaManager = new DefaultSchemaManager( new SchemaEditorSchemaLoader() );
@@ -274,9 +279,12 @@
e.printStackTrace();
}
- updateErrorsList();
+ // Updates errors and warnings
+ updateErrorsAndWarnings();
+ // Notify listeners
notifyListeners();
+
monitor.done();
return Status.OK_STATUS;
@@ -286,11 +294,28 @@
}
- private void updateErrorsList()
+ /**
+ * Updates the errors and warnings.
+ */
+ private void updateErrorsAndWarnings()
{
+ // Errors
errorsMap.clear();
- errorsList = schemaManager.getErrors();
- for ( Throwable error : errorsList )
+ indexErrors();
+
+ // Warnings
+ createWarnings();
+ warningsMap.clear();
+ indexWarnings();
+ }
+
+
+ /**
+ * Indexes the errors.
+ */
+ private void indexErrors()
+ {
+ for ( Throwable error : schemaManager.getErrors() )
{
if ( error instanceof LdapSchemaException )
{
@@ -325,6 +350,60 @@
/**
+ * Creates the warnings.
+ */
+ private void createWarnings()
+ {
+ // Clearing previous warnings
+ warningsList.clear();
+
+ // Getting the schema handler to check for schema objects without names (aliases)
+ SchemaHandler schemaHandler = Activator.getDefault().getSchemaHandler();
+
+ if ( schemaHandler != null )
+ {
+ // Checking attribute types
+ for ( AttributeType attributeType : schemaHandler.getAttributeTypes() )
+ {
+ checkSchemaObjectNames( attributeType );
+ }
+
+ // Checking object classes
+ for ( ObjectClass objectClass : schemaHandler.getObjectClasses() )
+ {
+ checkSchemaObjectNames( objectClass );
+ }
+ }
+ }
+
+
+ /**
+ * Checks the names of the given schema object.
+ *
+ * @param schemaObject the schema object to check
+ */
+ private void checkSchemaObjectNames( SchemaObject schemaObject )
+ {
+ if ( ( schemaObject.getNames() == null ) || ( schemaObject.getNames().size() == 0 ) )
+ {
+ warningsList.add( new NoAliasWarning( schemaObject ) );
+ }
+ }
+
+
+ /**
+ * Indexes the warnings.
+ */
+ private void indexWarnings()
+ {
+ for ( SchemaWarning warning : warningsList )
+ {
+ warningsMap.put( warning.getSource(), warning );
+ }
+ }
+
+
+ /**
* Gets the errors.
*
* @return
@@ -332,7 +411,14 @@
*/
public List<Throwable> getErrors()
{
- return errorsList;
+ if ( schemaManager != null )
+ {
+ return schemaManager.getErrors();
+ }
+ else
+ {
+ return new ArrayList<Throwable>();
+ }
}
@@ -342,10 +428,9 @@
* @return
* the warnings
*/
- public List<Object> getWarnings()
+ public List<SchemaWarning> getWarnings()
{
- // TODO
- return new ArrayList<Object>();
+ return warningsList;
}
@@ -433,10 +518,10 @@
* @return
* the associated warnings
*/
+ @SuppressWarnings("unchecked")
public List<Object> getWarnings( SchemaObject so )
{
- return new ArrayList<Object>();
- // return ( List<?> ) warningsMap.get( so );
+ return ( List<Object> ) warningsMap.get( so );
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaCheckerElement.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaWarning.java
similarity index 92%
rename from plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaCheckerElement.java
rename to plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaWarning.java
index fd255ba..2a03c6a 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaCheckerElement.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaWarning.java
@@ -24,11 +24,11 @@
/**
- * Common interface for the all the schema errors.
+ * This interface defines a schema warning.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface SchemaCheckerElement
+public interface SchemaWarning
{
/**
* Gets the source object.
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoader.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoader.java
index b8bda92..0422c0a 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoader.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoader.java
@@ -29,6 +29,7 @@
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.registries.AbstractSchemaLoader;
import org.apache.directory.shared.ldap.model.schema.registries.Schema;
@@ -222,7 +223,7 @@
{
for ( Schema schema : schemas )
{
- List<ObjectClass> objectClasses = project.getSchemaHandler().getSchema( schema.getSchemaName() )
+ List<MutableObjectClass> objectClasses = project.getSchemaHandler().getSchema( schema.getSchemaName() )
.getObjectClasses();
for ( ObjectClass objectClass : objectClasses )
{
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/ViewUtils.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/ViewUtils.java
index 4a2bee9..ce2e8bb 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/ViewUtils.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/ViewUtils.java
@@ -22,9 +22,9 @@
import java.util.List;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.ui.PlatformUI;
@@ -85,94 +85,73 @@
/**
- * Displays an Error Message Box with the given title and message.
+ * Displays an error message dialog with the given title and message.
*
- * @param title
- * the title of the window
- * @param message
- * the message to display
- * @return
- * the ID of the button that was selected to dismiss
- * the message box (e.g. SWT.OK, SWT.CANCEL, etc...)
+ * @param title the title of the window
+ * @param message the message to display
+ * @return <code>true</code> if the user presses the OK or Yes button,
+ * <code>false</code> otherwise
*/
- public static int displayErrorMessageBox( String title, String message )
+ public static boolean displayErrorMessageDialog( String title, String message )
{
- return displayMessageBox( SWT.OK | SWT.ICON_ERROR, title, message );
+ return displayMessageDialog( MessageDialog.ERROR, title, message );
}
/**
- * Displays a Information Message Box with the given title and message.
+ * Displays a warning message dialog with the given title and message.
*
- * @param title
- * the title of the window
- * @param message
- * the message to display
- * @return
- * the ID of the button that was selected to dismiss
- * the message box (e.g. SWT.OK, SWT.CANCEL, etc...)
+ * @param title the title of the window
+ * @param message the message to display
+ * @return <code>true</code> if the user presses the OK or Yes button,
+ * <code>false</code> otherwise
*/
- public static int displayWarningMessageBox( String title, String message )
+ public static boolean displayWarningMessageDialog( String title, String message )
{
- return displayMessageBox( SWT.OK | SWT.ICON_WARNING, title, message );
+ return displayMessageDialog( MessageDialog.WARNING, title, message );
}
/**
- * Displays a Information Message Box with the given title and message.
+ * Displays a information message dialog with the given title and message.
*
- * @param title
- * the title of the window
- * @param message
- * the message to display
- * @return
- * the ID of the button that was selected to dismiss
- * the message box (e.g. SWT.OK, SWT.CANCEL, etc...)
+ * @param title the title of the window
+ * @param message the message to display
+ * @return <code>true</code> if the user presses the OK or Yes button,
+ * <code>false</code> otherwise
*/
- public static int displayInformationMessageBox( String title, String message )
+ public static boolean displayInformationMessageDialog( String title, String message )
{
- return displayMessageBox( SWT.OK | SWT.ICON_INFORMATION, title, message );
+ return displayMessageDialog( MessageDialog.INFORMATION, title, message );
}
/**
- * Displays a Information Question Box with the given title and message.
- *
- * @param buttonStyle
- * the style of the buttons of the dialog (e.g. SWT.OK, SWT.CANCEL, etc...)
- * @param title
- * the title of the window
- * @param message
- * the message to display
- * @return
- * the ID of the button that was selected to dismiss
- * the message box (e.g. SWT.OK, SWT.CANCEL, etc...)
+ * Displays a Information Question message dialog with the given title and message.
+ *
+ * @param title the title of the window
+ * @param message the message to display
+ * @return <code>true</code> if the user presses the OK or Yes button,
+ * <code>false</code> otherwise
*/
- public static int displayQuestionMessageBox( int buttonStyle, String title, String message )
+ public static boolean displayQuestionMessageDialog( String title, String message )
{
- return displayMessageBox( SWT.ICON_QUESTION | buttonStyle, title, message );
+ return displayMessageDialog( MessageDialog.QUESTION, title, message );
}
/**
- * Displays a Message Box with the given style, title and message.
+ * Displays a message dialog with the given style, title and message.
*
- * @param style
- * the style of dialog
- * @param title
- * the title of the window
- * @param message
- * the message to display
- * @return
- * the ID of the button that was selected to dismiss
- * the message box (e.g. SWT.OK, SWT.CANCEL, etc...)
+ * @param kind the kind of dialog
+ * @param title the title of the window
+ * @param message the message to display
+ * @return <code>true</code> if the user presses the OK or Yes button,
+ * <code>false</code> otherwise
*/
- private static int displayMessageBox( int style, String title, String message )
+ private static boolean displayMessageDialog( int kind, String title, String message )
{
- MessageBox messageBox = new MessageBox( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), style );
- messageBox.setText( title );
- messageBox.setMessage( message );
- return messageBox.open();
+ return MessageDialog.open( kind, PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), title,
+ message, SWT.NONE );
}
-
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditAliasesDialog.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AbstractAliasesDialog.java
similarity index 85%
rename from plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditAliasesDialog.java
rename to plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AbstractAliasesDialog.java
index 0c73085..0c80475 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditAliasesDialog.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AbstractAliasesDialog.java
@@ -44,7 +44,6 @@
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
@@ -59,19 +58,16 @@
/**
- * This class implements the Manage Aliases Dialog.
+ * This class implements dialog to manage aliases.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class EditAliasesDialog extends Dialog
+public abstract class AbstractAliasesDialog extends Dialog
{
/** The aliases List */
- private List<String> initialLowerCasedAliases;
- private List<String> aliases;
- private List<String> lowerCasedAliases;
-
- /** The dirty flag */
- private boolean dirty = false;
+ private List<String> initialLowerCasedAliases = new ArrayList<String>();
+ private List<String> aliases = new ArrayList<String>();
+ private List<String> lowerCasedAliases = new ArrayList<String>();
/** The listener used to override the listerner on the RETURN key */
private Listener returnKeyListener = new Listener()
@@ -86,9 +82,6 @@
}
};
- /** The {@link Display} */
- private Display display;
-
// UI Fields
private Table aliasesTable;
private TableEditor tableEditor;
@@ -101,17 +94,13 @@
/**
- * Creates a new instance of EditAliasesDialog.
+ * Creates a new instance of AbstractAliasesDialog.
*
- * @param aliases
- * an array containing the aliases
+ * @param aliases an array of aliases
*/
- public EditAliasesDialog( List<String> aliases )
+ public AbstractAliasesDialog( List<String> aliases )
{
super( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell() );
- initialLowerCasedAliases = new ArrayList<String>();
- this.aliases = new ArrayList<String>();
- lowerCasedAliases = new ArrayList<String>();
if ( aliases != null )
{
for ( String alias : aliases )
@@ -121,8 +110,6 @@
lowerCasedAliases.add( Strings.toLowerCase( alias ) );
}
}
-
- display = Activator.getDefault().getWorkbench().getDisplay();
}
@@ -138,15 +125,15 @@
// Aliases Label
Label aliasesLabel = new Label( composite, SWT.NONE );
- aliasesLabel.setText( Messages.getString( "EditAliasesDialog.Aliases" ) ); //$NON-NLS-1$
+ aliasesLabel.setText( Messages.getString( "AbstractAliasesDialog.Aliases" ) ); //$NON-NLS-1$
aliasesLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, true, 2, 1 ) );
// Aliases Table
aliasesTable = new Table( composite, SWT.BORDER | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION
| SWT.HIDE_SELECTION );
GridData gridData = new GridData( SWT.FILL, SWT.FILL, true, true, 1, 3 );
- gridData.heightHint = 125;
- gridData.minimumHeight = 125;
+ gridData.heightHint = 90;
+ gridData.minimumHeight = 90;
gridData.widthHint = 200;
gridData.minimumWidth = 200;
aliasesTable.setLayoutData( gridData );
@@ -159,18 +146,18 @@
// Add Button
addButton = new Button( composite, SWT.PUSH );
- addButton.setText( Messages.getString( "EditAliasesDialog.Add" ) ); //$NON-NLS-1$
+ addButton.setText( Messages.getString( "AbstractAliasesDialog.Add" ) ); //$NON-NLS-1$
addButton.setLayoutData( new GridData( SWT.FILL, SWT.NONE, false, false ) );
// Edit Button
editButton = new Button( composite, SWT.PUSH );
- editButton.setText( Messages.getString( "EditAliasesDialog.Edit" ) ); //$NON-NLS-1$
+ editButton.setText( Messages.getString( "AbstractAliasesDialog.Edit" ) ); //$NON-NLS-1$
editButton.setLayoutData( new GridData( SWT.FILL, SWT.NONE, false, false ) );
editButton.setEnabled( false );
// Remove Button
removeButton = new Button( composite, SWT.PUSH );
- removeButton.setText( Messages.getString( "EditAliasesDialog.Remove" ) ); //$NON-NLS-1$
+ removeButton.setText( Messages.getString( "AbstractAliasesDialog.Remove" ) ); //$NON-NLS-1$
removeButton.setLayoutData( new GridData( SWT.FILL, SWT.NONE, false, false ) );
removeButton.setEnabled( false );
@@ -189,7 +176,7 @@
// Error Label
errorLabel = new Label( errorComposite, SWT.NONE );
errorLabel.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
- errorLabel.setText( Messages.getString( "EditAliasesDialog.ElementWithSameAliasExists" ) ); //$NON-NLS-1$
+ errorLabel.setText( getAliasAlreadyExistsErrorMessage() );
// Filling the Table with the given aliases
fillAliasesTable();
@@ -257,7 +244,7 @@
Menu menu = new Menu( getShell(), SWT.POP_UP );
aliasesTable.setMenu( menu );
MenuItem removeMenuItem = new MenuItem( menu, SWT.PUSH );
- removeMenuItem.setText( Messages.getString( "EditAliasesDialog.Remove" ) ); //$NON-NLS-1$
+ removeMenuItem.setText( Messages.getString( "AbstractAliasesDialog.Remove" ) ); //$NON-NLS-1$
removeMenuItem.setImage( PlatformUI.getWorkbench().getSharedImages().getImage( ISharedImages.IMG_TOOL_DELETE ) );
removeMenuItem.addListener( SWT.Selection, new Listener()
{
@@ -331,7 +318,6 @@
aliases.remove( item.getText() );
lowerCasedAliases.remove( Strings.toLowerCase( item.getText() ) );
}
- dirty = true;
}
@@ -343,7 +329,6 @@
TableItem item = new TableItem( aliasesTable, SWT.NONE );
item.setText( "" ); //$NON-NLS-1$
openTableEditor( item );
- dirty = true;
}
@@ -386,7 +371,7 @@
newEditor.selectAll();
newEditor.setFocus();
tableEditor.setEditor( newEditor, item, 0 );
- display.addFilter( SWT.Traverse, returnKeyListener );
+ Activator.getDefault().getWorkbench().getDisplay().addFilter( SWT.Traverse, returnKeyListener );
}
@@ -396,7 +381,7 @@
private void saveTableEditorText()
{
Text text = ( Text ) tableEditor.getEditor();
- if ( text != null )
+ if ( ( text != null ) && ( !text.isDisposed() ) )
{
TableItem item = tableEditor.getItem();
String oldText = item.getText();
@@ -411,7 +396,6 @@
lowerCasedAliases.add( Strings.toLowerCase( newText ) );
}
item.setText( newText );
- dirty = true;
}
}
checkAliases();
@@ -424,12 +408,12 @@
private void closeTableEditor()
{
Text text = ( Text ) tableEditor.getEditor();
- if ( text != null )
+ if ( ( text != null ) && ( !text.isDisposed() ) )
{
saveTableEditorText();
text.dispose();
}
- display.removeFilter( SWT.Traverse, returnKeyListener );
+ Activator.getDefault().getWorkbench().getDisplay().removeFilter( SWT.Traverse, returnKeyListener );
}
@@ -442,17 +426,19 @@
for ( String alias : aliases )
{
- if ( ( Activator.getDefault().getSchemaHandler().isAliasOrOidAlreadyTaken( alias ) )
+ if ( ( isAliasAlreadyTaken( alias ) )
&& ( !initialLowerCasedAliases.contains( Strings.toLowerCase( alias ) ) ) )
{
errorComposite.setVisible( true );
- errorLabel.setText( Messages.getString( "EditAliasesDialog.ElementWithSameAliasExists" ) ); //$NON-NLS-1$
+ errorLabel.setText( getAliasAlreadyExistsErrorMessage() );
+ return;
}
else if ( !PluginUtils.verifyName( alias ) )
{
errorComposite.setVisible( true );
- errorLabel.setText( NLS.bind( Messages.getString( "EditAliasesDialog.TheAliasBegin" ), new String[] //$NON-NLS-1$
+ errorLabel.setText( NLS.bind( Messages.getString( "AbstractAliasesDialog.InvalidAlias" ), new String[] //$NON-NLS-1$
{ alias } ) );
+ return;
}
}
}
@@ -464,7 +450,7 @@
protected void configureShell( Shell newShell )
{
super.configureShell( newShell );
- newShell.setText( Messages.getString( "EditAliasesDialog.EditAlias" ) ); //$NON-NLS-1$
+ newShell.setText( Messages.getString( "AbstractAliasesDialog.EditAlias" ) ); //$NON-NLS-1$
}
@@ -481,13 +467,18 @@
/**
- * Gets the Dirty flag of the dialog
+ * Gets the error message in the case where an identical alias already exists.
*
- * @return
- * the dirty flag of the dialog
+ * @return the error message
*/
- public boolean isDirty()
- {
- return dirty;
- }
+ protected abstract String getAliasAlreadyExistsErrorMessage();
+
+
+ /**
+ * Checks if the given alias is already taken.
+ *
+ * @return <code>true</code> if the given alias is already taken,
+ * <code>false</code> if not.
+ */
+ protected abstract boolean isAliasAlreadyTaken( String alias );
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AbstractRenameDialog.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AbstractRenameDialog.java
new file mode 100644
index 0000000..9411dd3
--- /dev/null
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AbstractRenameDialog.java
@@ -0,0 +1,187 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.studio.schemaeditor.view.dialogs;
+
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+
+
+/**
+ * This dialog is used to rename items like projects or schemas.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public abstract class AbstractRenameDialog extends Dialog
+{
+ /** The original name*/
+ private String originalName;
+
+ /** The new name */
+ private String newName;
+
+ // UI Fields
+ private Text newNameText;
+ private Composite errorComposite;
+ private Image errorImage;
+ private Label errorLabel;
+ private Button okButton;
+
+
+ /**
+ * Creates a new instance of AbstractRenameDialog.
+ *
+ * @param originalName
+ * the original name
+ */
+ public AbstractRenameDialog( String originalName )
+ {
+ super( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell() );
+ this.originalName = originalName;
+ this.newName = originalName;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void configureShell( Shell newShell )
+ {
+ super.configureShell( newShell );
+ newShell.setText( Messages.getString( "RenameProjectDialog.Rename" ) ); //$NON-NLS-1$
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected Control createDialogArea( Composite parent )
+ {
+ Composite composite = new Composite( parent, SWT.NONE );
+ composite.setLayout( new GridLayout( 2, false ) );
+ composite.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
+
+ // New Name
+ Label newNameLabel = new Label( composite, SWT.NONE );
+ newNameLabel.setText( Messages.getString( "AbstractRenameDialog.NewName" ) ); //$NON-NLS-1$
+ newNameText = new Text( composite, SWT.BORDER );
+ newNameText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
+ newNameText.setText( originalName );
+ newNameText.addModifyListener( new ModifyListener()
+ {
+ public void modifyText( ModifyEvent e )
+ {
+ // Getting the new name
+ newName = newNameText.getText();
+
+ if ( !newName.equalsIgnoreCase( originalName ) )
+ {
+ // Checking if the new is already taken
+ boolean checkNewName = isNewNameAlreadyTaken();
+
+ // Enabling (or not) the ok button and showing (or not) the error composite
+ okButton.setEnabled( !checkNewName );
+ errorComposite.setVisible( checkNewName );
+ }
+ else
+ {
+ // Enabling the ok button and showing the error composite
+ okButton.setEnabled( true );
+ errorComposite.setVisible( false );
+ }
+ }
+ } );
+
+ // Error Composite
+ errorComposite = new Composite( composite, SWT.NONE );
+ errorComposite.setLayout( new GridLayout( 2, false ) );
+ errorComposite.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true, 2, 1 ) );
+ errorComposite.setVisible( false );
+
+ // Error Image
+ errorImage = PlatformUI.getWorkbench().getSharedImages().getImage( ISharedImages.IMG_OBJS_ERROR_TSK );
+ Label label = new Label( errorComposite, SWT.NONE );
+ label.setImage( errorImage );
+ label.setSize( 16, 16 );
+
+ // Error Label
+ errorLabel = new Label( errorComposite, SWT.NONE );
+ errorLabel.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
+ errorLabel.setText( getErrorMessage() );
+
+ newNameText.setFocus();
+ newNameText.selectAll();
+
+ return composite;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void createButtonsForButtonBar( Composite parent )
+ {
+ createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false );
+ okButton = createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true );
+ }
+
+
+ /**
+ * Returns the new name.
+ *
+ * @return
+ * the new name
+ */
+ public String getNewName()
+ {
+ return newName;
+ }
+
+
+ /**
+ * Gets the error message.
+ *
+ * @return the error message
+ */
+ protected abstract String getErrorMessage();
+
+
+ /**
+ * Checks if the new name is already taken.
+ *
+ * @return <code>true</code> if the new name is already taken,
+ * <code>false</code> if not.
+ */
+ protected abstract boolean isNewNameAlreadyTaken();
+}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditAttributeTypeAliasesDialog.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditAttributeTypeAliasesDialog.java
new file mode 100644
index 0000000..e2b9c4d
--- /dev/null
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditAttributeTypeAliasesDialog.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.studio.schemaeditor.view.dialogs;
+
+
+import java.util.List;
+
+import org.apache.directory.studio.schemaeditor.Activator;
+import org.eclipse.swt.widgets.Shell;
+
+
+/**
+ * This dialog is used to edit aliases of an attribute type.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class EditAttributeTypeAliasesDialog extends AbstractAliasesDialog
+{
+ /**
+ * Creates a new instance of EditAttributeTypeAliasesDialog.
+ *
+ * @param aliases an array of aliases
+ */
+ public EditAttributeTypeAliasesDialog( List<String> aliases )
+ {
+ super( aliases );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void configureShell( Shell newShell )
+ {
+ super.configureShell( newShell );
+ newShell.setText( Messages.getString( "EditAttributeTypeAliasesDialog.EditAliases" ) ); //$NON-NLS-1$
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getAliasAlreadyExistsErrorMessage()
+ {
+ return Messages.getString( "EditAttributeTypeAliasesDialog.AliasAlreadyExists" ); //$NON-NLS-1$
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected boolean isAliasAlreadyTaken( String alias )
+ {
+ return Activator.getDefault().getSchemaHandler().isAliasAlreadyTakenForAttributeType( alias );
+ }
+}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditObjectClassAliasesDialog.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditObjectClassAliasesDialog.java
new file mode 100644
index 0000000..2384eae
--- /dev/null
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditObjectClassAliasesDialog.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.studio.schemaeditor.view.dialogs;
+
+
+import java.util.List;
+
+import org.apache.directory.studio.schemaeditor.Activator;
+import org.eclipse.swt.widgets.Shell;
+
+
+/**
+ * This dialog is used to edit aliases of an object class.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class EditObjectClassAliasesDialog extends AbstractAliasesDialog
+{
+ /**
+ * Creates a new instance of EditObjectClassAliasesDialog.
+ *
+ * @param aliases an array of aliases
+ */
+ public EditObjectClassAliasesDialog( List<String> aliases )
+ {
+ super( aliases );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void configureShell( Shell newShell )
+ {
+ super.configureShell( newShell );
+ newShell.setText( Messages.getString( "EditObjectClassAliasesDialog.EditAliases" ) ); //$NON-NLS-1$
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getAliasAlreadyExistsErrorMessage()
+ {
+ return Messages.getString( "EditObjectClassAliasesDialog.AliasAlreadyExists" ); //$NON-NLS-1$
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected boolean isAliasAlreadyTaken( String alias )
+ {
+ return Activator.getDefault().getSchemaHandler().isAliasAlreadyTakenForObjectClass( alias );
+ }
+}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/AttributeTypeAdapter.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameAttributeTypeDialog.java
similarity index 60%
copy from plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/AttributeTypeAdapter.java
copy to plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameAttributeTypeDialog.java
index 9b1b607..657ad83 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/AttributeTypeAdapter.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameAttributeTypeDialog.java
@@ -17,32 +17,38 @@
* under the License.
*
*/
-package org.apache.directory.studio.schemaeditor.controller;
+package org.apache.directory.studio.schemaeditor.view.dialogs;
+
+
+import java.util.List;
+
+import org.eclipse.swt.widgets.Shell;
/**
- * This adapter class provides default implementations for the methods
- * described by the AttributeTypeListener interface.
- * <p>
- * Classes that wish to deal with attribute type events can extend this class
- * and override only the methods which they are interested in.
+ * This dialog is used to rename an attribute type.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class AttributeTypeAdapter implements AttributeTypeListener
+public class RenameAttributeTypeDialog extends EditAttributeTypeAliasesDialog
{
/**
- * {@inheritDoc}
+ * Creates a new instance of RenameAttributeTypeDialog.
+ *
+ * @param aliases an array of aliases
*/
- public void attributeTypeModified()
+ public RenameAttributeTypeDialog( List<String> aliases )
{
+ super( aliases );
}
/**
* {@inheritDoc}
*/
- public void attributeTypeRemoved()
+ protected void configureShell( Shell newShell )
{
+ super.configureShell( newShell );
+ newShell.setText( Messages.getString( "RenameAttributeTypeDialog.RenameAttributeType" ) ); //$NON-NLS-1$
}
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/AttributeTypeAdapter.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameObjectClassDialog.java
similarity index 60%
copy from plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/AttributeTypeAdapter.java
copy to plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameObjectClassDialog.java
index 9b1b607..e41b4df 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/AttributeTypeAdapter.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameObjectClassDialog.java
@@ -17,32 +17,38 @@
* under the License.
*
*/
-package org.apache.directory.studio.schemaeditor.controller;
+package org.apache.directory.studio.schemaeditor.view.dialogs;
+
+
+import java.util.List;
+
+import org.eclipse.swt.widgets.Shell;
/**
- * This adapter class provides default implementations for the methods
- * described by the AttributeTypeListener interface.
- * <p>
- * Classes that wish to deal with attribute type events can extend this class
- * and override only the methods which they are interested in.
+ * This dialog is used to rename an object class.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class AttributeTypeAdapter implements AttributeTypeListener
+public class RenameObjectClassDialog extends EditObjectClassAliasesDialog
{
/**
- * {@inheritDoc}
+ * Creates a new instance of RenameObjectClassDialog.
+ *
+ * @param aliases an array of aliases
*/
- public void attributeTypeModified()
+ public RenameObjectClassDialog( List<String> aliases )
{
+ super( aliases );
}
/**
* {@inheritDoc}
*/
- public void attributeTypeRemoved()
+ protected void configureShell( Shell newShell )
{
+ super.configureShell( newShell );
+ newShell.setText( Messages.getString( "RenameObjectClassDialog.RenameObjectClass" ) ); //$NON-NLS-1$
}
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameProjectDialog.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameProjectDialog.java
index 2fab532..dc1ce5e 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameProjectDialog.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameProjectDialog.java
@@ -21,23 +21,7 @@
import org.apache.directory.studio.schemaeditor.Activator;
-import org.apache.directory.studio.schemaeditor.controller.ProjectsHandler;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
/**
@@ -45,25 +29,8 @@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class RenameProjectDialog extends Dialog
+public class RenameProjectDialog extends AbstractRenameDialog
{
- /** The original name*/
- private String originalName;
-
- /** The new name */
- private String newName;
-
- /** The ProjectsHandler */
- private ProjectsHandler projectsHandler;
-
- // UI Fields
- private Text newNameText;
- private Composite errorComposite;
- private Image errorImage;
- private Label errorLabel;
- private Button okButton;
-
-
/**
* Creates a new instance of RenameProjectDialog.
*
@@ -72,9 +39,7 @@
*/
public RenameProjectDialog( String originalName )
{
- super( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell() );
- this.originalName = originalName;
- projectsHandler = Activator.getDefault().getProjectsHandler();
+ super( originalName );
}
@@ -92,82 +57,17 @@
/**
* {@inheritDoc}
*/
- protected Control createDialogArea( Composite parent )
+ protected String getErrorMessage()
{
- Composite composite = new Composite( parent, SWT.NONE );
- composite.setLayout( new GridLayout( 2, false ) );
- composite.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
-
- // New Name
- Label newNameLabel = new Label( composite, SWT.NONE );
- newNameLabel.setText( Messages.getString( "RenameProjectDialog.NewName" ) ); //$NON-NLS-1$
- newNameText = new Text( composite, SWT.BORDER );
- newNameText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
- newNameText.setText( originalName );
- newNameText.addModifyListener( new ModifyListener()
- {
- public void modifyText( ModifyEvent e )
- {
- newName = newNameText.getText();
-
- if ( !newName.equals( originalName ) )
- {
- if ( projectsHandler.isProjectNameAlreadyTaken( newName ) )
- {
- okButton.setEnabled( false );
- errorComposite.setVisible( true );
- return;
- }
- }
-
- // Default
- okButton.setEnabled( true );
- errorComposite.setVisible( false );
- }
- } );
-
- // Error Composite
- errorComposite = new Composite( composite, SWT.NONE );
- errorComposite.setLayout( new GridLayout( 2, false ) );
- errorComposite.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true, 2, 1 ) );
- errorComposite.setVisible( false );
-
- // Error Image
- errorImage = PlatformUI.getWorkbench().getSharedImages().getImage( ISharedImages.IMG_OBJS_ERROR_TSK );
- Label label = new Label( errorComposite, SWT.NONE );
- label.setImage( errorImage );
- label.setSize( 16, 16 );
-
- // Error Label
- errorLabel = new Label( errorComposite, SWT.NONE );
- errorLabel.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
- errorLabel.setText( Messages.getString( "RenameProjectDialog.NameExists" ) ); //$NON-NLS-1$
-
- newNameText.setFocus();
- newNameText.selectAll();
-
- return composite;
+ return Messages.getString( "RenameProjectDialog.NameExists" ); //$NON-NLS-1$
}
/**
* {@inheritDoc}
*/
- protected void createButtonsForButtonBar( Composite parent )
+ protected boolean isNewNameAlreadyTaken()
{
- createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false );
- okButton = createButton( parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true );
- }
-
-
- /**
- * Returns the new name.
- *
- * @return
- * the new name
- */
- public String getNewName()
- {
- return newName;
+ return Activator.getDefault().getProjectsHandler().isProjectNameAlreadyTaken( getNewName() );
}
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameSchemaDialog.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameSchemaDialog.java
new file mode 100644
index 0000000..7138913
--- /dev/null
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameSchemaDialog.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.studio.schemaeditor.view.dialogs;
+
+
+import org.apache.directory.studio.schemaeditor.Activator;
+import org.eclipse.swt.widgets.Shell;
+
+
+/**
+ * this dialog is used to rename a project.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class RenameSchemaDialog extends AbstractRenameDialog
+{
+ /**
+ * Creates a new instance of RenameSchemaDialog.
+ *
+ * @param originalName
+ * the original name of the project
+ */
+ public RenameSchemaDialog( String originalName )
+ {
+ super( originalName );
+
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void configureShell( Shell newShell )
+ {
+ super.configureShell( newShell );
+ newShell.setText( Messages.getString( "RenameSchemaDialog.Rename" ) ); //$NON-NLS-1$
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected String getErrorMessage()
+ {
+ return Messages.getString( "RenameSchemaDialog.NameExists" ); //$NON-NLS-1$
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected boolean isNewNameAlreadyTaken()
+ {
+ return Activator.getDefault().getSchemaHandler().isSchemaNameAlreadyTaken( getNewName() );
+ }
+}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages.properties
index ba479d2..fef6215 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages.properties
@@ -15,6 +15,13 @@
# specific language governing permissions and limitations
# under the License.
+AbstractAliasesDialog.EditAlias=Edit Aliases
+AbstractAliasesDialog.Add=Add...
+AbstractAliasesDialog.Aliases=Aliases:
+AbstractAliasesDialog.Edit=Edit...
+AbstractAliasesDialog.Remove=Remove
+AbstractAliasesDialog.InvalidAlias=The alias "{0}" is invalid.
+AbstractRenameDialog.NewName=New name:
AttributeTypeSelectionDialog.ChooseAType=Choose an attribute type
AttributeTypeSelectionDialog.InvalidSelection=Invalid Selection
AttributeTypeSelectionDialog.MatchingTypes=Matching attribute type(s)
@@ -22,13 +29,10 @@
AttributeTypeSelectionDialog.TypeSelection=Attribute Type Selection
AttributeTypeSelectionDialog.Choose=Choose
AttributeTypeSelectionDialogLabelProvider.None=(None) - ({0})
-EditAliasesDialog.Add=Add...
-EditAliasesDialog.Aliases=Aliases:
-EditAliasesDialog.Edit=Edit...
-EditAliasesDialog.EditAlias=Edit Aliases
-EditAliasesDialog.ElementWithSameAliasExists=An element with the same alias already exists.
-EditAliasesDialog.Remove=Remove
-EditAliasesDialog.TheAliasBegin=The alias "{0}" is invalid.
+EditAttributeTypeAliasesDialog.EditAliases=Edit Attribute Type Aliases
+EditAttributeTypeAliasesDialog.AliasAlreadyExists=An attribute type with the same alias already exists.
+EditObjectClassAliasesDialog.EditAliases=Edit ObjectClass Aliases
+EditObjectClassAliasesDialog.AliasAlreadyExists=An object class type with the same alias already exists.
ObjectClassSelectionDialog.ChooseClass=Choose an object class
ObjectClassSelectionDialog.ClassSelection=Object Class Selection
ObjectClassSelectionDialog.InvalidSelection=Invalid Selection
@@ -40,6 +44,9 @@
PreviousSearchesDialog.Previous=Previous Searches
PreviousSearchesDialog.Remove=Remove
PreviousSearchesDialog.ShowResultsInView=Select the search to show in the search results view:
+RenameAttributeTypeDialog.RenameAttributeType=Rename Attribute Type
+RenameObjectClassDialog.RenameObjectClass=Rename Object Class
RenameProjectDialog.NameExists=A project with the same name already exists.
-RenameProjectDialog.NewName=New name:
RenameProjectDialog.Rename=Rename Schema Project
+RenameSchemaDialog.NameExists=A schema with the same name already exists.
+RenameSchemaDialog.Rename=Rename Schema
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages_de.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages_de.properties
index f3379c3..5591d0d 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages_de.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages_de.properties
@@ -15,6 +15,13 @@
# specific language governing permissions and limitations
# under the License.
+AbstractAliasesDialog.Add=Hinzuf\u00FCgen...
+AbstractAliasesDialog.Aliases=Aliase\:
+AbstractAliasesDialog.Edit=Editieren...
+AbstractAliasesDialog.EditAlias=Aliase editieren
+AbstractAliasesDialog.Remove=L\u00F6schen
+AbstractAliasesDialog.InvalidAlias=Der Alias "{0}" ist ung\u00FCltig.
+AbstractRenameDialog.NewName=Neuer Name\:
AttributeTypeSelectionDialog.ChooseAType=W\u00E4hle einen Attribut Typ
AttributeTypeSelectionDialog.InvalidSelection=Ung\u00FCltige Auswahl
AttributeTypeSelectionDialog.MatchingTypes=Passend Attribut Typ(en)
@@ -22,13 +29,10 @@
AttributeTypeSelectionDialog.TypeSelection=Auswahl Attribute Typ
AttributeTypeSelectionDialog.Choose=Ausw\u00E4hlen
AttributeTypeSelectionDialogLabelProvider.None=(Keine) - ({0})
-EditAliasesDialog.Add=Hinzuf\u00FCgen...
-EditAliasesDialog.Aliases=Aliase\:
-EditAliasesDialog.Edit=Editieren...
-EditAliasesDialog.EditAlias=Aliase editieren
-EditAliasesDialog.ElementWithSameAliasExists=Es existiert schon ein Element mit demselben Alias.
-EditAliasesDialog.Remove=L\u00F6schen
-EditAliasesDialog.TheAliasBegin=Der Alias "{0}" ist ung\u00FCltig.
+EditAttributeTypeAliasesDialog.EditAliases=TODO:Edit Attribute Type Aliases
+EditAttributeTypeAliasesDialog.AliasAlreadyExists=TODO:An attribute type with the same alias already exists.
+EditObjectClassAliasesDialog.EditAliases=TODO:Edit ObjectClass Aliases
+EditObjectClassAliasesDialog.AliasAlreadyExists=TODO:An object class type with the same alias already exists.
ObjectClassSelectionDialog.ChooseClass=W\u00E4hle eine Objektklasse
ObjectClassSelectionDialog.ClassSelection=Auswahl Objektklasse
ObjectClassSelectionDialog.InvalidSelection=Ung\u00FCltige Auswahl
@@ -40,6 +44,9 @@
PreviousSearchesDialog.Previous=Fr\u00FChere Suchen
PreviousSearchesDialog.Remove=L\u00F6schen
PreviousSearchesDialog.ShowResultsInView=W\u00E4hlen Sie die Suche aus, die in der Resultate-Ansicht angezeigt werden soll\:
+RenameAttributeTypeDialog.RenameAttributeType=Attribut Typ umbenennen
+RenameObjectClassDialog.RenameObjectClass=Objektklasse umbenennen
RenameProjectDialog.NameExists=Ein Projekt mit diesem Namen existiert bereits.
-RenameProjectDialog.NewName=Neuer Name\:
RenameProjectDialog.Rename=Schema Project umbenennen
+RenameSchemaDialog.NameExists=Ein Schema mit diesem Namen existiert bereits.
+RenameSchemaDialog.Rename=Schema umbenennen
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages_fr.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages_fr.properties
index 1a74e94..6d43522 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages_fr.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/messages_fr.properties
@@ -15,6 +15,13 @@
# specific language governing permissions and limitations
# under the License.
+AbstractAliasesDialog.Add=Ajouter...
+AbstractAliasesDialog.Aliases=Alias :
+AbstractAliasesDialog.Edit=Editer...
+AbstractAliasesDialog.EditAlias=Editer les alias
+AbstractAliasesDialog.Remove=Supprimer
+AbstractAliasesDialog.InvalidAlias=L''alias "{0}" est invalide.
+AbstractRenameDialog.NewName=Nouveau nom:
AttributeTypeSelectionDialog.ChooseAType=Choisissez un type d'attribut
AttributeTypeSelectionDialog.InvalidSelection=S\u00E9lection invalide
AttributeTypeSelectionDialog.MatchingTypes=Types d'attributs correspondant
@@ -22,13 +29,10 @@
AttributeTypeSelectionDialog.TypeSelection=S\u00E9lection de type d'attribut
AttributeTypeSelectionDialog.Choose=Choisir
AttributeTypeSelectionDialogLabelProvider.None=(Pas de nom) - ({0})
-EditAliasesDialog.Add=Ajouter...
-EditAliasesDialog.Aliases=Alias :
-EditAliasesDialog.Edit=Editer...
-EditAliasesDialog.EditAlias=Editer les alias
-EditAliasesDialog.ElementWithSameAliasExists=Un \u00E9l\u00E9ment avec le m\u00EAme alias existe.
-EditAliasesDialog.Remove=Supprimer
-EditAliasesDialog.TheAliasBegin=L''alias "{0}" est invalide.
+EditAttributeTypeAliasesDialog.EditAliases=Editer les alias du type d'attribut
+EditAttributeTypeAliasesDialog.AliasAlreadyExists=Un type d'attribut avec un alias identique existe d\u00E9j\u00E0.
+EditObjectClassAliasesDialog.EditAliases=Editer les alias de la classe d'objet
+EditObjectClassAliasesDialog.AliasAlreadyExists=Une classe d'objet avec un alias identique existe d\u00E9j\u00E0.
ObjectClassSelectionDialog.ChooseClass=Choisissez une classe d'objet
ObjectClassSelectionDialog.ClassSelection=S\u00E9lection d'une classe d'objet
ObjectClassSelectionDialog.InvalidSelection=S\u00E9lection invalide
@@ -40,6 +44,9 @@
PreviousSearchesDialog.Previous=Recherches pr\u00E9c\u00E9dentes
PreviousSearchesDialog.Remove=Supprimer
PreviousSearchesDialog.ShowResultsInView=S\u00E9lectionner la recherche \u00E0 afficher dans la vue des r\u00E9sultats de recherches:
+RenameAttributeTypeDialog.RenameAttributeType=Renommer le type d'attribut
+RenameObjectClassDialog.RenameObjectClass=Renommer la classe d'objet
RenameProjectDialog.NameExists=Un projet avec un nom identique existe d\u00E9j\u00E0.
-RenameProjectDialog.NewName=Nouveau nom:
RenameProjectDialog.Rename=Renommer le projet de sch\u00E9ma
+RenameSchemaDialog.NameExists=Un sch\u00E9ma avec un nom identique existe d\u00E9j\u00E0.
+RenameSchemaDialog.Rename=Renommer le sch\u00E9ma
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/AbstractSchemaObjectEditorPage.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/AbstractSchemaObjectEditorPage.java
new file mode 100644
index 0000000..c46e025
--- /dev/null
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/AbstractSchemaObjectEditorPage.java
@@ -0,0 +1,376 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.directory.studio.schemaeditor.view.editors;
+
+
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.events.VerifyListener;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormEditor;
+import org.eclipse.ui.forms.editor.FormPage;
+import org.eclipse.ui.forms.events.IHyperlinkListener;
+import org.eclipse.ui.forms.widgets.Hyperlink;
+
+
+/**
+ * This abstract class defines a schema object editor page.
+ */
+public abstract class AbstractSchemaObjectEditorPage<E extends FormEditor> extends FormPage
+{
+ /** The flag to indicate if the page has been initialized */
+ protected boolean initialized = false;
+
+
+ /**
+ * Default constructor
+ *
+ * @param editor the parent editor
+ * @param id the unique identifier
+ * @param title the page title
+ */
+ public AbstractSchemaObjectEditorPage( E editor, String id, String title )
+ {
+ super( editor, id, title );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ public E getEditor()
+ {
+ return ( E ) super.getEditor();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void createFormContent( IManagedForm managedForm )
+ {
+ initialized = true;
+ }
+
+
+ /**
+ * Adds listeners to UI fields
+ */
+ protected void addListeners()
+ {
+ }
+
+
+ /**
+ * Removes listeners from UI fields
+ */
+ protected void removeListeners()
+ {
+ }
+
+
+ /**
+ * Initializes the UI fields from the input.
+ */
+ protected void fillInUiFields()
+ {
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void dispose()
+ {
+ removeListeners();
+
+ super.dispose();
+ }
+
+
+ /**
+ * Refreshes the UI.
+ */
+ public void refreshUI()
+ {
+ if ( initialized )
+ {
+ removeListeners();
+ fillInUiFields();
+ addListeners();
+ }
+ }
+
+
+ /**
+ * Adds a modify listener to the given Text.
+ *
+ * @param text the Text control
+ * @param listener the listener
+ */
+ protected void addModifyListener( Text text, ModifyListener listener )
+ {
+ if ( ( text != null ) && ( !text.isDisposed() ) && ( listener != null ) )
+ {
+ text.addModifyListener( listener );
+ }
+ }
+
+
+ /**
+ * Adds a modify listener to the given Text.
+ *
+ * @param text the StyledText control
+ * @param listener the listener
+ */
+ protected void addModifyListener( StyledText text, ModifyListener listener )
+ {
+ if ( ( text != null ) && ( !text.isDisposed() ) && ( listener != null ) )
+ {
+ text.addModifyListener( listener );
+ }
+ }
+
+
+ /**
+ * Adds a modify listener to the given Text.
+ *
+ * @param combo the Combo control
+ * @param listener the listener
+ */
+ protected void addModifyListener( Combo combo, ModifyListener listener )
+ {
+ if ( ( combo != null ) && ( !combo.isDisposed() ) && ( listener != null ) )
+ {
+ combo.addModifyListener( listener );
+ }
+ }
+
+
+ /**
+ * Adds a verify listener to the given Text.
+ *
+ * @param text the Text control
+ * @param listener the listener
+ */
+ protected void addVerifyListener( Text text, VerifyListener listener )
+ {
+ if ( ( text != null ) && ( !text.isDisposed() ) && ( listener != null ) )
+ {
+ text.addVerifyListener( listener );
+ }
+ }
+
+
+ /**
+ * Adds a selection changed listener to the given Viewer.
+ *
+ * @param viewer the viewer control
+ * @param listener the listener
+ */
+ protected void addSelectionChangedListener( Viewer viewer, ISelectionChangedListener listener )
+ {
+ if ( ( viewer != null ) && ( viewer.getControl() != null ) && ( !viewer.getControl().isDisposed() )
+ && ( listener != null ) )
+ {
+ viewer.addSelectionChangedListener( listener );
+ }
+ }
+
+
+ /**
+ * Adds an hyperlink listener to the given HyperLink.
+ *
+ * @param hyperLink the HyperLink
+ * @param listener the listener
+ */
+ protected void addHyperlinkListener( Hyperlink hyperLink, IHyperlinkListener listener )
+ {
+ if ( ( hyperLink != null ) && ( !hyperLink.isDisposed() ) && ( listener != null ) )
+ {
+ hyperLink.addHyperlinkListener( listener );
+ }
+ }
+
+
+ /**
+ * Adds a selection listener to the given Button.
+ *
+ * @param button the Button control
+ * @param listener the listener
+ */
+ protected void addSelectionListener( Button button, SelectionListener listener )
+ {
+ if ( ( button != null ) && ( !button.isDisposed() ) && ( listener != null ) )
+ {
+ button.addSelectionListener( listener );
+ }
+ }
+
+
+ /**
+ * Adds a mouse listener to the given Table.
+ *
+ * @param table the Table control
+ * @param listener the listener
+ */
+ protected void addMouseListener( Table table, MouseListener listener )
+ {
+ if ( ( table != null ) && ( !table.isDisposed() ) && ( listener != null ) )
+ {
+ table.addMouseListener( listener );
+ }
+ }
+
+
+ /**
+ * Removes a modify listener from the given Text.
+ *
+ * @param text the Text control
+ * @param listener the listener
+ */
+ protected void removeModifyListener( Text text, ModifyListener listener )
+ {
+ if ( ( text != null ) && ( !text.isDisposed() ) && ( listener != null ) )
+ {
+ text.removeModifyListener( listener );
+ }
+ }
+
+
+ /**
+ * Removes a modify listener from the given Text.
+ *
+ * @param text the StyledText control
+ * @param listener the listener
+ */
+ protected void removeModifyListener( StyledText text, ModifyListener listener )
+ {
+ if ( ( text != null ) && ( !text.isDisposed() ) && ( listener != null ) )
+ {
+ text.removeModifyListener( listener );
+ }
+ }
+
+
+ /**
+ * Removes a modify listener from the given Text.
+ *
+ * @param combo the Combo control
+ * @param listener the listener
+ */
+ protected void removeModifyListener( Combo combo, ModifyListener listener )
+ {
+ if ( ( combo != null ) && ( !combo.isDisposed() ) && ( listener != null ) )
+ {
+ combo.removeModifyListener( listener );
+ }
+ }
+
+
+ /**
+ * Removes a verify listener from the given Text.
+ *
+ * @param text the Text control
+ * @param listener the listener
+ */
+ protected void removeVerifyListener( Text text, VerifyListener listener )
+ {
+ if ( ( text != null ) && ( !text.isDisposed() ) && ( listener != null ) )
+ {
+ text.removeVerifyListener( listener );
+ }
+ }
+
+
+ /**
+ * Removes a selection changed listener from the given Viewer.
+ *
+ * @param viewer
+ * the viewer control
+ * @param listener
+ * the listener
+ */
+ protected void removeSelectionChangedListener( Viewer viewer, ISelectionChangedListener listener )
+ {
+ if ( ( viewer != null ) && ( viewer.getControl() != null ) && ( !viewer.getControl().isDisposed() )
+ && ( listener != null ) )
+ {
+ viewer.removeSelectionChangedListener( listener );
+ }
+ }
+
+
+ /**
+ * Removes an hyperlink listener from the given HyperLink.
+ *
+ * @param hyperLink the HyperLink
+ * @param listener the listener
+ */
+ protected void removeHyperlinkListener( Hyperlink hyperLink, IHyperlinkListener listener )
+ {
+ if ( ( hyperLink != null ) && ( !hyperLink.isDisposed() ) && ( listener != null ) )
+ {
+ hyperLink.removeHyperlinkListener( listener );
+ }
+ }
+
+
+ /**
+ * Removes a selection listener from the given Button.
+ *
+ * @param button
+ * the Button control
+ * @param listener
+ * the listener
+ */
+ protected void removeSelectionListener( Button button, SelectionListener listener )
+ {
+ if ( ( button != null ) && ( !button.isDisposed() ) && ( listener != null ) )
+ {
+ button.removeSelectionListener( listener );
+ }
+ }
+
+
+ /**
+ * Removes a mouse listener from the given Table.
+ *
+ * @param table the Table control
+ * @param listener the listener
+ */
+ protected void removeMouseListener( Table table, MouseListener listener )
+ {
+ if ( ( table != null ) && ( !table.isDisposed() ) && ( listener != null ) )
+ {
+ table.removeMouseListener( listener );
+ }
+ }
+}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/EditorsUtils.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/EditorsUtils.java
new file mode 100644
index 0000000..1806a5a
--- /dev/null
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/EditorsUtils.java
@@ -0,0 +1,145 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.studio.schemaeditor.view.editors;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.ListDialog;
+
+
+/**
+ * This class implements a utility class for the editors.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class EditorsUtils
+{
+ /**
+ * Saves all the dirty editors (asking the user if they need to be saved or not).
+ *
+ * @return <code>true</code> if all the dirty editors were saved successfully,
+ * <code>false</code> if not (if the user decided to not save them, or
+ * if an error occurred when saving).
+ */
+ public static boolean saveAllDirtyEditors()
+ {
+ IWorkbench workbench = PlatformUI.getWorkbench();
+ IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+ List<IEditorPart> dirtyEditorsList = getDirtyEditorsList( workbench );
+
+ if ( dirtyEditorsList.size() > 0 )
+ {
+ // Creating the dialog to ask the user if the dirty editors must be saved
+ ListDialog dialog = new ListDialog( workbenchWindow.getShell() );
+ dialog.setTitle( Messages.getString( "EditorsUtils.SaveDialogTitle" ) ); //$NON-NLS-1$
+ dialog.setMessage( Messages.getString( "EditorsUtils.SaveDialogMessage" ) ); //$NON-NLS-1$
+ dialog.setLabelProvider( new LabelProvider()
+ {
+ public Image getImage( Object element )
+ {
+ return ( ( IEditorPart ) element ).getTitleImage();
+ }
+
+
+ public String getText( Object element )
+ {
+ IEditorPart editorPart = ( IEditorPart ) element;
+
+ StringBuilder sb = new StringBuilder();
+ sb.append( editorPart.getTitle() );
+
+ String tooltip = editorPart.getTitleToolTip();
+
+ if ( ( tooltip != null ) && ( !"".equals( tooltip ) ) )
+ {
+ sb.append( " [" );
+ sb.append( tooltip );
+ sb.append( "]" );
+ }
+
+ return sb.toString();
+ }
+ } );
+ dialog.setContentProvider( new ArrayContentProvider() );
+ dialog.setHelpAvailable( false );
+ dialog.setAddCancelButton( true );
+ dialog.setInput( dirtyEditorsList );
+
+ // Opening the dialog
+ if ( dialog.open() != Dialog.OK )
+ {
+ // Cancel
+ return false;
+ }
+
+ // Forcing the save of all dirty editors
+ return workbenchWindow.getWorkbench().saveAllEditors( false );
+ }
+
+ return true;
+ }
+
+
+ /**
+ * Returns a list of all editors having unsaved content.
+ *
+ * @return a list of all dirty editors.
+ */
+ public static List<IEditorPart> getDirtyEditorsList( IWorkbench workbench )
+ {
+ List<IEditorPart> dirtyEditorsList = new ArrayList<IEditorPart>();
+
+ if ( workbench != null )
+ {
+ List<IEditorInput> processedInputs = new ArrayList<IEditorInput>();
+
+ for ( IWorkbenchWindow workbenchWindow : workbench.getWorkbenchWindows() )
+ {
+ for ( IWorkbenchPage workbenchPage : workbenchWindow.getPages() )
+ {
+ for ( IEditorPart editor : workbenchPage.getDirtyEditors() )
+ {
+ IEditorInput input = editor.getEditorInput();
+
+ if ( !processedInputs.contains( input ) )
+ {
+ processedInputs.add( input );
+ dirtyEditorsList.add( editor );
+ }
+ }
+ }
+ }
+ }
+
+ return dirtyEditorsList;
+ }
+}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/Messages.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/Messages.java
new file mode 100644
index 0000000..a9b091f
--- /dev/null
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/Messages.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.studio.schemaeditor.view.editors;
+
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+
+public class Messages
+{
+ private static final String BUNDLE_NAME = "org.apache.directory.studio.schemaeditor.view.editors.messages"; //$NON-NLS-1$
+
+ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle( BUNDLE_NAME );
+
+
+ private Messages()
+ {
+ }
+
+
+ public static String getString( String key )
+ {
+ try
+ {
+ return RESOURCE_BUNDLE.getString( key );
+ }
+ catch ( MissingResourceException e )
+ {
+ return '!' + key + '!';
+ }
+ }
+}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/NonExistingSyntax.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/NonExistingSyntax.java
index 62e3552..b6f1f30 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/NonExistingSyntax.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/NonExistingSyntax.java
@@ -27,34 +27,34 @@
*/
public class NonExistingSyntax
{
- /** The None syntax name */
+ /** The None syntax description */
public static final String NONE = "(None)"; //$NON-NLS-1$
- /** The name */
- private String name;
+ /** The description */
+ private String description;
/**
* Creates a new instance of NonExistingSyntax.
*
- * @param name
- * the name the NonExistingSyntax
+ * @param description
+ * the description the NonExistingSyntax
*/
- public NonExistingSyntax( String name )
+ public NonExistingSyntax( String description )
{
- this.name = name;
+ this.description = description;
}
/**
- * Gets the name of the NonExistingSyntax.
+ * Gets the description of the NonExistingSyntax.
*
* @return
- * the name of the NonExistingSyntax
+ * the description of the NonExistingSyntax
*/
- public String getName()
+ public String getDescription()
{
- return name;
+ return description;
}
@@ -66,13 +66,13 @@
*/
public String getDisplayName()
{
- if ( name.equals( NONE ) )
+ if ( description.equals( NONE ) )
{
return NONE;
}
else
{
- return name + " " + "(This syntax doesnt exist)";
+ return description + " " + "(This syntax doesnt exist)";
}
}
@@ -84,7 +84,7 @@
{
if ( obj instanceof NonExistingSyntax )
{
- return name.equalsIgnoreCase( ( ( NonExistingSyntax ) obj ).getName() );
+ return description.equalsIgnoreCase( ( ( NonExistingSyntax ) obj ).getDescription() );
}
return false;
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java
index ecb92af..d6ee0f9 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java
@@ -21,7 +21,6 @@
import java.util.Comparator;
-import java.util.List;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingSyntax;
@@ -39,46 +38,34 @@
*/
public int compare( Object o1, Object o2 )
{
+ String syntax1Description = null;
+ String syntax2Description = null;
+
if ( o1 instanceof LdapSyntax && o2 instanceof LdapSyntax )
{
- List<String> syntax1Names = ( ( LdapSyntax ) o1 ).getNames();
- List<String> syntax2Names = ( ( LdapSyntax ) o2 ).getNames();
+ syntax1Description = ( ( LdapSyntax ) o1 ).getDescription();
+ syntax2Description = ( ( LdapSyntax ) o2 ).getDescription();
- if ( ( syntax1Names != null ) && ( syntax2Names != null ) && ( syntax1Names.size() > 0 )
- && ( syntax2Names.size() > 0 ) )
- {
- return syntax1Names.get( 0 ).compareToIgnoreCase( syntax2Names.get( 0 ) );
- }
}
else if ( o1 instanceof LdapSyntax && o2 instanceof NonExistingSyntax )
{
- List<String> syntax1Names = ( ( LdapSyntax ) o1 ).getNames();
- String syntax2Name = ( ( NonExistingSyntax ) o2 ).getName();
-
- if ( ( syntax1Names != null ) && ( syntax2Name != null ) && ( syntax1Names.size() > 0 ) )
- {
- return syntax1Names.get( 0 ).compareToIgnoreCase( syntax2Name );
- }
+ syntax1Description = ( ( LdapSyntax ) o1 ).getDescription();
+ syntax2Description = ( ( NonExistingSyntax ) o2 ).getDescription();
}
else if ( o1 instanceof NonExistingSyntax && o2 instanceof LdapSyntax )
{
- String syntax1Name = ( ( NonExistingSyntax ) o1 ).getName();
- List<String> syntax2Names = ( ( LdapSyntax ) o2 ).getNames();
-
- if ( ( syntax1Name != null ) && ( syntax2Names != null ) && ( syntax2Names.size() > 0 ) )
- {
- return syntax1Name.compareToIgnoreCase( syntax2Names.get( 0 ) );
- }
+ syntax1Description = ( ( NonExistingSyntax ) o1 ).getDescription();
+ syntax2Description = ( ( LdapSyntax ) o2 ).getDescription();
}
else if ( o1 instanceof NonExistingSyntax && o2 instanceof NonExistingSyntax )
{
- String syntax1Name = ( ( NonExistingSyntax ) o1 ).getName();
- String syntax2Name = ( ( NonExistingSyntax ) o2 ).getName();
+ syntax1Description = ( ( NonExistingSyntax ) o1 ).getDescription();
+ syntax2Description = ( ( NonExistingSyntax ) o2 ).getDescription();
+ }
- if ( ( syntax1Name != null ) && ( syntax2Name != null ) )
- {
- return syntax1Name.compareToIgnoreCase( syntax2Name );
- }
+ if ( ( syntax1Description != null ) && ( syntax2Description != null ) )
+ {
+ return syntax1Description.compareToIgnoreCase( syntax2Description );
}
return 0;
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java
index 48b83c4..7b6992c 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboLabelProvider.java
@@ -42,10 +42,31 @@
{
LdapSyntax syntax = ( LdapSyntax ) obj;
+ // Getting description (and name for backward compatibility)
+ String description = syntax.getDescription();
String name = syntax.getName();
- if ( name != null )
+
+
+ if ( ( description != null ) || ( name != null ) )
{
- return name + " - (" + syntax.getOid() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+ StringBuilder sb = new StringBuilder();
+
+ if ( description != null )
+ {
+ // Using description
+ sb.append( description );
+ }
+ else
+ {
+ // Using name (for backward compatibility)
+ sb.append( name );
+ }
+
+ sb.append( " - (" ); //$NON-NLS-1$
+ sb.append( syntax.getOid() );
+ sb.append( ")" ); //$NON-NLS-1$
+
+ return sb.toString();
}
else
{
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AbstractAttributeTypeEditorPage.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AbstractAttributeTypeEditorPage.java
new file mode 100644
index 0000000..83ca6d3
--- /dev/null
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AbstractAttributeTypeEditorPage.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.directory.studio.schemaeditor.view.editors.attributetype;
+
+
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
+import org.apache.directory.studio.schemaeditor.view.editors.AbstractSchemaObjectEditorPage;
+
+
+/**
+ * This abstract class defines an attribute type editor page.
+ */
+public abstract class AbstractAttributeTypeEditorPage extends AbstractSchemaObjectEditorPage<AttributeTypeEditor>
+{
+ /** The flag to indicate if the page has been initialized */
+ protected boolean initialized = false;
+
+
+ /**
+ * Default constructor
+ *
+ * @param editor the parent editor
+ * @param id the unique identifier
+ * @param title the page title
+ */
+ public AbstractAttributeTypeEditorPage( AttributeTypeEditor editor, String id, String title )
+ {
+ super( editor, id, title );
+ }
+
+
+ /**
+ * Gets the original attribute type.
+ *
+ * @return
+ * the original attribute type
+ */
+ public AttributeType getOriginalAttributeType()
+ {
+ return getEditor().getOriginalAttributeType();
+ }
+
+
+ /**
+ * Gets the modified attribute type.
+ *
+ * @return
+ * the modified attribute type
+ */
+ public MutableAttributeType getModifiedAttributeType()
+ {
+ return getEditor().getModifiedAttributeType();
+ }
+
+
+ /**
+ * Sets the editor as dirty
+ */
+ protected void setEditorDirty()
+ {
+ getEditor().setDirty( true );
+ }
+}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java
index a7858bc..3806dc2 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java
@@ -6,27 +6,26 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.view.editors.attributetype;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.PluginUtils;
-import org.apache.directory.studio.schemaeditor.controller.AttributeTypeAdapter;
-import org.apache.directory.studio.schemaeditor.controller.AttributeTypeListener;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerAdapter;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener;
@@ -34,9 +33,8 @@
import org.apache.log4j.Logger;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.dialogs.IPageChangedListener;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.dialogs.PageChangedEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.PartInitException;
@@ -64,15 +62,15 @@
private boolean dirty = false;
// The pages
- private AttributeTypeEditorOverviewPage overview;
- private AttributeTypeEditorSourceCodePage sourceCode;
- private AttributeTypeEditorUsedByPage usedBy;
+ private AttributeTypeEditorOverviewPage overviewPage;
+ private AttributeTypeEditorSourceCodePage sourceCodePage;
+ private AttributeTypeEditorUsedByPage usedByPage;
/** The original attribute type */
- private AttributeType originalAttributeType;
+ private MutableAttributeType originalAttributeType;
/** The attribute type used to save modifications */
- private AttributeType modifiedAttributeType;
+ private MutableAttributeType modifiedAttributeType;
/** The originalSchema */
private Schema originalSchema;
@@ -86,36 +84,54 @@
if ( selectedPage instanceof AttributeTypeEditorOverviewPage )
{
- if ( !sourceCode.canLeaveThePage() )
+ if ( !sourceCodePage.canLeaveThePage() )
{
notifyError( Messages.getString( "AttributeTypeEditor.CodeErrors" ) ); //$NON-NLS-1$
return;
}
- overview.refreshUI();
+ overviewPage.refreshUI();
}
else if ( selectedPage instanceof AttributeTypeEditorSourceCodePage )
{
- if ( sourceCode.canLeaveThePage() )
+ if ( sourceCodePage.canLeaveThePage() )
{
- sourceCode.refreshUI();
+ sourceCodePage.refreshUI();
}
}
}
};
- /** The attribute type listener */
- private AttributeTypeListener attributeTypeListener = new AttributeTypeAdapter()
- {
- public void attributeTypeRemoved()
- {
- getEditorSite().getPage().closeEditor( instance, false );
- }
- };
-
/** The SchemaHandler listener */
private SchemaHandlerListener schemaHandlerListener = new SchemaHandlerAdapter()
{
+ public void attributeTypeModified( AttributeType at )
+ {
+ if ( at.equals( originalAttributeType ) )
+ {
+ // Updating the modified attribute type
+ modifiedAttributeType = PluginUtils.getClone( originalAttributeType );
+
+ // Refreshing the editor pages
+ overviewPage.refreshUI();
+ sourceCodePage.refreshUI();
+ usedByPage.refreshUI();
+
+ // Refreshing the part name (in case of a change in the name)
+ setPartName( getEditorInput().getName() );
+ }
+ }
+
+
+ public void attributeTypeRemoved( AttributeType at )
+ {
+ if ( at.equals( originalAttributeType ) )
+ {
+ getEditorSite().getPage().closeEditor( instance, false );
+ }
+ }
+
+
public void schemaRemoved( Schema schema )
{
if ( schema.equals( originalSchema ) )
@@ -123,6 +139,21 @@
getEditorSite().getPage().closeEditor( instance, false );
}
}
+
+
+ public void schemaRenamed( Schema schema )
+ {
+ if ( schema.equals( originalSchema ) )
+ {
+ // Updating the modified attribute type
+ modifiedAttributeType = PluginUtils.getClone( originalAttributeType );
+
+ // Refreshing the editor pages
+ overviewPage.refreshUI();
+ sourceCodePage.refreshUI();
+ usedByPage.refreshUI();
+ }
+ }
};
@@ -139,12 +170,11 @@
setInput( input );
setPartName( input.getName() );
- originalAttributeType = ( ( AttributeTypeEditorInput ) getEditorInput() ).getAttributeType();
+ originalAttributeType = (MutableAttributeType)( ( AttributeTypeEditorInput ) getEditorInput() ).getAttributeType();
modifiedAttributeType = PluginUtils.getClone( originalAttributeType );
SchemaHandler schemaHandler = Activator.getDefault().getSchemaHandler();
originalSchema = schemaHandler.getSchema( originalAttributeType.getSchemaName() );
- schemaHandler.addListener( originalAttributeType, attributeTypeListener );
schemaHandler.addListener( schemaHandlerListener );
addPageChangedListener( pageChangedListener );
@@ -157,7 +187,6 @@
public void dispose()
{
SchemaHandler schemaHandler = Activator.getDefault().getSchemaHandler();
- schemaHandler.removeListener( originalAttributeType, attributeTypeListener );
schemaHandler.removeListener( schemaHandlerListener );
super.dispose();
@@ -171,12 +200,12 @@
{
try
{
- overview = new AttributeTypeEditorOverviewPage( this );
- addPage( overview );
- sourceCode = new AttributeTypeEditorSourceCodePage( this );
- addPage( sourceCode );
- usedBy = new AttributeTypeEditorUsedByPage( this );
- addPage( usedBy );
+ overviewPage = new AttributeTypeEditorOverviewPage( this );
+ addPage( overviewPage );
+ sourceCodePage = new AttributeTypeEditorSourceCodePage( this );
+ addPage( sourceCodePage );
+ usedByPage = new AttributeTypeEditorUsedByPage( this );
+ addPage( usedByPage );
}
catch ( PartInitException e )
{
@@ -191,7 +220,7 @@
public void doSave( IProgressMonitor monitor )
{
// Verifying if there is an error on the source code page
- if ( !sourceCode.canLeaveThePage() )
+ if ( !sourceCodePage.canLeaveThePage() )
{
notifyError( Messages.getString( "AttributeTypeEditor.AttributeErrors" ) ); //$NON-NLS-1$
monitor.setCanceled( true );
@@ -266,7 +295,7 @@
* @return
* the modified attribute type
*/
- public AttributeType getModifiedAttributeType()
+ public MutableAttributeType getModifiedAttributeType()
{
return modifiedAttributeType;
}
@@ -278,7 +307,7 @@
* @param modifiedAttributeType
* the modified attribute type to set.
*/
- public void setModifiedAttributeType( AttributeType modifiedAttributeType )
+ public void setModifiedAttributeType( MutableAttributeType modifiedAttributeType )
{
this.modifiedAttributeType = modifiedAttributeType;
}
@@ -286,15 +315,13 @@
/**
* Opens an error dialog displaying the given message.
- *
+ *
* @param message
* the message to display
*/
private void notifyError( String message )
{
- MessageBox messageBox = new MessageBox( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), SWT.OK
- | SWT.ICON_ERROR );
- messageBox.setMessage( message );
- messageBox.open();
+ MessageDialog.openError( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+ Messages.getString( "AttributeTypeEditor.Error" ), message ); //$NON-NLS-1$
}
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java
index 12cdade..dc14444 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java
@@ -108,6 +108,7 @@
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("rawtypes")
public Object getAdapter( Class adapter )
{
return null;
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
index f55ef4d..7e6f57b 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.view.editors.attributetype;
@@ -28,6 +28,7 @@
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.UsageEnum;
import org.apache.directory.studio.schemaeditor.Activator;
@@ -39,7 +40,7 @@
import org.apache.directory.studio.schemaeditor.model.alias.AliasWithError;
import org.apache.directory.studio.schemaeditor.model.alias.AliasesStringParser;
import org.apache.directory.studio.schemaeditor.view.ViewUtils;
-import org.apache.directory.studio.schemaeditor.view.dialogs.EditAliasesDialog;
+import org.apache.directory.studio.schemaeditor.view.dialogs.EditAttributeTypeAliasesDialog;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingAttributeType;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingMatchingRule;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingSyntax;
@@ -50,7 +51,6 @@
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -72,8 +72,6 @@
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.FormPage;
import org.eclipse.ui.forms.events.HyperlinkAdapter;
import org.eclipse.ui.forms.events.HyperlinkEvent;
import org.eclipse.ui.forms.widgets.FormToolkit;
@@ -85,17 +83,11 @@
/**
* This class is the Overview Page of the Attribute Type Editor
*/
-public class AttributeTypeEditorOverviewPage extends FormPage
+public class AttributeTypeEditorOverviewPage extends AbstractAttributeTypeEditorPage
{
/** The page ID*/
public static final String ID = AttributeTypeEditor.ID + ".overviewPage"; //$NON-NLS-1$
- /** The original object class */
- private AttributeType originalAttributeType;
-
- /** The modified object class */
- private AttributeType modifiedAttributeType;
-
/** The original schema */
private Schema originalSchema;
@@ -105,102 +97,69 @@
/** The SchemaHandler Listener */
private SchemaHandlerListener schemaHandlerListener = new SchemaHandlerListener()
{
- /**
- * {@inheritDoc}
- */
public void attributeTypeAdded( AttributeType at )
{
refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void attributeTypeModified( AttributeType at )
{
refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void attributeTypeRemoved( AttributeType at )
{
- if ( !at.equals( originalAttributeType ) )
+ if ( !at.equals( getOriginalAttributeType() ) )
{
refreshUI();
}
}
- /**
- * {@inheritDoc}
- */
public void matchingRuleAdded( MatchingRule mr )
{
refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void matchingRuleModified( MatchingRule mr )
{
refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void matchingRuleRemoved( MatchingRule mr )
{
refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void objectClassAdded( ObjectClass oc )
{
refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void objectClassModified( ObjectClass oc )
{
refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void objectClassRemoved( ObjectClass oc )
{
refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void schemaAdded( Schema schema )
{
refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void schemaRemoved( Schema schema )
{
if ( !schema.equals( originalSchema ) )
@@ -210,27 +169,24 @@
}
- /**
- * {@inheritDoc}
- */
+ public void schemaRenamed( Schema schema )
+ {
+ refreshUI();
+ }
+
+
public void syntaxAdded( LdapSyntax syntax )
{
refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void syntaxModified( LdapSyntax syntax )
{
refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void syntaxRemoved( LdapSyntax syntax )
{
refreshUI();
@@ -269,6 +225,7 @@
{
public void modifyText( ModifyEvent e )
{
+ AttributeType modifiedAttributeType = getModifiedAttributeType();
AliasesStringParser parser = new AliasesStringParser();
parser.parse( aliasesText.getText() );
List<Alias> parsedAliases = parser.getAliases();
@@ -291,16 +248,13 @@
{
public void widgetSelected( SelectionEvent e )
{
- EditAliasesDialog editDialog = new EditAliasesDialog( modifiedAttributeType.getNames() );
- if ( editDialog.open() != Window.OK )
+ AttributeType modifiedAttributeType = getModifiedAttributeType();
+ EditAttributeTypeAliasesDialog dialog = new EditAttributeTypeAliasesDialog(
+ modifiedAttributeType.getNames() );
+ if ( dialog.open() == EditAttributeTypeAliasesDialog.OK )
{
- return;
- }
- if ( editDialog.isDirty() )
- {
- modifiedAttributeType.setNames( editDialog.getAliases() );
- if ( ( modifiedAttributeType.getNames() != null )
- && ( modifiedAttributeType.getNames().size() != 0 ) )
+ modifiedAttributeType.setNames( dialog.getAliases() );
+ if ( ( modifiedAttributeType.getNames() != null ) && ( modifiedAttributeType.getNames().size() != 0 ) )
{
aliasesText.setText( ViewUtils.concateAliases( modifiedAttributeType.getNames() ) );
}
@@ -325,10 +279,10 @@
if ( Oid.isOid( oid ) )
{
- if ( ( originalAttributeType.getOid().equals( oid ) )
- || !( schemaHandler.isAliasOrOidAlreadyTaken( oid ) ) )
+ if ( ( getOriginalAttributeType().getOid().equals( oid ) )
+ || !( schemaHandler.isOidAlreadyTaken( oid ) ) )
{
- modifiedAttributeType.setOid( oid );
+ getModifiedAttributeType().setOid( oid );
setEditorDirty();
}
else
@@ -365,7 +319,7 @@
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
SchemaEditorInput input = new SchemaEditorInput( schemaHandler
- .getSchema( modifiedAttributeType.getSchemaName() ) );
+ .getSchema( getModifiedAttributeType().getSchemaName() ) );
String editorId = SchemaEditor.ID;
try
{
@@ -384,7 +338,7 @@
public void modifyText( ModifyEvent e )
{
int caretPosition = descriptionText.getCaretPosition();
- modifiedAttributeType.setDescription( descriptionText.getText() );
+ getModifiedAttributeType().setDescription( descriptionText.getText() );
descriptionText.setSelection( caretPosition );
setEditorDirty();
}
@@ -419,6 +373,7 @@
{
public void selectionChanged( SelectionChangedEvent event )
{
+ MutableAttributeType modifiedAttributeType = getModifiedAttributeType();
Object selectedItem = ( ( StructuredSelection ) supComboViewer.getSelection() ).getFirstElement();
if ( selectedItem instanceof AttributeType )
@@ -456,6 +411,7 @@
{
public void modifyText( ModifyEvent e )
{
+ MutableAttributeType modifiedAttributeType = getModifiedAttributeType();
if ( usageCombo.getSelectionIndex() == 0 )
{
modifiedAttributeType.setUsage( UsageEnum.DIRECTORY_OPERATION );
@@ -481,6 +437,7 @@
{
public void selectionChanged( SelectionChangedEvent event )
{
+ MutableAttributeType modifiedAttributeType = getModifiedAttributeType();
Object selectedItem = ( ( StructuredSelection ) syntaxComboViewer.getSelection() ).getFirstElement();
if ( selectedItem instanceof LdapSyntax )
@@ -491,13 +448,13 @@
{
NonExistingSyntax nes = ( NonExistingSyntax ) selectedItem;
- if ( NonExistingMatchingRule.NONE.equals( nes.getName() ) )
+ if ( NonExistingMatchingRule.NONE.equals( nes.getDescription() ) )
{
modifiedAttributeType.setSyntaxOid( null );
}
else
{
- modifiedAttributeType.setSyntaxOid( ( ( NonExistingSyntax ) selectedItem ).getName() );
+ modifiedAttributeType.setSyntaxOid( ( ( NonExistingSyntax ) selectedItem ).getDescription() );
}
}
setEditorDirty();
@@ -509,7 +466,8 @@
{
public void modifyText( ModifyEvent e )
{
- if ( syntaxLengthText.getText().length() == 0 )
+ MutableAttributeType modifiedAttributeType = getModifiedAttributeType();
+ if ( syntaxLengthText.getText().length() <= 0 )
{
modifiedAttributeType.setSyntaxLength( -1 );
}
@@ -538,7 +496,7 @@
{
public void widgetSelected( SelectionEvent e )
{
- modifiedAttributeType.setObsolete( obsoleteCheckbox.getSelection() );
+ getModifiedAttributeType().setObsolete( obsoleteCheckbox.getSelection() );
setEditorDirty();
}
};
@@ -548,7 +506,7 @@
{
public void widgetSelected( SelectionEvent e )
{
- modifiedAttributeType.setSingleValued( singleValueCheckbox.getSelection() );
+ getModifiedAttributeType().setSingleValued( singleValueCheckbox.getSelection() );
setEditorDirty();
}
};
@@ -558,7 +516,7 @@
{
public void widgetSelected( SelectionEvent e )
{
- modifiedAttributeType.setCollective( collectiveCheckbox.getSelection() );
+ getModifiedAttributeType().setCollective( collectiveCheckbox.getSelection() );
setEditorDirty();
}
};
@@ -568,7 +526,7 @@
{
public void widgetSelected( SelectionEvent e )
{
- modifiedAttributeType.setUserModifiable( !noUserModificationCheckbox.getSelection() );
+ getModifiedAttributeType().setUserModifiable( !noUserModificationCheckbox.getSelection() );
setEditorDirty();
}
};
@@ -578,6 +536,7 @@
{
public void selectionChanged( SelectionChangedEvent event )
{
+ MutableAttributeType modifiedAttributeType = getModifiedAttributeType();
Object selectedItem = ( ( StructuredSelection ) equalityComboViewer.getSelection() ).getFirstElement();
if ( selectedItem instanceof MatchingRule )
@@ -606,6 +565,7 @@
{
public void selectionChanged( SelectionChangedEvent event )
{
+ MutableAttributeType modifiedAttributeType = getModifiedAttributeType();
Object selectedItem = ( ( StructuredSelection ) orderingComboViewer.getSelection() ).getFirstElement();
if ( selectedItem instanceof MatchingRule )
@@ -634,6 +594,7 @@
{
public void selectionChanged( SelectionChangedEvent event )
{
+ MutableAttributeType modifiedAttributeType = getModifiedAttributeType();
Object selectedItem = ( ( StructuredSelection ) substringComboViewer.getSelection() ).getFirstElement();
if ( selectedItem instanceof MatchingRule )
@@ -677,7 +638,7 @@
* @param editor
* the associated editor
*/
- public AttributeTypeEditorOverviewPage( FormEditor editor )
+ public AttributeTypeEditorOverviewPage( AttributeTypeEditor editor )
{
super( editor, ID, Messages.getString( "AttributeTypeEditorOverviewPage.Overview" ) ); //$NON-NLS-1$
schemaHandler = Activator.getDefault().getSchemaHandler();
@@ -690,10 +651,7 @@
*/
protected void createFormContent( IManagedForm managedForm )
{
- // Getting the original and modified attribute types
- modifiedAttributeType = ( ( AttributeTypeEditor ) getEditor() ).getModifiedAttributeType();
- originalAttributeType = ( ( AttributeTypeEditor ) getEditor() ).getOriginalAttributeType();
- originalSchema = schemaHandler.getSchema( originalAttributeType.getSchemaName() );
+ super.createFormContent( managedForm );
// Creating the base UI
ScrolledForm form = managedForm.getForm();
@@ -909,10 +867,15 @@
/**
- * Fills in the User Interface fields.
+ * {@inheritDoc}
*/
- private void fillInUiFields()
+ protected void fillInUiFields()
{
+ // Getting the modified attribute type
+ AttributeType modifiedAttributeType = getModifiedAttributeType();
+
+ originalSchema = schemaHandler.getSchema( getOriginalAttributeType().getSchemaName() );
+
// ALIASES Label
if ( ( modifiedAttributeType.getNames() != null ) && ( modifiedAttributeType.getNames().size() != 0 ) )
{
@@ -948,7 +911,7 @@
fillSyntaxCombo();
// SYNTAX LENGTH Field
- if ( modifiedAttributeType.getSyntaxLength() != 0 )
+ if ( modifiedAttributeType.getSyntaxLength() > 0 )
{
syntaxLengthText.setText( modifiedAttributeType.getSyntaxLength() + "" ); //$NON-NLS-1$
}
@@ -981,9 +944,9 @@
*/
private void fillSupCombo()
{
- supComboViewer.setInput( new ATESuperiorComboInput( originalAttributeType ) );
+ supComboViewer.setInput( new ATESuperiorComboInput( getOriginalAttributeType() ) );
- String supAtName = modifiedAttributeType.getSuperiorOid();
+ String supAtName = getModifiedAttributeType().getSuperiorOid();
if ( supAtName == null )
{
supComboViewer.setSelection( new StructuredSelection( new NonExistingAttributeType(
@@ -1016,21 +979,22 @@
*/
private void fillInUsageCombo()
{
- if ( modifiedAttributeType.getUsage() == UsageEnum.DIRECTORY_OPERATION )
+ UsageEnum usage = getModifiedAttributeType().getUsage();
+
+ switch ( usage )
{
- usageCombo.select( 0 );
- }
- else if ( modifiedAttributeType.getUsage() == UsageEnum.DISTRIBUTED_OPERATION )
- {
- usageCombo.select( 1 );
- }
- else if ( modifiedAttributeType.getUsage() == UsageEnum.DSA_OPERATION )
- {
- usageCombo.select( 2 );
- }
- else if ( modifiedAttributeType.getUsage() == UsageEnum.USER_APPLICATIONS )
- {
- usageCombo.select( 3 );
+ case DIRECTORY_OPERATION:
+ usageCombo.select( 0 );
+ return;
+ case DISTRIBUTED_OPERATION:
+ usageCombo.select( 1 );
+ return;
+ case DSA_OPERATION:
+ usageCombo.select( 2 );
+ return;
+ case USER_APPLICATIONS:
+ usageCombo.select( 3 );
+ return;
}
}
@@ -1042,7 +1006,7 @@
{
syntaxComboViewer.setInput( new ATESyntaxComboInput() );
- String syntaxOID = modifiedAttributeType.getSyntaxOid();
+ String syntaxOID = getModifiedAttributeType().getSyntaxOid();
if ( syntaxOID == null )
{
syntaxComboViewer.setSelection( new StructuredSelection( new NonExistingSyntax( NonExistingSyntax.NONE ) ),
@@ -1077,7 +1041,7 @@
{
equalityComboViewer.setInput( new ATEMatchingRulesComboInput() );
- String equalityName = modifiedAttributeType.getEqualityOid();
+ String equalityName = getModifiedAttributeType().getEqualityOid();
if ( equalityName == null )
{
equalityComboViewer.setSelection( new StructuredSelection( new NonExistingMatchingRule(
@@ -1112,7 +1076,7 @@
{
orderingComboViewer.setInput( new ATEMatchingRulesComboInput() );
- String orderingName = modifiedAttributeType.getOrderingOid();
+ String orderingName = getModifiedAttributeType().getOrderingOid();
if ( orderingName == null )
{
orderingComboViewer.setSelection( new StructuredSelection( new NonExistingMatchingRule(
@@ -1148,7 +1112,7 @@
{
substringComboViewer.setInput( new ATEMatchingRulesComboInput() );
- String substringName = modifiedAttributeType.getSubstringOid();
+ String substringName = getModifiedAttributeType().getSubstringOid();
if ( substringName == null )
{
substringComboViewer.setSelection( new StructuredSelection( new NonExistingMatchingRule(
@@ -1177,89 +1141,70 @@
/**
- * Adds listeners to UI fields
+ * {@inheritDoc}
*/
- private void addListeners()
+ protected void addListeners()
{
- aliasesText.addModifyListener( aliasesTextModifyListener );
- aliasesButton.addSelectionListener( aliasesButtonListener );
- oidText.addModifyListener( oidTextModifyListener );
- oidText.addVerifyListener( oidTextVerifyListener );
- schemaLink.addHyperlinkListener( schemaLinkListener );
- descriptionText.addModifyListener( descriptionTextListener );
- supLabel.addHyperlinkListener( supLabelListener );
- supComboViewer.addSelectionChangedListener( supComboViewerListener );
- usageCombo.addModifyListener( usageComboListener );
- syntaxComboViewer.addSelectionChangedListener( syntaxComboViewerListener );
- syntaxLengthText.addModifyListener( syntaxLengthTextModifyListener );
- syntaxLengthText.addVerifyListener( syntaxLengthTextVerifyListener );
- obsoleteCheckbox.addSelectionListener( obsoleteCheckboxListener );
- singleValueCheckbox.addSelectionListener( singleValueCheckboxListener );
- collectiveCheckbox.addSelectionListener( collectiveCheckboxListener );
- noUserModificationCheckbox.addSelectionListener( noUserModificationCheckboxListener );
- equalityComboViewer.addSelectionChangedListener( equalityComboViewerListener );
- orderingComboViewer.addSelectionChangedListener( orderingComboViewerListener );
- substringComboViewer.addSelectionChangedListener( substringComboViewerListener );
+ addModifyListener( aliasesText, aliasesTextModifyListener );
+ addSelectionListener( aliasesButton, aliasesButtonListener );
+ addModifyListener( oidText, oidTextModifyListener );
+ addVerifyListener( oidText, oidTextVerifyListener );
+ addHyperlinkListener( schemaLink, schemaLinkListener );
+ addModifyListener( descriptionText, descriptionTextListener );
+ addHyperlinkListener( supLabel, supLabelListener );
+ addSelectionChangedListener( supComboViewer, supComboViewerListener );
+ addModifyListener( usageCombo, usageComboListener );
+ addSelectionChangedListener( syntaxComboViewer, syntaxComboViewerListener );
+ addModifyListener( syntaxLengthText, syntaxLengthTextModifyListener );
+ addVerifyListener( syntaxLengthText, syntaxLengthTextVerifyListener );
+ addSelectionListener( obsoleteCheckbox, obsoleteCheckboxListener );
+ addSelectionListener( singleValueCheckbox, singleValueCheckboxListener );
+ addSelectionListener( collectiveCheckbox, collectiveCheckboxListener );
+ addSelectionListener( noUserModificationCheckbox, noUserModificationCheckboxListener );
+ addSelectionChangedListener( equalityComboViewer, equalityComboViewerListener );
+ addSelectionChangedListener( orderingComboViewer, orderingComboViewerListener );
+ addSelectionChangedListener( substringComboViewer, substringComboViewerListener );
Display.getCurrent().addFilter( SWT.MouseWheel, mouseWheelFilter );
}
/**
- * Removes listeners from UI fields
+ * {@inheritDoc}
*/
- private void removeListeners()
+ protected void removeListeners()
{
- aliasesText.removeModifyListener( aliasesTextModifyListener );
- aliasesButton.removeSelectionListener( aliasesButtonListener );
- oidText.removeModifyListener( oidTextModifyListener );
- oidText.removeVerifyListener( oidTextVerifyListener );
- schemaLink.removeHyperlinkListener( schemaLinkListener );
- descriptionText.removeModifyListener( descriptionTextListener );
- supLabel.removeHyperlinkListener( supLabelListener );
- supComboViewer.removeSelectionChangedListener( supComboViewerListener );
- usageCombo.removeModifyListener( usageComboListener );
- syntaxComboViewer.removeSelectionChangedListener( syntaxComboViewerListener );
- syntaxLengthText.removeModifyListener( syntaxLengthTextModifyListener );
- syntaxLengthText.removeVerifyListener( syntaxLengthTextVerifyListener );
- obsoleteCheckbox.removeSelectionListener( obsoleteCheckboxListener );
- singleValueCheckbox.removeSelectionListener( singleValueCheckboxListener );
- collectiveCheckbox.removeSelectionListener( collectiveCheckboxListener );
- noUserModificationCheckbox.removeSelectionListener( noUserModificationCheckboxListener );
- equalityComboViewer.removeSelectionChangedListener( equalityComboViewerListener );
- orderingComboViewer.removeSelectionChangedListener( orderingComboViewerListener );
- substringComboViewer.removeSelectionChangedListener( substringComboViewerListener );
+ removeModifyListener( aliasesText, aliasesTextModifyListener );
+ removeSelectionListener( aliasesButton, aliasesButtonListener );
+ removeModifyListener( oidText, oidTextModifyListener );
+ removeVerifyListener( oidText, oidTextVerifyListener );
+ removeHyperlinkListener( schemaLink, schemaLinkListener );
+ removeModifyListener( descriptionText, descriptionTextListener );
+ removeHyperlinkListener( supLabel, supLabelListener );
+ removeSelectionChangedListener( supComboViewer, supComboViewerListener );
+ removeModifyListener( usageCombo, usageComboListener );
+ removeSelectionChangedListener( syntaxComboViewer, syntaxComboViewerListener );
+ removeModifyListener( syntaxLengthText, syntaxLengthTextModifyListener );
+ removeVerifyListener( syntaxLengthText, syntaxLengthTextVerifyListener );
+ removeSelectionListener( obsoleteCheckbox, obsoleteCheckboxListener );
+ removeSelectionListener( singleValueCheckbox, singleValueCheckboxListener );
+ removeSelectionListener( collectiveCheckbox, collectiveCheckboxListener );
+ removeSelectionListener( noUserModificationCheckbox, noUserModificationCheckboxListener );
+ removeSelectionChangedListener( equalityComboViewer, equalityComboViewerListener );
+ removeSelectionChangedListener( orderingComboViewer, orderingComboViewerListener );
+ removeSelectionChangedListener( substringComboViewer, substringComboViewerListener );
Display.getCurrent().removeFilter( SWT.MouseWheel, mouseWheelFilter );
}
/**
- * Sets the dirty state of the editor to dirty
- */
- private void setEditorDirty()
- {
- ( ( AttributeTypeEditor ) getEditor() ).setDirty( true );
- }
-
-
- /**
- * Refreshes the UI.
- */
- public void refreshUI()
- {
- removeListeners();
- fillInUiFields();
- addListeners();
- }
-
-
- /**
* {@inheritDoc}
*/
public void dispose()
{
schemaHandler.removeListener( schemaHandlerListener );
+
super.dispose();
}
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java
index 687f167..48da538 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.view.editors.attributetype;
@@ -26,6 +26,7 @@
import java.util.List;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
import org.apache.directory.shared.ldap.model.schema.parsers.OpenLdapSchemaParser;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.model.io.OpenLdapSchemaFileExporter;
@@ -41,8 +42,6 @@
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.FormPage;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.ScrolledForm;
@@ -50,14 +49,11 @@
/**
* This class is the Source Code Page of the Attribute Type Editor
*/
-public class AttributeTypeEditorSourceCodePage extends FormPage
+public class AttributeTypeEditorSourceCodePage extends AbstractAttributeTypeEditorPage
{
/** The page ID */
public static final String ID = AttributeTypeEditor.ID + "sourceCodePage"; //$NON-NLS-1$
- /** The modified attribute type */
- private AttributeType modifiedAttributeType;
-
/** The Schema Source Viewer */
private SchemaSourceViewer schemaSourceViewer;
@@ -72,7 +68,7 @@
canLeaveThePage = true;
try
{
- ( ( AttributeTypeEditor ) getEditor() ).setDirty( true );
+ getEditor().setDirty( true );
OpenLdapSchemaParser parser = new OpenLdapSchemaParser();
parser.parse( schemaSourceViewer.getTextWidget().getText() );
List<?> attributeTypes = parser.getAttributeTypes();
@@ -103,7 +99,7 @@
* @param editor
* the associated editor
*/
- public AttributeTypeEditorSourceCodePage( FormEditor editor )
+ public AttributeTypeEditorSourceCodePage( AttributeTypeEditor editor )
{
super( editor, ID, Messages.getString( "AttributeTypeEditorSourceCodePage.SourceCode" ) ); //$NON-NLS-1$
}
@@ -114,6 +110,8 @@
*/
protected void createFormContent( IManagedForm managedForm )
{
+ super.createFormContent( managedForm );
+
ScrolledForm form = managedForm.getForm();
FormToolkit toolkit = managedForm.getToolkit();
GridLayout layout = new GridLayout();
@@ -122,8 +120,6 @@
form.getBody().setLayout( layout );
toolkit.paintBordersFor( form.getBody() );
- modifiedAttributeType = ( ( AttributeTypeEditor ) getEditor() ).getModifiedAttributeType();
-
// SOURCE CODE Field
schemaSourceViewer = new SchemaSourceViewer( form.getBody(), null, null, false, SWT.BORDER | SWT.H_SCROLL
| SWT.V_SCROLL );
@@ -141,21 +137,47 @@
// Initialization from the "input" attribute type
fillInUiFields();
- schemaSourceViewer.getTextWidget().addModifyListener( schemaSourceViewerListener );
+ // Listeners initialization
+ addListeners();
// Help Context for Dynamic Help
PlatformUI.getWorkbench().getHelpSystem().setHelp( form,
PluginConstants.PLUGIN_ID + "." + "attribute_type_editor" ); //$NON-NLS-1$ //$NON-NLS-2$
+
+ initialized = true;
}
/**
- * Fills in the User Interface.
+ * {@inheritDoc}
*/
- private void fillInUiFields()
+ protected void addListeners()
{
- // SOURCE CODE Field
- schemaSourceViewer.getDocument().set( OpenLdapSchemaFileExporter.toSourceCode( modifiedAttributeType ) );
+ if ( schemaSourceViewer != null )
+ {
+ addModifyListener( schemaSourceViewer.getTextWidget(), schemaSourceViewerListener );
+ }
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void removeListeners()
+ {
+ if ( schemaSourceViewer != null )
+ {
+ removeModifyListener( schemaSourceViewer.getTextWidget(), schemaSourceViewerListener );
+ }
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void fillInUiFields()
+ {
+ schemaSourceViewer.getDocument().set( OpenLdapSchemaFileExporter.toSourceCode( getModifiedAttributeType() ) );
}
@@ -177,6 +199,8 @@
*/
private void updateAttributeType( AttributeType atl )
{
+ MutableAttributeType modifiedAttributeType = getModifiedAttributeType();
+
modifiedAttributeType.setCollective( atl.isCollective() );
modifiedAttributeType.setDescription( atl.getDescription() );
modifiedAttributeType.setEqualityOid( atl.getEqualityOid() );
@@ -192,13 +216,4 @@
modifiedAttributeType.setUsage( atl.getUsage() );
modifiedAttributeType.setUserModifiable( atl.isUserModifiable() );
}
-
-
- /**
- * Refreshes the UI.
- */
- public void refreshUI()
- {
- fillInUiFields();
- }
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java
index 5f6ebe1..a885704 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.view.editors.attributetype;
@@ -24,10 +24,10 @@
import java.util.List;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
-import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerAdapter;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener;
import org.apache.directory.studio.schemaeditor.model.Schema;
@@ -49,8 +49,6 @@
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.FormPage;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.ScrolledForm;
import org.eclipse.ui.forms.widgets.Section;
@@ -59,20 +57,11 @@
/**
* This class is the Used By Page of the Attribute Type Editor
*/
-public class AttributeTypeEditorUsedByPage extends FormPage
+public class AttributeTypeEditorUsedByPage extends AbstractAttributeTypeEditorPage
{
/** The page ID */
public static final String ID = AttributeTypeEditor.ID + "usedByPage"; //$NON-NLS-1$
- /** The modified attribute type */
- private AttributeType modifiedAttributeType;
-
- /** The original attribute type */
- private AttributeType originalAttributeType;
-
- /** The Schema Handler */
- private SchemaHandler schemaHandler;
-
/** The Schema listener */
private SchemaHandlerListener schemaHandlerListener = new SchemaHandlerAdapter()
{
@@ -168,7 +157,7 @@
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
try
{
- page.openEditor( new ObjectClassEditorInput( ( ObjectClass ) selectedItem ),
+ page.openEditor( new ObjectClassEditorInput( ( MutableObjectClass ) selectedItem ),
ObjectClassEditor.ID );
}
catch ( PartInitException exception )
@@ -192,7 +181,7 @@
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
try
{
- page.openEditor( new ObjectClassEditorInput( ( ObjectClass ) selectedItem ),
+ page.openEditor( new ObjectClassEditorInput( ( MutableObjectClass ) selectedItem ),
ObjectClassEditor.ID );
}
catch ( PartInitException exception )
@@ -210,11 +199,10 @@
* @param editor
* the associated editor
*/
- public AttributeTypeEditorUsedByPage( FormEditor editor )
+ public AttributeTypeEditorUsedByPage( AttributeTypeEditor editor )
{
super( editor, ID, Messages.getString( "AttributeTypeEditorUsedByPage.UsedBy" ) ); //$NON-NLS-1$
- schemaHandler = Activator.getDefault().getSchemaHandler();
- schemaHandler.addListener( schemaHandlerListener );
+ Activator.getDefault().getSchemaHandler().addListener( schemaHandlerListener );
}
@@ -223,10 +211,6 @@
*/
protected void createFormContent( IManagedForm managedForm )
{
- // Getting the modified and original attribute types
- modifiedAttributeType = ( ( AttributeTypeEditor ) getEditor() ).getModifiedAttributeType();
- originalAttributeType = ( ( AttributeTypeEditor ) getEditor() ).getOriginalAttributeType();
-
// Creating the base UI
ScrolledForm form = managedForm.getForm();
FormToolkit toolkit = managedForm.getToolkit();
@@ -248,6 +232,8 @@
// Help Context for Dynamic Help
PlatformUI.getWorkbench().getHelpSystem().setHelp( form,
PluginConstants.PLUGIN_ID + "." + "attribute_type_editor" ); //$NON-NLS-1$ //$NON-NLS-2$
+
+ initialized = true;
}
@@ -261,6 +247,8 @@
*/
private void createAsMandatoryAttributeSection( Composite parent, FormToolkit toolkit )
{
+ AttributeType modifiedAttributeType = getModifiedAttributeType();
+
// As Mandatory Attribute Section
Section mandatoryAttributeSection = toolkit.createSection( parent, Section.DESCRIPTION | Section.EXPANDED
| Section.TITLE_BAR );
@@ -308,6 +296,8 @@
*/
private void createAsOptionalAttributeSection( Composite parent, FormToolkit toolkit )
{
+ AttributeType modifiedAttributeType = getModifiedAttributeType();
+
// Matching Rules Section
Section optionalAttributeSection = toolkit.createSection( parent, Section.DESCRIPTION | Section.EXPANDED
| Section.TITLE_BAR );
@@ -346,22 +336,34 @@
/**
- * Fills in the User Interface.
+ * {@inheritDoc}
*/
- private void fillInUiFields()
+ protected void fillInUiFields()
{
- mandatoryAttributeTableViewer.setInput( originalAttributeType );
- optionalAttibuteTableViewer.setInput( originalAttributeType );
+ AttributeType modifiedAttributeType = getModifiedAttributeType();
+
+ mandatoryAttributeTableViewer.setInput( modifiedAttributeType );
+ optionalAttibuteTableViewer.setInput( modifiedAttributeType );
}
/**
- * Adds listeners to UI fields
+ * {@inheritDoc}
*/
- private void addListeners()
+ protected void addListeners()
{
- mandatoryAttributeTable.addMouseListener( mandatoryAttributeTableListener );
- optionalAttibuteTable.addMouseListener( optionalAttibuteTableListener );
+ addMouseListener( mandatoryAttributeTable, mandatoryAttributeTableListener );
+ addMouseListener( optionalAttibuteTable, optionalAttibuteTableListener );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void removeListeners()
+ {
+ removeMouseListener( mandatoryAttributeTable, mandatoryAttributeTableListener );
+ removeMouseListener( optionalAttibuteTable, optionalAttibuteTableListener );
}
@@ -386,9 +388,8 @@
*/
public void dispose()
{
- schemaHandler.removeListener( schemaHandlerListener );
+ Activator.getDefault().getSchemaHandler().removeListener( schemaHandlerListener );
super.dispose();
}
-
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages.properties
index 8fca25a..d74d57f 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages.properties
@@ -20,6 +20,7 @@
ATESyntaxComboLabelProvider.None=(None) - ({0})
AttributeTypeEditor.AttributeErrors=The editor of the Source Code contains errors, you cannot save the attribute type until these errors are fixed.
AttributeTypeEditor.CodeErrors=The editor of the Source Code contains errors, you cannot return to the Overview page until these errors are fixed.
+AttributeTypeEditor.Error=Error\!
AttributeTypeEditorInput.FromSchema={0} from the {1} schema
AttributeTypeEditorOverviewPage.Aliases=Aliases:
AttributeTypeEditorOverviewPage.Collective=Collective
@@ -30,7 +31,6 @@
AttributeTypeEditorOverviewPage.GeneralInformation=General information
AttributeTypeEditorOverviewPage.MalformedOID=Malformed OID.
AttributeTypeEditorOverviewPage.MatchingRules=Matching Rules
-AttributeTypeEditorOverviewPage.None=(None)
AttributeTypeEditorOverviewPage.Obsolete=Obsolete
AttributeTypeEditorOverviewPage.OID=OID:
AttributeTypeEditorOverviewPage.Ordering=Ordering:
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_de.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_de.properties
index 0b57acb..b774902 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_de.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_de.properties
@@ -20,6 +20,7 @@
ATESyntaxComboLabelProvider.None=(Keine) - ({0})
AttributeTypeEditor.AttributeErrors=Der Editor des Source Codes enth\u00E4lt Fehler, Sie k\u00F6nnen den Attribut Typ nicht speichern bis diese Fehler behoben sind.
AttributeTypeEditor.CodeErrors=Der Editor des Source Codes enth\u00E4lt Fehler, Sie k\u00F6nne solange nicht auf die \u00DCbersichtseite zur\u00FCckkehren, bis diese Fehler behoben sind.
+AttributeTypeEditor.Error=Fehler\!
AttributeTypeEditorInput.FromSchema={0} aus dem {1} Schema
AttributeTypeEditorOverviewPage.Aliases=Aliase\:
AttributeTypeEditorOverviewPage.Collective=Gemeinsam
@@ -30,7 +31,6 @@
AttributeTypeEditorOverviewPage.GeneralInformation=Allgemeine Informationen
AttributeTypeEditorOverviewPage.MalformedOID=Ung\u00FCltige OID.
AttributeTypeEditorOverviewPage.MatchingRules=Passende Regeln
-AttributeTypeEditorOverviewPage.None=(Keine)
AttributeTypeEditorOverviewPage.Obsolete=Obsolet
AttributeTypeEditorOverviewPage.OID=OID:
AttributeTypeEditorOverviewPage.Ordering=Sortierung\:
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_fr.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_fr.properties
index cd2beb8..363b98a 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_fr.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_fr.properties
@@ -20,7 +20,8 @@
ATESyntaxComboLabelProvider.None=(Pas de nom) - ({0})
AttributeTypeEditor.AttributeErrors=L'\u00E9diteur de code source contient des erreurs, vous ne pouvez pas sauvegarder le type d'attribut tant que ces erreurs ne sont pas corrig\u00E9es.
AttributeTypeEditor.CodeErrors=L'\u00E9diteur de code source contient des erreurs, vous ne pouvez pas revenir \u00E0 la vue g\u00E9n\u00E9rale tant que ces erreurs ne sont pas corrig\u00E9es.
-AttributeTypeEditorInput.FromSchema={0} en provenance du sch\u00E9ma {1}
+AttributeTypeEditor.Error=Erreur \!
+AttributeTypeEditorInput.FromSchema={0} du sch\u00E9ma {1}
AttributeTypeEditorOverviewPage.Aliases=Alias:
AttributeTypeEditorOverviewPage.Collective=Collectif
AttributeTypeEditorOverviewPage.Description=Description:
@@ -30,7 +31,6 @@
AttributeTypeEditorOverviewPage.GeneralInformation=Information g\u00E9nerale
AttributeTypeEditorOverviewPage.MalformedOID=OID incorrect.
AttributeTypeEditorOverviewPage.MatchingRules=R\u00E8gles de s\u00E9lection
-AttributeTypeEditorOverviewPage.None=(Pas de nom)
AttributeTypeEditorOverviewPage.Obsolete=Obsolete
AttributeTypeEditorOverviewPage.OID=OID:
AttributeTypeEditorOverviewPage.Ordering=Ordre:
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/messages.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/messages.properties
new file mode 100644
index 0000000..83e0ab5
--- /dev/null
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/messages.properties
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+EditorsUtils.SaveDialogTitle=Save All Modified Resources
+EditorsUtils.SaveDialogMessage=All modified resources must be saved before this operation.
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/messages_de.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/messages_de.properties
new file mode 100644
index 0000000..160d707
--- /dev/null
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/messages_de.properties
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+EditorsUtils.SaveDialogTitle=TODO:Save All Modified Resources
+EditorsUtils.SaveDialogMessage=TODO:All modified resources must be saved before this operation.
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/messages_fr.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/messages_fr.properties
new file mode 100644
index 0000000..0e0955f
--- /dev/null
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/messages_fr.properties
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+EditorsUtils.SaveDialogTitle=Sauvegarder toutes les ressources modifiées
+EditorsUtils.SaveDialogMessage=Toutes les ressources modifiées doivent être sauvegardées avant de poursuivre.
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/AbstractObjectClassEditorPage.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/AbstractObjectClassEditorPage.java
new file mode 100644
index 0000000..cb33107
--- /dev/null
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/AbstractObjectClassEditorPage.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.directory.studio.schemaeditor.view.editors.objectclass;
+
+
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
+import org.apache.directory.shared.ldap.model.schema.ObjectClass;
+import org.apache.directory.studio.schemaeditor.view.editors.AbstractSchemaObjectEditorPage;
+
+
+/**
+ * This abstract class defines an object class editor page.
+ */
+public abstract class AbstractObjectClassEditorPage extends AbstractSchemaObjectEditorPage<ObjectClassEditor>
+{
+ /** The flag to indicate if the page has been initialized */
+ protected boolean initialized = false;
+
+
+ /**
+ * Default constructor
+ *
+ * @param editor the parent editor
+ * @param id the unique identifier
+ * @param title the page title
+ */
+ public AbstractObjectClassEditorPage( ObjectClassEditor editor, String id, String title )
+ {
+ super( editor, id, title );
+ }
+
+
+ /**
+ * Gets the original object class.
+ *
+ * @return
+ * the original object class
+ */
+ public ObjectClass getOriginalObjectClass()
+ {
+ return getEditor().getOriginalObjectClass();
+ }
+
+
+ /**
+ * Gets the modified object class.
+ *
+ * @return
+ * the modified object class
+ */
+ public MutableObjectClass getModifiedObjectClass()
+ {
+ return getEditor().getModifiedObjectClass();
+ }
+
+
+ /**
+ * Sets the editor as dirty
+ */
+ protected void setEditorDirty()
+ {
+ getEditor().setDirty( true );
+ }
+}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java
index 7030c2e..e6d4d26 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java
@@ -6,27 +6,26 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.view.editors.objectclass;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.PluginUtils;
-import org.apache.directory.studio.schemaeditor.controller.ObjectClassAdapter;
-import org.apache.directory.studio.schemaeditor.controller.ObjectClassListener;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerAdapter;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener;
@@ -34,9 +33,8 @@
import org.apache.log4j.Logger;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.dialogs.IPageChangedListener;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.dialogs.PageChangedEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.PartInitException;
@@ -58,20 +56,18 @@
/** The editor */
private ObjectClassEditor instance;
- /** The Overview page */
- private ObjectClassEditorOverviewPage overview;
-
- /** The Source Code page */
- private ObjectClassEditorSourceCodePage sourceCode;
+ // The pages
+ private ObjectClassEditorOverviewPage overviewPage;
+ private ObjectClassEditorSourceCodePage sourceCodePage;
/** The dirty state flag */
private boolean dirty = false;
/** The original object class */
- private ObjectClass originalObjectClass;
+ private MutableObjectClass originalObjectClass;
/** The object class used to save modifications */
- private ObjectClass modifiedObjectClass;
+ private MutableObjectClass modifiedObjectClass;
/** The originalSchema */
private Schema originalSchema;
@@ -85,36 +81,53 @@
if ( selectedPage instanceof ObjectClassEditorOverviewPage )
{
- if ( !sourceCode.canLeaveThePage() )
+ if ( !sourceCodePage.canLeaveThePage() )
{
notifyError( Messages.getString( "ObjectClassEditor.CodeError" ) ); //$NON-NLS-1$
return;
}
- overview.refreshUI();
+ overviewPage.refreshUI();
}
else if ( selectedPage instanceof ObjectClassEditorSourceCodePage )
{
- if ( sourceCode.canLeaveThePage() )
+ if ( sourceCodePage.canLeaveThePage() )
{
- sourceCode.refreshUI();
+ sourceCodePage.refreshUI();
}
}
}
};
- /** The object class listener */
- private ObjectClassListener objectClassListener = new ObjectClassAdapter()
- {
- public void objectClassRemoved()
- {
- getEditorSite().getPage().closeEditor( instance, false );
- }
- };
-
/** The SchemaHandler listener */
private SchemaHandlerListener schemaHandlerListener = new SchemaHandlerAdapter()
{
+ public void objectClassModified( ObjectClass oc )
+ {
+ if ( oc.equals( originalObjectClass ) )
+ {
+ // Updating the modified object class
+ modifiedObjectClass = PluginUtils.getClone( originalObjectClass );
+
+ // Refreshing the editor pages
+ overviewPage.refreshUI();
+ sourceCodePage.refreshUI();
+
+ // Refreshing the part name (in case of a change in the name)
+ setPartName( getEditorInput().getName() );
+ }
+ }
+
+
+ public void objectClassRemoved( ObjectClass oc )
+ {
+ if ( oc.equals( originalObjectClass ) )
+ {
+ getEditorSite().getPage().closeEditor( instance, false );
+ }
+ }
+
+
public void schemaRemoved( Schema schema )
{
if ( schema.equals( originalSchema ) )
@@ -122,6 +135,20 @@
getEditorSite().getPage().closeEditor( instance, false );
}
}
+
+
+ public void schemaRenamed( Schema schema )
+ {
+ if ( schema.equals( originalSchema ) )
+ {
+ // Updating the modified object class
+ modifiedObjectClass = PluginUtils.getClone( originalObjectClass );
+
+ // Refreshing the editor pages
+ overviewPage.refreshUI();
+ sourceCodePage.refreshUI();
+ }
+ }
};
@@ -143,7 +170,6 @@
SchemaHandler schemaHandler = Activator.getDefault().getSchemaHandler();
originalSchema = schemaHandler.getSchema( originalObjectClass.getSchemaName() );
- schemaHandler.addListener( originalObjectClass, objectClassListener );
schemaHandler.addListener( schemaHandlerListener );
addPageChangedListener( pageChangedListener );
@@ -156,7 +182,6 @@
public void dispose()
{
SchemaHandler schemaHandler = Activator.getDefault().getSchemaHandler();
- schemaHandler.removeListener( originalObjectClass, objectClassListener );
schemaHandler.removeListener( schemaHandlerListener );
super.dispose();
@@ -170,10 +195,10 @@
{
try
{
- overview = new ObjectClassEditorOverviewPage( this ); //$NON-NLS-1$ //$NON-NLS-2$
- addPage( overview );
- sourceCode = new ObjectClassEditorSourceCodePage( this ); //$NON-NLS-1$ //$NON-NLS-2$
- addPage( sourceCode );
+ overviewPage = new ObjectClassEditorOverviewPage( this );
+ addPage( overviewPage );
+ sourceCodePage = new ObjectClassEditorSourceCodePage( this );
+ addPage( sourceCodePage );
}
catch ( PartInitException e )
{
@@ -188,7 +213,7 @@
public void doSave( IProgressMonitor monitor )
{
// Verifying if there is an error on the source code page
- if ( !sourceCode.canLeaveThePage() )
+ if ( !sourceCodePage.canLeaveThePage() )
{
notifyError( Messages.getString( "ObjectClassEditor.CodeErrorObject" ) ); //$NON-NLS-1$
monitor.setCanceled( true );
@@ -262,7 +287,7 @@
* @return
* the modified object class
*/
- public ObjectClass getModifiedObjectClass()
+ public MutableObjectClass getModifiedObjectClass()
{
return modifiedObjectClass;
}
@@ -274,7 +299,7 @@
* @param modifiedObjectClass
* the modified object class to set.
*/
- public void setModifiedObjectClass( ObjectClass modifiedObjectClass )
+ public void setModifiedObjectClass( MutableObjectClass modifiedObjectClass )
{
this.modifiedObjectClass = modifiedObjectClass;
}
@@ -282,15 +307,13 @@
/**
* Opens an error dialog displaying the given message.
- *
+ *
* @param message
* the message to display
*/
private void notifyError( String message )
{
- MessageBox messageBox = new MessageBox( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), SWT.OK
- | SWT.ICON_ERROR );
- messageBox.setMessage( message );
- messageBox.open();
+ MessageDialog.openError( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+ Messages.getString( "ObjectClassEditor.Error" ), message ); //$NON-NLS-1$
}
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java
index 197d932..eb50d84 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java
@@ -56,6 +56,7 @@
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("unchecked")
public Object[] getElements( Object inputElement )
{
if ( inputElement instanceof List<?> )
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java
index 0be7149..dccb054 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.view.editors.objectclass;
@@ -23,7 +23,7 @@
import java.util.List;
-import org.apache.directory.shared.ldap.model.schema.ObjectClass;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IEditorInput;
@@ -35,7 +35,7 @@
*/
public class ObjectClassEditorInput implements IEditorInput
{
- private ObjectClass objectClass;
+ private MutableObjectClass objectClass;
/**
@@ -44,7 +44,7 @@
* @param obj
* the object class
*/
- public ObjectClassEditorInput( ObjectClass obj )
+ public ObjectClassEditorInput( MutableObjectClass obj )
{
super();
objectClass = obj;
@@ -108,6 +108,7 @@
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("rawtypes")
public Object getAdapter( Class adapter )
{
return null;
@@ -134,7 +135,7 @@
* @return
* the input object class
*/
- public ObjectClass getObjectClass()
+ public MutableObjectClass getObjectClass()
{
return this.objectClass;
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
index 33a27b9..c6f8b5d 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.view.editors.objectclass;
@@ -28,6 +28,7 @@
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
import org.apache.directory.studio.schemaeditor.Activator;
@@ -40,7 +41,7 @@
import org.apache.directory.studio.schemaeditor.model.alias.AliasesStringParser;
import org.apache.directory.studio.schemaeditor.view.ViewUtils;
import org.apache.directory.studio.schemaeditor.view.dialogs.AttributeTypeSelectionDialog;
-import org.apache.directory.studio.schemaeditor.view.dialogs.EditAliasesDialog;
+import org.apache.directory.studio.schemaeditor.view.dialogs.EditObjectClassAliasesDialog;
import org.apache.directory.studio.schemaeditor.view.dialogs.ObjectClassSelectionDialog;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingAttributeType;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingObjectClass;
@@ -51,7 +52,6 @@
import org.apache.log4j.Logger;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -77,8 +77,6 @@
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.FormPage;
import org.eclipse.ui.forms.events.HyperlinkAdapter;
import org.eclipse.ui.forms.events.HyperlinkEvent;
import org.eclipse.ui.forms.widgets.FormToolkit;
@@ -90,17 +88,11 @@
/**
* This class is the Overview Page of the Object Class Editor
*/
-public class ObjectClassEditorOverviewPage extends FormPage
+public class ObjectClassEditorOverviewPage extends AbstractObjectClassEditorPage
{
/** The page ID */
public static final String ID = ObjectClassEditor.ID + "overviewPage"; //$NON-NLS-1$
- /** The original object class */
- private ObjectClass originalObjectClass;
-
- /** The modified object class */
- private ObjectClass modifiedObjectClass;
-
/** The original schema */
private Schema originalSchema;
@@ -110,102 +102,69 @@
/** The SchemaHandler Listener */
private SchemaHandlerListener schemaHandlerListener = new SchemaHandlerListener()
{
- /**
- * {@inheritDoc}
- */
public void attributeTypeAdded( AttributeType at )
{
refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void attributeTypeModified( AttributeType at )
{
refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void attributeTypeRemoved( AttributeType at )
{
refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void matchingRuleAdded( MatchingRule mr )
{
refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void matchingRuleModified( MatchingRule mr )
{
refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void matchingRuleRemoved( MatchingRule mr )
{
refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void objectClassAdded( ObjectClass oc )
{
refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void objectClassModified( ObjectClass oc )
{
refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void objectClassRemoved( ObjectClass oc )
{
- if ( !oc.equals( originalObjectClass ) )
+ if ( !oc.equals( getOriginalObjectClass() ) )
{
refreshUI();
}
}
- /**
- * {@inheritDoc}
- */
public void schemaAdded( Schema schema )
{
refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void schemaRemoved( Schema schema )
{
if ( !schema.equals( originalSchema ) )
@@ -215,27 +174,24 @@
}
- /**
- * {@inheritDoc}
- */
+ public void schemaRenamed( Schema schema )
+ {
+ refreshUI();
+ }
+
+
public void syntaxAdded( LdapSyntax syntax )
{
refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void syntaxModified( LdapSyntax syntax )
{
refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void syntaxRemoved( LdapSyntax syntax )
{
refreshUI();
@@ -271,6 +227,7 @@
{
public void modifyText( ModifyEvent e )
{
+ ObjectClass modifiedObjectClass = getModifiedObjectClass();
AliasesStringParser parser = new AliasesStringParser();
parser.parse( aliasesText.getText() );
List<Alias> parsedAliases = parser.getAliases();
@@ -293,14 +250,12 @@
{
public void widgetSelected( SelectionEvent e )
{
- EditAliasesDialog editDialog = new EditAliasesDialog( modifiedObjectClass.getNames() );
- if ( editDialog.open() != Window.OK )
+ ObjectClass modifiedObjectClass = getModifiedObjectClass();
+
+ EditObjectClassAliasesDialog dialog = new EditObjectClassAliasesDialog( modifiedObjectClass.getNames() );
+ if ( dialog.open() == EditObjectClassAliasesDialog.OK )
{
- return;
- }
- if ( editDialog.isDirty() )
- {
- modifiedObjectClass.setNames( editDialog.getAliases() );
+ modifiedObjectClass.setNames( dialog.getAliases() );
if ( ( modifiedObjectClass.getNames() != null ) && ( modifiedObjectClass.getNames().size() != 0 ) )
{
aliasesText.setText( ViewUtils.concateAliases( modifiedObjectClass.getNames() ) );
@@ -322,12 +277,13 @@
oidText.setForeground( ViewUtils.COLOR_BLACK );
oidText.setToolTipText( "" ); //$NON-NLS-1$
+ ObjectClass modifiedObjectClass = getModifiedObjectClass();
String oid = oidText.getText();
if ( Oid.isOid( oid ) )
{
- if ( ( originalObjectClass.getOid().equals( oid ) )
- || !( schemaHandler.isAliasOrOidAlreadyTaken( oid ) ) )
+ if ( ( getOriginalObjectClass().getOid().equals( oid ) )
+ || !( schemaHandler.isOidAlreadyTaken( oid ) ) )
{
modifiedObjectClass.setOid( oid );
setEditorDirty();
@@ -365,7 +321,7 @@
{
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- SchemaEditorInput input = new SchemaEditorInput( schemaHandler.getSchema( modifiedObjectClass
+ SchemaEditorInput input = new SchemaEditorInput( schemaHandler.getSchema( getModifiedObjectClass()
.getSchemaName() ) );
String editorId = SchemaEditor.ID;
try
@@ -385,7 +341,7 @@
public void modifyText( ModifyEvent e )
{
int caretPosition = descriptionText.getCaretPosition();
- modifiedObjectClass.setDescription( descriptionText.getText() );
+ getModifiedObjectClass().setDescription( descriptionText.getText() );
descriptionText.setSelection( caretPosition );
setEditorDirty();
}
@@ -396,6 +352,8 @@
{
public void modifyText( ModifyEvent e )
{
+ MutableObjectClass modifiedObjectClass = getModifiedObjectClass();
+
if ( classTypeCombo.getSelectionIndex() == 0 )
{
modifiedObjectClass.setType( ObjectClassTypeEnum.ABSTRACT );
@@ -417,7 +375,7 @@
{
public void widgetSelected( SelectionEvent e )
{
- modifiedObjectClass.setObsolete( obsoleteCheckbox.getSelection() );
+ getModifiedObjectClass().setObsolete( obsoleteCheckbox.getSelection() );
setEditorDirty();
}
};
@@ -469,6 +427,8 @@
{
public void widgetSelected( SelectionEvent e )
{
+ MutableObjectClass modifiedObjectClass = getModifiedObjectClass();
+
AttributeTypeSelectionDialog dialog = new AttributeTypeSelectionDialog();
List<AttributeType> hiddenATs = new ArrayList<AttributeType>();
List<String> mustsHidden = modifiedObjectClass.getMustAttributeTypeOids();
@@ -485,7 +445,7 @@
}
dialog.setHiddenAttributeTypes( hiddenATs.toArray( new AttributeType[0] ) );
- if ( dialog.open() != Window.OK )
+ if ( dialog.open() != AttributeTypeSelectionDialog.OK )
{
return;
}
@@ -532,6 +492,8 @@
return;
}
+ MutableObjectClass modifiedObjectClass = getModifiedObjectClass();
+
Object selectedElement = selection.getFirstElement();
if ( selectedElement != null )
{
@@ -606,6 +568,7 @@
{
public void widgetSelected( SelectionEvent e )
{
+ MutableObjectClass modifiedObjectClass = getModifiedObjectClass();
AttributeTypeSelectionDialog dialog = new AttributeTypeSelectionDialog();
List<AttributeType> hiddenATs = new ArrayList<AttributeType>();
List<String> maysHidden = modifiedObjectClass.getMayAttributeTypeOids();
@@ -622,7 +585,7 @@
}
dialog.setHiddenAttributeTypes( hiddenATs.toArray( new AttributeType[0] ) );
- if ( dialog.open() != Window.OK )
+ if ( dialog.open() != AttributeTypeSelectionDialog.OK )
{
return;
}
@@ -669,6 +632,8 @@
return;
}
+ MutableObjectClass modifiedObjectClass = getModifiedObjectClass();
+
Object selectedElement = selection.getFirstElement();
if ( selectedElement != null )
{
@@ -720,7 +685,7 @@
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
try
{
- page.openEditor( new ObjectClassEditorInput( ( ObjectClass ) selectedElement ),
+ page.openEditor( new ObjectClassEditorInput( ( MutableObjectClass ) selectedElement ),
ObjectClassEditor.ID );
}
catch ( PartInitException exception )
@@ -743,6 +708,7 @@
{
public void widgetSelected( SelectionEvent e )
{
+ MutableObjectClass modifiedObjectClass = getModifiedObjectClass();
ObjectClassSelectionDialog dialog = new ObjectClassSelectionDialog();
List<ObjectClass> hiddenOCs = new ArrayList<ObjectClass>();
for ( String sup : modifiedObjectClass.getSuperiorOids() )
@@ -753,10 +719,10 @@
hiddenOCs.add( oc );
}
}
- hiddenOCs.add( originalObjectClass );
+ hiddenOCs.add( getOriginalObjectClass() );
dialog.setHiddenObjectClasses( hiddenOCs.toArray( new ObjectClass[0] ) );
- if ( dialog.open() != Window.OK )
+ if ( dialog.open() != ObjectClassSelectionDialog.OK )
{
return;
}
@@ -800,6 +766,8 @@
return;
}
+ MutableObjectClass modifiedObjectClass = getModifiedObjectClass();
+
Object selectedElement = selection.getFirstElement();
if ( selectedElement != null )
{
@@ -847,11 +815,11 @@
/**
- * Default constructor
- * @param editor
- * the associated editor
+ * Default constructor.
+ *
+ * @param editor the associated editor
*/
- public ObjectClassEditorOverviewPage( FormEditor editor )
+ public ObjectClassEditorOverviewPage( ObjectClassEditor editor )
{
super( editor, ID, Messages.getString( "ObjectClassEditorOverviewPage.Overview" ) ); //$NON-NLS-1$
schemaHandler = Activator.getDefault().getSchemaHandler();
@@ -864,10 +832,7 @@
*/
protected void createFormContent( IManagedForm managedForm )
{
- // Getting the original and modified object classes
- modifiedObjectClass = ( ( ObjectClassEditor ) getEditor() ).getModifiedObjectClass();
- originalObjectClass = ( ( ObjectClassEditor ) getEditor() ).getOriginalObjectClass();
- originalSchema = schemaHandler.getSchema( originalObjectClass.getSchemaName() );
+ super.createFormContent( managedForm );
// Creating the base UI
ScrolledForm form = managedForm.getForm();
@@ -887,9 +852,6 @@
// Optionnal Attributes Section
createOptionalAttributesSection( bottomComposite, toolkit );
- // Enabling or disabling the fields
- // setFieldsEditableState();
-
// Filling the UI with values from the object class
fillInUiFields();
@@ -1102,10 +1064,14 @@
/**
- * Initializes the UI fields from the input.
+ * {@inheritDoc}
*/
- private void fillInUiFields()
+ protected void fillInUiFields()
{
+ // Getting the original and modified object classes
+ ObjectClass modifiedObjectClass = getModifiedObjectClass();
+ originalSchema = schemaHandler.getSchema( getOriginalObjectClass().getSchemaName() );
+
// ALIASES Label
if ( ( modifiedObjectClass.getNames() != null ) && ( modifiedObjectClass.getNames().size() != 0 ) )
{
@@ -1152,9 +1118,9 @@
*/
private void fillInSuperiorsTable()
{
- if ( modifiedObjectClass.getSuperiorOids() != null )
+ if ( getModifiedObjectClass().getSuperiorOids() != null )
{
- superiorsTableViewer.setInput( modifiedObjectClass.getSuperiorOids() );
+ superiorsTableViewer.setInput( getModifiedObjectClass().getSuperiorOids() );
}
}
@@ -1175,17 +1141,19 @@
*/
private void fillInClassType()
{
- if ( modifiedObjectClass.getType() == ObjectClassTypeEnum.ABSTRACT )
+ ObjectClassTypeEnum type = getModifiedObjectClass().getType();
+
+ switch ( type )
{
- classTypeCombo.select( 0 );
- }
- else if ( modifiedObjectClass.getType() == ObjectClassTypeEnum.AUXILIARY )
- {
- classTypeCombo.select( 1 );
- }
- else if ( modifiedObjectClass.getType() == ObjectClassTypeEnum.STRUCTURAL )
- {
- classTypeCombo.select( 2 );
+ case ABSTRACT:
+ classTypeCombo.select( 0 );
+ return;
+ case AUXILIARY:
+ classTypeCombo.select( 1 );
+ return;
+ case STRUCTURAL:
+ classTypeCombo.select( 2 );
+ return;
}
}
@@ -1195,9 +1163,9 @@
*/
private void fillInMandatoryAttributesTable()
{
- if ( modifiedObjectClass.getMustAttributeTypeOids() != null )
+ if ( getModifiedObjectClass().getMustAttributeTypeOids() != null )
{
- mandatoryAttributesTableViewer.setInput( modifiedObjectClass.getMustAttributeTypeOids() );
+ mandatoryAttributesTableViewer.setInput( getModifiedObjectClass().getMustAttributeTypeOids() );
}
}
@@ -1207,88 +1175,68 @@
*/
private void fillInOptionalAttributesTable()
{
- if ( modifiedObjectClass.getMayAttributeTypeOids() != null )
+ if ( getModifiedObjectClass().getMayAttributeTypeOids() != null )
{
- optionalAttributesTableViewer.setInput( modifiedObjectClass.getMayAttributeTypeOids() );
+ optionalAttributesTableViewer.setInput( getModifiedObjectClass().getMayAttributeTypeOids() );
}
}
/**
- * Adds listeners to UI fields
+ * {@inheritDoc}
*/
- private void addListeners()
+ protected void addListeners()
{
- aliasesText.addModifyListener( aliasesTextModifyListener );
- aliasesButton.addSelectionListener( aliasesButtonListener );
- oidText.addModifyListener( oidTextModifyListener );
- oidText.addVerifyListener( oidTextVerifyListener );
- descriptionText.addModifyListener( descriptionTextListener );
- addButtonSuperiorsTable.addSelectionListener( addButtonSuperiorsTableListener );
- removeButtonSuperiorsTable.addSelectionListener( removeButtonSuperiorsTableListener );
- classTypeCombo.addModifyListener( classTypeListener );
- obsoleteCheckbox.addSelectionListener( obsoleteListener );
- addButtonMandatoryTable.addSelectionListener( addButtonMandatoryTableListener );
- removeButtonMandatoryTable.addSelectionListener( removeButtonMandatoryTableListener );
- addButtonOptionalTable.addSelectionListener( addButtonOptionalTableListener );
- removeButtonOptionalTable.addSelectionListener( removeButtonOptionalTableListener );
- schemaLink.addHyperlinkListener( schemaLinkListener );
- superiorsTable.addMouseListener( superiorsTableListener );
- mandatoryAttributesTable.addMouseListener( mandatoryAttributesTableListener );
- optionalAttributesTable.addMouseListener( optionalAttributesTableListener );
+ addModifyListener( aliasesText, aliasesTextModifyListener );
+ addSelectionListener( aliasesButton, aliasesButtonListener );
+ addModifyListener( oidText, oidTextModifyListener );
+ addVerifyListener( oidText, oidTextVerifyListener );
+ addModifyListener( descriptionText, descriptionTextListener );
+ addSelectionListener( addButtonSuperiorsTable, addButtonSuperiorsTableListener );
+ addSelectionListener( removeButtonSuperiorsTable, removeButtonSuperiorsTableListener );
+ addModifyListener( classTypeCombo, classTypeListener );
+ addSelectionListener( obsoleteCheckbox, obsoleteListener );
+ addSelectionListener( addButtonMandatoryTable, addButtonMandatoryTableListener );
+ addSelectionListener( addButtonMandatoryTable, removeButtonMandatoryTableListener );
+ addSelectionListener( addButtonOptionalTable, addButtonOptionalTableListener );
+ addSelectionListener( removeButtonOptionalTable, removeButtonOptionalTableListener );
+ addHyperlinkListener( schemaLink, schemaLinkListener );
+ addMouseListener( superiorsTable, superiorsTableListener );
+ addMouseListener( mandatoryAttributesTable, mandatoryAttributesTableListener );
+ addMouseListener( optionalAttributesTable, optionalAttributesTableListener );
Display.getCurrent().addFilter( SWT.MouseWheel, mouseWheelFilter );
}
/**
- * Removes listeners from UI fields
+ * {@inheritDoc}
*/
- private void removeListeners()
+ protected void removeListeners()
{
- aliasesText.removeModifyListener( aliasesTextModifyListener );
- aliasesButton.removeSelectionListener( aliasesButtonListener );
- oidText.removeModifyListener( oidTextModifyListener );
- oidText.removeVerifyListener( oidTextVerifyListener );
- schemaLink.removeHyperlinkListener( schemaLinkListener );
- descriptionText.removeModifyListener( descriptionTextListener );
- superiorsTable.removeMouseListener( superiorsTableListener );
- addButtonSuperiorsTable.removeSelectionListener( addButtonSuperiorsTableListener );
- removeButtonSuperiorsTable.removeSelectionListener( removeButtonSuperiorsTableListener );
- classTypeCombo.removeModifyListener( classTypeListener );
- obsoleteCheckbox.removeSelectionListener( obsoleteListener );
- mandatoryAttributesTable.removeMouseListener( mandatoryAttributesTableListener );
- addButtonMandatoryTable.removeSelectionListener( addButtonMandatoryTableListener );
- removeButtonMandatoryTable.removeSelectionListener( removeButtonMandatoryTableListener );
- optionalAttributesTable.removeMouseListener( optionalAttributesTableListener );
- addButtonOptionalTable.removeSelectionListener( addButtonOptionalTableListener );
- removeButtonOptionalTable.removeSelectionListener( removeButtonOptionalTableListener );
+ removeModifyListener( aliasesText, aliasesTextModifyListener );
+ removeSelectionListener( aliasesButton, aliasesButtonListener );
+ removeModifyListener( oidText, oidTextModifyListener );
+ removeVerifyListener( oidText, oidTextVerifyListener );
+ removeHyperlinkListener( schemaLink, schemaLinkListener );
+ removeModifyListener( descriptionText, descriptionTextListener );
+ removeMouseListener( superiorsTable, superiorsTableListener );
+ removeSelectionListener( addButtonSuperiorsTable, addButtonSuperiorsTableListener );
+ removeSelectionListener( removeButtonSuperiorsTable, removeButtonSuperiorsTableListener );
+ removeModifyListener( classTypeCombo, classTypeListener );
+ removeSelectionListener( obsoleteCheckbox, obsoleteListener );
+ removeMouseListener( mandatoryAttributesTable, mandatoryAttributesTableListener );
+ removeSelectionListener( addButtonMandatoryTable, addButtonMandatoryTableListener );
+ removeSelectionListener( removeButtonMandatoryTable, removeButtonMandatoryTableListener );
+ removeMouseListener( optionalAttributesTable, optionalAttributesTableListener );
+ removeSelectionListener( addButtonOptionalTable, addButtonOptionalTableListener );
+ removeSelectionListener( removeButtonOptionalTable, removeButtonOptionalTableListener );
Display.getCurrent().removeFilter( SWT.MouseWheel, mouseWheelFilter );
}
/**
- * Sets the editor as dirty
- */
- private void setEditorDirty()
- {
- ( ( ObjectClassEditor ) getEditor() ).setDirty( true );
- }
-
-
- /**
- * Refreshes the UI.
- */
- public void refreshUI()
- {
- removeListeners();
- fillInUiFields();
- addListeners();
- }
-
-
- /**
* {@inheritDoc}
*/
public void dispose()
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java
index fc2f4e6..e58ee9c 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.view.editors.objectclass;
@@ -25,6 +25,7 @@
import java.text.ParseException;
import java.util.List;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.parsers.OpenLdapSchemaParser;
import org.apache.directory.studio.schemaeditor.PluginConstants;
@@ -41,8 +42,6 @@
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.FormPage;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.ScrolledForm;
@@ -50,17 +49,11 @@
/**
* This class is the Source Code Page of the Object Class Editor
*/
-public class ObjectClassEditorSourceCodePage extends FormPage
+public class ObjectClassEditorSourceCodePage extends AbstractObjectClassEditorPage
{
/** The page ID */
public static final String ID = ObjectClassEditor.ID + "sourceCodePage"; //$NON-NLS-1$
- /** The page title*/
- public static final String TITLE = "Source Code"; //$NON-NLS-1$
-
- /** The modified object class */
- private ObjectClass modifiedObjectClass;
-
/** The Schema Source Viewer */
private SchemaSourceViewer schemaSourceViewer;
@@ -75,7 +68,7 @@
canLeaveThePage = true;
try
{
- ( ( ObjectClassEditor ) getEditor() ).setDirty( true );
+ getEditor().setDirty( true );
OpenLdapSchemaParser parser = new OpenLdapSchemaParser();
parser.parse( schemaSourceViewer.getTextWidget().getText() );
@@ -102,13 +95,13 @@
/**
- * Default constructor
- * @param editor
- * the associated editor
+ * Default constructor.
+ *
+ * @param editor the associated editor
*/
- public ObjectClassEditorSourceCodePage( FormEditor editor )
+ public ObjectClassEditorSourceCodePage( ObjectClassEditor editor )
{
- super( editor, ID, TITLE );
+ super( editor, ID, Messages.getString( "ObjectClassEditorSourceCodePage.SourceCode" ) ); //$NON-NLS-1$
}
@@ -117,6 +110,8 @@
*/
protected void createFormContent( IManagedForm managedForm )
{
+ super.createFormContent( managedForm );
+
ScrolledForm form = managedForm.getForm();
FormToolkit toolkit = managedForm.getToolkit();
GridLayout layout = new GridLayout();
@@ -125,8 +120,6 @@
form.getBody().setLayout( layout );
toolkit.paintBordersFor( form.getBody() );
- modifiedObjectClass = ( ( ObjectClassEditor ) getEditor() ).getModifiedObjectClass();
-
// SOURCE CODE Field
schemaSourceViewer = new SchemaSourceViewer( form.getBody(), null, null, false, SWT.BORDER | SWT.H_SCROLL
| SWT.V_SCROLL );
@@ -144,7 +137,8 @@
// Initialization from the "input" object class
fillInUiFields();
- schemaSourceViewer.getTextWidget().addModifyListener( schemaSourceViewerListener );
+ // Listeners initialization
+ addListeners();
// Help Context for Dynamic Help
PlatformUI.getWorkbench().getHelpSystem().setHelp( form,
@@ -153,12 +147,35 @@
/**
- * Fills in the User Interface.
+ * {@inheritDoc}
*/
- private void fillInUiFields()
+ protected void addListeners()
{
- // SOURCE CODE Field
- schemaSourceViewer.getDocument().set( OpenLdapSchemaFileExporter.toSourceCode( modifiedObjectClass ) );
+ if ( schemaSourceViewer != null )
+ {
+ schemaSourceViewer.getTextWidget().addModifyListener( schemaSourceViewerListener );
+ }
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void removeListeners()
+ {
+ if ( schemaSourceViewer != null )
+ {
+ schemaSourceViewer.getTextWidget().removeModifyListener( schemaSourceViewerListener );
+ }
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void fillInUiFields()
+ {
+ schemaSourceViewer.getDocument().set( OpenLdapSchemaFileExporter.toSourceCode( getModifiedObjectClass() ) );
}
@@ -179,6 +196,8 @@
*/
private void updateObjectClass( ObjectClass ocl )
{
+ MutableObjectClass modifiedObjectClass = getModifiedObjectClass();
+
modifiedObjectClass.setDescription( ocl.getDescription() );
modifiedObjectClass.setMayAttributeTypeOids( ocl.getMayAttributeTypeOids() );
modifiedObjectClass.setMustAttributeTypeOids( ocl.getMustAttributeTypeOids() );
@@ -188,13 +207,4 @@
modifiedObjectClass.setSuperiorOids( ocl.getSuperiorOids() );
modifiedObjectClass.setType( ocl.getType() );
}
-
-
- /**
- * Refreshes the UI.
- */
- public void refreshUI()
- {
- fillInUiFields();
- }
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableContentProvider.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableContentProvider.java
index 5afc8e4..f048721 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableContentProvider.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSuperiorsTableContentProvider.java
@@ -58,6 +58,7 @@
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("unchecked")
public Object[] getElements( Object inputElement )
{
if ( inputElement instanceof List<?> )
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages.properties
index 064b1b3..14416d9 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages.properties
@@ -17,6 +17,7 @@
ObjectClassEditor.CodeError=The editor of the Source Code contains errors, you cannot return to the Overview page until these errors are fixed.
ObjectClassEditor.CodeErrorObject=The editor of the Source Code contains errors, you cannot save the object class until these errors are fixed.
+ObjectClassEditor.Error=Error\!
ObjectClassEditorAttributesTableLabelProvider.none=(None) - ({0})
ObjectClassEditorInput.FromSchema={0} from the {1} schema
ObjectClassEditorOverviewPage.Abstract=Abstract
@@ -30,7 +31,6 @@
ObjectClassEditorOverviewPage.GeneralInformation=General information
ObjectClassEditorOverviewPage.MalformedOID=Malformed OID.
ObjectClassEditorOverviewPage.MandatoryAttributes=Mandatory attributes
-ObjectClassEditorOverviewPage.None=(None)
ObjectClassEditorOverviewPage.Obsolete=Obsolete
ObjectClassEditorOverviewPage.OID=OID:
ObjectClassEditorOverviewPage.OptionalAttributes=Optional attributes
@@ -42,4 +42,5 @@
ObjectClassEditorOverviewPage.SpecifyOptionalAttributes=Specify the optional attribute types.
ObjectClassEditorOverviewPage.Structural=Structural
ObjectClassEditorOverviewPage.SuperiorClasses=Superior classes:
+ObjectClassEditorSourceCodePage.SourceCode=Source Code
ObjectClassEditorSuperiorsTableLabelProvider.None=(None) - ({0})
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_de.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_de.properties
index b76c983..20e0a9d 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_de.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_de.properties
@@ -17,6 +17,7 @@
ObjectClassEditor.CodeError=Der Editor des Source Codes enth\u00E4lt Fehler, Sie k\u00F6nne solange nicht auf die \u00DCbersichtseite zur\u00FCckkehren, bis diese Fehler behoben sind.
ObjectClassEditor.CodeErrorObject=Der Editor des Source Codes enth\u00E4lt Fehler, Sie k\u00F6nnen den Objektklasse nicht speichern bis diese Fehler behoben sind.
+ObjectClassEditor.Error=Fehler\!
ObjectClassEditorAttributesTableLabelProvider.none=(Keine) - ({0})
ObjectClassEditorInput.FromSchema={0} aus dem {1} Schema
ObjectClassEditorOverviewPage.Abstract=Abstrakt
@@ -30,7 +31,6 @@
ObjectClassEditorOverviewPage.GeneralInformation=Allgemeine Informationen
ObjectClassEditorOverviewPage.MalformedOID=Ung\u00FCltige OID.
ObjectClassEditorOverviewPage.MandatoryAttributes=Pflichtattribute
-ObjectClassEditorOverviewPage.None=(Keine)
ObjectClassEditorOverviewPage.Obesolete=Obsolet
ObjectClassEditorOverviewPage.OID=OID:
ObjectClassEditorOverviewPage.OptionalAttributes=Optionale Attribute
@@ -42,4 +42,5 @@
ObjectClassEditorOverviewPage.SpecifyOptionalAttributes=Spezifizieren Sie optionale Attribut-Typen.
ObjectClassEditorOverviewPage.Structural=Strukturell
ObjectClassEditorOverviewPage.SuperiorClasses=\u00DCbergeordnete Klassen\:
+ObjectClassEditorSourceCodePage.SourceCode=Source Code
ObjectClassEditorSuperiorsTableLabelProvider.None=(Keine) - ({0})
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_fr.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_fr.properties
index 146a237..72f4cb0 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_fr.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_fr.properties
@@ -17,8 +17,9 @@
ObjectClassEditor.CodeError=L'\u00E9diteur de code source contient des erreurs, vous ne pouvez pas revenir \u00E0 la vue d'ensemble tant que ces erreurs ne sont pas corrig\u00E9es.
ObjectClassEditor.CodeErrorObject=L'\u00E9diteur de code source contient des erreurs, vous ne pouvez pas sauvegarder la classe d'objet tant que ces erreurs ne sont pas corrig\u00E9es.
+ObjectClassEditor.Error=Erreur \!
ObjectClassEditorAttributesTableLabelProvider.none=(Pas de nom) - ({0})
-ObjectClassEditorInput.FromSchema={0} en provenance du sch\u00E9ma {1}
+ObjectClassEditorInput.FromSchema={0} du sch\u00E9ma {1}
ObjectClassEditorOverviewPage.Abstract=Abstrait
ObjectClassEditorOverviewPage.Add=Ajouter...
ObjectClassEditorOverviewPage.Aliases=Alias:
@@ -30,7 +31,6 @@
ObjectClassEditorOverviewPage.GeneralInformation=Informations g\u00E9n\u00E9rales
ObjectClassEditorOverviewPage.MalformedOID=OID incorrect.
ObjectClassEditorOverviewPage.MandatoryAttributes=Attributs obligatoires
-ObjectClassEditorOverviewPage.None=(Pas de nom)
ObjectClassEditorOverviewPage.Obesolete=Obsolete
ObjectClassEditorOverviewPage.OID=OID:
ObjectClassEditorOverviewPage.OptionalAttributes=Attributs optionnels
@@ -42,4 +42,5 @@
ObjectClassEditorOverviewPage.SpecifyOptionalAttributes=Pr\u00E9ciser les attributs optionnels.
ObjectClassEditorOverviewPage.Structural=Structurel
ObjectClassEditorOverviewPage.SuperiorClasses=Classes h\u00E9rit\u00E9es:
+ObjectClassEditorSourceCodePage.SourceCode=Code source
ObjectClassEditorSuperiorsTableLabelProvider.None=(Pas de nom) - ({0})
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditor.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditor.java
index c7652ab..d7efec6 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditor.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditor.java
@@ -51,10 +51,10 @@
private SchemaEditor instance;
/** The Overview Page */
- private SchemaEditorOverviewPage overview;
+ private SchemaEditorOverviewPage overviewPage;
/** The Source Code page */
- private SchemaEditorSourceCodePage sourceCode;
+ private SchemaEditorSourceCodePage sourceCodePage;
/** The associated schema */
private Schema schema;
@@ -69,6 +69,18 @@
getEditorSite().getPage().closeEditor( instance, false );
}
}
+
+
+ public void schemaRenamed( Schema schema )
+ {
+ // Refreshing the editor pages
+ overviewPage.refreshUI();
+ sourceCodePage.refreshUI();
+
+ // Refreshing the part name (in case of a change in the name)
+ setPartName( getEditorInput().getName() );
+
+ }
};
@@ -98,10 +110,10 @@
{
try
{
- overview = new SchemaEditorOverviewPage( this );
- addPage( overview );
- sourceCode = new SchemaEditorSourceCodePage( this );
- addPage( sourceCode );
+ overviewPage = new SchemaEditorOverviewPage( this );
+ addPage( overviewPage );
+ sourceCodePage = new SchemaEditorSourceCodePage( this );
+ addPage( sourceCodePage );
}
catch ( PartInitException e )
{
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorInput.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorInput.java
index 8dad82d..13ca57d 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorInput.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorInput.java
@@ -94,6 +94,7 @@
/**
* {@inheritDoc}
*/
+ @SuppressWarnings("rawtypes")
public Object getAdapter( Class adapter )
{
return null;
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java
index 7f69434..b427b11 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java
@@ -6,29 +6,31 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.view.editors.schema;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.PluginUtils;
-import org.apache.directory.studio.schemaeditor.controller.SchemaAdapter;
-import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
-import org.apache.directory.studio.schemaeditor.controller.SchemaListener;
+import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerAdapter;
+import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener;
import org.apache.directory.studio.schemaeditor.model.Schema;
import org.apache.directory.studio.schemaeditor.view.ViewUtils;
import org.apache.directory.studio.schemaeditor.view.editors.attributetype.AttributeTypeEditor;
@@ -64,70 +66,108 @@
/** The page ID */
public static final String ID = SchemaEditor.ID + "overviewPage"; //$NON-NLS-1$
- /** The SchemaHandler */
- private SchemaHandler schemaHandler;
-
/** The associated schema */
- private Schema schema;
+ private Schema originalSchema;
- private SchemaListener schemaListener = new SchemaAdapter()
+ private SchemaHandlerListener schemaHandlerListener = new SchemaHandlerAdapter()
{
- /**
- * {@inheritDoc}
- */
public void attributeTypeAdded( AttributeType at )
{
- fillInUiFields();
+ refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void attributeTypeModified( AttributeType at )
{
- fillInUiFields();
+ refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void attributeTypeRemoved( AttributeType at )
{
- fillInUiFields();
+ refreshUI();
}
- /**
- * {@inheritDoc}
- */
+ public void matchingRuleAdded( MatchingRule mr )
+ {
+ refreshUI();
+ }
+
+
+ public void matchingRuleModified( MatchingRule mr )
+ {
+ refreshUI();
+ }
+
+
+ public void matchingRuleRemoved( MatchingRule mr )
+ {
+ refreshUI();
+ }
+
+
public void objectClassAdded( ObjectClass oc )
{
- fillInUiFields();
+ refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void objectClassModified( ObjectClass oc )
{
- fillInUiFields();
+ refreshUI();
}
- /**
- * {@inheritDoc}
- */
public void objectClassRemoved( ObjectClass oc )
{
- fillInUiFields();
+ refreshUI();
+ }
+
+
+ public void schemaAdded( Schema schema )
+ {
+ refreshUI();
+ }
+
+
+ public void schemaRemoved( Schema schema )
+ {
+ if ( !schema.equals( originalSchema ) )
+ {
+ refreshUI();
+ }
+ }
+
+
+ public void schemaRenamed( Schema schema )
+ {
+ refreshUI();
+ }
+
+
+ public void syntaxAdded( LdapSyntax syntax )
+ {
+ refreshUI();
+ }
+
+
+ public void syntaxModified( LdapSyntax syntax )
+ {
+ refreshUI();
+ }
+
+
+ public void syntaxRemoved( LdapSyntax syntax )
+ {
+ refreshUI();
}
};
// UI Fields
+ private Section attributeTypesSection;
private TableViewer attributeTypesTableViewer;
+ private Section objectClassesSection;
private TableViewer objectClassesTableViewer;
// Listeners
@@ -153,8 +193,9 @@
catch ( PartInitException exception )
{
PluginUtils.logError( Messages.getString( "SchemaEditorOverviewPage.ErrorOpenEditor" ), exception ); //$NON-NLS-1$
- ViewUtils.displayErrorMessageBox( Messages.getString( "SchemaEditorOverviewPage.Error" ), Messages //$NON-NLS-1$
- .getString( "SchemaEditorOverviewPage.ErrorOpenEditor" ) ); //$NON-NLS-1$
+ ViewUtils.displayErrorMessageDialog(
+ Messages.getString( "SchemaEditorOverviewPage.Error" ), Messages //$NON-NLS-1$
+ .getString( "SchemaEditorOverviewPage.ErrorOpenEditor" ) ); //$NON-NLS-1$
}
}
}
@@ -172,7 +213,7 @@
if ( !selection.isEmpty() )
{
- ObjectClass oc = ( ObjectClass ) selection.getFirstElement();
+ MutableObjectClass oc = ( MutableObjectClass ) selection.getFirstElement();
try
{
@@ -182,14 +223,16 @@
catch ( PartInitException exception )
{
PluginUtils.logError( Messages.getString( "SchemaEditorOverviewPage.ErrorOpenEditor" ), exception ); //$NON-NLS-1$
- ViewUtils.displayErrorMessageBox( Messages.getString( "SchemaEditorOverviewPage.Error" ), Messages //$NON-NLS-1$
- .getString( "SchemaEditorOverviewPage.ErrorOpenEditor" ) ); //$NON-NLS-1$
+ ViewUtils.displayErrorMessageDialog(
+ Messages.getString( "SchemaEditorOverviewPage.Error" ), Messages //$NON-NLS-1$
+ .getString( "SchemaEditorOverviewPage.ErrorOpenEditor" ) ); //$NON-NLS-1$
}
}
}
};
+
/**
* Creates a new instance of SchemaFormEditorOverviewPage.
*
@@ -199,7 +242,7 @@
public SchemaEditorOverviewPage( FormEditor editor )
{
super( editor, ID, Messages.getString( "SchemaEditorOverviewPage.Overview" ) ); //$NON-NLS-1$
- schemaHandler = Activator.getDefault().getSchemaHandler();
+ Activator.getDefault().getSchemaHandler().addListener( schemaHandlerListener );
}
@@ -209,7 +252,7 @@
protected void createFormContent( IManagedForm managedForm )
{
// Getting the associated schema
- schema = ( ( SchemaEditor ) getEditor() ).getSchema();
+ originalSchema = ( ( SchemaEditor ) getEditor() ).getSchema();
// Creating the base UI
ScrolledForm form = managedForm.getForm();
@@ -243,11 +286,9 @@
private void createAttributeTypesSection( Composite parent, FormToolkit toolkit )
{
// Attribute Types Section
- Section attributeTypesSection = toolkit.createSection( parent, Section.DESCRIPTION | Section.EXPANDED
+ attributeTypesSection = toolkit.createSection( parent, Section.DESCRIPTION | Section.EXPANDED
| Section.TITLE_BAR );
- attributeTypesSection.setDescription( NLS.bind(
- Messages.getString( "SchemaEditorOverviewPage.SchemaAttribute" ), new String[] //$NON-NLS-1$
- { schema.getSchemaName() } ) );
+ attributeTypesSection.setDescription( "" ); //$NON-NLS-1$
attributeTypesSection.setText( Messages.getString( "SchemaEditorOverviewPage.AttributeTypes" ) ); //$NON-NLS-1$
// Creating the layout of the section
@@ -276,11 +317,9 @@
private void createObjectClassesSection( Composite parent, FormToolkit toolkit )
{
// Attribute Types Section
- Section objectClassesSection = toolkit.createSection( parent, Section.DESCRIPTION | Section.EXPANDED
+ objectClassesSection = toolkit.createSection( parent, Section.DESCRIPTION | Section.EXPANDED
| Section.TITLE_BAR );
- objectClassesSection.setDescription( NLS.bind( Messages
- .getString( "SchemaEditorOverviewPage.SchemaObjectClasses" ), new String[] //$NON-NLS-1$
- { schema.getSchemaName() } ) );
+ objectClassesSection.setDescription( "" );//$NON-NLS-1$
objectClassesSection.setText( Messages.getString( "SchemaEditorOverviewPage.ObjectClasses" ) ); //$NON-NLS-1$
// Creating the layout of the section
@@ -303,8 +342,14 @@
*/
private void fillInUiFields()
{
- attributeTypesTableViewer.setInput( schema.getAttributeTypes() );
- objectClassesTableViewer.setInput( schema.getObjectClasses() );
+ attributeTypesSection.setDescription( NLS.bind(
+ Messages.getString( "SchemaEditorOverviewPage.SchemaAttribute" ), new String[] //$NON-NLS-1$
+ { originalSchema.getSchemaName() } ) );
+ objectClassesSection.setDescription( NLS.bind( Messages
+ .getString( "SchemaEditorOverviewPage.SchemaObjectClasses" ), new String[] //$NON-NLS-1$
+ { originalSchema.getSchemaName() } ) );
+ attributeTypesTableViewer.setInput( originalSchema.getAttributeTypes() );
+ objectClassesTableViewer.setInput( originalSchema.getObjectClasses() );
}
@@ -313,7 +358,6 @@
*/
private void addListeners()
{
- schemaHandler.addListener( schema, schemaListener );
attributeTypesTableViewer.addDoubleClickListener( attributeTypesTableViewerListener );
objectClassesTableViewer.addDoubleClickListener( objectClassesTableViewerListener );
}
@@ -324,7 +368,6 @@
*/
private void removeListeners()
{
- schemaHandler.removeListener( schema, schemaListener );
attributeTypesTableViewer.removeDoubleClickListener( attributeTypesTableViewerListener );
objectClassesTableViewer.removeDoubleClickListener( objectClassesTableViewerListener );
}
@@ -337,6 +380,19 @@
{
removeListeners();
+ Activator.getDefault().getSchemaHandler().removeListener( schemaHandlerListener );
+
super.dispose();
}
+
+
+ /**
+ * Refreshes the UI.
+ */
+ public void refreshUI()
+ {
+ removeListeners();
+ fillInUiFields();
+ addListeners();
+ }
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java
index 40128c5..2248046 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java
@@ -27,7 +27,8 @@
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
-import org.apache.directory.studio.schemaeditor.controller.SchemaListener;
+import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerAdapter;
+import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener;
import org.apache.directory.studio.schemaeditor.model.Schema;
import org.apache.directory.studio.schemaeditor.model.io.OpenLdapSchemaFileExporter;
import org.apache.directory.studio.schemaeditor.view.widget.SchemaSourceViewer;
@@ -56,6 +57,9 @@
/** The page ID */
public static final String ID = SchemaEditor.ID + "sourceCode"; //$NON-NLS-1$
+ /** The flag to indicate if the page has been initialized */
+ private boolean initialized = false;
+
/** The associated schema */
private Schema schema;
@@ -63,14 +67,14 @@
private SchemaSourceViewer schemaSourceViewer;
// Listerner
- private SchemaListener schemaListener = new SchemaListener()
+ private SchemaHandlerListener schemaHandlerListener = new SchemaHandlerAdapter()
{
/**
* {@inheritDoc}
*/
public void attributeTypeAdded( AttributeType at )
{
- fillInUiFields();
+ refreshUI();
}
@@ -79,7 +83,7 @@
*/
public void attributeTypeModified( AttributeType at )
{
- fillInUiFields();
+ refreshUI();
}
@@ -88,7 +92,7 @@
*/
public void attributeTypeRemoved( AttributeType at )
{
- fillInUiFields();
+ refreshUI();
}
@@ -97,7 +101,7 @@
*/
public void matchingRuleAdded( MatchingRule mr )
{
- fillInUiFields();
+ refreshUI();
}
@@ -106,7 +110,7 @@
*/
public void matchingRuleModified( MatchingRule mr )
{
- fillInUiFields();
+ refreshUI();
}
@@ -115,7 +119,7 @@
*/
public void matchingRuleRemoved( MatchingRule mr )
{
- fillInUiFields();
+ refreshUI();
}
@@ -124,7 +128,7 @@
*/
public void objectClassAdded( ObjectClass oc )
{
- fillInUiFields();
+ refreshUI();
}
@@ -133,7 +137,7 @@
*/
public void objectClassModified( ObjectClass oc )
{
- fillInUiFields();
+ refreshUI();
}
@@ -142,7 +146,7 @@
*/
public void objectClassRemoved( ObjectClass oc )
{
- fillInUiFields();
+ refreshUI();
}
@@ -151,7 +155,7 @@
*/
public void syntaxAdded( LdapSyntax syntax )
{
- fillInUiFields();
+ refreshUI();
}
@@ -160,7 +164,7 @@
*/
public void syntaxModified( LdapSyntax syntax )
{
- fillInUiFields();
+ refreshUI();
}
@@ -169,7 +173,7 @@
*/
public void syntaxRemoved( LdapSyntax syntax )
{
- fillInUiFields();
+ refreshUI();
}
};
@@ -183,6 +187,7 @@
public SchemaEditorSourceCodePage( FormEditor editor )
{
super( editor, ID, Messages.getString( "SchemaEditorSourceCodePage.SourceCode" ) ); //$NON-NLS-1$
+ Activator.getDefault().getSchemaHandler().addListener( schemaHandlerListener );
}
@@ -217,10 +222,10 @@
// Initializes the UI from the schema
fillInUiFields();
- addListeners();
-
// Help Context for Dynamic Help
PlatformUI.getWorkbench().getHelpSystem().setHelp( form, PluginConstants.PLUGIN_ID + "." + "schema_editor" ); //$NON-NLS-1$ //$NON-NLS-2$
+
+ initialized = true;
}
@@ -234,30 +239,24 @@
/**
- * Adds the listeners.
- */
- private void addListeners()
- {
- Activator.getDefault().getSchemaHandler().addListener( schema, schemaListener );
- }
-
-
- /**
- * Removes the listeners.
- */
- private void removeListeners()
- {
- Activator.getDefault().getSchemaHandler().removeListener( schema, schemaListener );
- }
-
-
- /**
* {@inheritDoc}
*/
public void dispose()
{
- removeListeners();
+ Activator.getDefault().getSchemaHandler().removeListener( schemaHandlerListener );
super.dispose();
}
+
+
+ /**
+ * Refreshes the UI.
+ */
+ public void refreshUI()
+ {
+ if ( initialized )
+ {
+ fillInUiFields();
+ }
+ }
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/messages.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/messages.properties
index efa44a7..b444457 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/messages.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/messages.properties
@@ -17,7 +17,7 @@
SchemaEditorOverviewPage.AttributeTypes=Attribute Types
SchemaEditorOverviewPage.Error=Error
-SchemaEditorOverviewPage.ErrorOpenEditor=An error occured when opening the editor.
+SchemaEditorOverviewPage.ErrorOpenEditor=An error occurred when opening the editor.
SchemaEditorOverviewPage.ObjectClasses=Object Classes
SchemaEditorOverviewPage.Overview=Overview
SchemaEditorOverviewPage.SchemaAttribute=The schema "{0}" contains the following attribute types.
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/SearchPage.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/SearchPage.java
index a87adcf..f4c34d0 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/SearchPage.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/SearchPage.java
@@ -355,7 +355,7 @@
catch ( PartInitException e )
{
PluginUtils.logError( Messages.getString( "SearchPage.ErrorOpeningView" ), e ); //$NON-NLS-1$
- ViewUtils.displayErrorMessageBox(
+ ViewUtils.displayErrorMessageDialog(
Messages.getString( "SearchPage.Error" ), Messages.getString( "SearchPage.ErrorOpeningView" ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/messages.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/messages.properties
index f6ea5d4..2f962b5 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/messages.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/messages.properties
@@ -19,7 +19,7 @@
SearchPage.ClassesOnly=Object Classes Only
SearchPage.Description=Description
SearchPage.Error=Error
-SearchPage.ErrorOpeningView=An error occured when opening the view.
+SearchPage.ErrorOpeningView=An error occurred when opening the view.
SearchPage.MandatoryAttributes=Mandatory Attributes
SearchPage.MatchingRules=Matching Rules
SearchPage.OID=OID
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/messages_fr.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/messages_fr.properties
index cf01e1f..9d2408d 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/messages_fr.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/messages_fr.properties
@@ -16,7 +16,7 @@
# under the License.
SearchPage.Aliases=Alias
-SearchPage.ClassesOnly=Classes d'objet uniquement
+SearchPage.ClassesOnly=Classes d'objets uniquement
SearchPage.Description=Description
SearchPage.Error=Erreur
SearchPage.ErrorOpeningView=Une erreur est survenue lors de l'ouverture de la vue.
@@ -26,11 +26,11 @@
SearchPage.OptionalAttributes=Attributs optionnels
SearchPage.Scope=Port\u00E9e
SearchPage.SearchIn=Rechercher dans
-SearchPage.SearchInForAttribute=Rechercher dans (pour les types d'attribut)
-SearchPage.SearchInObject=Rechercher dans (pour les classes d'objet)
+SearchPage.SearchInForAttribute=Rechercher dans (pour les types d'attributs)
+SearchPage.SearchInObject=Rechercher dans (pour les classes d'objets)
SearchPage.SearchString=Cha\u00EEne de caract\u00E8res de recherche (*=n'importe quelle cha\u00EEne, ?=n'importe quel caract\u00E8re):
SearchPage.Superior=Sup\u00E9rieur
SearchPage.Superiors=Sup\u00E9rieurs
-SearchPage.Syntax=Syntaxs
-SearchPage.TypesAndClasses=Types d'attributs et classes d'objet
+SearchPage.Syntax=Syntaxes
+SearchPage.TypesAndClasses=Types d'attributs et classes d'objets
SearchPage.TypesOnly=Types d'attributs uniquement
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewContentProvider.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewContentProvider.java
index 4d21163..dd06234 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewContentProvider.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewContentProvider.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.view.views;
@@ -25,6 +25,7 @@
import java.util.List;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
@@ -62,7 +63,7 @@
if ( parentElement instanceof ObjectClass )
{
- ObjectClass oc = ( ObjectClass ) parentElement;
+ MutableObjectClass oc = ( MutableObjectClass ) parentElement;
children = createTypeHierarchyObjectClass( oc );
}
@@ -89,7 +90,7 @@
* @return
* the Type Hierarchy for an object class
*/
- private List<TreeNode> createTypeHierarchyObjectClass( ObjectClass oc )
+ private List<TreeNode> createTypeHierarchyObjectClass( MutableObjectClass oc )
{
List<TreeNode> children = new ArrayList<TreeNode>();
@@ -145,7 +146,7 @@
{
if ( parent instanceof ObjectClass )
{
- ObjectClass parentOC = ( ObjectClass ) parent;
+ MutableObjectClass parentOC = ( MutableObjectClass ) parent;
ObjectClassWrapper duplicatedOCW = ( ObjectClassWrapper ) duplicateTreeNode( ocw );
ObjectClassWrapper ocw2 = new ObjectClassWrapper( parentOC );
@@ -312,7 +313,7 @@
}
else if ( child instanceof ObjectClass )
{
- ObjectClass oc = ( ObjectClass ) child;
+ MutableObjectClass oc = ( MutableObjectClass ) child;
childNode = new ObjectClassWrapper( oc, node );
node.addChild( childNode );
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewContentProvider.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewContentProvider.java
index 546a3e3..724ddd0 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewContentProvider.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewContentProvider.java
@@ -26,6 +26,7 @@
import org.apache.directory.shared.ldap.model.exception.LdapSchemaException;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.model.schemachecker.SchemaChecker;
+import org.apache.directory.studio.schemaeditor.model.schemachecker.SchemaWarning;
import org.apache.directory.studio.schemaeditor.view.wrappers.Folder;
import org.apache.directory.studio.schemaeditor.view.wrappers.Folder.FolderType;
import org.apache.directory.studio.schemaeditor.view.wrappers.ProblemsViewRoot;
@@ -103,17 +104,16 @@
}
}
- // TODO
-// SchemaWarning[] warnings = schemaChecker.getWarnings().toArray( new SchemaWarning[0] );
-// if ( !( warnings.length == 0 ) )
-// {
-// Folder warningsFolder = new Folder( FolderType.WARNING, root );
-// root.addChild( warningsFolder );
-// for ( SchemaWarning warning : warnings )
-// {
-// warningsFolder.addChild( new SchemaWarningWrapper( warning, warningsFolder ) );
-// }
-// }
+ SchemaWarning[] warnings = schemaChecker.getWarnings().toArray( new SchemaWarning[0] );
+ if ( !( warnings.length == 0 ) )
+ {
+ Folder warningsFolder = new Folder( FolderType.WARNING, root );
+ root.addChild( warningsFolder );
+ for ( SchemaWarning warning : warnings )
+ {
+ warningsFolder.addChild( new SchemaWarningWrapper( warning, warningsFolder ) );
+ }
+ }
}
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java
index 945c7e2..bb544ce 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java
@@ -29,6 +29,8 @@
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
+import org.apache.directory.studio.schemaeditor.model.schemachecker.NoAliasWarning;
+import org.apache.directory.studio.schemaeditor.model.schemachecker.SchemaWarning;
import org.apache.directory.studio.schemaeditor.view.wrappers.Folder;
import org.apache.directory.studio.schemaeditor.view.wrappers.SchemaErrorWrapper;
import org.apache.directory.studio.schemaeditor.view.wrappers.SchemaWarningWrapper;
@@ -95,22 +97,20 @@
if ( columnIndex == 0 )
{
- return ""; // TODO getMessage( warningWrapper.getSchemaWarning() );
+ return getMessage( warningWrapper.getSchemaWarning() );
}
else if ( columnIndex == 1 )
{
- return "";
- // TODO
- // String name = warningWrapper.getSchemaWarning().getSource().getName();
- //
- // if ( ( name != null ) && ( !name.equals( "" ) ) ) //$NON-NLS-1$
- // {
- // return name;
- // }
- // else
- // {
- // return warningWrapper.getSchemaWarning().getSource().getOid();
- // }
+ String name = warningWrapper.getSchemaWarning().getSource().getName();
+
+ if ( ( name != null ) && ( !name.equals( "" ) ) ) //$NON-NLS-1$
+ {
+ return name;
+ }
+ else
+ {
+ return warningWrapper.getSchemaWarning().getSource().getOid();
+ }
}
}
else if ( element instanceof Folder )
@@ -137,7 +137,7 @@
{
switch ( exception.getCode() )
{
- // Codes for all Schema Objects
+ // Codes for all Schema Objects
case NAME_ALREADY_REGISTERED:
return getMessageNameAlreadyRegistered( exception );
case OID_ALREADY_REGISTERED:
@@ -204,24 +204,31 @@
}
return ""; //$NON-NLS-1$
+ }
- // else if ( element instanceof NoAliasWarning )
- // {
- // NoAliasWarning noAliasWarning = ( NoAliasWarning ) element;
- // SchemaObject source = noAliasWarning.getSourceObject();
- // if ( source instanceof AttributeType )
- // {
- // return NLS
- // .bind(
- // Messages.getString( "ProblemsViewLabelProvider.NoAliasWarningAttributeType" ), new String[] { source.getOid() } ); //$NON-NLS-1$
- // }
- // else if ( source instanceof ObjectClass )
- // {
- // return NLS
- // .bind(
- // Messages.getString( "ProblemsViewLabelProvider.NoAliasWarningObjectClass" ), new String[] { source.getOid() } ); //$NON-NLS-1$
- // }
- // }
+
+ private String getMessage( SchemaWarning warning )
+ {
+
+ if ( warning instanceof NoAliasWarning )
+ {
+ NoAliasWarning noAliasWarning = ( NoAliasWarning ) warning;
+ SchemaObject source = noAliasWarning.getSource();
+ if ( source instanceof AttributeType )
+ {
+ return NLS
+ .bind(
+ Messages.getString( "ProblemsViewLabelProvider.NoAliasWarningAttributeType" ), new String[] { source.getOid() } ); //$NON-NLS-1$
+ }
+ else if ( source instanceof ObjectClass )
+ {
+ return NLS
+ .bind(
+ Messages.getString( "ProblemsViewLabelProvider.NoAliasWarningObjectClass" ), new String[] { source.getOid() } ); //$NON-NLS-1$
+ }
+ }
+
+ return ""; //$NON-NLS-1$
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsViewContentProvider.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsViewContentProvider.java
index dcdee70..c9e3343 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsViewContentProvider.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsViewContentProvider.java
@@ -93,7 +93,6 @@
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
public Object[] getChildren( Object parentElement )
{
List<TreeNode> children = new ArrayList<TreeNode>();
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaView.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaView.java
index ee44b0b..d71baee 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaView.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaView.java
@@ -25,6 +25,7 @@
import org.apache.directory.studio.schemaeditor.controller.SchemaViewController;
import org.apache.directory.studio.schemaeditor.view.wrappers.SchemaViewRoot;
import org.eclipse.jface.viewers.DecoratingLabelProvider;
+import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
@@ -116,4 +117,14 @@
{
treeViewer.refresh();
}
+
+
+ /**
+ * Refreshes the viewer and selects the given selection
+ */
+ public void refresh( ISelection selection )
+ {
+ treeViewer.refresh();
+ treeViewer.setSelection( selection );
+ }
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java
index 0f091c2..348d0f4 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.view.views;
@@ -26,6 +26,7 @@
import org.apache.commons.collections.map.MultiValueMap;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
@@ -184,7 +185,7 @@
}
else if ( rootChild instanceof ObjectClass )
{
- ObjectClass oc = ( ObjectClass ) rootChild;
+ MutableObjectClass oc = ( MutableObjectClass ) rootChild;
childNode = new ObjectClassWrapper( oc, ocFolder );
ocFolder.addChild( childNode );
}
@@ -318,7 +319,7 @@
}
else if ( child instanceof ObjectClass )
{
- ObjectClass oc = ( ObjectClass ) child;
+ MutableObjectClass oc = ( MutableObjectClass ) child;
childNode = new ObjectClassWrapper( oc, node );
node.addChild( childNode );
}
@@ -577,7 +578,7 @@
{
AttributeTypeWrapper atw = new AttributeTypeWrapper( ( AttributeType ) child, createdWrapper );
atw.getParent().addChild( atw );
- elementsToWrappersMap.put( ( AttributeType ) child, atw );
+ elementsToWrappersMap.put( child, atw );
}
}
}
@@ -732,7 +733,7 @@
*/
private void attributeTypeRemovedHierarchicalPresentation( AttributeType at )
{
- // Creating children nodes of the AT
+ // Creating children nodes of the AT
// and attaching them to the root
List<Object> children = hierarchyManager.getChildren( at );
if ( children != null )
@@ -762,7 +763,7 @@
}
atw.getParent().addChild( atw );
- elementsToWrappersMap.put( ( AttributeType ) child, atw );
+ elementsToWrappersMap.put( child, atw );
}
}
@@ -820,7 +821,7 @@
* @param oc
* the added object class
*/
- public void objectClassAdded( ObjectClass oc )
+ public void objectClassAdded( MutableObjectClass oc )
{
int presentation = store.getInt( PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION );
if ( presentation == PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION_FLAT )
@@ -841,7 +842,7 @@
* @param oc
* the added object class
*/
- public void objectClassAddedFlatPresentation( ObjectClass oc )
+ public void objectClassAddedFlatPresentation( MutableObjectClass oc )
{
SchemaWrapper schemaWrapper = ( SchemaWrapper ) getWrapper( Activator.getDefault().getSchemaHandler()
.getSchema( oc.getSchemaName() ) );
@@ -878,7 +879,7 @@
* @param oc
* the added object class
*/
- public void objectClassAddedHierarchicalPresentation( ObjectClass oc )
+ public void objectClassAddedHierarchicalPresentation( MutableObjectClass oc )
{
// Removing unattached nodes for "top"
List<Object> ocChildren = new ArrayList<Object>();
@@ -997,9 +998,9 @@
for ( TreeNode createdWrapper : createdWrappers )
{
- ObjectClassWrapper ocw = new ObjectClassWrapper( ( ObjectClass ) child, createdWrapper );
+ ObjectClassWrapper ocw = new ObjectClassWrapper( ( MutableObjectClass ) child, createdWrapper );
ocw.getParent().addChild( ocw );
- elementsToWrappersMap.put( ( ObjectClass ) child, ocw );
+ elementsToWrappersMap.put( child, ocw );
addHierarchyChildren( ocw, hierarchyManager.getChildren( child ) );
}
}
@@ -1013,7 +1014,7 @@
* @param oc
* the modified object class
*/
- public void objectClassModified( ObjectClass oc )
+ public void objectClassModified( MutableObjectClass oc )
{
int presentation = store.getInt( PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION );
if ( presentation == PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION_FLAT )
@@ -1047,7 +1048,7 @@
* @param oc
* the modified object class
*/
- public void objectClassModifiedHierarchicalPresentation( ObjectClass oc )
+ public void objectClassModifiedHierarchicalPresentation( MutableObjectClass oc )
{
// Propagating the modification to the hierarchy manager
hierarchyManager.objectClassModified( oc );
@@ -1155,7 +1156,7 @@
*/
public void objectClassRemovedHierarchicalPresentation( ObjectClass oc )
{
- // Creating children nodes of the OC
+ // Creating children nodes of the OC
// and attaching them to the root
List<Object> children = hierarchyManager.getChildren( oc );
if ( children != null )
@@ -1173,7 +1174,7 @@
Folder folder = ( Folder ) rootChild;
if ( folder.getType().equals( FolderType.OBJECT_CLASS ) )
{
- ocw = new ObjectClassWrapper( ( ObjectClass ) child, folder );
+ ocw = new ObjectClassWrapper( ( MutableObjectClass ) child, folder );
break;
}
}
@@ -1181,11 +1182,11 @@
}
else if ( group == PluginConstants.PREFS_SCHEMA_VIEW_GROUPING_MIXED )
{
- ocw = new ObjectClassWrapper( ( ObjectClass ) child, root );
+ ocw = new ObjectClassWrapper( ( MutableObjectClass ) child, root );
}
ocw.getParent().addChild( ocw );
- elementsToWrappersMap.put( ( ObjectClass ) child, ocw );
+ elementsToWrappersMap.put( child, ocw );
addHierarchyChildren( ocw, hierarchyManager.getChildren( child ) );
}
}
@@ -1255,7 +1256,7 @@
attributeTypeAddedHierarchicalPresentation( at );
}
- for ( ObjectClass oc : schema.getObjectClasses() )
+ for ( MutableObjectClass oc : schema.getObjectClasses() )
{
objectClassAddedHierarchicalPresentation( oc );
}
@@ -1349,7 +1350,7 @@
Folder ocFolder = new Folder( FolderType.OBJECT_CLASS, schemaWrapper );
schemaWrapper.addChild( ocFolder );
- for ( ObjectClass objectClass : schema.getObjectClasses() )
+ for ( MutableObjectClass objectClass : schema.getObjectClasses() )
{
ObjectClassWrapper ocw = new ObjectClassWrapper( objectClass, ocFolder );
ocw.getParent().addChild( ocw );
@@ -1365,7 +1366,7 @@
elementsToWrappersMap.put( attributeType, atw );
}
- for ( ObjectClass objectClass : schema.getObjectClasses() )
+ for ( MutableObjectClass objectClass : schema.getObjectClasses() )
{
ObjectClassWrapper ocw = new ObjectClassWrapper( objectClass, schemaWrapper );
ocw.getParent().addChild( ocw );
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
index 44787f5..46d0684 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.view.views;
@@ -27,6 +27,7 @@
import java.util.regex.Pattern;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.SchemaObject;
import org.apache.directory.studio.schemaeditor.Activator;
@@ -150,7 +151,7 @@
Label separatorLabel2 = new Label( parent, SWT.SEPARATOR | SWT.HORIZONTAL );
separatorLabel2.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
- // Create the table
+ // Create the table
createTableViewer();
setSearchResultsLabel( null, 0 );
@@ -201,7 +202,7 @@
{
resultsTable.setFocus();
}
- else if ( ( e.keyCode == Action.findKeyCode( "RETURN" ) ) || ( e.keyCode == SWT.KEYPAD_CR ) ) //$NON-NLS-1$
+ else if ( ( e.keyCode == Action.findKeyCode( "RETURN" ) ) || ( e.keyCode == SWT.KEYPAD_CR ) ) //$NON-NLS-1$
{
search();
}
@@ -558,7 +559,7 @@
}
else if ( item instanceof ObjectClass )
{
- input = new ObjectClassEditorInput( ( ObjectClass ) item );
+ input = new ObjectClassEditorInput( ( MutableObjectClass ) item );
editorId = ObjectClassEditor.ID;
}
@@ -574,7 +575,7 @@
{
PluginUtils.logError( Messages.getString( "SearchView.ErrorOpeningEditor" ), exception ); //$NON-NLS-1$
ViewUtils
- .displayErrorMessageBox(
+ .displayErrorMessageDialog(
Messages.getString( "SearchView.Error" ), Messages.getString( "SearchView.ErrorOpeningEditor" ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages.properties
index 418526a..f3a0f8d 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages.properties
@@ -70,7 +70,7 @@
SearchView.ClassesOnly=Object Classes Only
SearchView.Description=Description
SearchView.Error=Error
-SearchView.ErrorOpeningEditor=An error occured when opening the editor.
+SearchView.ErrorOpeningEditor=An error occurred when opening the editor.
SearchView.InWorkspace=\ in workspace
SearchView.MandatoryAttributes=Mandatory Attributes
SearchView.Match=match
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages_fr.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages_fr.properties
index 543463d..dbaca45 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages_fr.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages_fr.properties
@@ -27,23 +27,23 @@
ProblemsView.Warning=avertissement
ProblemsView.Warnings=avertissements
-ProblemsViewLabelProvider.NonExistentSchema=TODO:Schema "{0}" does not exist.
-ProblemsViewLabelProvider.ATCannotSubtypeCollectiveAT=TODO:A collective attribute type cannot be subtyped.
-ProblemsViewLabelProvider.ATCycleTypeHierarchy=TODO:A cycle has been detected in attribute type hierarchy.
-ProblemsViewLabelProvider.ATSyntaxOrSuperiorRequired=TODO:A syntax or a superior is required.
-ProblemsViewLabelProvider.ATMustHaveSameUsageThanSuperior=TODO:The attribute type must have the same usage than its superior.
-ProblemsViewLabelProvider.ATUserApplicationsUsageMustBeUserModifiable=TODO:Having a usage set to 'userApplications', the attribute type must be user modifiable.
-ProblemsViewLabelProvider.ATCollectiveMustHaveUserApplicationsUsage=TODO:Being collective, the attribute type must have a usage set to 'userApplications'.
-ProblemsViewLabelProvider.ATCollectiveCannotBeSingleValued=TODO:Being collective, the attribute type cannot be single valued.
-ProblemsViewLabelProvider.OCAbstractMustInheritFromAbstractOC=TODO:An abstract object class must inherit from another abstract object class.
-ProblemsViewLabelProvider.OCAuxiliaryCannotInheritFromStructuralOC=TODO:An auxiliary object class cannot inherit from a structural object class.
-ProblemsViewLabelProvider.OCStructuralCannotInheritFromAuxiliaryOC=TODO:A structural object class cannot inherit from an auxiliary object class.
-ProblemsViewLabelProvider.OCCycleClassHierarchy=TODO:A cycle has been detected in object class hierarchy.
-ProblemsViewLabelProvider.OCCollectiveNotAllowedInMust=TODO:Collective attribute type "{0}" is not allowed as a mandatory attribute type.
-ProblemsViewLabelProvider.OCCollectiveNotAllowedInMay=TODO:Collective attribute type "{0}" is not allowed as an optional attribute type.
-ProblemsViewLabelProvider.OCDuplicateATInMust=TODO:Duplicated attribute type "{0}" in the mandatory attribute types list.
-ProblemsViewLabelProvider.OCDuplicateATInMay=TODO:Duplicated attribute type "{0}" in the optional attribute types list.
-ProblemsViewLabelProvider.OCDuplicateATInMayAndMust=TODO:Duplicated attribute type "{0}" in the mandatory and optional attribute types lists.
+ProblemsViewLabelProvider.NonExistentSchema=Le schéma "{0}" n'existe pas.
+ProblemsViewLabelProvider.ATCannotSubtypeCollectiveAT=Un type d'attribute collectif ne peut pas être sous-typé.
+ProblemsViewLabelProvider.ATCycleTypeHierarchy=Un cycle a été détecté dans la hierarchie de types d'attributs.
+ProblemsViewLabelProvider.ATSyntaxOrSuperiorRequired=Une syntaxe ou un supérieur est requis.
+ProblemsViewLabelProvider.ATMustHaveSameUsageThanSuperior=Le type d'attribute doit avoir le même usage que son supérieur.
+ProblemsViewLabelProvider.ATUserApplicationsUsageMustBeUserModifiable=Ayant pour usage 'userApplications', le type d'attribut doit être modifiable par l'utilisateur.
+ProblemsViewLabelProvider.ATCollectiveMustHaveUserApplicationsUsage=Etant collectif, le type d'attribute doit avoir un usage 'userApplications'.
+ProblemsViewLabelProvider.ATCollectiveCannotBeSingleValued=Etant collectif, le type d'attribut ne peut pas être mono-valué.
+ProblemsViewLabelProvider.OCAbstractMustInheritFromAbstractOC=Une class d'objet abstraite doit hériter d'une autre classe d'objet abstraite.
+ProblemsViewLabelProvider.OCAuxiliaryCannotInheritFromStructuralOC=Une classe d'objet auxiliaire ne peut pas hériter d'une classe d'objet structurelle.
+ProblemsViewLabelProvider.OCStructuralCannotInheritFromAuxiliaryOC=Une classe d'objet structurelle ne peut pas hériter d'une classe d'objet auxiliaire.
+ProblemsViewLabelProvider.OCCycleClassHierarchy=Un cycle a été détecté dans la hierarchie de classes d'objet.
+ProblemsViewLabelProvider.OCCollectiveNotAllowedInMust=Le type d'attribut collectif "{0}" n'est pas autorisé en tant que type d'attribute obligatoire.
+ProblemsViewLabelProvider.OCCollectiveNotAllowedInMay=Le type d'attribut collectif "{0}" n'est pas autorisé en tant que type d'attribute optionnel.
+ProblemsViewLabelProvider.OCDuplicateATInMust=Type d'attribut "{0}" dupliqué dans la liste des types d'attributs obligatoires.
+ProblemsViewLabelProvider.OCDuplicateATInMay=Type d'attribut "{0}" dupliqué dans la liste des types d'attributs optionnels.
+ProblemsViewLabelProvider.OCDuplicateATInMayAndMust=Type d'attribut "{0}" dupliqué dans les listes des types d'attributs obligatoires et optionnels.
ProblemsViewLabelProvider.NameAlreadyRegisteredAT=L''alias "{0}" est d\u00E9j\u00E0 utilis\u00E9 par un autre \u00E9lement\: le type d'attribut avec pour OID "{1}".
ProblemsViewLabelProvider.NameAlreadyRegisteredOC=L''alias "{0}" est d\u00E9j\u00E0 utilis\u00E9 par un autre \u00E9l\u00E9ment\: la classe d'objet avec pour OID "{1}".
ProblemsViewLabelProvider.OidAlreadyRegisteredAT=L''OID "{0}" est d\u00E9j\u00E0 utilis\u00E9 par un autre \u00E9l\u00E9ment\: le type d'attribut avec pour alias "{1}".
@@ -51,9 +51,9 @@
ProblemsViewLabelProvider.NoAliasWarningAttributeType=Le type d''attribut avec pour OID "{0}" n''a aucun alias.
ProblemsViewLabelProvider.NoAliasWarningObjectClass=La classe d''objet avec pour OID "{0}" n''a aucun alias.
ProblemsViewLabelProvider.OCNonExistentMustAT=Le type d''attibut obligatoire "{0}" n''existe pas.
-ProblemsViewLabelProvider.ATNonExistentEqualityMatchingRule=TODO:Equality matching rule "{0}" does not exist.
-ProblemsViewLabelProvider.ATNonExistentOrderingMatchingRule=TODO:Ordering matching rule "{0}" does not exist.
-ProblemsViewLabelProvider.ATNonExistentSubstringMatchingRule=TODO:Substring matching rule "{0}" does not exist.
+ProblemsViewLabelProvider.ATNonExistentEqualityMatchingRule=La règle de comparaison d'égalité "{0}" n'existe pas.
+ProblemsViewLabelProvider.ATNonExistentOrderingMatchingRule=La règle de comparaison d'ordre "{0}" n'existe pas.
+ProblemsViewLabelProvider.ATNonExistentSubstringMatchingRule=La règle de comparaison de sous-chaîne de caractère "{0}" n'existe pas.
ProblemsViewLabelProvider.OCNonExistentMayAT=Le type d''attribut optionnel "{0}" n''existe pas.
ProblemsViewLabelProvider.ATNonExistentSuperior=Le type d''attribut sup\u00E9rieur "{0}" n''existe pas.
ProblemsViewLabelProvider.OCNonExistentSuperior=La classe d''objet sup\u00E9rieure "{0}" n''existe pas.
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/CoreSchemasSelectionWidget.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/CoreSchemasSelectionWidget.java
index 67d0ec6..ae54571 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/CoreSchemasSelectionWidget.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/CoreSchemasSelectionWidget.java
@@ -61,8 +61,8 @@
/** The array containing the 'core' from ApacheDS */
private static final String[] coreSchemasFromApacheDS = new String[]
- { "apache", "apachedns", "apachemeta", "autofs", "collective", "corba", "core", "cosine", "dhcp", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
- "inetorgperson", "java", "krb5kdc", "mozilla", "nis", "samba", "system" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
+ { "adsconfig","apache", "apachedns", "apachemeta", "autofs", "collective", "corba", "core", "cosine", "dhcp", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
+ "inetorgperson", "java", "krb5kdc", "mozilla", "nis", "pwdpolicy", "samba", "system" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
/** The array containing the 'core' from OpenLDAP */
private static final String[] coreSchemasFromOpenLdap = new String[]
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesDifferencesWizardPage.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesDifferencesWizardPage.java
index dd73a50..e826199 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesDifferencesWizardPage.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesDifferencesWizardPage.java
@@ -82,7 +82,7 @@
{
Project project = Activator.getDefault().getProjectsHandler().getOpenProject();
- differencesWidget.setInput( DifferenceEngine.getDifferences( project.getSchemaBackup(), project
+ differencesWidget.setInput( DifferenceEngine.getDifferences( project.getInitialSchema(), project
.getSchemaHandler().getSchemas() ) );
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesWizard.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesWizard.java
index 8592c1f..beaa7f9 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesWizard.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesWizard.java
@@ -20,16 +20,10 @@
package org.apache.directory.studio.schemaeditor.view.wizards;
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.model.DependenciesComputer;
import org.apache.directory.studio.schemaeditor.model.DependenciesComputer.DependencyComputerException;
import org.apache.directory.studio.schemaeditor.model.Project;
-import org.apache.directory.studio.schemaeditor.model.Schema;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.ui.IExportWizard;
@@ -77,26 +71,26 @@
*/
public boolean performFinish()
{
- final List<Schema> orderedSchemas = dependenciesComputer.getDependencyOrderedSchemasList();
-
- try
- {
- getContainer().run( false, false, new IRunnableWithProgress()
- {
- public void run( IProgressMonitor monitor )
- {
- //TODO implement
- }
- } );
- }
- catch ( InvocationTargetException e )
- {
- // Nothing to do (it will never occur)
- }
- catch ( InterruptedException e )
- {
- // Nothing to do.
- }
+ // final List<Schema> orderedSchemas = dependenciesComputer.getDependencyOrderedSchemasList();
+ //
+ // try
+ // {
+ // getContainer().run( false, false, new IRunnableWithProgress()
+ // {
+ // public void run( IProgressMonitor monitor )
+ // {
+ // //TODO implement
+ // }
+ // } );
+ // }
+ // catch ( InvocationTargetException e )
+ // {
+ // // Nothing to do (it will never occur)
+ // }
+ // catch ( InterruptedException e )
+ // {
+ // // Nothing to do.
+ // }
return true;
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportProjectsWizard.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportProjectsWizard.java
index b9eeae1..d30329f 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportProjectsWizard.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportProjectsWizard.java
@@ -109,7 +109,7 @@
.bind(
Messages.getString( "ExportProjectsWizard.ErrorWhenSavingProject" ), new String[] { project.getName() } ), e ); //$NON-NLS-1$
ViewUtils
- .displayErrorMessageBox(
+ .displayErrorMessageDialog(
Messages.getString( "ExportProjectsWizard.Error" ), NLS.bind( Messages.getString( "ExportProjectsWizard.ErrorWhenSavingProject" ), new String[] { project.getName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
catch ( FileNotFoundException e )
@@ -120,7 +120,7 @@
.bind(
Messages.getString( "ExportProjectsWizard.ErrorWhenSavingProject" ), new String[] { project.getName() } ), e ); //$NON-NLS-1$
ViewUtils
- .displayErrorMessageBox(
+ .displayErrorMessageDialog(
Messages.getString( "ExportProjectsWizard.Error" ), NLS.bind( Messages.getString( "ExportProjectsWizard.ErrorWhenSavingProject" ), new String[] { project.getName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
catch ( IOException e )
@@ -131,7 +131,7 @@
.bind(
Messages.getString( "ExportProjectsWizard.ErrorWhenSavingProject" ), new String[] { project.getName() } ), e ); //$NON-NLS-1$
ViewUtils
- .displayErrorMessageBox(
+ .displayErrorMessageDialog(
Messages.getString( "ExportProjectsWizard.Error" ), NLS.bind( Messages.getString( "ExportProjectsWizard.ErrorWhenSavingProject" ), new String[] { project.getName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
monitor.worked( 1 );
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizard.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizard.java
index d5237c0..2087b0d 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizard.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizard.java
@@ -105,7 +105,7 @@
Messages.getString( "ExportSchemasAsOpenLdapWizard.ErrorSavingSchema" ), new String[] { schema.getSchemaName() } ), //$NON-NLS-1$
e );
ViewUtils
- .displayErrorMessageBox(
+ .displayErrorMessageDialog(
Messages.getString( "ExportSchemasAsOpenLdapWizard.Error" ), NLS.bind( Messages.getString( "ExportSchemasAsOpenLdapWizard.ErrorSavingSchema" ), new String[] { schema.getSchemaName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
monitor.worked( 1 );
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java
index 8145ad0..eaa97ef 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java
@@ -107,7 +107,7 @@
.bind(
Messages.getString( "ExportSchemasAsXmlWizard.ErrorWhenSavingSchema" ), new String[] { schema.getSchemaName() } ), e ); //$NON-NLS-1$
ViewUtils
- .displayErrorMessageBox(
+ .displayErrorMessageDialog(
Messages.getString( "ExportSchemasAsXmlWizard.Error" ), NLS.bind( Messages.getString( "ExportSchemasAsXmlWizard.ErrorWhenSavingSchema" ), new String[] { schema.getSchemaName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
monitor.worked( 1 );
@@ -146,7 +146,7 @@
PluginUtils.logError( Messages
.getString( "ExportSchemasAsXmlWizard.ErrorWhenSavingSchemas" ), e ); //$NON-NLS-1$
ViewUtils
- .displayErrorMessageBox(
+ .displayErrorMessageDialog(
Messages.getString( "ExportSchemasAsXmlWizard.Error" ), Messages.getString( "ExportSchemasAsXmlWizard.ErrorWhenSavingSchemas" ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
monitor.worked( 1 );
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java
index d0b14e1..5ea13d3 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.view.wizards;
@@ -38,6 +38,7 @@
import org.apache.directory.shared.converter.schema.ObjectClassHolder;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.util.Strings;
import org.apache.directory.studio.schemaeditor.Activator;
@@ -114,7 +115,7 @@
sb
.append( NLS
.bind(
- Messages.getString( "ExportSchemasForADSWizard.GeneratedByApacheComment" ), new String[] { format.format( date ) } ) ); //$NON-NLS-1$
+ Messages.getString( "ExportSchemasForADSWizard.GeneratedByApacheComment" ), new String[] { format.format( date ) } ) ); //$NON-NLS-1$
try
{
@@ -133,7 +134,7 @@
.bind(
Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchema" ), new String[] { schema.getSchemaName() } ), e ); //$NON-NLS-1$
ViewUtils
- .displayErrorMessageBox(
+ .displayErrorMessageDialog(
Messages.getString( "ExportSchemasForADSWizard.Error" ), NLS.bind( Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchema" ), new String[] { schema.getSchemaName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
monitor.worked( 1 );
@@ -184,7 +185,7 @@
.bind(
Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchema" ), new String[] { schema.getSchemaName() } ), e ); //$NON-NLS-1$
ViewUtils
- .displayErrorMessageBox(
+ .displayErrorMessageDialog(
Messages.getString( "ExportSchemasForADSWizard.Error" ), NLS.bind( Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchema" ), new String[] { schema.getSchemaName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -200,7 +201,7 @@
PluginUtils.logError(
Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchemas" ), e ); //$NON-NLS-1$
ViewUtils
- .displayErrorMessageBox(
+ .displayErrorMessageDialog(
Messages.getString( "ExportSchemasForADSWizard.Error" ), Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchemas" ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
monitor.worked( 1 );
@@ -231,14 +232,14 @@
* the StringBuffer
* @throws NamingException
* if an error occurs during the conversion
- * @throws LdapException
+ * @throws LdapException
*/
private void toLdif( Schema schema, StringBuffer sb ) throws NamingException, LdapException
{
sb
.append( NLS
.bind(
- Messages.getString( "ExportSchemasForADSWizard.SchemaComment" ), new String[] { schema.getSchemaName().toUpperCase() } ) ); //$NON-NLS-1$
+ Messages.getString( "ExportSchemasForADSWizard.SchemaComment" ), new String[] { schema.getSchemaName().toUpperCase() } ) ); //$NON-NLS-1$
sb.append( "dn: cn=" + schema.getSchemaName() + ", ou=schema\n" ); //$NON-NLS-1$ //$NON-NLS-2$
sb.append( "objectclass: metaSchema\n" ); //$NON-NLS-1$
@@ -341,7 +342,7 @@
sb.append( "\n" ); //$NON-NLS-1$
// Generating LDIF for Object Classes
- List<ObjectClass> sortedObjectClasses = getSortedObjectClasses( schema.getObjectClasses() );
+ List<MutableObjectClass> sortedObjectClasses = getSortedObjectClasses( schema.getObjectClasses() );
for ( ObjectClass oc : sortedObjectClasses )
{
ObjectClassHolder holder = new ObjectClassHolder( oc.getOid() );
@@ -398,10 +399,10 @@
* @param objectClasses the unsorted object classes
* @return the sorted object classes
*/
- private List<ObjectClass> getSortedObjectClasses( List<ObjectClass> objectClasses )
+ private List<MutableObjectClass> getSortedObjectClasses( List<MutableObjectClass> objectClasses )
{
// clone the unsorted list
- List<ObjectClass> unsortedObjectClasses = new ArrayList<ObjectClass>( objectClasses );
+ List<MutableObjectClass> unsortedObjectClasses = new ArrayList<MutableObjectClass>( objectClasses );
// list of all existing names
Set<String> objectClassNames = new HashSet<String>();
@@ -414,16 +415,16 @@
}
// sort object classes
- List<ObjectClass> sortedObjectClasses = new ArrayList<ObjectClass>();
+ List<MutableObjectClass> sortedObjectClasses = new ArrayList<MutableObjectClass>();
Set<String> movedObjectClasses = new HashSet<String>();
boolean moved = true;
while ( !unsortedObjectClasses.isEmpty() && moved )
{
moved = false;
- Iterator<ObjectClass> unsortedIterator = unsortedObjectClasses.iterator();
+ Iterator<MutableObjectClass> unsortedIterator = unsortedObjectClasses.iterator();
while ( unsortedIterator.hasNext() )
{
- ObjectClass oc = unsortedIterator.next();
+ MutableObjectClass oc = unsortedIterator.next();
for ( String superName : oc.getSuperiorOids() )
{
if ( !objectClassNames.contains( Strings.toLowerCase( superName ) )
@@ -443,7 +444,7 @@
}
// add the rest
- for ( ObjectClass oc : unsortedObjectClasses )
+ for ( MutableObjectClass oc : unsortedObjectClasses )
{
sortedObjectClasses.add( oc );
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportProjectsWizard.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportProjectsWizard.java
index 09876cd..0f9e7a3 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportProjectsWizard.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportProjectsWizard.java
@@ -94,7 +94,32 @@
{
Project project = ProjectsImporter.getProject( new FileInputStream( projectFile ),
projectFile.getAbsolutePath() );
- projectsHandler.addProject( project );
+
+ if ( projectsHandler.isProjectNameAlreadyTaken( project.getName() ) )
+ {
+ PluginUtils
+ .logError(
+ NLS
+ .bind(
+ Messages.getString( "ImportProjectsWizard.ErrorImportingProject" ), //$NON-NLS-1$
+ new String[]
+ { project.getName() } ), null );
+ ViewUtils
+ .displayErrorMessageDialog(
+ Messages.getString( "ImportProjectsWizard.ImportError" ), //$NON-NLS-1$
+ NLS
+ .bind(
+ Messages.getString( "ImportProjectsWizard.ErrorImportingProject" ) //$NON-NLS-1$
+ + "\n" //$NON-NLS-1$
+ + Messages
+ .getString( "ImportProjectsWizard.ErrorProjectNameExists" ), //$NON-NLS-1$
+ new String[]
+ { project.getName() } ) );
+ }
+ else
+ {
+ projectsHandler.addProject( project );
+ }
}
catch ( ProjectsImportException e )
{
@@ -104,7 +129,7 @@
.bind(
Messages.getString( "ImportProjectsWizard.ErrorImportingProject" ), new String[] { projectFile.getName() } ), e ); //$NON-NLS-1$
ViewUtils
- .displayErrorMessageBox(
+ .displayErrorMessageDialog(
Messages.getString( "ImportProjectsWizard.ImportError" ), //$NON-NLS-1$
NLS
.bind(
@@ -118,7 +143,7 @@
.bind(
Messages.getString( "ImportProjectsWizard.ErrorImportingProject" ), new String[] { projectFile.getName() } ), e ); //$NON-NLS-1$
ViewUtils
- .displayErrorMessageBox(
+ .displayErrorMessageDialog(
Messages.getString( "ImportProjectsWizard.ImportError" ), //$NON-NLS-1$
NLS
.bind(
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java
index 522ebb3..05ff04c 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java
@@ -144,14 +144,22 @@
if ( parentElement instanceof AttributeTypeFolder )
{
AttributeTypeFolder folder = ( AttributeTypeFolder ) parentElement;
- List<AttributeType> attributeTypes = folder.schema.getAttributeTypes();
- return attributeTypes.toArray();
+ List<AttributeTypeWrapper> attributeTypeWrappers = new ArrayList<AttributeTypeWrapper>();
+ for ( AttributeType attributeType : folder.schema.getAttributeTypes() )
+ {
+ attributeTypeWrappers.add( new AttributeTypeWrapper( attributeType, folder ) );
+ }
+ return attributeTypeWrappers.toArray();
}
if ( parentElement instanceof ObjectClassFolder )
{
ObjectClassFolder folder = ( ObjectClassFolder ) parentElement;
- List<ObjectClass> objectClasses = folder.schema.getObjectClasses();
- return objectClasses.toArray();
+ List<ObjectClassWrapper> objectClassWrappers = new ArrayList<ObjectClassWrapper>();
+ for ( ObjectClass objectClass : folder.schema.getObjectClasses() )
+ {
+ objectClassWrappers.add( new ObjectClassWrapper( objectClass, folder ) );
+ }
+ return objectClassWrappers.toArray();
}
return new Object[0];
@@ -177,26 +185,26 @@
{
return Messages.getString( "MergeSchemasSelectionWizardPage.AttributeTypes" ); //$NON-NLS-1$
}
- else if ( element instanceof AttributeType )
+ else if ( element instanceof AttributeTypeWrapper )
{
- AttributeType at = ( ( AttributeType ) element );
+ AttributeType at = ( ( AttributeTypeWrapper ) element ).attributeType;
List<String> names = at.getNames();
if ( ( names != null ) && ( names.size() > 0 ) )
{
- return names.get(0);
+ return names.get( 0 );
}
else
{
return at.getOid();
}
}
- else if ( element instanceof ObjectClass )
+ else if ( element instanceof ObjectClassWrapper )
{
- ObjectClass oc = ( ( ObjectClass ) element );
+ ObjectClass oc = ( ( ObjectClassWrapper ) element ).objectClass;
List<String> names = oc.getNames();
if ( ( names != null ) && ( names.size() > 0 ) )
{
- return names.get(0);
+ return names.get( 0 );
}
else
{
@@ -234,11 +242,11 @@
{
return Activator.getDefault().getImage( PluginConstants.IMG_FOLDER_AT );
}
- else if ( element instanceof AttributeType )
+ else if ( element instanceof AttributeTypeWrapper )
{
return Activator.getDefault().getImage( PluginConstants.IMG_ATTRIBUTE_TYPE );
}
- else if ( element instanceof ObjectClass )
+ else if ( element instanceof ObjectClassWrapper )
{
return Activator.getDefault().getImage( PluginConstants.IMG_OBJECT_CLASS );
}
@@ -355,4 +363,30 @@
this.schema = schema;
}
}
+
+ class ObjectClassWrapper
+ {
+ ObjectClass objectClass;
+ ObjectClassFolder folder;
+
+
+ public ObjectClassWrapper( ObjectClass objectClass, ObjectClassFolder folder )
+ {
+ this.objectClass = objectClass;
+ this.folder = folder;
+ }
+ }
+
+ class AttributeTypeWrapper
+ {
+ AttributeType attributeType;
+ AttributeTypeFolder folder;
+
+
+ public AttributeTypeWrapper( AttributeType attributeType, AttributeTypeFolder folder )
+ {
+ this.attributeType = attributeType;
+ this.folder = folder;
+ }
+ }
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java
index 0df3773..2108822 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.view.wizards;
@@ -29,13 +29,17 @@
import org.apache.directory.shared.ldap.model.schema.AbstractSchemaObject;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.model.Project;
import org.apache.directory.studio.schemaeditor.model.Schema;
import org.apache.directory.studio.schemaeditor.view.dialogs.MessageDialogWithTextarea;
import org.apache.directory.studio.schemaeditor.view.wizards.MergeSchemasSelectionWizardPage.AttributeTypeFolder;
+import org.apache.directory.studio.schemaeditor.view.wizards.MergeSchemasSelectionWizardPage.AttributeTypeWrapper;
import org.apache.directory.studio.schemaeditor.view.wizards.MergeSchemasSelectionWizardPage.ObjectClassFolder;
+import org.apache.directory.studio.schemaeditor.view.wizards.MergeSchemasSelectionWizardPage.ObjectClassWrapper;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.osgi.util.NLS;
@@ -102,13 +106,13 @@
private void mergeObjects( Object[] sourceObjects, List<String> errorMessages, boolean replaceUnknownSyntax,
boolean mergeDependencies, boolean pullUpAttributes )
{
- /*
+ /*
* List of already processed schema objects. Used to avoid that schema objects are process multiple time.
*/
Set<Object> processedObjects = new HashSet<Object>();
/*
- * List of created target schemas.
+ * List of created target schemas.
*/
Map<String, Schema> targetSchemas = new HashMap<String, Schema>();
@@ -149,29 +153,25 @@
{
ObjectClassFolder ocf = ( ObjectClassFolder ) sourceObject;
Schema targetSchema = getTargetSchema( ocf.schema.getProject(), targetProject, targetSchemas );
- List<ObjectClass> sourceObjectClasses = ocf.schema.getObjectClasses();
+ List<MutableObjectClass> sourceObjectClasses = ocf.schema.getObjectClasses();
for ( ObjectClass sourceObjectClass : sourceObjectClasses )
{
mergeObjectClass( sourceObjectClass, targetProject, targetSchema, processedObjects, errorMessages,
replaceUnknownSyntax, mergeDependencies, pullUpAttributes );
}
}
- if ( sourceObject instanceof AttributeType )
+ if ( sourceObject instanceof AttributeTypeWrapper )
{
- AttributeType at = ( AttributeType ) sourceObject;
- Schema targetSchema = getTargetSchema(
- Activator.getDefault().getSchemaHandler().getSchema( at.getSchemaName() ).getProject(),
- targetProject, targetSchemas );
- mergeAttributeType( at, targetProject, targetSchema, processedObjects, errorMessages,
+ AttributeTypeWrapper atw = ( AttributeTypeWrapper ) sourceObject;
+ Schema targetSchema = getTargetSchema( atw.folder.schema.getProject(), targetProject, targetSchemas );
+ mergeAttributeType( atw.attributeType, targetProject, targetSchema, processedObjects, errorMessages,
replaceUnknownSyntax, mergeDependencies, pullUpAttributes );
}
- if ( sourceObject instanceof ObjectClass )
+ if ( sourceObject instanceof ObjectClassWrapper )
{
- ObjectClass oc = ( ObjectClass ) sourceObject;
- Schema targetSchema = getTargetSchema(
- Activator.getDefault().getSchemaHandler().getSchema( oc.getSchemaName() ).getProject(),
- targetProject, targetSchemas );
- mergeObjectClass( oc, targetProject, targetSchema, processedObjects, errorMessages,
+ ObjectClassWrapper ocw = ( ObjectClassWrapper ) sourceObject;
+ Schema targetSchema = getTargetSchema( ocw.folder.schema.getProject(), targetProject, targetSchemas );
+ mergeObjectClass( ocw.objectClass, targetProject, targetSchema, processedObjects, errorMessages,
replaceUnknownSyntax, mergeDependencies, pullUpAttributes );
}
}
@@ -210,7 +210,7 @@
/**
- * Merges all attribute types and object classes and form the given sourceSchema to the targetSchema.
+ * Merges all attribute types and object classes and form the given sourceSchema to the targetSchema.
*/
private void mergeSchema( Schema sourceSchema, Project targetProject, Schema targetSchema,
Set<Object> processedObjects, List<String> errorMessages, boolean replaceUnknownSyntax,
@@ -223,7 +223,7 @@
replaceUnknownSyntax, mergeDependencies, pullUpAttributes );
}
- List<ObjectClass> sourceObjectClasses = sourceSchema.getObjectClasses();
+ List<MutableObjectClass> sourceObjectClasses = sourceSchema.getObjectClasses();
for ( ObjectClass sourceObjectClass : sourceObjectClasses )
{
mergeObjectClass( sourceObjectClass, targetProject, targetSchema, processedObjects, errorMessages,
@@ -233,7 +233,7 @@
/**
- * Merges the given attribute type to the targetSchema.
+ * Merges the given attribute type to the targetSchema.
*/
private void mergeAttributeType( AttributeType sourceAttributeType, Project targetProject, Schema targetSchema,
Set<Object> processedObjects, List<String> errorMessages, boolean replaceUnknownSyntax,
@@ -261,13 +261,13 @@
}
// check if OID or alias name already exist in target project
- boolean oidOrAliasAlreadyTaken = targetProject.getSchemaHandler().isAliasOrOidAlreadyTaken(
+ boolean oidOrAliasAlreadyTaken = targetProject.getSchemaHandler().isOidAlreadyTaken(
sourceAttributeType.getOid() );
if ( !oidOrAliasAlreadyTaken )
{
for ( String name : sourceAttributeType.getNames() )
{
- oidOrAliasAlreadyTaken = targetProject.getSchemaHandler().isAliasOrOidAlreadyTaken( name );
+ oidOrAliasAlreadyTaken = targetProject.getSchemaHandler().isAliasAlreadyTakenForAttributeType( name );
if ( oidOrAliasAlreadyTaken )
{
break;
@@ -297,7 +297,7 @@
}
// clone attribute type
- AttributeType clonedAttributeType = new AttributeType( sourceAttributeType.getOid() );
+ MutableAttributeType clonedAttributeType = new MutableAttributeType( sourceAttributeType.getOid() );
clonedAttributeType.setNames( sourceAttributeType.getNames() );
clonedAttributeType.setDescription( sourceAttributeType.getDescription() );
clonedAttributeType.setSuperiorOid( sourceAttributeType.getSuperiorOid() );
@@ -357,7 +357,7 @@
/**
- * Merges the given object class to the targetSchema.
+ * Merges the given object class to the targetSchema.
*/
private void mergeObjectClass( ObjectClass sourceObjectClass, Project targetProject, Schema targetSchema,
Set<Object> processedObjects, List<String> errorMessages, boolean replaceUnknownSyntax,
@@ -385,13 +385,13 @@
}
// check if OID or alias name already exist in target project
- boolean oidOrAliasAlreadyTaken = targetProject.getSchemaHandler().isAliasOrOidAlreadyTaken(
+ boolean oidOrAliasAlreadyTaken = targetProject.getSchemaHandler().isOidAlreadyTaken(
sourceObjectClass.getOid() );
if ( !oidOrAliasAlreadyTaken )
{
for ( String name : sourceObjectClass.getNames() )
{
- oidOrAliasAlreadyTaken = targetProject.getSchemaHandler().isAliasOrOidAlreadyTaken( name );
+ oidOrAliasAlreadyTaken = targetProject.getSchemaHandler().isAliasAlreadyTakenForObjectClass( name );
if ( oidOrAliasAlreadyTaken )
{
break;
@@ -421,7 +421,7 @@
}
// create object class
- ObjectClass clonedObjectClass = new ObjectClass( sourceObjectClass.getOid() );
+ MutableObjectClass clonedObjectClass = new MutableObjectClass( sourceObjectClass.getOid() );
clonedObjectClass.setOid( sourceObjectClass.getOid() );
clonedObjectClass.setNames( sourceObjectClass.getNames() );
clonedObjectClass.setDescription( sourceObjectClass.getDescription() );
@@ -442,7 +442,8 @@
{
if ( superClassName != null )
{
- ObjectClass superSourceObjectClass = Activator.getDefault().getSchemaHandler().getObjectClass( superClassName );
+ ObjectClass superSourceObjectClass = Activator.getDefault().getSchemaHandler()
+ .getObjectClass( superClassName );
ObjectClass superTargetObjectClass = targetProject.getSchemaHandler()
.getObjectClass( superClassName );
if ( superSourceObjectClass != null )
@@ -482,7 +483,8 @@
{
if ( attributeName != null )
{
- AttributeType attributeType = Activator.getDefault().getSchemaHandler().getAttributeType( attributeName );
+ AttributeType attributeType = Activator.getDefault().getSchemaHandler()
+ .getAttributeType( attributeName );
if ( attributeType != null )
{
mergeAttributeType( attributeType, targetProject, targetSchema, processedObjects,
@@ -498,7 +500,7 @@
}
- private void pullUpAttributes( ObjectClass targetObjectClass, ObjectClass sourceSuperObjectClass,
+ private void pullUpAttributes( MutableObjectClass targetObjectClass, ObjectClass sourceSuperObjectClass,
ObjectClass targetSuperObjectClass )
{
// must
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java
index 9e4b045..0a5b6ce 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java
@@ -245,13 +245,12 @@
/**
* Initializes the UI fields.
*/
- @SuppressWarnings("unchecked")
private void initFields()
{
if ( schemaHandler != null )
{
// Getting the syntaxes
- List<Object> syntaxes = new ArrayList( schemaHandler.getSyntaxes() );
+ List<Object> syntaxes = new ArrayList<Object>( schemaHandler.getSyntaxes() );
// Adding the (None) Syntax
String none = Messages.getString( "NewAttributeTypeContentWizardPage.None" ); //$NON-NLS-1$
syntaxes.add( none );
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java
index 4f4b4bb..a5c528e 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeGeneralWizardPage.java
@@ -35,8 +35,7 @@
import org.apache.directory.studio.schemaeditor.model.alias.AliasWithPartError;
import org.apache.directory.studio.schemaeditor.model.alias.AliasWithStartError;
import org.apache.directory.studio.schemaeditor.model.alias.AliasesStringParser;
-import org.apache.directory.studio.schemaeditor.view.dialogs.EditAliasesDialog;
-import org.eclipse.jface.dialogs.Dialog;
+import org.apache.directory.studio.schemaeditor.view.dialogs.EditAttributeTypeAliasesDialog;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -218,9 +217,9 @@
*/
public void widgetSelected( SelectionEvent arg0 )
{
- EditAliasesDialog dialog = new EditAliasesDialog( getAliasesValue() );
+ EditAttributeTypeAliasesDialog dialog = new EditAttributeTypeAliasesDialog( getAliasesValue() );
- if ( ( dialog.open() == Dialog.OK ) && ( dialog.isDirty() ) )
+ if ( dialog.open() == EditAttributeTypeAliasesDialog.OK )
{
String[] newAliases = dialog.getAliases();
@@ -336,7 +335,7 @@
return;
}
if ( ( !oidCombo.getText().equals( "" ) ) && ( Oid.isOid( oidCombo.getText() ) ) //$NON-NLS-1$
- && ( schemaHandler.isAliasOrOidAlreadyTaken( oidCombo.getText() ) ) )
+ && ( schemaHandler.isOidAlreadyTaken( oidCombo.getText() ) ) )
{
displayErrorMessage( Messages.getString( "NewAttributeTypeGeneralWizardPage.ErrorObjectOIDExists" ) ); //$NON-NLS-1$
return;
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java
index 58b7844..cdd0674 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java
@@ -159,13 +159,12 @@
/**
* Initializes the UI fields.
*/
- @SuppressWarnings("unchecked")
private void initFields()
{
if ( schemaHandler != null )
{
// Getting the matching rules
- List<Object> matchingRules = new ArrayList( schemaHandler.getMatchingRules() );
+ List<Object> matchingRules = new ArrayList<Object>( schemaHandler.getMatchingRules() );
// Adding the (None) matching rule
String none = Messages.getString( "NewAttributeTypeMatchingRulesWizardPage.None" ); //$NON-NLS-1$
matchingRules.add( none );
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeWizard.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeWizard.java
index 250ca2f..ba30873 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeWizard.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeWizard.java
@@ -6,21 +6,21 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.view.wizards;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.PluginUtils;
@@ -73,7 +73,7 @@
public boolean performFinish()
{
// Creating the new attribute type
- AttributeType newAT = new AttributeType( generalPage.getOidValue() );
+ MutableAttributeType newAT = new MutableAttributeType( generalPage.getOidValue() );
newAT.setSchemaName( generalPage.getSchemaValue() );
newAT.setNames( generalPage.getAliasesValue() );
newAT.setDescription( generalPage.getDescriptionValue() );
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java
index d15e72d..c0c7d54 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassGeneralPageWizardPage.java
@@ -35,8 +35,7 @@
import org.apache.directory.studio.schemaeditor.model.alias.AliasWithPartError;
import org.apache.directory.studio.schemaeditor.model.alias.AliasWithStartError;
import org.apache.directory.studio.schemaeditor.model.alias.AliasesStringParser;
-import org.apache.directory.studio.schemaeditor.view.dialogs.EditAliasesDialog;
-import org.eclipse.jface.dialogs.Dialog;
+import org.apache.directory.studio.schemaeditor.view.dialogs.EditObjectClassAliasesDialog;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -219,9 +218,9 @@
*/
public void widgetSelected( SelectionEvent arg0 )
{
- EditAliasesDialog dialog = new EditAliasesDialog( getAliasesValue() );
+ EditObjectClassAliasesDialog dialog = new EditObjectClassAliasesDialog( getAliasesValue() );
- if ( ( dialog.open() == Dialog.OK ) && ( dialog.isDirty() ) )
+ if ( dialog.open() == EditObjectClassAliasesDialog.OK )
{
String[] newAliases = dialog.getAliases();
@@ -337,7 +336,7 @@
return;
}
if ( ( !oidCombo.getText().equals( "" ) ) && ( Oid.isOid( oidCombo.getText() ) ) //$NON-NLS-1$
- && ( schemaHandler.isAliasOrOidAlreadyTaken( oidCombo.getText() ) ) )
+ && ( schemaHandler.isOidAlreadyTaken( oidCombo.getText() ) ) )
{
displayErrorMessage( Messages.getString( "NewObjectClassGeneralPageWizardPage.ErrorObjectOIDExists" ) ); //$NON-NLS-1$
return;
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassWizard.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassWizard.java
index 01bd46f..c001239 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassWizard.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassWizard.java
@@ -6,21 +6,21 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.view.wizards;
-import org.apache.directory.shared.ldap.model.schema.ObjectClass;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.PluginUtils;
@@ -76,7 +76,7 @@
public boolean performFinish()
{
// Creating the new object class
- ObjectClass newOC = new ObjectClass( generalPage.getOidValue() );
+ MutableObjectClass newOC = new MutableObjectClass( generalPage.getOidValue() );
newOC.setSchemaName( generalPage.getSchemaValue() );
newOC.setNames( generalPage.getAliasesValue() );
newOC.setDescription( generalPage.getDescriptionValue() );
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java
index 935feb5..c39428e 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java
@@ -96,7 +96,6 @@
RunnableContextRunner.execute( new StudioConnectionRunnableWithProgress()
{
-
public void run( StudioProgressMonitor monitor )
{
// Getting the correct SchemaConnector for this connection
@@ -145,7 +144,7 @@
public String getName()
{
- return null;
+ return Messages.getString( "NewProjectWizard.FetchingSchema" ); //$NON-NLS-1$;
}
@@ -157,7 +156,7 @@
public String getErrorMessage()
{
- return null;
+ return Messages.getString( "NewProjectWizard.ErrorWhileFetchingSchema" ); //$NON-NLS-1$;
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages.properties
index 588d968..b76437b 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages.properties
@@ -22,7 +22,7 @@
CommitChangesInformationWizardPage.YouAreAboutToCommit=You are about to commit changes to Apache Directory Server.\n\nPlease carefully review the changes made on the schema on the next page.\n\nCommitting changes with an inconsistent schema may corrupt your server.
ExportProjectsWizard.ExportingProject=Export project\:
ExportProjectsWizard.Error=Error
-ExportProjectsWizard.ErrorWhenSavingProject=An error occured when saving the project "{0}".
+ExportProjectsWizard.ErrorWhenSavingProject=An error occurred when saving the project "{0}".
ExportProjectsWizardPage.Browse=Browse...
ExportProjectsWizardPage.ChooseFolder=Choose Folder
ExportProjectsWizardPage.DeselectAll=Deselect All
@@ -40,7 +40,7 @@
ExportProjectsWizardPage.SelectFolderToExportTo=Select the folder in which export the files.
ExportProjectsWizardPage.SelectSchemaProjects=Select the schema projects to export:
ExportSchemasAsOpenLdapWizard.Error=Error
-ExportSchemasAsOpenLdapWizard.ErrorSavingSchema=An error occured when saving the schema "{0}".
+ExportSchemasAsOpenLdapWizard.ErrorSavingSchema=An error occurred when saving the schema "{0}".
ExportSchemasAsOpenLdapWizard.ExportingSchemas=Exporting schemas\:
ExportSchemasAsOpenLdapWizardPage.Browse=Browse...
ExportSchemasAsOpenLdapWizardPage.ChooseFolder=Choose Folder
@@ -60,8 +60,8 @@
ExportSchemasAsOpenLdapWizardPage.SelectFolderToExport=Select the folder in which export the files.
ExportSchemasAsOpenLdapWizardPage.SelectSchemasToExport=Select the schemas to export:
ExportSchemasAsXmlWizard.Error=Error
-ExportSchemasAsXmlWizard.ErrorWhenSavingSchema=An error occured when saving the schema "{0}".
-ExportSchemasAsXmlWizard.ErrorWhenSavingSchemas=An error occured when saving the schemas.
+ExportSchemasAsXmlWizard.ErrorWhenSavingSchema=An error occurred when saving the schema "{0}".
+ExportSchemasAsXmlWizard.ErrorWhenSavingSchemas=An error occurred when saving the schemas.
ExportSchemasAsXmlWizard.ExportingSchemas=Exporting schemas\:
ExportSchemasAsXmlWizardPage.24=
ExportSchemasAsXmlWizardPage.AllFiles=All Files
@@ -90,8 +90,8 @@
ExportSchemasAsXmlWizardPage.SelectSchemasToExport=Select the schemas to export:
ExportSchemasAsXmlWizardPage.XMLFiles=XML Files
ExportSchemasForADSWizard.Error=Error
-ExportSchemasForADSWizard.ErrorSavingSchema=An error occured when saving the schema "{0}".
-ExportSchemasForADSWizard.ErrorSavingSchemas=An error occured when saving the schemas.
+ExportSchemasForADSWizard.ErrorSavingSchema=An error occurred when saving the schema "{0}".
+ExportSchemasForADSWizard.ErrorSavingSchemas=An error occurred when saving the schemas.
ExportSchemasForADSWizard.ExportingSchemas=Exporting schemas\:
ExportSchemasForADSWizard.GeneratedByApacheComment=\# Generated by Apache Directory Studio on {0}\n\n
ExportSchemasForADSWizard.SchemaComment=\# SCHEMA "{0}"\n
@@ -123,7 +123,8 @@
ImportCoreSchemasWizardPage.ErrorNoSchemaProjectOpen=A Schema Project must be open to import core schemas files.
ImportCoreSchemasWizardPage.ImportCoreSchemas=Import core schemas
ImportCoreSchemasWizardPage.PleaseSelectCoreSchemas=Please select the 'core' schemas to import.
-ImportProjectsWizard.ErrorImportingProject=An error occured when importing project "{0}".
+ImportProjectsWizard.ErrorImportingProject=An error occurred when importing project "{0}".
+ImportProjectsWizard.ErrorProjectNameExists=A project with this name already exists.
ImportProjectsWizard.ImportError=Import Error
ImportProjectsWizard.ImportingProjects=Importing projects\:
ImportProjectsWizardPage.Browse=Browse...
@@ -162,7 +163,7 @@
ImportSchemasFromOpenLdapWizardPage.SelectFolderToImportFrom=Select the folder from which import the files.
ImportSchemasFromOpenLdapWizardPage.SelectOpenLDAPSchema=Please select the OpenLdap schema files to import.
ImportSchemasFromXmlWizard.Error=Error
-ImportSchemasFromXmlWizard.ErrorImportingSchema=An error occured when importing the schema "{0}".
+ImportSchemasFromXmlWizard.ErrorImportingSchema=An error occurred when importing the schema "{0}".
ImportSchemasFromXmlWizard.ImportingSchemas=Importing schemas\:
ImportSchemasFromXmlWizardPage.Browse=Browse...
ImportSchemasFromXmlWizardPage.ChooseFolder=Choose Folder
@@ -270,6 +271,8 @@
NewObjectClassOptionalAttributesPage.OptionalAttributeTypes=Optional Attribute Types
NewObjectClassOptionalAttributesPage.Remove=Remove
NewObjectClassOptionalAttributesPage.SpecifiyOptionalAttributeTypesForObjectClass=Please specify the optional attribute types for the object class.
+NewProjectWizard.FetchingSchema=Fetching Schema
+NewProjectWizard.ErrorWhileFetchingSchema=An error occurred when fetching the schema:
NewProjectWizardConnectionSelectionPage.ChooseConnection=Choose a connection:
NewProjectWizardConnectionSelectionPage.CreateSchemaProject=Create a Schema project.
NewProjectWizardConnectionSelectionPage.ErrorNoConnectionSelected=A connection must be selected.
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages_de.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages_de.properties
index 4559c73..114e09b 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages_de.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages_de.properties
@@ -129,6 +129,7 @@
ImportCoreSchemasWizardPage.PleaseSelectCoreSchemas=Bitte die Kern-Schemas f\u00FCr dein Import ausw\u00E4hlen.
ImportProjectsWizard.ErrorImportingProject=Ein Fehler ist beim Importieren des Projektes "{0}" aufgetreten.
+ImportProjectsWizard.ErrorProjectNameExists=Ein Projekt mit diesem Namen existiert bereits.
ImportProjectsWizard.ImportError=Import Fehler
ImportProjectsWizard.ImportingProjects=Projekte importieren\:
ImportProjectsWizardPage.Browse=Browsen...
@@ -279,6 +280,8 @@
NewObjectClassOptionalAttributesPage.OptionalAttributeTypes=Optionale Attribute-Typen
NewObjectClassOptionalAttributesPage.Remove=L\u00F6schen
NewObjectClassOptionalAttributesPage.SpecifiyOptionalAttributeTypesForObjectClass=Bitte die optionalen Attribute f\u00FCr die Objektlasse ausw\u00E4hlen.
+NewProjectWizard.FetchingSchema=TODO:Fetching Schema
+NewProjectWizard.ErrorWhileFetchingSchema=TODO:An error occurred when fetching the schema:
NewProjectWizardConnectionSelectionPage.ChooseConnection=Verbindung ausw\u00E4hlen:
NewProjectWizardConnectionSelectionPage.CreateSchemaProject=Schema Projekt erstellen.
NewProjectWizardConnectionSelectionPage.ErrorNoConnectionSelected=Eine Verbindung muss ausgew\u00E4hlt werden.
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages_fr.properties b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages_fr.properties
index ab9a9e9..dddb182 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages_fr.properties
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages_fr.properties
@@ -129,6 +129,7 @@
ImportCoreSchemasWizardPage.PleaseSelectCoreSchemas=Veuillez s\u00E9lectionner les sch\u00E9mas de base ('core') \u00E0 importer.
ImportProjectsWizard.ErrorImportingProject=Une erreur est survenue lors de l''importation du projet "{0}".
+ImportProjectsWizard.ErrorProjectNameExists=Un projet avec ce nom existe d\u00E9j\u00E0.
ImportProjectsWizard.ImportError=Erreur d'importation
ImportProjectsWizard.ImportingProjects=Importation des projets\:
ImportProjectsWizardPage.Browse=Parcourir...
@@ -285,6 +286,9 @@
NewObjectClassOptionalAttributesPage.Remove=Supprimer
NewObjectClassOptionalAttributesPage.SpecifiyOptionalAttributeTypesForObjectClass=Veuillez sp\u00E9cifier les types d'attribut optionnels pour la classe d'objet.
+NewProjectWizard.FetchingSchema=R\u00E9cup\u00E9ration du sch\u00E9ma
+NewProjectWizard.ErrorWhileFetchingSchema=Une erreur est survenue lors de la r\u00E9cup\u00E9ration du sch\u00E9ma :
+
NewProjectWizardConnectionSelectionPage.ChooseConnection=Choisissez une connexion:
NewProjectWizardConnectionSelectionPage.CreateSchemaProject=Cr\u00E9er un nouveau projet de sch\u00E9ma.
NewProjectWizardConnectionSelectionPage.ErrorNoConnectionSelected=Une connexion doit \u00EAtre s\u00E9lectionn\u00E9e.
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/ObjectClassWrapper.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/ObjectClassWrapper.java
index eb328ab..d4673b5 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/ObjectClassWrapper.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/ObjectClassWrapper.java
@@ -6,21 +6,21 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.view.wrappers;
-import org.apache.directory.shared.ldap.model.schema.ObjectClass;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.eclipse.osgi.util.NLS;
@@ -32,7 +32,7 @@
public class ObjectClassWrapper extends AbstractTreeNode
{
/** The wrapped ObjectClass */
- private ObjectClass objectClass;
+ private MutableObjectClass objectClass;
/**
@@ -41,7 +41,7 @@
* @param oc
* the wrapped ObjectClass
*/
- public ObjectClassWrapper( ObjectClass oc )
+ public ObjectClassWrapper( MutableObjectClass oc )
{
super( null );
objectClass = oc;
@@ -56,7 +56,7 @@
* @param parent
* the parent TreeNode
*/
- public ObjectClassWrapper( ObjectClass oc, TreeNode parent )
+ public ObjectClassWrapper( MutableObjectClass oc, TreeNode parent )
{
super( parent );
objectClass = oc;
@@ -69,7 +69,7 @@
* @return
* the wrapped ObjectClass
*/
- public ObjectClass getObjectClass()
+ public MutableObjectClass getObjectClass()
{
return objectClass;
}
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaSorter.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaSorter.java
index 179e791..fdabf1b 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaSorter.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaSorter.java
@@ -41,7 +41,10 @@
Schema s1 = ( ( SchemaWrapper ) o1 ).getSchema();
Schema s2 = ( ( SchemaWrapper ) o2 ).getSchema();
- return s1.getSchemaName().compareToIgnoreCase( s2.getSchemaName() );
+ if ( ( s1 != null ) && ( s2 != null ) )
+ {
+ return s1.getSchemaName().compareToIgnoreCase( s2.getSchemaName() );
+ }
}
// Default
diff --git a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaWarningWrapper.java b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaWarningWrapper.java
index 5f92ee8..22eb2c2 100644
--- a/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaWarningWrapper.java
+++ b/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/SchemaWarningWrapper.java
@@ -19,6 +19,8 @@
*/
package org.apache.directory.studio.schemaeditor.view.wrappers;
+import org.apache.directory.studio.schemaeditor.model.schemachecker.SchemaWarning;
+
@@ -29,8 +31,8 @@
*/
public class SchemaWarningWrapper extends AbstractTreeNode
{
- /** The wrapped SchemaError */
- private Object schemaWarning;
+ /** The wrapped SchemaWarning */
+ private SchemaWarning schemaWarning;
/**
@@ -39,7 +41,7 @@
* @param warning
* the wrapped SchemaWarning
*/
- public SchemaWarningWrapper( Object warning )
+ public SchemaWarningWrapper( SchemaWarning warning )
{
super( null );
schemaWarning = warning;
@@ -54,7 +56,7 @@
* @param parent
* the parent TreeNode
*/
- public SchemaWarningWrapper( Object warning, TreeNode parent )
+ public SchemaWarningWrapper( SchemaWarning warning, TreeNode parent )
{
super( parent );
schemaWarning = warning;
@@ -67,7 +69,7 @@
* @return
* the wrapped SchemaWarning
*/
- public Object getSchemaWarning()
+ public SchemaWarning getSchemaWarning()
{
return schemaWarning;
}
diff --git a/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngineTest.java b/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngineTest.java
index 66645e6..62e5e30 100644
--- a/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngineTest.java
+++ b/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngineTest.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.studio.schemaeditor.model.difference;
@@ -26,6 +26,8 @@
import junit.framework.TestCase;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
import org.apache.directory.shared.ldap.model.schema.UsageEnum;
@@ -100,7 +102,7 @@
public void testAddEqualityDifference() throws Exception
{
AttributeType o1 = new AttributeType( "1.2.3.4" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
o2.setEqualityOid( "Equality" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -126,7 +128,7 @@
public void testAddMandatoryATDifference() throws Exception
{
ObjectClass o1 = new ObjectClass( "1.2.3.4" );
- ObjectClass o2 = new ObjectClass( "1.2.3.4" );
+ MutableObjectClass o2 = new MutableObjectClass( "1.2.3.4" );
o2.setMustAttributeTypeOids( Arrays.asList( new String[]
{ "must" } ) );
@@ -154,7 +156,7 @@
public void testAddOptionalATDifference() throws Exception
{
ObjectClass o1 = new ObjectClass( "1.2.3.4" );
- ObjectClass o2 = new ObjectClass( "1.2.3.4" );
+ MutableObjectClass o2 = new MutableObjectClass( "1.2.3.4" );
o2.setMayAttributeTypeOids( Arrays.asList( new String[]
{ "may" } ) );
@@ -181,7 +183,7 @@
public void testAddOrderingDifference() throws Exception
{
AttributeType o1 = new AttributeType( "1.2.3.4" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
o2.setOrderingOid( "Ordering" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -207,7 +209,7 @@
public void testAddSubstringDifference() throws Exception
{
AttributeType o1 = new AttributeType( "1.2.3.4" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
o2.setSubstringOid( "Substring" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -233,7 +235,7 @@
public void testAddSuperiorATDifference() throws Exception
{
AttributeType o1 = new AttributeType( "1.2.3.4" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
o2.setSuperiorOid( "superiorAT" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -259,7 +261,7 @@
public void testAddSuperiorOCDifference() throws Exception
{
ObjectClass o1 = new ObjectClass( "1.2.3.4" );
- ObjectClass o2 = new ObjectClass( "1.2.3.4" );
+ MutableObjectClass o2 = new MutableObjectClass( "1.2.3.4" );
o2.setSuperiorOids( Arrays.asList( new String[]
{ "superiorOC" } ) );
@@ -286,7 +288,7 @@
public void testAddSyntaxDifference() throws Exception
{
AttributeType o1 = new AttributeType( "1.2.3.4" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
o2.setSyntaxOid( "1.2.3.4.5" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -312,7 +314,7 @@
public void testAddSyntaxLengthDifference() throws Exception
{
AttributeType o1 = new AttributeType( "1.2.3.4" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
o2.setSyntaxLength( 1234 );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -338,9 +340,9 @@
*/
public void testModifyClassTypeDifference() throws Exception
{
- ObjectClass o1 = new ObjectClass( "1.2.3.4" );
+ MutableObjectClass o1 = new MutableObjectClass( "1.2.3.4" );
o1.setType( ObjectClassTypeEnum.STRUCTURAL );
- ObjectClass o2 = new ObjectClass( "1.2.3.4" );
+ MutableObjectClass o2 = new MutableObjectClass( "1.2.3.4" );
o2.setType( ObjectClassTypeEnum.ABSTRACT );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -367,9 +369,9 @@
*/
public void testModifyCollectiveDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
o1.setCollective( true );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
o2.setCollective( false );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -425,9 +427,9 @@
*/
public void testModifyEqualityDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
o1.setEqualityOid( "equalityName" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
o2.setEqualityOid( "newEqualityName" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -454,9 +456,9 @@
*/
public void testModifyNoUserModificationDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
o1.setUserModifiable( true );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
o2.setUserModifiable( false );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -512,9 +514,9 @@
*/
public void testModifyOrderingDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
o1.setOrderingOid( "orderingName" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
o2.setOrderingOid( "newOrderingName" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -541,9 +543,9 @@
*/
public void testModifySingleValueDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
o1.setSingleValued( true );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
o2.setSingleValued( false );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -570,9 +572,9 @@
*/
public void testModifySubstringDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
o1.setSubstringOid( "substrName" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
o2.setSubstringOid( "newSubstrName" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -599,9 +601,9 @@
*/
public void testModifySuperiorATDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
o1.setSuperiorOid( "superiorName" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
o2.setSuperiorOid( "newSuperiorName" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -628,9 +630,9 @@
*/
public void testModifySyntaxDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
o1.setSyntaxOid( "1.2.3.4.5" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
o2.setSyntaxOid( "1.2.3.4.6" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -656,9 +658,9 @@
*/
public void testModifySyntaxLengthDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
o1.setSyntaxLength( 1234 );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
o2.setSyntaxLength( 12345 );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -685,9 +687,9 @@
*/
public void testModifyUsageDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
o1.setUsage( UsageEnum.DISTRIBUTED_OPERATION );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o2 = new MutableAttributeType( "1.2.3.4" );
o2.setUsage( UsageEnum.DIRECTORY_OPERATION );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -771,7 +773,7 @@
*/
public void testRemoveEqualityDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
o1.setEqualityOid( "equalityName" );
AttributeType o2 = new AttributeType( "1.2.3.4" );
@@ -798,10 +800,10 @@
*/
public void testRemoveMandatoryATDifference() throws Exception
{
- ObjectClass o1 = new ObjectClass( "1.2.3.4" );
+ MutableObjectClass o1 = new MutableObjectClass( "1.2.3.4" );
o1.setMustAttributeTypeOids( Arrays.asList( new String[]
{ "must1", "must2" } ) );
- ObjectClass o2 = new ObjectClass( "1.2.3.4" );
+ MutableObjectClass o2 = new MutableObjectClass( "1.2.3.4" );
o2.setMustAttributeTypeOids( Arrays.asList( new String[]
{ "must2" } ) );
@@ -829,10 +831,10 @@
*/
public void testRemoveOptionalATDifference() throws Exception
{
- ObjectClass o1 = new ObjectClass( "1.2.3.4" );
+ MutableObjectClass o1 = new MutableObjectClass( "1.2.3.4" );
o1.setMayAttributeTypeOids( Arrays.asList( new String[]
{ "may1", "may2" } ) );
- ObjectClass o2 = new ObjectClass( "1.2.3.4" );
+ MutableObjectClass o2 = new MutableObjectClass( "1.2.3.4" );
o2.setMayAttributeTypeOids( Arrays.asList( new String[]
{ "may2" } ) );
@@ -860,7 +862,7 @@
*/
public void testRemoveOrderingDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
o1.setOrderingOid( "orderingName" );
AttributeType o2 = new AttributeType( "1.2.3.4" );
@@ -887,7 +889,7 @@
*/
public void testRemoveSubstringDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
o1.setSubstringOid( "substrName" );
AttributeType o2 = new AttributeType( "1.2.3.4" );
@@ -915,7 +917,7 @@
*/
public void testRemoveSuperiorATDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
o1.setSuperiorOid( "superiorName" );
AttributeType o2 = new AttributeType( "1.2.3.4" );
@@ -943,10 +945,10 @@
*/
public void testRemoveSuperiorOCDifference() throws Exception
{
- ObjectClass o1 = new ObjectClass( "1.2.3.4" );
+ MutableObjectClass o1 = new MutableObjectClass( "1.2.3.4" );
o1.setSuperiorOids( Arrays.asList( new String[]
{ "sup1", "sup2" } ) );
- ObjectClass o2 = new ObjectClass( "1.2.3.4" );
+ MutableObjectClass o2 = new MutableObjectClass( "1.2.3.4" );
o2.setSuperiorOids( Arrays.asList( new String[]
{ "sup2" } ) );
@@ -974,7 +976,7 @@
*/
public void testRemoveSyntaxDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
o1.setSyntaxOid( "1.2.3.4.5" );
AttributeType o2 = new AttributeType( "1.2.3.4" );
@@ -1001,7 +1003,7 @@
*/
public void testRemoveSyntaxLengthDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeType o1 = new MutableAttributeType( "1.2.3.4" );
o1.setSyntaxLength( 1234 );
AttributeType o2 = new AttributeType( "1.2.3.4" );
diff --git a/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/certificate/CertificateDialog.java b/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/certificate/CertificateDialog.java
index 1a46655..73b5ca3 100644
--- a/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/certificate/CertificateDialog.java
+++ b/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/certificate/CertificateDialog.java
@@ -25,6 +25,7 @@
import java.io.File;
import java.io.IOException;
import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
@@ -271,7 +272,7 @@
}
- private static X509Certificate generateCertificate( byte[] data ) throws Exception
+ private static X509Certificate generateCertificate( byte[] data ) throws CertificateException
{
CertificateFactory cf = CertificateFactory.getInstance( "X.509" ); //$NON-NLS-1$
Certificate certificate = cf.generateCertificate( new ByteArrayInputStream( data ) );
diff --git a/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages.properties b/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages.properties
index 42f10b7..448a2f3 100644
--- a/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages.properties
+++ b/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages.properties
@@ -19,7 +19,6 @@
ImageDialog.Bytes=\ bytes
ImageDialog.CantReadFile=\ Error\: Can't read file ({0}
ImageDialog.CantWriteFile=Can't write to file
-ImageDialog.ComaPixel=\ Pixel,
ImageDialog.CurrentImage=Current Image
ImageDialog.ErrorFileNotFound=\ Error\: File not found
ImageDialog.ImageEditor=Image Editor
diff --git a/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages_fr.properties b/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages_fr.properties
index 18122b8..f627989 100644
--- a/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages_fr.properties
+++ b/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/messages_fr.properties
@@ -19,7 +19,6 @@
ImageDialog.Bytes=\ octets
ImageDialog.CantReadFile=\ Erreur : Impossible de trouver le fichier ({0}
ImageDialog.CantWriteFile=Impossible d'\u00E9crire dans le fichier
-ImageDialog.ComaPixel=\ Pixels,
ImageDialog.CurrentImage=Image courante
ImageDialog.ErrorFileNotFound=\ Erreur : Fichier introuvable
ImageDialog.ImageEditor=Editeur d'image
diff --git a/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectSidValueEditor.java b/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectSidValueEditor.java
index 187eab4..d133c7c 100644
--- a/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectSidValueEditor.java
+++ b/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectSidValueEditor.java
@@ -74,7 +74,7 @@
if ( bytes == null || bytes.length < 8 )
{
- return "Invalid SID";
+ return "Invalid SID";
}
char[] hex = Hex.encodeHex( bytes );
@@ -94,7 +94,7 @@
// check length
if ( bytes.length != ( 8 + count * 4 ) )
{
- return "Invalid SID";
+ return "Invalid SID";
}
// get authority, big-endian
diff --git a/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectGuidValueEditorTest.java b/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectGuidValueEditorTest.java
index f25788b..1e76ecd 100644
--- a/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectGuidValueEditorTest.java
+++ b/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectGuidValueEditorTest.java
@@ -43,7 +43,7 @@
( byte ) 0xBD, ( byte ) 0x06, //
( byte ) 0xE3, ( byte ) 0xA4, ( byte ) 0x09, ( byte ) 0x96, ( byte ) 0xA9, ( byte ) 0xA8 };
String displayValue = editor.convertToString( bytes );
- assertEquals( Strings.toLowerCase( "{db78ba89-b85f-447f-bd06-e3a40996a9a8}" ), displayValue );
+ assertEquals( Strings.toLowerCase( "{db78ba89-b85f-447f-bd06-e3a40996a9a8}" ), displayValue ); //$NON-NLS-1$
}
@@ -60,7 +60,7 @@
( byte ) 0x88, ( byte ) 0x99, //
( byte ) 0xAA, ( byte ) 0xBB, ( byte ) 0xCC, ( byte ) 0xDD, ( byte ) 0xEE, ( byte ) 0xFF };
String displayValue = editor.convertToString( bytes );
- assertEquals( Strings.toLowerCase( "{33221100-5544-7766-8899-AABBCCDDEEFF}" ), displayValue );
+ assertEquals( Strings.toLowerCase( "{33221100-5544-7766-8899-AABBCCDDEEFF}" ), displayValue ); //$NON-NLS-1$
}
@@ -73,7 +73,7 @@
byte[] bytes = new byte[]
{ ( byte ) 0x00, ( byte ) 0x11, ( byte ) 0x22, ( byte ) 0x33 };
String displayValue = editor.convertToString( bytes );
- assertEquals( "Invalid GUID", displayValue );
+ assertEquals( "Invalid GUID", displayValue );
// test too long
byte[] bytes2 = new byte[]
@@ -82,7 +82,7 @@
( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00,
( byte ) 0x00, };
String displayValue2 = editor.convertToString( bytes2 );
- assertEquals( "Invalid GUID", displayValue2 );
+ assertEquals( "Invalid GUID", displayValue2 );
}
@@ -92,6 +92,6 @@
InPlaceMsAdObjectGuidValueEditor editor = new InPlaceMsAdObjectGuidValueEditor();
byte[] bytes = null;
String displayValue = editor.convertToString( bytes );
- assertEquals( "Invalid GUID", displayValue );
+ assertEquals( "Invalid GUID", displayValue );
}
}
diff --git a/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectSidValueEditorTest.java b/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectSidValueEditorTest.java
index b113001..da9acda 100644
--- a/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectSidValueEditorTest.java
+++ b/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectSidValueEditorTest.java
@@ -42,7 +42,7 @@
( byte ) 0x04, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00 //
};
String displayValue = editor.convertToString( bytes );
- assertEquals( "S-1-5-4", displayValue );
+ assertEquals( "S-1-5-4", displayValue ); //$NON-NLS-1$
}
@@ -60,7 +60,7 @@
( byte ) 0x25, ( byte ) 0x02, ( byte ) 0x00, ( byte ) 0x00 //
};
String displayValue = editor.convertToString( bytes );
- assertEquals( "S-1-5-32-549", displayValue );
+ assertEquals( "S-1-5-32-549", displayValue ); //$NON-NLS-1$
}
@@ -82,7 +82,7 @@
( byte ) 0xf4, ( byte ) 0x01, ( byte ) 0x00, ( byte ) 0x00 //
};
String displayValue = editor.convertToString( bytes );
- assertEquals( "S-1-5-21-666267311-2692216076-1860112551-500", displayValue );
+ assertEquals( "S-1-5-21-666267311-2692216076-1860112551-500", displayValue ); //$NON-NLS-1$
}
@@ -95,7 +95,7 @@
byte[] bytes = new byte[]
{ ( byte ) 0x00 };
String displayValue = editor.convertToString( bytes );
- assertEquals( "Invalid SID", displayValue );
+ assertEquals( "Invalid SID", displayValue );
// test missing sub aurhority byte
byte[] bytes2 = new byte[]
@@ -112,7 +112,7 @@
( byte ) 0xf4, ( byte ) 0x01, ( byte ) 0x00, /*( byte ) 0x00*///
};
String displayValue2 = editor.convertToString( bytes2 );
- assertEquals( "Invalid SID", displayValue2 );
+ assertEquals( "Invalid SID", displayValue2 );
// test additional sub authority byte
byte[] bytes3 = new byte[]
@@ -129,7 +129,7 @@
( byte ) 0xf4, ( byte ) 0x01, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00 //
};
String displayValue3 = editor.convertToString( bytes3 );
- assertEquals( "Invalid SID", displayValue3 );
+ assertEquals( "Invalid SID", displayValue3 );
}
@@ -139,6 +139,6 @@
InPlaceMsAdObjectSidValueEditor editor = new InPlaceMsAdObjectSidValueEditor();
byte[] bytes = null;
String displayValue = editor.convertToString( bytes );
- assertEquals( "Invalid SID", displayValue );
+ assertEquals( "Invalid SID", displayValue );
}
}
diff --git a/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/uuid/InPlaceUuidValueEditorTest.java b/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/uuid/InPlaceUuidValueEditorTest.java
index 9e39ba5..4d10dae 100644
--- a/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/uuid/InPlaceUuidValueEditorTest.java
+++ b/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/uuid/InPlaceUuidValueEditorTest.java
@@ -43,7 +43,7 @@
( byte ) 0x80, ( byte ) 0xb4, //
( byte ) 0x00, ( byte ) 0xc0, ( byte ) 0x4f, ( byte ) 0xd4, ( byte ) 0x30, ( byte ) 0xc8 };
String displayValue = editor.convertToString( bytes );
- assertEquals( Strings.toLowerCase( "6ba7b810-9dad-11d1-80b4-00c04fd430c8" ), displayValue );
+ assertEquals( Strings.toLowerCase( "6ba7b810-9dad-11d1-80b4-00c04fd430c8" ), displayValue ); //$NON-NLS-1$
}
@@ -60,7 +60,7 @@
( byte ) 0x88, ( byte ) 0x99, //
( byte ) 0xAA, ( byte ) 0xBB, ( byte ) 0xCC, ( byte ) 0xDD, ( byte ) 0xEE, ( byte ) 0xFF };
String displayValue = editor.convertToString( bytes );
- assertEquals( Strings.toLowerCase( "00112233-4455-6677-8899-AABBCCDDEEFF" ), displayValue );
+ assertEquals( Strings.toLowerCase( "00112233-4455-6677-8899-AABBCCDDEEFF" ), displayValue ); //$NON-NLS-1$
}
@@ -73,7 +73,7 @@
byte[] bytes = new byte[]
{ ( byte ) 0x00, ( byte ) 0x11, ( byte ) 0x22, ( byte ) 0x33 };
String displayValue = editor.convertToString( bytes );
- assertEquals( "Invalid UUID", displayValue );
+ assertEquals( "Invalid UUID", displayValue );
// test too long
byte[] bytes2 = new byte[]
@@ -82,7 +82,7 @@
( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x00,
( byte ) 0x00, };
String displayValue2 = editor.convertToString( bytes2 );
- assertEquals( "Invalid UUID", displayValue2 );
+ assertEquals( "Invalid UUID", displayValue2 );
}
@@ -92,7 +92,7 @@
InPlaceUuidValueEditor editor = new InPlaceUuidValueEditor();
byte[] bytes = null;
String displayValue = editor.convertToString( bytes );
- assertEquals( "Invalid UUID", displayValue );
+ assertEquals( "Invalid UUID", displayValue );
}
}
diff --git a/pom.xml b/pom.xml
index af2100b..220b7d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,8 +23,7 @@
<parent>
<groupId>org.apache.directory.project</groupId>
<artifactId>project</artifactId>
- <version>24</version>
- <relativePath></relativePath>
+ <version>27</version>
</parent>
<groupId>org.apache.directory.studio</groupId>
@@ -62,34 +61,44 @@
<studio.dist.url>${project.distributionManagement.repository.url}</studio.dist.url>
<distMgmtSiteUrl>scpexe://people.apache.org/www/directory.apache.org/studio/gen-docs/${project.version}</distMgmtSiteUrl>
- <!-- Set versions for depending projects -->
+ <!-- Set versions for dependencies -->
+ <com.bandlem.eclipse.fullscreen.version>1.0.4.201108061054</com.bandlem.eclipse.fullscreen.version>
+ <net.sf.ehcache.version>2.4.4</net.sf.ehcache.version>
<org.antlr.version>2.7.7</org.antlr.version>
- <org.apache.commons.codec.version>1.3</org.apache.commons.codec.version>
+ <org.apache.commons.codec.version>1.6</org.apache.commons.codec.version>
<org.apache.commons.collections.version>3.2.1</org.apache.commons.collections.version>
- <org.apache.commons.io.version>2.0.1</org.apache.commons.io.version>
+ <org.apache.commons.io.version>2.1</org.apache.commons.io.version>
<org.apache.commons.lang.version>2.6</org.apache.commons.lang.version>
<org.apache.commons.logging.version>1.1.1</org.apache.commons.logging.version>
- <org.apache.commons.pool.version>1.5.6</org.apache.commons.pool.version>
- <org.apache.logging.log4j.version>1.2.14</org.apache.logging.log4j.version>
- <org.apache.httpcomponents.version>4.0</org.apache.httpcomponents.version>
- <org.apache.directory.shared.version>1.0.0-M9-SNAPSHOT</org.apache.directory.shared.version>
- <org.apache.directory.shared.validversion>1.0.0.M9-SNAPSHOT</org.apache.directory.shared.validversion>
- <org.apache.directory.server.version>2.0.0-M4-SNAPSHOT</org.apache.directory.server.version>
- <org.apache.directory.server.validversion>2.0.0.M4-SNAPSHOT</org.apache.directory.server.validversion>
- <org.apache.felix.ipojo.version>1.8.0</org.apache.felix.ipojo.version>
- <org.apache.felix.ipojo.annotations.version>1.8.0</org.apache.felix.ipojo.annotations.version>
- <org.apache.felix.ipojo.metadata.version>1.4.0</org.apache.felix.ipojo.metadata.version>
+ <org.apache.commons.pool.version>1.6</org.apache.commons.pool.version>
+ <org.apache.directory.shared.validversion>1.0.0.M12-SNAPSHOT</org.apache.directory.shared.validversion>
+ <org.apache.directory.shared.version>1.0.0-M12-SNAPSHOT</org.apache.directory.shared.version>
+ <org.apache.directory.server.validversion>2.0.0.M7-SNAPSHOT</org.apache.directory.server.validversion>
+ <org.apache.directory.server.version>2.0.0-M7-SNAPSHOT</org.apache.directory.server.version>
+ <org.apache.httpcomponents.version>4.1.2</org.apache.httpcomponents.version>
+ <org.apache.logging.log4j.version>1.2.16</org.apache.logging.log4j.version>
<org.apache.mina.core.version>2.0.4</org.apache.mina.core.version>
+ <org.apache.xmlgraphics.fop.version>1.0</org.apache.xmlgraphics.fop.version>
<org.bouncycastle.bcprov.jdk15.version>140</org.bouncycastle.bcprov.jdk15.version>
<org.dom4j.version>1.6.1</org.dom4j.version>
- <org.objectweb.asm.version>3.0</org.objectweb.asm.version>
- <org.osgi.compendium.version>4.0.0</org.osgi.compendium.version>
- <org.slf4j.version>1.6.1</org.slf4j.version>
- <org.xpp3.version>1.1.3.4.O</org.xpp3.version>
- <org.xpp3.validversion>1.1.340</org.xpp3.validversion>
- <net.sf.ehcache.version>2.2.0</net.sf.ehcache.version>
- <skin.version>1.0.2</skin.version>
+ <org.slf4j.version>1.6.4</org.slf4j.version>
+ <org.xpp3.validversion>1.1.4.c</org.xpp3.validversion>
+ <org.xpp3.version>1.1.4c</org.xpp3.version>
+ <org.apache.poi.version>3.7</org.apache.poi.version>
+ <xerces.xercesimpl.version>2.10.0</xerces.xercesimpl.version>
+
+ <!-- Set versions for maven plugins -->
+ <checkstyle.version>4.1</checkstyle.version>
<findbugs.annotations.version>1.0.0</findbugs.annotations.version>
+ <junit.version>4.10</junit.version>
+ <maven.artifact.version>3.0.4</maven.artifact.version>
+ <maven.dependency.plugin.version>2.4</maven.dependency.plugin.version>
+ <maven.model.version>3.0.4</maven.model.version>
+ <maven.plugin.api.version>3.0.4</maven.plugin.api.version>
+ <maven.project.version>3.0-alpha-2</maven.project.version>
+
+ <!-- Set versions for skins -->
+ <skin.version>1.0.2</skin.version>
</properties>
<profiles>
@@ -100,13 +109,14 @@
<maven.test.skip>true</maven.test.skip>
</properties>
</profile>
+
<!-- Release profile -->
- <profile>
+ <!--<profile>
<id>release</id>
<build>
- <plugins>
+ <plugins>-->
<!-- Configuration for signature of the jars using the keystore -->
- <plugin>
+ <!--<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
@@ -125,7 +135,8 @@
</plugin>
</plugins>
</build>
- </profile>
+ </profile>-->
+
<!--
Building repository module is enabled by default. Add
-P-libraries
@@ -133,15 +144,16 @@
-->
<profile>
<id>repository</id>
- <activation>
+ <activation>
<file>
<exists>pom.xml</exists>
</file>
- </activation>
+ </activation>
<modules>
<module>repository</module>
</modules>
</profile>
+
<!--
Building libraries module is enabled by default. Add
-P-libraries
@@ -149,15 +161,16 @@
-->
<profile>
<id>libraries</id>
- <activation>
+ <activation>
<file>
<exists>pom.xml</exists>
</file>
- </activation>
+ </activation>
<modules>
<module>libraries</module>
</modules>
</profile>
+
<!--
Building plugins module is enabled by default. Add
-P-plugins
@@ -165,15 +178,16 @@
-->
<profile>
<id>plugins</id>
- <activation>
+ <activation>
<file>
<exists>pom.xml</exists>
</file>
- </activation>
+ </activation>
<modules>
<module>plugins</module>
</modules>
</profile>
+
<!--
Building helps module is enabled by default. Add
-P-helps
@@ -181,15 +195,16 @@
-->
<profile>
<id>helps</id>
- <activation>
+ <activation>
<file>
<exists>pom.xml</exists>
</file>
- </activation>
+ </activation>
<modules>
<module>helps</module>
</modules>
</profile>
+
<!--
Building features module is enabled by default. Add
-P-features
@@ -197,15 +212,16 @@
-->
<profile>
<id>features</id>
- <activation>
+ <activation>
<file>
<exists>pom.xml</exists>
</file>
- </activation>
+ </activation>
<modules>
<module>features</module>
</modules>
</profile>
+
<!--
Integration tests are disabled by default. Add
-Pintegration-tests
@@ -217,6 +233,7 @@
<module>tests</module>
</modules>
</profile>
+
<!--
Building application module is enabled by default. Add
-P-application
@@ -239,337 +256,415 @@
<dependencies>
<!-- Apache Directory Studio Libraries -->
<dependency>
+ <groupId>com.bandlem.eclipse.fullscreen</groupId>
+ <artifactId>feature</artifactId>
+ <type>zip</type>
+ <version>${com.bandlem.eclipse.fullscreen.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.bandlem.eclipse.fullscreen</groupId>
+ <artifactId>ui</artifactId>
+ <version>${com.bandlem.eclipse.fullscreen.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>net.sf.ehcache.core</artifactId>
<version>${net.sf.ehcache.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.antlr.antlr</artifactId>
<version>${org.antlr.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.commons.codec</artifactId>
<version>${org.apache.commons.codec.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.commons.collections</artifactId>
<version>${org.apache.commons.collections.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.commons.io</artifactId>
<version>${org.apache.commons.io.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.commons.lang</artifactId>
<version>${org.apache.commons.lang.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.commons.logging</artifactId>
<version>${org.apache.commons.logging.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.commons.pool</artifactId>
<version>${org.apache.commons.pool.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.directory.server.config</artifactId>
<version>${org.apache.directory.server.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.server.core</artifactId>
+ <version>${org.apache.directory.server.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.directory.server.core.api</artifactId>
<version>${org.apache.directory.server.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.directory.server.core.avl</artifactId>
<version>${org.apache.directory.server.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.directory.server.core.constants</artifactId>
<version>${org.apache.directory.server.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.directory.server.i18n</artifactId>
<version>${org.apache.directory.server.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.directory.server.ldif.partition</artifactId>
<version>${org.apache.directory.server.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.directory.server.xdbm.partition</artifactId>
<version>${org.apache.directory.server.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.felix.ipojo</artifactId>
- <version>${org.apache.felix.ipojo.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.felix.ipojo.annotations</artifactId>
- <version>${org.apache.felix.ipojo.annotations.version}</version>
- </dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.httpcomponents.httpclient</artifactId>
<version>${org.apache.httpcomponents.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.httpcomponents.httpcore</artifactId>
<version>${org.apache.httpcomponents.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.logging.log4j</artifactId>
<version>${org.apache.logging.log4j.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.mina.core</artifactId>
<version>${org.apache.mina.core.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.bouncycastle.bcprov.jdk15</artifactId>
<version>${org.bouncycastle.bcprov.jdk15.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.dom4j.dom4j</artifactId>
<version>${org.dom4j.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.slf4j.api</artifactId>
<version>${org.slf4j.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.slf4j.log4j12</artifactId>
<version>${org.slf4j.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.xpp3.xpp3</artifactId>
<version>${org.xpp3.validversion}</version>
</dependency>
-
+
<!-- Apache Directory Studio Plugins -->
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>aciitemeditor</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>apacheds</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>apacheds.feature</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>apacheds.help</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>apacheds-launcher</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>apacheds.configuration</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>apacheds.configuration.v2</artifactId>
- <version>${project.version}</version>
- </dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>apacheds.configuration.feature</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>apacheds.configuration.v2</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>apacheds.configuration.v2.feature</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>apacheds.configuration.help</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>common.ui</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>common.core</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>connection.core</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>connection.ui</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>ldapbrowser.common</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>ldapbrowser.core</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>ldapbrowser.feature</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>ldapbrowser.help</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>ldapbrowser.ui</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>ldapservers</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>ldapservers.apacheds.v153</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>ldapservers.apacheds.v154</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>ldapservers.apacheds.v155</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>ldapservers.apacheds.v156</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>ldapservers.apacheds.v157</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>ldapservers.apacheds.v200</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>ldapservers.feature</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>ldifeditor</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>ldifeditor.feature</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>ldifeditor.help</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>ldifparser</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>rcp</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>rcp.feature</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>rcp.fullscreen</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>rcp.help</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>schemaeditor</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>schemaeditor.feature</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>schemaeditor.help</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>test.integration.core</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>test.integration.ui</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>updatesite</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>valueeditors</artifactId>
@@ -580,857 +675,1016 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
+ <version>${maven.plugin.api.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.1</version>
+ <version>${maven.dependency.plugin.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0.7</version>
+ <version>${maven.artifact.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>2.0.7</version>
+ <version>${maven.model.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0.7</version>
+ <version>${maven.project.version}</version>
</dependency>
- <!-- Apache Directory Studio launchers dependencies -->
- <dependency>
- <groupId>org.apache.directory.studio.launcher.linux</groupId>
- <artifactId>x86</artifactId>
+ <!-- Apache Directory Studio launchers dependencies -->
+ <dependency>
+ <groupId>org.apache.directory.studio.launcher.linux</groupId>
+ <artifactId>x86</artifactId>
+ <type>zip</type>
+ <version>2.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.studio.launcher.linux</groupId>
+ <artifactId>x86_64</artifactId>
+ <type>zip</type>
+ <version>2.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.studio.launcher.macosx</groupId>
+ <artifactId>x86</artifactId>
<type>zip</type>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio.launcher.linux</groupId>
- <artifactId>x86_64</artifactId>
+ <version>2.0.v20110718</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.studio.launcher.macosx</groupId>
+ <artifactId>x86_64</artifactId>
<type>zip</type>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio.launcher.macosx</groupId>
- <artifactId>x86</artifactId>
+ <version>2.0.v20110718</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.studio.launcher.win32</groupId>
+ <artifactId>x86</artifactId>
<type>zip</type>
- <version>2.0.v20110718</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio.launcher.macosx</groupId>
- <artifactId>x86_64</artifactId>
+ <version>2.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.studio.launcher.win32</groupId>
+ <artifactId>x86_64</artifactId>
<type>zip</type>
- <version>2.0.v20110718</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio.launcher.win32</groupId>
- <artifactId>x86</artifactId>
- <type>zip</type>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio.launcher.win32</groupId>
- <artifactId>x86_64</artifactId>
- <type>zip</type>
- <version>2.0</version>
- </dependency>
+ <version>2.0</version>
+ </dependency>
<!-- Eclipse dependencies -->
- <dependency>
- <groupId>com.ibm</groupId>
- <artifactId>icu</artifactId>
- <version>4.4.2.v20110208</version>
- </dependency>
- <dependency>
- <groupId>javax</groupId>
- <artifactId>servlet</artifactId>
- <version>2.5.0.v201103041518</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp</artifactId>
- <version>2.0.0.v201101211617</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>el</artifactId>
- <version>1.0.0.v201101211617</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>logging</artifactId>
- <version>1.0.4.v201101211617</version>
- </dependency>
- <dependency>
- <groupId>org.apache</groupId>
- <artifactId>jasper</artifactId>
- <version>5.5.17.v201101211617</version>
- </dependency>
- <dependency>
- <groupId>org.apache</groupId>
- <artifactId>lucene</artifactId>
- <version>2.9.1.v201101211721</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>analysis</artifactId>
- <version>2.9.1.v201101211721</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>compare</artifactId>
- <version>3.5.200.I20110525-0800-studio</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.compare</groupId>
- <artifactId>core</artifactId>
- <version>3.5.200.I20110208-0800</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>boot</artifactId>
- <version>3.1.200.v20100505</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>commands</artifactId>
- <version>3.6.0.I20110111-0800</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>contenttype</artifactId>
- <version>3.4.100.v20110423-0524</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>databinding</artifactId>
- <version>1.4.0.I20110111-0800</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core.databinding</groupId>
- <artifactId>observable</artifactId>
- <version>1.4.0.I20110222-0800</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core.databinding</groupId>
- <artifactId>property</artifactId>
- <version>1.4.0.I20110222-0800</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>expressions</artifactId>
- <version>3.4.300.v20110228</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>filebuffers</artifactId>
- <version>3.5.200.v20110505-0800</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>filesystem</artifactId>
- <version>1.3.100.v20110423-0524</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core.filesystem.linux</groupId>
- <artifactId>x86</artifactId>
- <version>1.4.0.v20110423-0524</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core.filesystem.linux</groupId>
- <artifactId>x86_64</artifactId>
- <version>1.2.0.v20110423-0524</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core.filesystem</groupId>
- <artifactId>macosx</artifactId>
- <version>1.3.0.v20110423-0524</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core.filesystem.win32</groupId>
- <artifactId>x86</artifactId>
- <version>1.1.300.v20110423-0524</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core.filesystem.win32</groupId>
- <artifactId>x86_64</artifactId>
- <version>1.1.300.v20110423-0524</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>jobs</artifactId>
- <version>3.5.100.v20110404</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>net</artifactId>
- <version>1.2.100.I20100511-0800</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core.net.linux</groupId>
- <artifactId>x86</artifactId>
- <version>1.1.200.I20110419-0800</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core.net.linux</groupId>
- <artifactId>x86_64</artifactId>
- <version>1.1.0.I20110331-0827</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core.net.win32</groupId>
- <artifactId>x86</artifactId>
- <version>1.0.100.I20110331-0827</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core.net.win32</groupId>
- <artifactId>x86_64</artifactId>
- <version>1.0.100.I20110331-0827</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>resources</artifactId>
- <version>3.7.100.v20110510-0712</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core.resources.win32</groupId>
- <artifactId>x86</artifactId>
- <version>3.5.100.v20110423-0524</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- <version>3.7.0.v20110110</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core.runtime</groupId>
- <artifactId>compatibility</artifactId>
- <version>3.2.100.v20100505</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core.runtime.compatibility</groupId>
- <artifactId>auth</artifactId>
- <version>3.2.200.v20100517</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core.runtime.compatibility</groupId>
- <artifactId>registry</artifactId>
- <version>3.5.0.v20110505</version>
+ <dependency>
+ <groupId>com.ibm</groupId>
+ <artifactId>icu</artifactId>
+ <version>4.4.2.v20110208</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax</groupId>
+ <artifactId>servlet</artifactId>
+ <version>2.5.0.v201103041518</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp</artifactId>
+ <version>2.0.0.v201101211617</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>el</artifactId>
+ <version>1.0.0.v201101211617</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>logging</artifactId>
+ <version>1.0.4.v201101211617</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache</groupId>
+ <artifactId>jasper</artifactId>
+ <version>5.5.17.v201101211617</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache</groupId>
+ <artifactId>lucene</artifactId>
+ <version>2.9.1.v201101211721</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>analysis</artifactId>
+ <version>2.9.1.v201101211721</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>compare</artifactId>
+ <version>3.5.201.R37x_v20110817-0800-studio</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.compare</groupId>
+ <artifactId>core</artifactId>
+ <version>3.5.200.I20110208-0800</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>boot</artifactId>
+ <version>3.1.200.v20100505</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>commands</artifactId>
+ <version>3.6.0.I20110111-0800</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>contenttype</artifactId>
+ <version>3.4.100.v20110423-0524</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>databinding</artifactId>
+ <version>1.4.0.I20110111-0800</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core.databinding</groupId>
+ <artifactId>observable</artifactId>
+ <version>1.4.0.I20110222-0800</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core.databinding</groupId>
+ <artifactId>property</artifactId>
+ <version>1.4.0.I20110222-0800</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>expressions</artifactId>
+ <version>3.4.300.v20110228</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filebuffers</artifactId>
+ <version>3.5.200.v20110505-0800</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filesystem</artifactId>
+ <version>1.3.100.v20110423-0524</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core.filesystem.linux</groupId>
+ <artifactId>x86</artifactId>
+ <version>1.4.0.v20110423-0524</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core.filesystem.linux</groupId>
+ <artifactId>x86_64</artifactId>
+ <version>1.2.0.v20110423-0524</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core.filesystem</groupId>
+ <artifactId>macosx</artifactId>
+ <version>1.3.0.v20110423-0524</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core.filesystem.win32</groupId>
+ <artifactId>x86</artifactId>
+ <version>1.1.300.v20110423-0524</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core.filesystem.win32</groupId>
+ <artifactId>x86_64</artifactId>
+ <version>1.1.300.v20110423-0524</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>jobs</artifactId>
+ <version>3.5.100.v20110404</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>net</artifactId>
+ <version>1.2.100.I20100511-0800</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core.net.linux</groupId>
+ <artifactId>x86</artifactId>
+ <version>1.1.200.I20110419-0800</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core.net.linux</groupId>
+ <artifactId>x86_64</artifactId>
+ <version>1.1.0.I20110331-0827</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core.net.win32</groupId>
+ <artifactId>x86</artifactId>
+ <version>1.0.100.I20110331-0827</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core.net.win32</groupId>
+ <artifactId>x86_64</artifactId>
+ <version>1.0.100.I20110331-0827</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>resources</artifactId>
+ <version>3.7.100.v20110510-0712</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core.resources.win32</groupId>
+ <artifactId>x86</artifactId>
+ <version>3.5.100.v20110423-0524</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ <version>3.7.0.v20110110</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core.runtime</groupId>
+ <artifactId>compatibility</artifactId>
+ <version>3.2.100.v20100505</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core.runtime.compatibility</groupId>
+ <artifactId>auth</artifactId>
+ <version>3.2.200.v20110110</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core.runtime.compatibility</groupId>
+ <artifactId>registry</artifactId>
+ <version>3.5.0.v20110505</version>
<type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>variables</artifactId>
- <version>3.2.500.v20110511</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.debug</groupId>
- <artifactId>core</artifactId>
- <version>3.7.0.v20110518</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.debug</groupId>
- <artifactId>ui</artifactId>
- <version>3.7.0.v20110518-studio</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>ecf</artifactId>
- <version>3.1.300.v20110531-2218</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ecf</groupId>
- <artifactId>filetransfer</artifactId>
- <version>5.0.0.v20110531-2218</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ecf</groupId>
- <artifactId>identity</artifactId>
- <version>3.1.100.v20110531-2218</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ecf.provider</groupId>
- <artifactId>filetransfer</artifactId>
- <version>3.2.0.v20110531-2218</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>app</artifactId>
- <version>1.3.100.v20110321</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>common</artifactId>
- <version>3.6.0.v20110523</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.http</groupId>
- <artifactId>jetty</artifactId>
- <version>2.0.100.v20110502</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.http</groupId>
- <artifactId>registry</artifactId>
- <version>1.1.100.v20110502</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.http</groupId>
- <artifactId>servlet</artifactId>
- <version>1.1.200.v20110502</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.jsp</groupId>
- <artifactId>jasper</artifactId>
- <version>1.0.300.v20110502</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.jsp.jasper</groupId>
- <artifactId>registry</artifactId>
- <version>1.0.200.v20100503</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>launcher</artifactId>
- <version>1.2.0.v20110502</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.launcher.cocoa</groupId>
- <artifactId>macosx</artifactId>
- <version>1.1.100.v20110502</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>variables</artifactId>
+ <version>3.2.500.v20110511</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>core</artifactId>
+ <version>3.7.0.v20110518</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.debug</groupId>
+ <artifactId>ui</artifactId>
+ <version>3.7.101.v20110817_r371-studio</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>ecf</artifactId>
+ <version>3.1.300.v20110531-2218</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ecf</groupId>
+ <artifactId>filetransfer</artifactId>
+ <version>5.0.0.v20110531-2218</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ecf</groupId>
+ <artifactId>identity</artifactId>
+ <version>3.1.100.v20110531-2218</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ecf.provider</groupId>
+ <artifactId>filetransfer</artifactId>
+ <version>3.2.0.v20110531-2218</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>app</artifactId>
+ <version>1.3.100.v20110321</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>common</artifactId>
+ <version>3.6.0.v20110523</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.http</groupId>
+ <artifactId>jetty</artifactId>
+ <version>2.0.100.v20110502</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.http</groupId>
+ <artifactId>registry</artifactId>
+ <version>1.1.100.v20110502</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.http</groupId>
+ <artifactId>servlet</artifactId>
+ <version>1.1.200.v20110502</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.jsp</groupId>
+ <artifactId>jasper</artifactId>
+ <version>1.0.300.v20110502</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.jsp.jasper</groupId>
+ <artifactId>registry</artifactId>
+ <version>1.0.200.v20100503</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>launcher</artifactId>
+ <version>1.2.0.v20110502</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.launcher.cocoa</groupId>
+ <artifactId>macosx</artifactId>
+ <version>1.1.100.v20110502</version>
<type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.launcher.cocoa.macosx</groupId>
- <artifactId>x86_64</artifactId>
- <version>1.1.100.v20110502</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.launcher.cocoa.macosx</groupId>
+ <artifactId>x86_64</artifactId>
+ <version>1.1.100.v20110502</version>
<type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.launcher.gtk.linux</groupId>
- <artifactId>x86</artifactId>
- <version>1.1.100.v20110505</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.launcher.gtk.linux</groupId>
+ <artifactId>x86</artifactId>
+ <version>1.1.100.v20110505</version>
<type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.launcher.gtk.linux</groupId>
- <artifactId>x86_64</artifactId>
- <version>1.1.100.v20110505</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.launcher.gtk.linux</groupId>
+ <artifactId>x86_64</artifactId>
+ <version>1.1.100.v20110505</version>
<type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.launcher.win32.win32</groupId>
- <artifactId>x86</artifactId>
- <version>1.1.100.v20110502</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.launcher.win32.win32</groupId>
+ <artifactId>x86</artifactId>
+ <version>1.1.100.v20110502</version>
<type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.launcher.win32.win32</groupId>
- <artifactId>x86_64</artifactId>
- <version>1.1.100.v20110502</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.launcher.win32.win32</groupId>
+ <artifactId>x86_64</artifactId>
+ <version>1.1.100.v20110502</version>
<type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2.artifact</groupId>
- <artifactId>repository</artifactId>
- <version>1.1.100.v20110519</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2</groupId>
- <artifactId>console</artifactId>
- <version>1.0.300.v20110502-1955</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2</groupId>
- <artifactId>core</artifactId>
- <version>2.1.0.v20110502-1955</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2</groupId>
- <artifactId>director</artifactId>
- <version>2.1.0.v20110504-1715</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2.director</groupId>
- <artifactId>app</artifactId>
- <version>1.0.300.v20110505</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2</groupId>
- <artifactId>directorywatcher</artifactId>
- <version>1.0.300.v20110502-1955</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2</groupId>
- <artifactId>discovery</artifactId>
- <version>1.0.100.v20110502-1955</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2.discovery</groupId>
- <artifactId>compatibility</artifactId>
- <version>1.0.1.v20110502-1955</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2</groupId>
- <artifactId>engine</artifactId>
- <version>2.1.0.v20110511</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2</groupId>
- <artifactId>extensionlocation</artifactId>
- <version>1.2.100.v20110510</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2</groupId>
- <artifactId>garbagecollector</artifactId>
- <version>1.0.200.v20110510</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2</groupId>
- <artifactId>jarprocessor</artifactId>
- <version>1.0.200.v20110502-1955</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2</groupId>
- <artifactId>metadata</artifactId>
- <version>2.1.0.v20110510</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2.metadata</groupId>
- <artifactId>generator</artifactId>
- <version>1.0.200.v20100503a</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2.metadata</groupId>
- <artifactId>repository</artifactId>
- <version>1.1.0.v20100513</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2</groupId>
- <artifactId>operations</artifactId>
- <version>2.1.0.v20110511-1821</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2</groupId>
- <artifactId>publisher</artifactId>
- <version>1.2.0.v20110511</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2</groupId>
- <artifactId>ql</artifactId>
- <version>2.0.100.v20110510</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2.reconciler</groupId>
- <artifactId>dropins</artifactId>
- <version>1.1.100.v20110510</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2</groupId>
- <artifactId>repository</artifactId>
- <version>2.1.0.v20110601</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2.repository</groupId>
- <artifactId>tools</artifactId>
- <version>2.0.100.v20110512-1320</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2.touchpoint</groupId>
- <artifactId>eclipse</artifactId>
- <version>2.1.0.v20110511</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2.touchpoint</groupId>
- <artifactId>natives</artifactId>
- <version>1.0.300.v20110502-1955</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2</groupId>
- <artifactId>ui</artifactId>
- <version>2.1.0.v20110601</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2.ui</groupId>
- <artifactId>discovery</artifactId>
- <version>1.0.0.v20110502-1955</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2.ui</groupId>
- <artifactId>sdk</artifactId>
- <version>1.0.200.v20110502-1955</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2.ui.sdk</groupId>
- <artifactId>scheduler</artifactId>
- <version>1.0.100.v20110502-1955</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2</groupId>
- <artifactId>updatechecker</artifactId>
- <version>1.1.200.v20110502-1955</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.p2</groupId>
- <artifactId>updatesite</artifactId>
- <version>1.0.300.v20110510</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>preferences</artifactId>
- <version>3.4.0.v20110502</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>registry</artifactId>
- <version>3.5.100.v20110502</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>security</artifactId>
- <version>1.1.0.v20110502</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>simpleconfigurator</artifactId>
- <version>1.0.200.v20110502-1955</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox.simpleconfigurator</groupId>
- <artifactId>manipulator</artifactId>
- <version>2.0.0.v20110502-1955</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>help</artifactId>
- <version>3.5.100.v20110426</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.help</groupId>
- <artifactId>appserver</artifactId>
- <version>3.1.400.v20110425</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.help</groupId>
- <artifactId>base</artifactId>
- <version>3.6.0.v201106131736</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.help</groupId>
- <artifactId>ui</artifactId>
- <version>3.5.100.v20110425</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.help</groupId>
- <artifactId>webapp</artifactId>
- <version>3.6.0.v20110518</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>core</artifactId>
- <version>3.7.0.v_B61</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt.core</groupId>
- <artifactId>manipulation</artifactId>
- <version>1.4.0.v20110505-0800</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>debug</artifactId>
- <version>3.7.0.v20110509</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2.artifact</groupId>
+ <artifactId>repository</artifactId>
+ <version>1.1.101.R37x_v20110714</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2</groupId>
+ <artifactId>console</artifactId>
+ <version>1.0.300.v20110502-1955</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2</groupId>
+ <artifactId>core</artifactId>
+ <version>2.1.0.v20110502-1955</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2</groupId>
+ <artifactId>director</artifactId>
+ <version>2.1.0.v20110504-1715</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2.director</groupId>
+ <artifactId>app</artifactId>
+ <version>1.0.300.v20110505</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2</groupId>
+ <artifactId>directorywatcher</artifactId>
+ <version>1.0.300.v20110502-1955</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2</groupId>
+ <artifactId>discovery</artifactId>
+ <version>1.0.100.v20110502-1955</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2.discovery</groupId>
+ <artifactId>compatibility</artifactId>
+ <version>1.0.1.v20110502-1955</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2</groupId>
+ <artifactId>engine</artifactId>
+ <version>2.1.0.v20110511</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2</groupId>
+ <artifactId>extensionlocation</artifactId>
+ <version>1.2.100.v20110510</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2</groupId>
+ <artifactId>garbagecollector</artifactId>
+ <version>1.0.200.v20110510</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2</groupId>
+ <artifactId>jarprocessor</artifactId>
+ <version>1.0.200.v20110502-1955</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2</groupId>
+ <artifactId>metadata</artifactId>
+ <version>2.1.0.v20110510</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2.metadata</groupId>
+ <artifactId>generator</artifactId>
+ <version>1.0.200.v20100503a</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2.metadata</groupId>
+ <artifactId>repository</artifactId>
+ <version>1.2.0.v20110511-1359</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2</groupId>
+ <artifactId>operations</artifactId>
+ <version>2.1.0.v20110511-1821</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2</groupId>
+ <artifactId>publisher</artifactId>
+ <version>1.2.0.v20110511</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2</groupId>
+ <artifactId>ql</artifactId>
+ <version>2.0.100.v20110510</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2.reconciler</groupId>
+ <artifactId>dropins</artifactId>
+ <version>1.1.100.v20110510</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2</groupId>
+ <artifactId>repository</artifactId>
+ <version>2.1.0.v20110601</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2.repository</groupId>
+ <artifactId>tools</artifactId>
+ <version>2.0.100.v20110512-1320</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2.touchpoint</groupId>
+ <artifactId>eclipse</artifactId>
+ <version>2.1.0.v20110511</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2.touchpoint</groupId>
+ <artifactId>natives</artifactId>
+ <version>1.0.300.v20110502-1955</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2</groupId>
+ <artifactId>ui</artifactId>
+ <version>2.1.0.v20110601</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2.ui</groupId>
+ <artifactId>discovery</artifactId>
+ <version>1.0.0.v20110502-1955</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2.ui</groupId>
+ <artifactId>sdk</artifactId>
+ <version>1.0.200.v20110502-1955</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2.ui.sdk</groupId>
+ <artifactId>scheduler</artifactId>
+ <version>1.0.100.v20110502-1955</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2</groupId>
+ <artifactId>updatechecker</artifactId>
+ <version>1.1.200.v20110502-1955</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.p2</groupId>
+ <artifactId>updatesite</artifactId>
+ <version>1.0.300.v20110510</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>preferences</artifactId>
+ <version>3.4.1.R37x_v20110725</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>registry</artifactId>
+ <version>3.5.101.R37x_v20110810-1611</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>security</artifactId>
+ <version>1.1.1.R37x_v20110822-1018</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>simpleconfigurator</artifactId>
+ <version>1.0.200.v20110502-1955</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox.simpleconfigurator</groupId>
+ <artifactId>manipulator</artifactId>
+ <version>2.0.0.v20110502-1955</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>help</artifactId>
+ <version>3.5.100.v20110426</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.help</groupId>
+ <artifactId>appserver</artifactId>
+ <version>3.1.400.v20110425</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.help</groupId>
+ <artifactId>base</artifactId>
+ <version>3.6.1.v201109091335</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.help</groupId>
+ <artifactId>ui</artifactId>
+ <version>3.5.101.r37_20110819</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.help</groupId>
+ <artifactId>webapp</artifactId>
+ <version>3.6.0.v20110518</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>core</artifactId>
+ <version>3.7.1.v_B76_R37x</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jdt.core</groupId>
+ <artifactId>manipulation</artifactId>
+ <version>1.4.0.v20110505-0800</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>debug</artifactId>
+ <version>3.7.1.v20110802_r371</version>
<type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt.debug</groupId>
- <artifactId>ui</artifactId>
- <version>3.6.0.v20110512-studio</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>launching</artifactId>
- <version>3.6.0.v20110509</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt.launching</groupId>
- <artifactId>macosx</artifactId>
- <version>3.2.100.v20110509</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>ui</artifactId>
- <version>3.7.0.v20110531-1200-studio</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>jface</artifactId>
- <version>3.7.0.I20110522-1430</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jface</groupId>
- <artifactId>databinding</artifactId>
- <version>1.5.0.I20100907-0800</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jface</groupId>
- <artifactId>text</artifactId>
- <version>3.7.0.v20110505-0800</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ltk.core</groupId>
- <artifactId>refactoring</artifactId>
- <version>3.5.200.v20110505-0800</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ltk.ui</groupId>
- <artifactId>refactoring</artifactId>
- <version>3.6.0.v20110505-0800</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <version>3.7.0.v20110613</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.osgi</groupId>
- <artifactId>services</artifactId>
- <version>3.3.0.v20110513</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.osgi</groupId>
- <artifactId>util</artifactId>
- <version>3.2.200.v20110110</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>rcp</artifactId>
- <version>3.7.0.v201106131736</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>search</artifactId>
- <version>3.7.0.v20110505-0800-studio</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>swt</artifactId>
- <version>3.7.0.v3735b</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.swt.cocoa</groupId>
- <artifactId>macosx</artifactId>
- <version>3.7.0.v3735b</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.swt.cocoa.macosx</groupId>
- <artifactId>x86_64</artifactId>
- <version>3.7.0.v3735b</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.swt.gtk.linux</groupId>
- <artifactId>x86</artifactId>
- <version>3.7.0.v3735b</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.swt.gtk.linux</groupId>
- <artifactId>x86_64</artifactId>
- <version>3.7.0.v3735b</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.swt.win32.win32</groupId>
- <artifactId>x86</artifactId>
- <version>3.7.0.v3735b</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.swt.win32.win32</groupId>
- <artifactId>x86_64</artifactId>
- <version>3.7.0.v3735b</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.team</groupId>
- <artifactId>core</artifactId>
- <version>3.6.0.I20110525-0800</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.team</groupId>
- <artifactId>ui</artifactId>
- <version>3.6.100.I20110525-0800-2-studio</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>text</artifactId>
- <version>3.5.100.v20110505-0800</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>ui</artifactId>
- <version>3.7.0.I20110602-0100</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>cocoa</artifactId>
- <version>1.1.0.I20101109-0800</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>console</artifactId>
- <version>3.5.100.v20110511</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>editors</artifactId>
- <version>3.7.0.v20110517-0800-studio</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>forms</artifactId>
- <version>3.5.100.v20110425</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>ide</artifactId>
- <version>3.7.0.I20110519-0100-studio</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui.ide</groupId>
- <artifactId>application</artifactId>
- <version>1.0.300.I20110306-2000-studio</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>intro</artifactId>
- <version>3.4.100.v20110425</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>navigator</artifactId>
- <version>3.5.100.I20110524-0800</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui.navigator</groupId>
- <artifactId>resources</artifactId>
- <version>3.4.300.I20110421-1800-studio</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>net</artifactId>
- <version>1.2.100.I20110511-0800</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>views</artifactId>
- <version>3.6.0.I20110412-0800-studio</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui.views.properties</groupId>
- <artifactId>tabbed</artifactId>
- <version>3.5.200.I20110201-0800</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>win32</artifactId>
- <version>3.2.200.I20100509-0800</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>workbench</artifactId>
- <version>3.7.0.I20110519-0100</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui.workbench</groupId>
- <artifactId>compatibility</artifactId>
- <version>3.2.100.I20110413-1600</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jdt.debug</groupId>
+ <artifactId>ui</artifactId>
+ <version>3.6.1.v20110803_r371-studio</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>launching</artifactId>
+ <version>3.6.1.v20110803_r371</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jdt.launching</groupId>
+ <artifactId>macosx</artifactId>
+ <version>3.2.100.v20110509</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>ui</artifactId>
+ <version>3.7.0.v20110531-1200-studio</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>jface</artifactId>
+ <version>3.7.0.I20110522-1430</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jface</groupId>
+ <artifactId>databinding</artifactId>
+ <version>1.5.0.I20100907-0800</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jface</groupId>
+ <artifactId>text</artifactId>
+ <version>3.7.1.r371_v20110825-0800</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ltk.core</groupId>
+ <artifactId>refactoring</artifactId>
+ <version>3.5.201.r371_v20110824-0800</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ltk.ui</groupId>
+ <artifactId>refactoring</artifactId>
+ <version>3.6.0.v20110505-0800</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>osgi</artifactId>
+ <version>3.7.1.R37x_v20110808-1106</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>services</artifactId>
+ <version>3.3.0.v20110513</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>util</artifactId>
+ <version>3.2.200.v20110110</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>rcp</artifactId>
+ <version>3.7.0.v201109091335</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>search</artifactId>
+ <version>3.7.0.v20110505-0800-studio</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>swt</artifactId>
+ <version>3.7.1.v3738a</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.swt.cocoa</groupId>
+ <artifactId>macosx</artifactId>
+ <version>3.7.1.v3738a</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.swt.cocoa.macosx</groupId>
+ <artifactId>x86_64</artifactId>
+ <version>3.7.1.v3738a</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.swt.gtk.linux</groupId>
+ <artifactId>x86</artifactId>
+ <version>3.7.1.v3738a</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.swt.gtk.linux</groupId>
+ <artifactId>x86_64</artifactId>
+ <version>3.7.1.v3738a</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.swt.win32.win32</groupId>
+ <artifactId>x86</artifactId>
+ <version>3.7.1.v3738a</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.swt.win32.win32</groupId>
+ <artifactId>x86_64</artifactId>
+ <version>3.7.1.v3738a</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.team</groupId>
+ <artifactId>core</artifactId>
+ <version>3.6.0.I20110525-0800</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.team</groupId>
+ <artifactId>ui</artifactId>
+ <version>3.6.100.I20110525-0800-2-studio</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>text</artifactId>
+ <version>3.5.101.r371_v20110810-0800</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>ui</artifactId>
+ <version>3.7.0.I20110602-0100</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>cocoa</artifactId>
+ <version>1.1.0.I20101109-0800</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>console</artifactId>
+ <version>3.5.100.v20110511</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>editors</artifactId>
+ <version>3.7.0.v20110517-0800-studio</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>forms</artifactId>
+ <version>3.5.100.v20110425</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>ide</artifactId>
+ <version>3.7.0.v20110809-1737-studio</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ui.ide</groupId>
+ <artifactId>application</artifactId>
+ <version>1.0.300.I20110306-2000-studio</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>intro</artifactId>
+ <version>3.4.100.v20110425</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>navigator</artifactId>
+ <version>3.5.100.v20110809-2227</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ui.navigator</groupId>
+ <artifactId>resources</artifactId>
+ <version>3.4.300.I20110421-1800-studio</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>net</artifactId>
+ <version>1.2.100.I20110511-0800</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>views</artifactId>
+ <version>3.6.0.I20110412-0800-studio</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ui.views.properties</groupId>
+ <artifactId>tabbed</artifactId>
+ <version>3.5.200.I20110201-0800</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>win32</artifactId>
+ <version>3.2.200.I20100509-0800</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ui</groupId>
+ <artifactId>workbench</artifactId>
+ <version>3.7.0.I20110519-0100</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ui.workbench</groupId>
+ <artifactId>compatibility</artifactId>
+ <version>3.2.100.I20110413-1600</version>
<type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui.workbench</groupId>
- <artifactId>texteditor</artifactId>
- <version>3.7.0.v20110505-0800</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.update</groupId>
- <artifactId>configurator</artifactId>
- <version>3.3.100.v20100512</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.update</groupId>
- <artifactId>core</artifactId>
- <version>3.2.500.v20110330</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.update</groupId>
- <artifactId>scheduler</artifactId>
- <version>3.2.300.v20100512</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.update</groupId>
- <artifactId>ui</artifactId>
- <version>3.2.300.v20100512</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>server</artifactId>
- <version>6.1.23.v201012071420</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>util</artifactId>
- <version>6.1.23.v201012071420</version>
- </dependency>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.ui.workbench</groupId>
+ <artifactId>texteditor</artifactId>
+ <version>3.7.0.v20110505-0800</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.update</groupId>
+ <artifactId>configurator</artifactId>
+ <version>3.3.100.v20100512</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.update</groupId>
+ <artifactId>core</artifactId>
+ <version>3.2.500.v20110330</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.update</groupId>
+ <artifactId>scheduler</artifactId>
+ <version>3.2.300.v20100512</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.update</groupId>
+ <artifactId>ui</artifactId>
+ <version>3.2.300.v20100512</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>server</artifactId>
+ <version>6.1.23.v201012071420</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>util</artifactId>
+ <version>6.1.23.v201012071420</version>
+ </dependency>
- <!-- Eclipse language packs -->
- <dependency>
- <groupId>org.eclipse.languagepack</groupId>
- <artifactId>BabelLanguagePack-eclipse-de</artifactId>
- <version>3.6.0.v20101211043401</version>
+ <!-- Eclipse language packs -->
+ <dependency>
+ <groupId>org.eclipse.languagepack</groupId>
+ <artifactId>BabelLanguagePack-eclipse-de</artifactId>
+ <version>3.6.0.v20101211043401</version>
<type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.eclipse.languagepack</groupId>
- <artifactId>BabelLanguagePack-eclipse-fr</artifactId>
- <version>3.6.0.v20101211043401</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.languagepack</groupId>
+ <artifactId>BabelLanguagePack-eclipse-fr</artifactId>
+ <version>3.6.0.v20101211043401</version>
<type>zip</type>
- </dependency>
+ </dependency>
- <!-- Testing framework dependencies -->
- <dependency>
- <groupId>org.eclipse.swtbot.eclipse</groupId>
- <artifactId>core</artifactId>
- <version>2.0.0.433-dev-e35</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.swtbot.eclipse</groupId>
- <artifactId>finder</artifactId>
- <version>2.0.0.433-dev-e35</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.swtbot.swt</groupId>
- <artifactId>finder</artifactId>
- <version>2.0.0.433-dev-e35</version>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.1</version>
- </dependency>
+ <!-- Testing framework dependencies -->
+ <dependency>
+ <groupId>org.eclipse.swtbot.eclipse</groupId>
+ <artifactId>core</artifactId>
+ <version>2.0.0.433-dev-e35</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.swtbot.eclipse</groupId>
+ <artifactId>finder</artifactId>
+ <version>2.0.0.433-dev-e35</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.swtbot.swt</groupId>
+ <artifactId>finder</artifactId>
+ <version>2.0.0.433-dev-e35</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <version>1.1</version>
+ </dependency>
<!-- Documentation generation dependencies -->
- <dependency>
- <groupId>docbook</groupId>
- <artifactId>docbook-xml</artifactId>
+ <dependency>
+ <groupId>docbook</groupId>
+ <artifactId>docbook-xml</artifactId>
<type>zip</type>
- <version>4.5</version>
- </dependency>
- <dependency>
- <groupId>docbook</groupId>
- <artifactId>docbook-xsl</artifactId>
+ <version>4.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>docbook</groupId>
+ <artifactId>docbook-xsl</artifactId>
<type>zip</type>
- <version>1.71.1</version>
- </dependency>
+ <version>1.71.1</version>
+ </dependency>
<!-- Apache Directory Shared -->
<dependency>
@@ -1438,76 +1692,85 @@
<artifactId>shared-asn1-api</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-asn1-ber</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-client-api</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-dsml-parser</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-i18n</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ipojo-manager</artifactId>
- <version>${org.apache.directory.shared.version}</version>
- </dependency>
+
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-codec-core</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-codec-standalone</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-extras-aci</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-extras-trigger</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-extras-util</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-model</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-schema-data</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-net-mina</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-schema-converter</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-util</artifactId>
@@ -1517,34 +1780,46 @@
<!-- ApacheDS -->
<dependency>
<groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core</artifactId>
+ <version>${org.apache.directory.server.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-api</artifactId>
<version>${org.apache.directory.server.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-avl</artifactId>
<version>${org.apache.directory.server.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-constants</artifactId>
<version>${org.apache.directory.server.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-i18n</artifactId>
<version>${org.apache.directory.server.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-ldif-partition</artifactId>
<version>${org.apache.directory.server.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-server-config</artifactId>
<version>${org.apache.directory.server.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-xdbm-partition</artifactId>
@@ -1557,121 +1832,115 @@
<artifactId>bcprov-jdk15</artifactId>
<version>${org.bouncycastle.bcprov.jdk15.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
- <version>0.94</version>
+ <version>${org.apache.xmlgraphics.fop.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
<version>${org.apache.mina.core.version}</version>
</dependency>
+
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
+ <version>${xerces.xercesimpl.version}</version>
</dependency>
+
<dependency>
<groupId>checkstyle</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.2</version>
+ <version>${checkstyle.version}</version>
</dependency>
+
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>${org.antlr.version}</version>
</dependency>
+
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>${org.dom4j.version}</version>
</dependency>
+
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${org.apache.commons.codec.version}</version>
</dependency>
+
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>${org.apache.commons.collections.version}</version>
</dependency>
+
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${org.apache.commons.io.version}</version>
</dependency>
+
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${org.apache.commons.lang.version}</version>
</dependency>
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${org.apache.commons.logging.version}</version>
</dependency>
+
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>${org.apache.commons.pool.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${org.apache.httpcomponents.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>${org.apache.httpcomponents.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo</artifactId>
- <version>${org.apache.felix.ipojo.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.annotations</artifactId>
- <version>${org.apache.felix.ipojo.annotations.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>${org.apache.felix.ipojo.metadata.version}</version>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>${org.objectweb.asm.version}</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${org.osgi.compendium.version}</version>
- </dependency>
+
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
<version>${org.xpp3.version}</version>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.5</version>
+ <version>${junit.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
- <version>3.0.1-FINAL</version>
+ <version>${org.apache.poi.version}</version>
</dependency>
+
<dependency>
<groupId>org.openoffice</groupId>
<artifactId>odfdom</artifactId>
<version>0.6.16</version>
</dependency>
+
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
@@ -1683,11 +1952,13 @@
<artifactId>slf4j-api</artifactId>
<version>${org.slf4j.version}</version>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${org.slf4j.version}</version>
</dependency>
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -1720,6 +1991,7 @@
<goalPrefix>studio</goalPrefix>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -1727,6 +1999,7 @@
<goalPrefix>bundle</goalPrefix>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
@@ -1734,6 +2007,7 @@
<skip>true</skip>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
@@ -1743,6 +2017,7 @@
<goals>install deploy</goals>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -1754,21 +2029,38 @@
<encoding>ISO-8859-1</encoding>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.0-beta-3</version>
+ <dependencies>
+ <!-- Add support for 'scp'/'sftp' -->
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>2.1</version>
+ </dependency>
+
+ <!-- Add support for 'scpexe' -->
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>2.1</version>
+ </dependency>
+ </dependencies>
+
<configuration>
<reportPlugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.7.2</version>
+ <version>${maven.surefire.report.plugin.version}</version>
<configuration>
<argLine>-Xmx1024m -XX:MaxPermSize=512m</argLine>
<aggregate>true</aggregate>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
@@ -1777,6 +2069,7 @@
<aggregate>true</aggregate>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
@@ -1789,11 +2082,13 @@
<aggregate>true</aggregate>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.3.1</version>
</plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
@@ -1807,6 +2102,7 @@
</tags>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -1827,21 +2123,25 @@
</reportSet>
</reportSets>
</plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.3.1</version>
</plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.4</version>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.6</version>
</plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>l10n-maven-plugin</artifactId>
@@ -1863,10 +2163,25 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.4</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagNameFormat>@{project.version}</tagNameFormat>
+ </configuration>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.directory.studio</groupId>
<artifactId>studio-maven-plugin</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5</version>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -1877,36 +2192,41 @@
<version>1.7.1</version>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.7.0</version>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>ant</groupId>
<artifactId>optional</artifactId>
<version>1.5.4</version>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
- <version>0.94</version>
+ <version>${org.apache.xmlgraphics.fop.version}</version>
<scope>compile</scope>
</dependency>
+
<!--
Putting this dependency in the core pom produces following error (?):
Embedded error: java.lang.ClassCastException: org.apache.fop.render.pdf.PDFRendererMaker cannot be cast to org.apache.fop.render.AbstractRendererMaker
- <dependency>
+ <dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>xmlgraphics-commons</artifactId>
<version>1.1</version>
<scope>compile</scope>
- </dependency>
+ </dependency>
-->
</dependencies>
</plugin>
+
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
@@ -1941,6 +2261,8 @@
<!-- OTHER_EXCLUDES -->
<exclude>application/docs/**/*</exclude>
<exclude>application/application-updatesite/src/main/resources/*</exclude>
+ <exclude>application/application-win32-x86-exe/src/main/resources/Apache Directory Studio.ini</exclude>
+ <exclude>application/application-win32-x86_64-exe/src/main/resources/Apache Directory Studio.ini</exclude>
<exclude>helps/ldapbrowser.help/src/main/resources/sevenseas.ldif</exclude>
<exclude>helps/**/src/main/resources/html/rfc/*.txt</exclude>
<exclude>helps/**/src/main/resources/html/rfcs/*.txt</exclude>
@@ -1950,9 +2272,14 @@
<exclude>plugins/ldapbrowser.core/src/main/resources/default_schema.ldif</exclude>
<exclude>plugins/rcp/resources/icons/linux/studio.xpm</exclude>
<exclude>plugins/schemaeditor/resources/schemas/openldap/*.xml</exclude>
+ <exclude>plugins/rcp.fullscreen/**/*.java</exclude>
+ <exclude>plugins/rcp.fullscreen/plugin.xml</exclude>
<exclude>repository/**/*</exclude>
<exclude>tests/**/*</exclude>
<exclude>tools/**/*</exclude>
+ <exclude>**/*.bmp</exclude>
+ <exclude>**/*.launch</exclude>
+ <exclude>**/maven-eclipse.xml</exclude>
</excludes>
</configuration>
</plugin>
@@ -1981,5 +2308,4 @@
<url>file://${project.basedir}</url>
</repository>
</repositories>
-
</project>
diff --git a/repository/org/eclipse/jdt/debug/3.7.0.v20110509/debug-3.7.0.v20110509.pom b/repository/com/bandlem/eclipse/fullscreen/feature/1.0.4.201108061054/feature-1.0.4.201108061054.pom
similarity index 71%
copy from repository/org/eclipse/jdt/debug/3.7.0.v20110509/debug-3.7.0.v20110509.pom
copy to repository/com/bandlem/eclipse/fullscreen/feature/1.0.4.201108061054/feature-1.0.4.201108061054.pom
index 4c6d46a..7d1d0b8 100644
--- a/repository/org/eclipse/jdt/debug/3.7.0.v20110509/debug-3.7.0.v20110509.pom
+++ b/repository/com/bandlem/eclipse/fullscreen/feature/1.0.4.201108061054/feature-1.0.4.201108061054.pom
@@ -2,8 +2,8 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>debug</artifactId>
- <version>3.7.0.v20110509</version>
+ <groupId>com.bandlem.eclipse.fullscreen</groupId>
+ <artifactId>feature</artifactId>
+ <version>1.0.4.201108061054</version>
<packaging>zip</packaging>
</project>
diff --git a/repository/com/bandlem/eclipse/fullscreen/feature/1.0.4.201108061054/feature-1.0.4.201108061054.pom.md5 b/repository/com/bandlem/eclipse/fullscreen/feature/1.0.4.201108061054/feature-1.0.4.201108061054.pom.md5
new file mode 100644
index 0000000..f167a4f
--- /dev/null
+++ b/repository/com/bandlem/eclipse/fullscreen/feature/1.0.4.201108061054/feature-1.0.4.201108061054.pom.md5
@@ -0,0 +1 @@
+3d608f87c2fa95b9e4a755a35c535cef
\ No newline at end of file
diff --git a/repository/com/bandlem/eclipse/fullscreen/feature/1.0.4.201108061054/feature-1.0.4.201108061054.pom.sha1 b/repository/com/bandlem/eclipse/fullscreen/feature/1.0.4.201108061054/feature-1.0.4.201108061054.pom.sha1
new file mode 100644
index 0000000..b0ee0b5
--- /dev/null
+++ b/repository/com/bandlem/eclipse/fullscreen/feature/1.0.4.201108061054/feature-1.0.4.201108061054.pom.sha1
@@ -0,0 +1 @@
+e4d989c2549b5bc69a61f7e6a8efb36fcf5908c1
\ No newline at end of file
diff --git a/repository/com/bandlem/eclipse/fullscreen/feature/1.0.4.201108061054/feature-1.0.4.201108061054.zip b/repository/com/bandlem/eclipse/fullscreen/feature/1.0.4.201108061054/feature-1.0.4.201108061054.zip
new file mode 100644
index 0000000..777a6c5
--- /dev/null
+++ b/repository/com/bandlem/eclipse/fullscreen/feature/1.0.4.201108061054/feature-1.0.4.201108061054.zip
Binary files differ
diff --git a/repository/com/bandlem/eclipse/fullscreen/feature/1.0.4.201108061054/feature-1.0.4.201108061054.zip.md5 b/repository/com/bandlem/eclipse/fullscreen/feature/1.0.4.201108061054/feature-1.0.4.201108061054.zip.md5
new file mode 100644
index 0000000..7b16a31
--- /dev/null
+++ b/repository/com/bandlem/eclipse/fullscreen/feature/1.0.4.201108061054/feature-1.0.4.201108061054.zip.md5
@@ -0,0 +1 @@
+cf2da4cff0356fc35a37e48b381ca616
\ No newline at end of file
diff --git a/repository/com/bandlem/eclipse/fullscreen/feature/1.0.4.201108061054/feature-1.0.4.201108061054.zip.sha1 b/repository/com/bandlem/eclipse/fullscreen/feature/1.0.4.201108061054/feature-1.0.4.201108061054.zip.sha1
new file mode 100644
index 0000000..229476b
--- /dev/null
+++ b/repository/com/bandlem/eclipse/fullscreen/feature/1.0.4.201108061054/feature-1.0.4.201108061054.zip.sha1
@@ -0,0 +1 @@
+5e403ea465c491927d1f24c5911cabe6af3000bc
\ No newline at end of file
diff --git a/repository/com/bandlem/eclipse/fullscreen/feature/maven-metadata.xml b/repository/com/bandlem/eclipse/fullscreen/feature/maven-metadata.xml
new file mode 100644
index 0000000..2052ba0
--- /dev/null
+++ b/repository/com/bandlem/eclipse/fullscreen/feature/maven-metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>com.bandlem.eclipse.fullscreen</groupId>
+ <artifactId>feature</artifactId>
+ <versioning>
+ <release>1.0.4.201108061054</release>
+ <versions>
+ <version>1.0.4.201108061054</version>
+ </versions>
+ <lastUpdated>20120509144205</lastUpdated>
+ </versioning>
+</metadata>
diff --git a/repository/com/bandlem/eclipse/fullscreen/feature/maven-metadata.xml.md5 b/repository/com/bandlem/eclipse/fullscreen/feature/maven-metadata.xml.md5
new file mode 100644
index 0000000..3f25865
--- /dev/null
+++ b/repository/com/bandlem/eclipse/fullscreen/feature/maven-metadata.xml.md5
@@ -0,0 +1 @@
+ea483ae218943d2d5d9fff329589d96b
\ No newline at end of file
diff --git a/repository/com/bandlem/eclipse/fullscreen/feature/maven-metadata.xml.sha1 b/repository/com/bandlem/eclipse/fullscreen/feature/maven-metadata.xml.sha1
new file mode 100644
index 0000000..b8dfccd
--- /dev/null
+++ b/repository/com/bandlem/eclipse/fullscreen/feature/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+bf4202c82bbd5b9ceca17d233ebd016ac3f1b47e
\ No newline at end of file
diff --git a/repository/com/bandlem/eclipse/fullscreen/ui/1.0.4.201108061054/ui-1.0.4.201108061054.jar b/repository/com/bandlem/eclipse/fullscreen/ui/1.0.4.201108061054/ui-1.0.4.201108061054.jar
new file mode 100644
index 0000000..47e86ac
--- /dev/null
+++ b/repository/com/bandlem/eclipse/fullscreen/ui/1.0.4.201108061054/ui-1.0.4.201108061054.jar
Binary files differ
diff --git a/repository/com/bandlem/eclipse/fullscreen/ui/1.0.4.201108061054/ui-1.0.4.201108061054.jar.md5 b/repository/com/bandlem/eclipse/fullscreen/ui/1.0.4.201108061054/ui-1.0.4.201108061054.jar.md5
new file mode 100644
index 0000000..a27c7fa
--- /dev/null
+++ b/repository/com/bandlem/eclipse/fullscreen/ui/1.0.4.201108061054/ui-1.0.4.201108061054.jar.md5
@@ -0,0 +1 @@
+9ecaf5c489f05435a13e27ded3181438
\ No newline at end of file
diff --git a/repository/com/bandlem/eclipse/fullscreen/ui/1.0.4.201108061054/ui-1.0.4.201108061054.jar.sha1 b/repository/com/bandlem/eclipse/fullscreen/ui/1.0.4.201108061054/ui-1.0.4.201108061054.jar.sha1
new file mode 100644
index 0000000..23e1c25
--- /dev/null
+++ b/repository/com/bandlem/eclipse/fullscreen/ui/1.0.4.201108061054/ui-1.0.4.201108061054.jar.sha1
@@ -0,0 +1 @@
+312647eef31d6210ade612ee1a3d27efa182d565
\ No newline at end of file
diff --git a/repository/org/eclipse/help/ui/3.5.100.v20110425/ui-3.5.100.v20110425.pom b/repository/com/bandlem/eclipse/fullscreen/ui/1.0.4.201108061054/ui-1.0.4.201108061054.pom
similarity index 77%
copy from repository/org/eclipse/help/ui/3.5.100.v20110425/ui-3.5.100.v20110425.pom
copy to repository/com/bandlem/eclipse/fullscreen/ui/1.0.4.201108061054/ui-1.0.4.201108061054.pom
index c3d0eba..7ec5ea3 100644
--- a/repository/org/eclipse/help/ui/3.5.100.v20110425/ui-3.5.100.v20110425.pom
+++ b/repository/com/bandlem/eclipse/fullscreen/ui/1.0.4.201108061054/ui-1.0.4.201108061054.pom
@@ -2,7 +2,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.help</groupId>
+ <groupId>com.bandlem.eclipse.fullscreen</groupId>
<artifactId>ui</artifactId>
- <version>3.5.100.v20110425</version>
+ <version>1.0.4.201108061054</version>
</project>
diff --git a/repository/com/bandlem/eclipse/fullscreen/ui/1.0.4.201108061054/ui-1.0.4.201108061054.pom.md5 b/repository/com/bandlem/eclipse/fullscreen/ui/1.0.4.201108061054/ui-1.0.4.201108061054.pom.md5
new file mode 100644
index 0000000..ff99489
--- /dev/null
+++ b/repository/com/bandlem/eclipse/fullscreen/ui/1.0.4.201108061054/ui-1.0.4.201108061054.pom.md5
@@ -0,0 +1 @@
+1e0063045ebe5e90cf51b4c85e2bbb9b
\ No newline at end of file
diff --git a/repository/com/bandlem/eclipse/fullscreen/ui/1.0.4.201108061054/ui-1.0.4.201108061054.pom.sha1 b/repository/com/bandlem/eclipse/fullscreen/ui/1.0.4.201108061054/ui-1.0.4.201108061054.pom.sha1
new file mode 100644
index 0000000..ebdfae6
--- /dev/null
+++ b/repository/com/bandlem/eclipse/fullscreen/ui/1.0.4.201108061054/ui-1.0.4.201108061054.pom.sha1
@@ -0,0 +1 @@
+1cbe803791d4b1c4e5f7f652bf6e4960625461d5
\ No newline at end of file
diff --git a/repository/com/bandlem/eclipse/fullscreen/ui/maven-metadata.xml b/repository/com/bandlem/eclipse/fullscreen/ui/maven-metadata.xml
new file mode 100644
index 0000000..b457ac1
--- /dev/null
+++ b/repository/com/bandlem/eclipse/fullscreen/ui/maven-metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>com.bandlem.eclipse.fullscreen</groupId>
+ <artifactId>ui</artifactId>
+ <versioning>
+ <release>1.0.4.201108061054</release>
+ <versions>
+ <version>1.0.4.201108061054</version>
+ </versions>
+ <lastUpdated>20120509134858</lastUpdated>
+ </versioning>
+</metadata>
diff --git a/repository/com/bandlem/eclipse/fullscreen/ui/maven-metadata.xml.md5 b/repository/com/bandlem/eclipse/fullscreen/ui/maven-metadata.xml.md5
new file mode 100644
index 0000000..45cfddc
--- /dev/null
+++ b/repository/com/bandlem/eclipse/fullscreen/ui/maven-metadata.xml.md5
@@ -0,0 +1 @@
+b8aa73fee6b95b1b624d1e8dd8e3c085
\ No newline at end of file
diff --git a/repository/com/bandlem/eclipse/fullscreen/ui/maven-metadata.xml.sha1 b/repository/com/bandlem/eclipse/fullscreen/ui/maven-metadata.xml.sha1
new file mode 100644
index 0000000..586af62
--- /dev/null
+++ b/repository/com/bandlem/eclipse/fullscreen/ui/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+5b1a5150065e44d296fa25508f9be433138eccbd
\ No newline at end of file
diff --git a/repository/org/eclipse/compare/3.5.200.I20110525-0800-studio/compare-3.5.200.I20110525-0800-studio.jar.md5 b/repository/org/eclipse/compare/3.5.200.I20110525-0800-studio/compare-3.5.200.I20110525-0800-studio.jar.md5
deleted file mode 100644
index d9fe28a..0000000
--- a/repository/org/eclipse/compare/3.5.200.I20110525-0800-studio/compare-3.5.200.I20110525-0800-studio.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-f75d3d1325549909f5dc67bf5a3838ab
\ No newline at end of file
diff --git a/repository/org/eclipse/compare/3.5.200.I20110525-0800-studio/compare-3.5.200.I20110525-0800-studio.jar.sha1 b/repository/org/eclipse/compare/3.5.200.I20110525-0800-studio/compare-3.5.200.I20110525-0800-studio.jar.sha1
deleted file mode 100644
index 16d4654..0000000
--- a/repository/org/eclipse/compare/3.5.200.I20110525-0800-studio/compare-3.5.200.I20110525-0800-studio.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1b8c5b4b9f22bcd084d125e93969c4efc0ae61de
\ No newline at end of file
diff --git a/repository/org/eclipse/compare/3.5.200.I20110525-0800-studio/compare-3.5.200.I20110525-0800-studio.pom.md5 b/repository/org/eclipse/compare/3.5.200.I20110525-0800-studio/compare-3.5.200.I20110525-0800-studio.pom.md5
deleted file mode 100644
index 51d9cd2..0000000
--- a/repository/org/eclipse/compare/3.5.200.I20110525-0800-studio/compare-3.5.200.I20110525-0800-studio.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-5bcf7ed98973fcf0af651dedc41d1002
\ No newline at end of file
diff --git a/repository/org/eclipse/compare/3.5.200.I20110525-0800-studio/compare-3.5.200.I20110525-0800-studio.pom.sha1 b/repository/org/eclipse/compare/3.5.200.I20110525-0800-studio/compare-3.5.200.I20110525-0800-studio.pom.sha1
deleted file mode 100644
index 0deb0e7..0000000
--- a/repository/org/eclipse/compare/3.5.200.I20110525-0800-studio/compare-3.5.200.I20110525-0800-studio.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e1890ae759a0bbe2c7995a46a5ee9afb70ef49ac
\ No newline at end of file
diff --git a/repository/org/eclipse/compare/3.5.200.I20110525-0800-studio/compare-3.5.200.I20110525-0800-studio.jar b/repository/org/eclipse/compare/3.5.201.R37x_v20110817-0800-studio/compare-3.5.201.R37x_v20110817-0800-studio.jar
similarity index 80%
rename from repository/org/eclipse/compare/3.5.200.I20110525-0800-studio/compare-3.5.200.I20110525-0800-studio.jar
rename to repository/org/eclipse/compare/3.5.201.R37x_v20110817-0800-studio/compare-3.5.201.R37x_v20110817-0800-studio.jar
index 3ae5cf0..0bb1f75 100644
--- a/repository/org/eclipse/compare/3.5.200.I20110525-0800-studio/compare-3.5.200.I20110525-0800-studio.jar
+++ b/repository/org/eclipse/compare/3.5.201.R37x_v20110817-0800-studio/compare-3.5.201.R37x_v20110817-0800-studio.jar
Binary files differ
diff --git a/repository/org/eclipse/compare/3.5.201.R37x_v20110817-0800-studio/compare-3.5.201.R37x_v20110817-0800-studio.jar.md5 b/repository/org/eclipse/compare/3.5.201.R37x_v20110817-0800-studio/compare-3.5.201.R37x_v20110817-0800-studio.jar.md5
new file mode 100644
index 0000000..f7025ff
--- /dev/null
+++ b/repository/org/eclipse/compare/3.5.201.R37x_v20110817-0800-studio/compare-3.5.201.R37x_v20110817-0800-studio.jar.md5
@@ -0,0 +1 @@
+8bbe559ddead11a332510c7bc1c53cbb
\ No newline at end of file
diff --git a/repository/org/eclipse/compare/3.5.201.R37x_v20110817-0800-studio/compare-3.5.201.R37x_v20110817-0800-studio.jar.sha1 b/repository/org/eclipse/compare/3.5.201.R37x_v20110817-0800-studio/compare-3.5.201.R37x_v20110817-0800-studio.jar.sha1
new file mode 100644
index 0000000..06df55c
--- /dev/null
+++ b/repository/org/eclipse/compare/3.5.201.R37x_v20110817-0800-studio/compare-3.5.201.R37x_v20110817-0800-studio.jar.sha1
@@ -0,0 +1 @@
+61eb6fd33a7cb92e20550e572f28101db88eb533
\ No newline at end of file
diff --git a/repository/org/eclipse/compare/3.5.200.I20110525-0800-studio/compare-3.5.200.I20110525-0800-studio.pom b/repository/org/eclipse/compare/3.5.201.R37x_v20110817-0800-studio/compare-3.5.201.R37x_v20110817-0800-studio.pom
similarity index 86%
rename from repository/org/eclipse/compare/3.5.200.I20110525-0800-studio/compare-3.5.200.I20110525-0800-studio.pom
rename to repository/org/eclipse/compare/3.5.201.R37x_v20110817-0800-studio/compare-3.5.201.R37x_v20110817-0800-studio.pom
index e5c74b8..5abb800 100644
--- a/repository/org/eclipse/compare/3.5.200.I20110525-0800-studio/compare-3.5.200.I20110525-0800-studio.pom
+++ b/repository/org/eclipse/compare/3.5.201.R37x_v20110817-0800-studio/compare-3.5.201.R37x_v20110817-0800-studio.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse</groupId>
<artifactId>compare</artifactId>
- <version>3.5.200.I20110525-0800-studio</version>
+ <version>3.5.201.R37x_v20110817-0800-studio</version>
</project>
diff --git a/repository/org/eclipse/compare/3.5.201.R37x_v20110817-0800-studio/compare-3.5.201.R37x_v20110817-0800-studio.pom.md5 b/repository/org/eclipse/compare/3.5.201.R37x_v20110817-0800-studio/compare-3.5.201.R37x_v20110817-0800-studio.pom.md5
new file mode 100644
index 0000000..706a072
--- /dev/null
+++ b/repository/org/eclipse/compare/3.5.201.R37x_v20110817-0800-studio/compare-3.5.201.R37x_v20110817-0800-studio.pom.md5
@@ -0,0 +1 @@
+abcbf87807633a1855509522634f7792
\ No newline at end of file
diff --git a/repository/org/eclipse/compare/3.5.201.R37x_v20110817-0800-studio/compare-3.5.201.R37x_v20110817-0800-studio.pom.sha1 b/repository/org/eclipse/compare/3.5.201.R37x_v20110817-0800-studio/compare-3.5.201.R37x_v20110817-0800-studio.pom.sha1
new file mode 100644
index 0000000..2eda73f
--- /dev/null
+++ b/repository/org/eclipse/compare/3.5.201.R37x_v20110817-0800-studio/compare-3.5.201.R37x_v20110817-0800-studio.pom.sha1
@@ -0,0 +1 @@
+bea86be762db4d1427c9a2fa3e9f11837faf148e
\ No newline at end of file
diff --git a/repository/org/eclipse/compare/maven-metadata.xml b/repository/org/eclipse/compare/maven-metadata.xml
index f396266..4c7f4be 100644
--- a/repository/org/eclipse/compare/maven-metadata.xml
+++ b/repository/org/eclipse/compare/maven-metadata.xml
@@ -3,7 +3,7 @@
<groupId>org.eclipse</groupId>
<artifactId>compare</artifactId>
<versioning>
- <release>3.5.200.I20110525-0800-studio</release>
+ <release>3.5.201.R37x_v20110817-0800-studio</release>
<versions>
<version>3.5.100.I20100526-0800-studio</version>
<version>3.5.100.I20100526-0800</version>
@@ -17,7 +17,8 @@
<version>3.5.2.r35x_20100113-0800-studio</version>
<version>3.5.200.I20110525-0800</version>
<version>3.5.200.I20110525-0800-studio</version>
+ <version>3.5.201.R37x_v20110817-0800-studio</version>
</versions>
- <lastUpdated>20110719131514</lastUpdated>
+ <lastUpdated>20111206131919</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/compare/maven-metadata.xml.md5 b/repository/org/eclipse/compare/maven-metadata.xml.md5
index 8abd1cf..8f10efa 100644
--- a/repository/org/eclipse/compare/maven-metadata.xml.md5
+++ b/repository/org/eclipse/compare/maven-metadata.xml.md5
@@ -1 +1 @@
-42a40cbb26302b4e5492e8456859bae5
\ No newline at end of file
+0a5907fe3d821d935fa6c9929495c745
\ No newline at end of file
diff --git a/repository/org/eclipse/compare/maven-metadata.xml.sha1 b/repository/org/eclipse/compare/maven-metadata.xml.sha1
index da085f8..f34435a 100644
--- a/repository/org/eclipse/compare/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/compare/maven-metadata.xml.sha1
@@ -1 +1 @@
-65fa52cf160602eae19f84658244971a142f46ab
\ No newline at end of file
+d4b03df300baae7684bfc8cc7619944ae43801bf
\ No newline at end of file
diff --git a/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20100517/auth-3.2.200.v20100517.jar b/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20100517/auth-3.2.200.v20100517.jar
deleted file mode 100644
index bc30333..0000000
--- a/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20100517/auth-3.2.200.v20100517.jar
+++ /dev/null
Binary files differ
diff --git a/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20100517/auth-3.2.200.v20100517.jar.md5 b/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20100517/auth-3.2.200.v20100517.jar.md5
deleted file mode 100644
index 0fa858f..0000000
--- a/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20100517/auth-3.2.200.v20100517.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-7d77538d6a2223da8e2cd3772978033e
\ No newline at end of file
diff --git a/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20100517/auth-3.2.200.v20100517.jar.sha1 b/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20100517/auth-3.2.200.v20100517.jar.sha1
deleted file mode 100644
index 9dadc81..0000000
--- a/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20100517/auth-3.2.200.v20100517.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9c98c277cffbb4ca06cafd5820562ef7b5100f5c
\ No newline at end of file
diff --git a/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20100517/auth-3.2.200.v20100517.pom.md5 b/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20100517/auth-3.2.200.v20100517.pom.md5
deleted file mode 100644
index 428145d..0000000
--- a/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20100517/auth-3.2.200.v20100517.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-c4dbaa4c126083373fc8085cba8c8758
\ No newline at end of file
diff --git a/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20100517/auth-3.2.200.v20100517.pom.sha1 b/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20100517/auth-3.2.200.v20100517.pom.sha1
deleted file mode 100644
index a153048..0000000
--- a/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20100517/auth-3.2.200.v20100517.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9faf71e6f447e471f512188fd067ed58e119f4ba
\ No newline at end of file
diff --git a/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20110110/auth-3.2.200.v20110110.jar b/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20110110/auth-3.2.200.v20110110.jar
new file mode 100644
index 0000000..fc0b429
--- /dev/null
+++ b/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20110110/auth-3.2.200.v20110110.jar
Binary files differ
diff --git a/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20110110/auth-3.2.200.v20110110.jar.md5 b/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20110110/auth-3.2.200.v20110110.jar.md5
new file mode 100644
index 0000000..81e9434
--- /dev/null
+++ b/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20110110/auth-3.2.200.v20110110.jar.md5
@@ -0,0 +1 @@
+daebca9595b5c9521a976a3c89ea2cb8
\ No newline at end of file
diff --git a/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20110110/auth-3.2.200.v20110110.jar.sha1 b/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20110110/auth-3.2.200.v20110110.jar.sha1
new file mode 100644
index 0000000..32dfd76
--- /dev/null
+++ b/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20110110/auth-3.2.200.v20110110.jar.sha1
@@ -0,0 +1 @@
+0ca9b9df8a8e4c6805c60a5761c470fce8ae828f
\ No newline at end of file
diff --git a/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20100517/auth-3.2.200.v20100517.pom b/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20110110/auth-3.2.200.v20110110.pom
similarity index 90%
rename from repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20100517/auth-3.2.200.v20100517.pom
rename to repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20110110/auth-3.2.200.v20110110.pom
index 60cd016..78d4802 100644
--- a/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20100517/auth-3.2.200.v20100517.pom
+++ b/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20110110/auth-3.2.200.v20110110.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.core.runtime.compatibility</groupId>
<artifactId>auth</artifactId>
- <version>3.2.200.v20100517</version>
+ <version>3.2.200.v20110110</version>
</project>
diff --git a/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20110110/auth-3.2.200.v20110110.pom.md5 b/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20110110/auth-3.2.200.v20110110.pom.md5
new file mode 100644
index 0000000..8b44656
--- /dev/null
+++ b/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20110110/auth-3.2.200.v20110110.pom.md5
@@ -0,0 +1 @@
+c256985bcead448f74b15d7d8fc21335
\ No newline at end of file
diff --git a/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20110110/auth-3.2.200.v20110110.pom.sha1 b/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20110110/auth-3.2.200.v20110110.pom.sha1
new file mode 100644
index 0000000..2264e08
--- /dev/null
+++ b/repository/org/eclipse/core/runtime/compatibility/auth/3.2.200.v20110110/auth-3.2.200.v20110110.pom.sha1
@@ -0,0 +1 @@
+bc59f0ccb4b53081fe42580406908e03e4a6e700
\ No newline at end of file
diff --git a/repository/org/eclipse/core/runtime/compatibility/auth/maven-metadata.xml b/repository/org/eclipse/core/runtime/compatibility/auth/maven-metadata.xml
index 617ac28..a02b99c 100644
--- a/repository/org/eclipse/core/runtime/compatibility/auth/maven-metadata.xml
+++ b/repository/org/eclipse/core/runtime/compatibility/auth/maven-metadata.xml
@@ -3,12 +3,13 @@
<groupId>org.eclipse.core.runtime.compatibility</groupId>
<artifactId>auth</artifactId>
<versioning>
- <release>3.2.200.v20100517</release>
+ <release>3.2.200.v20110110</release>
<versions>
<version>3.2.200.v20100517</version>
<version>3.2.100.v20070502</version>
<version>3.2.100.v20090413</version>
+ <version>3.2.200.v20110110</version>
</versions>
- <lastUpdated>20110104131821</lastUpdated>
+ <lastUpdated>20111206110505</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/core/runtime/compatibility/auth/maven-metadata.xml.md5 b/repository/org/eclipse/core/runtime/compatibility/auth/maven-metadata.xml.md5
index 3848698..bc56bc8 100644
--- a/repository/org/eclipse/core/runtime/compatibility/auth/maven-metadata.xml.md5
+++ b/repository/org/eclipse/core/runtime/compatibility/auth/maven-metadata.xml.md5
@@ -1 +1 @@
-68a04cbdc1d67834917da7b6c0750920
\ No newline at end of file
+e504dd7143db32cfed012031aad54dec
\ No newline at end of file
diff --git a/repository/org/eclipse/core/runtime/compatibility/auth/maven-metadata.xml.sha1 b/repository/org/eclipse/core/runtime/compatibility/auth/maven-metadata.xml.sha1
index b6e1dd4..f1583fd 100644
--- a/repository/org/eclipse/core/runtime/compatibility/auth/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/core/runtime/compatibility/auth/maven-metadata.xml.sha1
@@ -1 +1 @@
-e226dbd72d1883c4c3270d0e2171dc3d5e4499cb
\ No newline at end of file
+f8f2a6b1d6fd3cd66e0eed943f605a237115e20c
\ No newline at end of file
diff --git a/repository/org/eclipse/debug/ui/3.7.0.v20110518-studio/ui-3.7.0.v20110518-studio.jar.md5 b/repository/org/eclipse/debug/ui/3.7.0.v20110518-studio/ui-3.7.0.v20110518-studio.jar.md5
deleted file mode 100644
index 886c239..0000000
--- a/repository/org/eclipse/debug/ui/3.7.0.v20110518-studio/ui-3.7.0.v20110518-studio.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-a237cdfee69dc1b1678039a56f081efd
\ No newline at end of file
diff --git a/repository/org/eclipse/debug/ui/3.7.0.v20110518-studio/ui-3.7.0.v20110518-studio.jar.sha1 b/repository/org/eclipse/debug/ui/3.7.0.v20110518-studio/ui-3.7.0.v20110518-studio.jar.sha1
deleted file mode 100644
index 9077e02..0000000
--- a/repository/org/eclipse/debug/ui/3.7.0.v20110518-studio/ui-3.7.0.v20110518-studio.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4088b7cc61bdd9ae6190ab34172ea71aef6d723a
\ No newline at end of file
diff --git a/repository/org/eclipse/debug/ui/3.7.0.v20110518-studio/ui-3.7.0.v20110518-studio.pom.md5 b/repository/org/eclipse/debug/ui/3.7.0.v20110518-studio/ui-3.7.0.v20110518-studio.pom.md5
deleted file mode 100644
index 7efb7da..0000000
--- a/repository/org/eclipse/debug/ui/3.7.0.v20110518-studio/ui-3.7.0.v20110518-studio.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-8d4a4fd06b2ed95b67fb22051d3bbd41
\ No newline at end of file
diff --git a/repository/org/eclipse/debug/ui/3.7.0.v20110518-studio/ui-3.7.0.v20110518-studio.pom.sha1 b/repository/org/eclipse/debug/ui/3.7.0.v20110518-studio/ui-3.7.0.v20110518-studio.pom.sha1
deleted file mode 100644
index 345cfcb..0000000
--- a/repository/org/eclipse/debug/ui/3.7.0.v20110518-studio/ui-3.7.0.v20110518-studio.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-311cb78e52b5af6f6d48b8a8a49d198d1aa2fac1
\ No newline at end of file
diff --git a/repository/org/eclipse/debug/ui/3.7.0.v20110518-studio/ui-3.7.0.v20110518-studio.jar b/repository/org/eclipse/debug/ui/3.7.101.v20110817_r371-studio/ui-3.7.101.v20110817_r371-studio.jar
similarity index 68%
rename from repository/org/eclipse/debug/ui/3.7.0.v20110518-studio/ui-3.7.0.v20110518-studio.jar
rename to repository/org/eclipse/debug/ui/3.7.101.v20110817_r371-studio/ui-3.7.101.v20110817_r371-studio.jar
index 9221b4c..321c7b2 100644
--- a/repository/org/eclipse/debug/ui/3.7.0.v20110518-studio/ui-3.7.0.v20110518-studio.jar
+++ b/repository/org/eclipse/debug/ui/3.7.101.v20110817_r371-studio/ui-3.7.101.v20110817_r371-studio.jar
Binary files differ
diff --git a/repository/org/eclipse/debug/ui/3.7.101.v20110817_r371-studio/ui-3.7.101.v20110817_r371-studio.jar.md5 b/repository/org/eclipse/debug/ui/3.7.101.v20110817_r371-studio/ui-3.7.101.v20110817_r371-studio.jar.md5
new file mode 100644
index 0000000..a9ee953
--- /dev/null
+++ b/repository/org/eclipse/debug/ui/3.7.101.v20110817_r371-studio/ui-3.7.101.v20110817_r371-studio.jar.md5
@@ -0,0 +1 @@
+7a7be23b071ccfac10c911025ede5fb8
\ No newline at end of file
diff --git a/repository/org/eclipse/debug/ui/3.7.101.v20110817_r371-studio/ui-3.7.101.v20110817_r371-studio.jar.sha1 b/repository/org/eclipse/debug/ui/3.7.101.v20110817_r371-studio/ui-3.7.101.v20110817_r371-studio.jar.sha1
new file mode 100644
index 0000000..674818e
--- /dev/null
+++ b/repository/org/eclipse/debug/ui/3.7.101.v20110817_r371-studio/ui-3.7.101.v20110817_r371-studio.jar.sha1
@@ -0,0 +1 @@
+1e599d45214e38e5803bae277395122b43d6e966
\ No newline at end of file
diff --git a/repository/org/eclipse/debug/ui/3.7.0.v20110518-studio/ui-3.7.0.v20110518-studio.pom b/repository/org/eclipse/debug/ui/3.7.101.v20110817_r371-studio/ui-3.7.101.v20110817_r371-studio.pom
similarity index 87%
rename from repository/org/eclipse/debug/ui/3.7.0.v20110518-studio/ui-3.7.0.v20110518-studio.pom
rename to repository/org/eclipse/debug/ui/3.7.101.v20110817_r371-studio/ui-3.7.101.v20110817_r371-studio.pom
index 8161b01..9c051ec 100644
--- a/repository/org/eclipse/debug/ui/3.7.0.v20110518-studio/ui-3.7.0.v20110518-studio.pom
+++ b/repository/org/eclipse/debug/ui/3.7.101.v20110817_r371-studio/ui-3.7.101.v20110817_r371-studio.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.debug</groupId>
<artifactId>ui</artifactId>
- <version>3.7.0.v20110518-studio</version>
+ <version>3.7.101.v20110817_r371-studio</version>
</project>
diff --git a/repository/org/eclipse/debug/ui/3.7.101.v20110817_r371-studio/ui-3.7.101.v20110817_r371-studio.pom.md5 b/repository/org/eclipse/debug/ui/3.7.101.v20110817_r371-studio/ui-3.7.101.v20110817_r371-studio.pom.md5
new file mode 100644
index 0000000..9c1a810
--- /dev/null
+++ b/repository/org/eclipse/debug/ui/3.7.101.v20110817_r371-studio/ui-3.7.101.v20110817_r371-studio.pom.md5
@@ -0,0 +1 @@
+b0f0ee4cda87034c2e6f57511e9c0dd0
\ No newline at end of file
diff --git a/repository/org/eclipse/debug/ui/3.7.101.v20110817_r371-studio/ui-3.7.101.v20110817_r371-studio.pom.sha1 b/repository/org/eclipse/debug/ui/3.7.101.v20110817_r371-studio/ui-3.7.101.v20110817_r371-studio.pom.sha1
new file mode 100644
index 0000000..508b1c8
--- /dev/null
+++ b/repository/org/eclipse/debug/ui/3.7.101.v20110817_r371-studio/ui-3.7.101.v20110817_r371-studio.pom.sha1
@@ -0,0 +1 @@
+0b6cf1df6a07287852c099bd5be80b0635d5754f
\ No newline at end of file
diff --git a/repository/org/eclipse/debug/ui/maven-metadata.xml b/repository/org/eclipse/debug/ui/maven-metadata.xml
index 95b2429..b8d7ccc 100644
--- a/repository/org/eclipse/debug/ui/maven-metadata.xml
+++ b/repository/org/eclipse/debug/ui/maven-metadata.xml
@@ -3,7 +3,7 @@
<groupId>org.eclipse.debug</groupId>
<artifactId>ui</artifactId>
<versioning>
- <release>3.7.0.v20110518-studio</release>
+ <release>3.7.101.v20110817_r371-studio</release>
<versions>
<version>3.6.1.v20100901_r361-studio</version>
<version>3.6.1.v20100901_r361</version>
@@ -17,7 +17,8 @@
<version>3.5.2.v20091028_r352-studio</version>
<version>3.7.0.v20110518</version>
<version>3.7.0.v20110518-studio</version>
+ <version>3.7.101.v20110817_r371-studio</version>
</versions>
- <lastUpdated>20110719133319</lastUpdated>
+ <lastUpdated>20111206131923</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/debug/ui/maven-metadata.xml.md5 b/repository/org/eclipse/debug/ui/maven-metadata.xml.md5
index f886b5d..21b2a57 100644
--- a/repository/org/eclipse/debug/ui/maven-metadata.xml.md5
+++ b/repository/org/eclipse/debug/ui/maven-metadata.xml.md5
@@ -1 +1 @@
-8570fb692040adf558ff06901f37486f
\ No newline at end of file
+040f52e597e591638565114637c74a19
\ No newline at end of file
diff --git a/repository/org/eclipse/debug/ui/maven-metadata.xml.sha1 b/repository/org/eclipse/debug/ui/maven-metadata.xml.sha1
index 5828bc5..a86e8f2 100644
--- a/repository/org/eclipse/debug/ui/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/debug/ui/maven-metadata.xml.sha1
@@ -1 +1 @@
-ab587f9bb4f9aa169ea109f801f831b3194073b9
\ No newline at end of file
+b0a652ec17db48ce3ee66659eb1ad7eab7d675a0
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/p2/artifact/repository/1.1.100.v20110519/repository-1.1.100.v20110519.jar.md5 b/repository/org/eclipse/equinox/p2/artifact/repository/1.1.100.v20110519/repository-1.1.100.v20110519.jar.md5
deleted file mode 100644
index 12bebc4..0000000
--- a/repository/org/eclipse/equinox/p2/artifact/repository/1.1.100.v20110519/repository-1.1.100.v20110519.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-94bc1f645a8be12c122cac2a6fc69efd
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/p2/artifact/repository/1.1.100.v20110519/repository-1.1.100.v20110519.jar.sha1 b/repository/org/eclipse/equinox/p2/artifact/repository/1.1.100.v20110519/repository-1.1.100.v20110519.jar.sha1
deleted file mode 100644
index 637861e..0000000
--- a/repository/org/eclipse/equinox/p2/artifact/repository/1.1.100.v20110519/repository-1.1.100.v20110519.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e5d56c8b1ae998a1cbeaa70078633bd633254cb3
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/p2/artifact/repository/1.1.100.v20110519/repository-1.1.100.v20110519.pom.md5 b/repository/org/eclipse/equinox/p2/artifact/repository/1.1.100.v20110519/repository-1.1.100.v20110519.pom.md5
deleted file mode 100644
index 9f4fa62..0000000
--- a/repository/org/eclipse/equinox/p2/artifact/repository/1.1.100.v20110519/repository-1.1.100.v20110519.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-d60bdb126c2d4186d3e060d1e0070fce
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/p2/artifact/repository/1.1.100.v20110519/repository-1.1.100.v20110519.pom.sha1 b/repository/org/eclipse/equinox/p2/artifact/repository/1.1.100.v20110519/repository-1.1.100.v20110519.pom.sha1
deleted file mode 100644
index 52b2330..0000000
--- a/repository/org/eclipse/equinox/p2/artifact/repository/1.1.100.v20110519/repository-1.1.100.v20110519.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-61e50854dea10c9833e27bbf26e7be2dc6d3f762
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/p2/artifact/repository/1.1.100.v20110519/repository-1.1.100.v20110519.jar b/repository/org/eclipse/equinox/p2/artifact/repository/1.1.101.R37x_v20110714/repository-1.1.101.R37x_v20110714.jar
similarity index 77%
rename from repository/org/eclipse/equinox/p2/artifact/repository/1.1.100.v20110519/repository-1.1.100.v20110519.jar
rename to repository/org/eclipse/equinox/p2/artifact/repository/1.1.101.R37x_v20110714/repository-1.1.101.R37x_v20110714.jar
index e360e99..aa9e38d 100644
--- a/repository/org/eclipse/equinox/p2/artifact/repository/1.1.100.v20110519/repository-1.1.100.v20110519.jar
+++ b/repository/org/eclipse/equinox/p2/artifact/repository/1.1.101.R37x_v20110714/repository-1.1.101.R37x_v20110714.jar
Binary files differ
diff --git a/repository/org/eclipse/equinox/p2/artifact/repository/1.1.101.R37x_v20110714/repository-1.1.101.R37x_v20110714.jar.md5 b/repository/org/eclipse/equinox/p2/artifact/repository/1.1.101.R37x_v20110714/repository-1.1.101.R37x_v20110714.jar.md5
new file mode 100644
index 0000000..5b36f52
--- /dev/null
+++ b/repository/org/eclipse/equinox/p2/artifact/repository/1.1.101.R37x_v20110714/repository-1.1.101.R37x_v20110714.jar.md5
@@ -0,0 +1 @@
+f621b97bf29ac9e858774ab35e09a2f3
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/p2/artifact/repository/1.1.101.R37x_v20110714/repository-1.1.101.R37x_v20110714.jar.sha1 b/repository/org/eclipse/equinox/p2/artifact/repository/1.1.101.R37x_v20110714/repository-1.1.101.R37x_v20110714.jar.sha1
new file mode 100644
index 0000000..13e5396
--- /dev/null
+++ b/repository/org/eclipse/equinox/p2/artifact/repository/1.1.101.R37x_v20110714/repository-1.1.101.R37x_v20110714.jar.sha1
@@ -0,0 +1 @@
+691309150843c2deecfb655fc7431b27fb37058c
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/p2/artifact/repository/1.1.100.v20110519/repository-1.1.100.v20110519.pom b/repository/org/eclipse/equinox/p2/artifact/repository/1.1.101.R37x_v20110714/repository-1.1.101.R37x_v20110714.pom
similarity index 89%
rename from repository/org/eclipse/equinox/p2/artifact/repository/1.1.100.v20110519/repository-1.1.100.v20110519.pom
rename to repository/org/eclipse/equinox/p2/artifact/repository/1.1.101.R37x_v20110714/repository-1.1.101.R37x_v20110714.pom
index 6d40c06..bb30782 100644
--- a/repository/org/eclipse/equinox/p2/artifact/repository/1.1.100.v20110519/repository-1.1.100.v20110519.pom
+++ b/repository/org/eclipse/equinox/p2/artifact/repository/1.1.101.R37x_v20110714/repository-1.1.101.R37x_v20110714.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.equinox.p2.artifact</groupId>
<artifactId>repository</artifactId>
- <version>1.1.100.v20110519</version>
+ <version>1.1.101.R37x_v20110714</version>
</project>
diff --git a/repository/org/eclipse/equinox/p2/artifact/repository/1.1.101.R37x_v20110714/repository-1.1.101.R37x_v20110714.pom.md5 b/repository/org/eclipse/equinox/p2/artifact/repository/1.1.101.R37x_v20110714/repository-1.1.101.R37x_v20110714.pom.md5
new file mode 100644
index 0000000..7129d28
--- /dev/null
+++ b/repository/org/eclipse/equinox/p2/artifact/repository/1.1.101.R37x_v20110714/repository-1.1.101.R37x_v20110714.pom.md5
@@ -0,0 +1 @@
+a87a85600880f657050eec5a7e5c27f5
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/p2/artifact/repository/1.1.101.R37x_v20110714/repository-1.1.101.R37x_v20110714.pom.sha1 b/repository/org/eclipse/equinox/p2/artifact/repository/1.1.101.R37x_v20110714/repository-1.1.101.R37x_v20110714.pom.sha1
new file mode 100644
index 0000000..54d407f
--- /dev/null
+++ b/repository/org/eclipse/equinox/p2/artifact/repository/1.1.101.R37x_v20110714/repository-1.1.101.R37x_v20110714.pom.sha1
@@ -0,0 +1 @@
+6446b623b99320c7f3c27b2ac6af56e19c3c6737
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/p2/artifact/repository/maven-metadata.xml b/repository/org/eclipse/equinox/p2/artifact/repository/maven-metadata.xml
index a914b82..11e48d6 100644
--- a/repository/org/eclipse/equinox/p2/artifact/repository/maven-metadata.xml
+++ b/repository/org/eclipse/equinox/p2/artifact/repository/maven-metadata.xml
@@ -3,13 +3,14 @@
<groupId>org.eclipse.equinox.p2.artifact</groupId>
<artifactId>repository</artifactId>
<versioning>
- <release>1.1.100.v20110519</release>
+ <release>1.1.101.R37x_v20110714</release>
<versions>
<version>1.1.1.R36x_v20100901</version>
<version>1.0.100.v20090527-1812</version>
<version>1.0.101.R35x_v20090721</version>
<version>1.1.100.v20110519</version>
+ <version>1.1.101.R37x_v20110714</version>
</versions>
- <lastUpdated>20110718112526</lastUpdated>
+ <lastUpdated>20111206110510</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/equinox/p2/artifact/repository/maven-metadata.xml.md5 b/repository/org/eclipse/equinox/p2/artifact/repository/maven-metadata.xml.md5
index 740a88d..d9e4fa5 100644
--- a/repository/org/eclipse/equinox/p2/artifact/repository/maven-metadata.xml.md5
+++ b/repository/org/eclipse/equinox/p2/artifact/repository/maven-metadata.xml.md5
@@ -1 +1 @@
-439189698c134b9bdfca559a514beb50
\ No newline at end of file
+2c4e3463e6f57bdc2073e70bff318adc
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/p2/artifact/repository/maven-metadata.xml.sha1 b/repository/org/eclipse/equinox/p2/artifact/repository/maven-metadata.xml.sha1
index ce1e461..0e1ff18 100644
--- a/repository/org/eclipse/equinox/p2/artifact/repository/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/equinox/p2/artifact/repository/maven-metadata.xml.sha1
@@ -1 +1 @@
-765a17c565331aedda78ada8b5aad735f1ca418e
\ No newline at end of file
+f79f6f2f93d121086d938ef61002990b8f98fe87
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/p2/metadata/repository/1.1.0.v20100513/repository-1.1.0.v20100513.jar b/repository/org/eclipse/equinox/p2/metadata/repository/1.1.0.v20100513/repository-1.1.0.v20100513.jar
deleted file mode 100644
index 41478f3..0000000
--- a/repository/org/eclipse/equinox/p2/metadata/repository/1.1.0.v20100513/repository-1.1.0.v20100513.jar
+++ /dev/null
Binary files differ
diff --git a/repository/org/eclipse/equinox/p2/metadata/repository/1.1.0.v20100513/repository-1.1.0.v20100513.jar.md5 b/repository/org/eclipse/equinox/p2/metadata/repository/1.1.0.v20100513/repository-1.1.0.v20100513.jar.md5
deleted file mode 100644
index c66060c..0000000
--- a/repository/org/eclipse/equinox/p2/metadata/repository/1.1.0.v20100513/repository-1.1.0.v20100513.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-d8e7f0494f4974e59698c306a1edfb65
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/p2/metadata/repository/1.1.0.v20100513/repository-1.1.0.v20100513.jar.sha1 b/repository/org/eclipse/equinox/p2/metadata/repository/1.1.0.v20100513/repository-1.1.0.v20100513.jar.sha1
deleted file mode 100644
index 2c4af1e..0000000
--- a/repository/org/eclipse/equinox/p2/metadata/repository/1.1.0.v20100513/repository-1.1.0.v20100513.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7ef63dce131f48b757896afcc90dd3c1c8de3bb1
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/p2/metadata/repository/1.1.0.v20100513/repository-1.1.0.v20100513.pom.md5 b/repository/org/eclipse/equinox/p2/metadata/repository/1.1.0.v20100513/repository-1.1.0.v20100513.pom.md5
deleted file mode 100644
index 329fb57..0000000
--- a/repository/org/eclipse/equinox/p2/metadata/repository/1.1.0.v20100513/repository-1.1.0.v20100513.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-284cac869d6e0b3f9b455424e4a5bd30
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/p2/metadata/repository/1.1.0.v20100513/repository-1.1.0.v20100513.pom.sha1 b/repository/org/eclipse/equinox/p2/metadata/repository/1.1.0.v20100513/repository-1.1.0.v20100513.pom.sha1
deleted file mode 100644
index b8e81d6..0000000
--- a/repository/org/eclipse/equinox/p2/metadata/repository/1.1.0.v20100513/repository-1.1.0.v20100513.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8e6371cc3319f388d1884401d3f998d227ed4340
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/p2/metadata/repository/1.2.0.v20110511-1359/repository-1.2.0.v20110511-1359.jar b/repository/org/eclipse/equinox/p2/metadata/repository/1.2.0.v20110511-1359/repository-1.2.0.v20110511-1359.jar
new file mode 100644
index 0000000..3ef87eb
--- /dev/null
+++ b/repository/org/eclipse/equinox/p2/metadata/repository/1.2.0.v20110511-1359/repository-1.2.0.v20110511-1359.jar
Binary files differ
diff --git a/repository/org/eclipse/equinox/p2/metadata/repository/1.2.0.v20110511-1359/repository-1.2.0.v20110511-1359.jar.md5 b/repository/org/eclipse/equinox/p2/metadata/repository/1.2.0.v20110511-1359/repository-1.2.0.v20110511-1359.jar.md5
new file mode 100644
index 0000000..310fea6
--- /dev/null
+++ b/repository/org/eclipse/equinox/p2/metadata/repository/1.2.0.v20110511-1359/repository-1.2.0.v20110511-1359.jar.md5
@@ -0,0 +1 @@
+f8c3b0a87a7e04dc4a7f915c1fdd9d4e
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/p2/metadata/repository/1.2.0.v20110511-1359/repository-1.2.0.v20110511-1359.jar.sha1 b/repository/org/eclipse/equinox/p2/metadata/repository/1.2.0.v20110511-1359/repository-1.2.0.v20110511-1359.jar.sha1
new file mode 100644
index 0000000..3135ec7
--- /dev/null
+++ b/repository/org/eclipse/equinox/p2/metadata/repository/1.2.0.v20110511-1359/repository-1.2.0.v20110511-1359.jar.sha1
@@ -0,0 +1 @@
+23fa8c86c98e86ae3c94368ab5e71909a051ed5d
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/p2/metadata/repository/1.1.0.v20100513/repository-1.1.0.v20100513.pom b/repository/org/eclipse/equinox/p2/metadata/repository/1.2.0.v20110511-1359/repository-1.2.0.v20110511-1359.pom
similarity index 89%
rename from repository/org/eclipse/equinox/p2/metadata/repository/1.1.0.v20100513/repository-1.1.0.v20100513.pom
rename to repository/org/eclipse/equinox/p2/metadata/repository/1.2.0.v20110511-1359/repository-1.2.0.v20110511-1359.pom
index 26d8b29..43785f7 100644
--- a/repository/org/eclipse/equinox/p2/metadata/repository/1.1.0.v20100513/repository-1.1.0.v20100513.pom
+++ b/repository/org/eclipse/equinox/p2/metadata/repository/1.2.0.v20110511-1359/repository-1.2.0.v20110511-1359.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.equinox.p2.metadata</groupId>
<artifactId>repository</artifactId>
- <version>1.1.0.v20100513</version>
+ <version>1.2.0.v20110511-1359</version>
</project>
diff --git a/repository/org/eclipse/equinox/p2/metadata/repository/1.2.0.v20110511-1359/repository-1.2.0.v20110511-1359.pom.md5 b/repository/org/eclipse/equinox/p2/metadata/repository/1.2.0.v20110511-1359/repository-1.2.0.v20110511-1359.pom.md5
new file mode 100644
index 0000000..675dda0
--- /dev/null
+++ b/repository/org/eclipse/equinox/p2/metadata/repository/1.2.0.v20110511-1359/repository-1.2.0.v20110511-1359.pom.md5
@@ -0,0 +1 @@
+69ab1beed626208448e3bbd7be5737a7
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/p2/metadata/repository/1.2.0.v20110511-1359/repository-1.2.0.v20110511-1359.pom.sha1 b/repository/org/eclipse/equinox/p2/metadata/repository/1.2.0.v20110511-1359/repository-1.2.0.v20110511-1359.pom.sha1
new file mode 100644
index 0000000..290f25f
--- /dev/null
+++ b/repository/org/eclipse/equinox/p2/metadata/repository/1.2.0.v20110511-1359/repository-1.2.0.v20110511-1359.pom.sha1
@@ -0,0 +1 @@
+be8f60e1359eb6f645d06be55433c63ca054dea7
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/p2/metadata/repository/maven-metadata.xml b/repository/org/eclipse/equinox/p2/metadata/repository/maven-metadata.xml
index 890b70d..5139732 100644
--- a/repository/org/eclipse/equinox/p2/metadata/repository/maven-metadata.xml
+++ b/repository/org/eclipse/equinox/p2/metadata/repository/maven-metadata.xml
@@ -3,12 +3,13 @@
<groupId>org.eclipse.equinox.p2.metadata</groupId>
<artifactId>repository</artifactId>
<versioning>
- <release>1.1.0.v20100513</release>
+ <release>1.2.0.v20110511-1359</release>
<versions>
<version>1.1.0.v20100513</version>
<version>1.0.100.v20090525</version>
<version>1.0.101.R35x_v20090812</version>
+ <version>1.2.0.v20110511-1359</version>
</versions>
- <lastUpdated>20110104132004</lastUpdated>
+ <lastUpdated>20111206110515</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/equinox/p2/metadata/repository/maven-metadata.xml.md5 b/repository/org/eclipse/equinox/p2/metadata/repository/maven-metadata.xml.md5
index 240ef45..32efb04 100644
--- a/repository/org/eclipse/equinox/p2/metadata/repository/maven-metadata.xml.md5
+++ b/repository/org/eclipse/equinox/p2/metadata/repository/maven-metadata.xml.md5
@@ -1 +1 @@
-10b2f530dae106c924ad0ab321b87ff5
\ No newline at end of file
+eeabb0c31aaa675faaf8e10739a720ad
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/p2/metadata/repository/maven-metadata.xml.sha1 b/repository/org/eclipse/equinox/p2/metadata/repository/maven-metadata.xml.sha1
index b477efa..adee7b8 100644
--- a/repository/org/eclipse/equinox/p2/metadata/repository/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/equinox/p2/metadata/repository/maven-metadata.xml.sha1
@@ -1 +1 @@
-6ae3d0158ec2dfa72fcd0f8e26a1c8f64429a573
\ No newline at end of file
+f702d5a6478723ee4561a44b9675fa925d4fff93
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/preferences/3.4.0.v20110502/preferences-3.4.0.v20110502.jar.md5 b/repository/org/eclipse/equinox/preferences/3.4.0.v20110502/preferences-3.4.0.v20110502.jar.md5
deleted file mode 100644
index 24f081e..0000000
--- a/repository/org/eclipse/equinox/preferences/3.4.0.v20110502/preferences-3.4.0.v20110502.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-6df989489605803459e47403a222805c
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/preferences/3.4.0.v20110502/preferences-3.4.0.v20110502.jar.sha1 b/repository/org/eclipse/equinox/preferences/3.4.0.v20110502/preferences-3.4.0.v20110502.jar.sha1
deleted file mode 100644
index 78cc0c9..0000000
--- a/repository/org/eclipse/equinox/preferences/3.4.0.v20110502/preferences-3.4.0.v20110502.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0937ba0387d24761b68d9fa343669d58e40fb041
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/preferences/3.4.0.v20110502/preferences-3.4.0.v20110502.pom.md5 b/repository/org/eclipse/equinox/preferences/3.4.0.v20110502/preferences-3.4.0.v20110502.pom.md5
deleted file mode 100644
index cae0899..0000000
--- a/repository/org/eclipse/equinox/preferences/3.4.0.v20110502/preferences-3.4.0.v20110502.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-31201ecf98fb5c455b36d0975fe5139b
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/preferences/3.4.0.v20110502/preferences-3.4.0.v20110502.pom.sha1 b/repository/org/eclipse/equinox/preferences/3.4.0.v20110502/preferences-3.4.0.v20110502.pom.sha1
deleted file mode 100644
index a5d424f..0000000
--- a/repository/org/eclipse/equinox/preferences/3.4.0.v20110502/preferences-3.4.0.v20110502.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-02a2a91c7205c517ac20b80afa4c8dcb2a984c57
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/preferences/3.4.0.v20110502/preferences-3.4.0.v20110502.jar b/repository/org/eclipse/equinox/preferences/3.4.1.R37x_v20110725/preferences-3.4.1.R37x_v20110725.jar
similarity index 68%
rename from repository/org/eclipse/equinox/preferences/3.4.0.v20110502/preferences-3.4.0.v20110502.jar
rename to repository/org/eclipse/equinox/preferences/3.4.1.R37x_v20110725/preferences-3.4.1.R37x_v20110725.jar
index 87eddaf..e478ea2 100644
--- a/repository/org/eclipse/equinox/preferences/3.4.0.v20110502/preferences-3.4.0.v20110502.jar
+++ b/repository/org/eclipse/equinox/preferences/3.4.1.R37x_v20110725/preferences-3.4.1.R37x_v20110725.jar
Binary files differ
diff --git a/repository/org/eclipse/equinox/preferences/3.4.1.R37x_v20110725/preferences-3.4.1.R37x_v20110725.jar.md5 b/repository/org/eclipse/equinox/preferences/3.4.1.R37x_v20110725/preferences-3.4.1.R37x_v20110725.jar.md5
new file mode 100644
index 0000000..3d80376
--- /dev/null
+++ b/repository/org/eclipse/equinox/preferences/3.4.1.R37x_v20110725/preferences-3.4.1.R37x_v20110725.jar.md5
@@ -0,0 +1 @@
+7b4ed2d511b7f42a0e2589088ae4f95e
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/preferences/3.4.1.R37x_v20110725/preferences-3.4.1.R37x_v20110725.jar.sha1 b/repository/org/eclipse/equinox/preferences/3.4.1.R37x_v20110725/preferences-3.4.1.R37x_v20110725.jar.sha1
new file mode 100644
index 0000000..83fc089
--- /dev/null
+++ b/repository/org/eclipse/equinox/preferences/3.4.1.R37x_v20110725/preferences-3.4.1.R37x_v20110725.jar.sha1
@@ -0,0 +1 @@
+6770649a91266a4a17747b201723a1fea8c8a198
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/preferences/3.4.0.v20110502/preferences-3.4.0.v20110502.pom b/repository/org/eclipse/equinox/preferences/3.4.1.R37x_v20110725/preferences-3.4.1.R37x_v20110725.pom
similarity index 89%
rename from repository/org/eclipse/equinox/preferences/3.4.0.v20110502/preferences-3.4.0.v20110502.pom
rename to repository/org/eclipse/equinox/preferences/3.4.1.R37x_v20110725/preferences-3.4.1.R37x_v20110725.pom
index 4561379..21db28b 100644
--- a/repository/org/eclipse/equinox/preferences/3.4.0.v20110502/preferences-3.4.0.v20110502.pom
+++ b/repository/org/eclipse/equinox/preferences/3.4.1.R37x_v20110725/preferences-3.4.1.R37x_v20110725.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.equinox</groupId>
<artifactId>preferences</artifactId>
- <version>3.4.0.v20110502</version>
+ <version>3.4.1.R37x_v20110725</version>
</project>
diff --git a/repository/org/eclipse/equinox/preferences/3.4.1.R37x_v20110725/preferences-3.4.1.R37x_v20110725.pom.md5 b/repository/org/eclipse/equinox/preferences/3.4.1.R37x_v20110725/preferences-3.4.1.R37x_v20110725.pom.md5
new file mode 100644
index 0000000..46022f8
--- /dev/null
+++ b/repository/org/eclipse/equinox/preferences/3.4.1.R37x_v20110725/preferences-3.4.1.R37x_v20110725.pom.md5
@@ -0,0 +1 @@
+55829236798dcece172d7b789ae81922
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/preferences/3.4.1.R37x_v20110725/preferences-3.4.1.R37x_v20110725.pom.sha1 b/repository/org/eclipse/equinox/preferences/3.4.1.R37x_v20110725/preferences-3.4.1.R37x_v20110725.pom.sha1
new file mode 100644
index 0000000..d7cb2b2
--- /dev/null
+++ b/repository/org/eclipse/equinox/preferences/3.4.1.R37x_v20110725/preferences-3.4.1.R37x_v20110725.pom.sha1
@@ -0,0 +1 @@
+5069a9526af343f656c63404682520831eecd714
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/preferences/maven-metadata.xml b/repository/org/eclipse/equinox/preferences/maven-metadata.xml
index 7e8952b..b9f5b49 100644
--- a/repository/org/eclipse/equinox/preferences/maven-metadata.xml
+++ b/repository/org/eclipse/equinox/preferences/maven-metadata.xml
@@ -3,7 +3,7 @@
<groupId>org.eclipse.equinox</groupId>
<artifactId>preferences</artifactId>
<versioning>
- <release>3.4.0.v20110502</release>
+ <release>3.4.1.R37x_v20110725</release>
<versions>
<version>3.3.0.v20100503</version>
<version>3.2.101.R33x_v20080117</version>
@@ -12,7 +12,8 @@
<version>3.2.300.v20090520-1800</version>
<version>3.2.301.R35x_v20091117</version>
<version>3.4.0.v20110502</version>
+ <version>3.4.1.R37x_v20110725</version>
</versions>
- <lastUpdated>20110718113053</lastUpdated>
+ <lastUpdated>20111206110520</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/equinox/preferences/maven-metadata.xml.md5 b/repository/org/eclipse/equinox/preferences/maven-metadata.xml.md5
index 620c688..0c3afe7 100644
--- a/repository/org/eclipse/equinox/preferences/maven-metadata.xml.md5
+++ b/repository/org/eclipse/equinox/preferences/maven-metadata.xml.md5
@@ -1 +1 @@
-df2a3d9adfbd02b9748119fe36743035
\ No newline at end of file
+0eca6042421a3908da9e618a2a5d8ce1
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/preferences/maven-metadata.xml.sha1 b/repository/org/eclipse/equinox/preferences/maven-metadata.xml.sha1
index 96e98a3..ff90530 100644
--- a/repository/org/eclipse/equinox/preferences/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/equinox/preferences/maven-metadata.xml.sha1
@@ -1 +1 @@
-257919ab4306be32a9bcc14b7ac399bacb2fcbf5
\ No newline at end of file
+b817ddda21111f752c4f3869e82464a506ee261b
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/registry/3.5.100.v20110502/registry-3.5.100.v20110502.jar.md5 b/repository/org/eclipse/equinox/registry/3.5.100.v20110502/registry-3.5.100.v20110502.jar.md5
deleted file mode 100644
index 08a6dba..0000000
--- a/repository/org/eclipse/equinox/registry/3.5.100.v20110502/registry-3.5.100.v20110502.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-47c236e9b7f7b3d99789903f4f8fbc2f
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/registry/3.5.100.v20110502/registry-3.5.100.v20110502.jar.sha1 b/repository/org/eclipse/equinox/registry/3.5.100.v20110502/registry-3.5.100.v20110502.jar.sha1
deleted file mode 100644
index 4503daa..0000000
--- a/repository/org/eclipse/equinox/registry/3.5.100.v20110502/registry-3.5.100.v20110502.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-58f582bbb4ef9ed8f556065a8da9230ce8a08033
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/registry/3.5.100.v20110502/registry-3.5.100.v20110502.pom.md5 b/repository/org/eclipse/equinox/registry/3.5.100.v20110502/registry-3.5.100.v20110502.pom.md5
deleted file mode 100644
index 987a23f..0000000
--- a/repository/org/eclipse/equinox/registry/3.5.100.v20110502/registry-3.5.100.v20110502.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-d1f4673e159440699b602e703baea39f
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/registry/3.5.100.v20110502/registry-3.5.100.v20110502.pom.sha1 b/repository/org/eclipse/equinox/registry/3.5.100.v20110502/registry-3.5.100.v20110502.pom.sha1
deleted file mode 100644
index f394e15..0000000
--- a/repository/org/eclipse/equinox/registry/3.5.100.v20110502/registry-3.5.100.v20110502.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4eeea4b36cf3735bddde09d8f17fd96ee3c67b09
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/registry/3.5.100.v20110502/registry-3.5.100.v20110502.jar b/repository/org/eclipse/equinox/registry/3.5.101.R37x_v20110810-1611/registry-3.5.101.R37x_v20110810-1611.jar
similarity index 79%
rename from repository/org/eclipse/equinox/registry/3.5.100.v20110502/registry-3.5.100.v20110502.jar
rename to repository/org/eclipse/equinox/registry/3.5.101.R37x_v20110810-1611/registry-3.5.101.R37x_v20110810-1611.jar
index a93b642..c2732f4 100644
--- a/repository/org/eclipse/equinox/registry/3.5.100.v20110502/registry-3.5.100.v20110502.jar
+++ b/repository/org/eclipse/equinox/registry/3.5.101.R37x_v20110810-1611/registry-3.5.101.R37x_v20110810-1611.jar
Binary files differ
diff --git a/repository/org/eclipse/equinox/registry/3.5.101.R37x_v20110810-1611/registry-3.5.101.R37x_v20110810-1611.jar.md5 b/repository/org/eclipse/equinox/registry/3.5.101.R37x_v20110810-1611/registry-3.5.101.R37x_v20110810-1611.jar.md5
new file mode 100644
index 0000000..f303f7f
--- /dev/null
+++ b/repository/org/eclipse/equinox/registry/3.5.101.R37x_v20110810-1611/registry-3.5.101.R37x_v20110810-1611.jar.md5
@@ -0,0 +1 @@
+ceec1e028aa3db40038d7239e6f5afaf
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/registry/3.5.101.R37x_v20110810-1611/registry-3.5.101.R37x_v20110810-1611.jar.sha1 b/repository/org/eclipse/equinox/registry/3.5.101.R37x_v20110810-1611/registry-3.5.101.R37x_v20110810-1611.jar.sha1
new file mode 100644
index 0000000..adc2585
--- /dev/null
+++ b/repository/org/eclipse/equinox/registry/3.5.101.R37x_v20110810-1611/registry-3.5.101.R37x_v20110810-1611.jar.sha1
@@ -0,0 +1 @@
+eac5aeb82732847bc7f11e2b5c934004c4c7a543
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/registry/3.5.100.v20110502/registry-3.5.100.v20110502.pom b/repository/org/eclipse/equinox/registry/3.5.101.R37x_v20110810-1611/registry-3.5.101.R37x_v20110810-1611.pom
similarity index 87%
rename from repository/org/eclipse/equinox/registry/3.5.100.v20110502/registry-3.5.100.v20110502.pom
rename to repository/org/eclipse/equinox/registry/3.5.101.R37x_v20110810-1611/registry-3.5.101.R37x_v20110810-1611.pom
index 926d034..717a256 100644
--- a/repository/org/eclipse/equinox/registry/3.5.100.v20110502/registry-3.5.100.v20110502.pom
+++ b/repository/org/eclipse/equinox/registry/3.5.101.R37x_v20110810-1611/registry-3.5.101.R37x_v20110810-1611.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.equinox</groupId>
<artifactId>registry</artifactId>
- <version>3.5.100.v20110502</version>
+ <version>3.5.101.R37x_v20110810-1611</version>
</project>
diff --git a/repository/org/eclipse/equinox/registry/3.5.101.R37x_v20110810-1611/registry-3.5.101.R37x_v20110810-1611.pom.md5 b/repository/org/eclipse/equinox/registry/3.5.101.R37x_v20110810-1611/registry-3.5.101.R37x_v20110810-1611.pom.md5
new file mode 100644
index 0000000..ddf71b2
--- /dev/null
+++ b/repository/org/eclipse/equinox/registry/3.5.101.R37x_v20110810-1611/registry-3.5.101.R37x_v20110810-1611.pom.md5
@@ -0,0 +1 @@
+ec094795d32048044374b47e7945de74
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/registry/3.5.101.R37x_v20110810-1611/registry-3.5.101.R37x_v20110810-1611.pom.sha1 b/repository/org/eclipse/equinox/registry/3.5.101.R37x_v20110810-1611/registry-3.5.101.R37x_v20110810-1611.pom.sha1
new file mode 100644
index 0000000..c60ac67
--- /dev/null
+++ b/repository/org/eclipse/equinox/registry/3.5.101.R37x_v20110810-1611/registry-3.5.101.R37x_v20110810-1611.pom.sha1
@@ -0,0 +1 @@
+139b6e153200059a6d89d63904098a3dcc2961e8
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/registry/maven-metadata.xml b/repository/org/eclipse/equinox/registry/maven-metadata.xml
index 7eef72c..25aea5e 100644
--- a/repository/org/eclipse/equinox/registry/maven-metadata.xml
+++ b/repository/org/eclipse/equinox/registry/maven-metadata.xml
@@ -3,14 +3,15 @@
<groupId>org.eclipse.equinox</groupId>
<artifactId>registry</artifactId>
<versioning>
- <release>3.5.100.v20110502</release>
+ <release>3.5.101.R37x_v20110810-1611</release>
<versions>
<version>3.5.0.v20100503</version>
<version>3.3.1-R33x_v20070802</version>
<version>3.4.0.v20080516-0950</version>
<version>3.4.100.v20090520-1800</version>
<version>3.5.100.v20110502</version>
+ <version>3.5.101.R37x_v20110810-1611</version>
</versions>
- <lastUpdated>20110718113105</lastUpdated>
+ <lastUpdated>20111206110524</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/equinox/registry/maven-metadata.xml.md5 b/repository/org/eclipse/equinox/registry/maven-metadata.xml.md5
index 7eb8bc6..29904af 100644
--- a/repository/org/eclipse/equinox/registry/maven-metadata.xml.md5
+++ b/repository/org/eclipse/equinox/registry/maven-metadata.xml.md5
@@ -1 +1 @@
-559c7162d2c6a90a3135eaf496ec5b61
\ No newline at end of file
+018136b3608f4caff094a40f0760b299
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/registry/maven-metadata.xml.sha1 b/repository/org/eclipse/equinox/registry/maven-metadata.xml.sha1
index cb84085..7fe84cc 100644
--- a/repository/org/eclipse/equinox/registry/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/equinox/registry/maven-metadata.xml.sha1
@@ -1 +1 @@
-cd8acdd48dc119bb6c912642b0b90e132bfce9cb
\ No newline at end of file
+e22ae89756f8be6bda09b2853b37b6c5cf1ef115
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/security/1.1.0.v20110502/security-1.1.0.v20110502.jar.md5 b/repository/org/eclipse/equinox/security/1.1.0.v20110502/security-1.1.0.v20110502.jar.md5
deleted file mode 100644
index 8bcc0a3..0000000
--- a/repository/org/eclipse/equinox/security/1.1.0.v20110502/security-1.1.0.v20110502.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-b471804a28af1315a59122398f4e5ee5
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/security/1.1.0.v20110502/security-1.1.0.v20110502.jar.sha1 b/repository/org/eclipse/equinox/security/1.1.0.v20110502/security-1.1.0.v20110502.jar.sha1
deleted file mode 100644
index 23a7dd1..0000000
--- a/repository/org/eclipse/equinox/security/1.1.0.v20110502/security-1.1.0.v20110502.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d34c654dfa5ef4b2ac9fbcc25e75d0f81d6299e5
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/security/1.1.0.v20110502/security-1.1.0.v20110502.pom.md5 b/repository/org/eclipse/equinox/security/1.1.0.v20110502/security-1.1.0.v20110502.pom.md5
deleted file mode 100644
index 810ea66..0000000
--- a/repository/org/eclipse/equinox/security/1.1.0.v20110502/security-1.1.0.v20110502.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-fc453f97bca10155655fdd2757dbb16a
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/security/1.1.0.v20110502/security-1.1.0.v20110502.pom.sha1 b/repository/org/eclipse/equinox/security/1.1.0.v20110502/security-1.1.0.v20110502.pom.sha1
deleted file mode 100644
index 26f0b20..0000000
--- a/repository/org/eclipse/equinox/security/1.1.0.v20110502/security-1.1.0.v20110502.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-92292a6ee7d5ec8f4f036ded67ad2dacc3bb7efa
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/security/1.1.0.v20110502/security-1.1.0.v20110502.jar b/repository/org/eclipse/equinox/security/1.1.1.R37x_v20110822-1018/security-1.1.1.R37x_v20110822-1018.jar
similarity index 75%
rename from repository/org/eclipse/equinox/security/1.1.0.v20110502/security-1.1.0.v20110502.jar
rename to repository/org/eclipse/equinox/security/1.1.1.R37x_v20110822-1018/security-1.1.1.R37x_v20110822-1018.jar
index a647efb..1e83dd0 100644
--- a/repository/org/eclipse/equinox/security/1.1.0.v20110502/security-1.1.0.v20110502.jar
+++ b/repository/org/eclipse/equinox/security/1.1.1.R37x_v20110822-1018/security-1.1.1.R37x_v20110822-1018.jar
Binary files differ
diff --git a/repository/org/eclipse/equinox/security/1.1.1.R37x_v20110822-1018/security-1.1.1.R37x_v20110822-1018.jar.md5 b/repository/org/eclipse/equinox/security/1.1.1.R37x_v20110822-1018/security-1.1.1.R37x_v20110822-1018.jar.md5
new file mode 100644
index 0000000..f4099e5
--- /dev/null
+++ b/repository/org/eclipse/equinox/security/1.1.1.R37x_v20110822-1018/security-1.1.1.R37x_v20110822-1018.jar.md5
@@ -0,0 +1 @@
+c6b0c4160d22c9441980a46476dc1b58
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/security/1.1.1.R37x_v20110822-1018/security-1.1.1.R37x_v20110822-1018.jar.sha1 b/repository/org/eclipse/equinox/security/1.1.1.R37x_v20110822-1018/security-1.1.1.R37x_v20110822-1018.jar.sha1
new file mode 100644
index 0000000..0bf3b4f
--- /dev/null
+++ b/repository/org/eclipse/equinox/security/1.1.1.R37x_v20110822-1018/security-1.1.1.R37x_v20110822-1018.jar.sha1
@@ -0,0 +1 @@
+0ffb9b1d7cd992ce6c8aaeec2f6f98dfbb1d2f91
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/security/1.1.0.v20110502/security-1.1.0.v20110502.pom b/repository/org/eclipse/equinox/security/1.1.1.R37x_v20110822-1018/security-1.1.1.R37x_v20110822-1018.pom
similarity index 88%
rename from repository/org/eclipse/equinox/security/1.1.0.v20110502/security-1.1.0.v20110502.pom
rename to repository/org/eclipse/equinox/security/1.1.1.R37x_v20110822-1018/security-1.1.1.R37x_v20110822-1018.pom
index 6ab4c2d..d2302a3 100644
--- a/repository/org/eclipse/equinox/security/1.1.0.v20110502/security-1.1.0.v20110502.pom
+++ b/repository/org/eclipse/equinox/security/1.1.1.R37x_v20110822-1018/security-1.1.1.R37x_v20110822-1018.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.equinox</groupId>
<artifactId>security</artifactId>
- <version>1.1.0.v20110502</version>
+ <version>1.1.1.R37x_v20110822-1018</version>
</project>
diff --git a/repository/org/eclipse/equinox/security/1.1.1.R37x_v20110822-1018/security-1.1.1.R37x_v20110822-1018.pom.md5 b/repository/org/eclipse/equinox/security/1.1.1.R37x_v20110822-1018/security-1.1.1.R37x_v20110822-1018.pom.md5
new file mode 100644
index 0000000..e9b1cca
--- /dev/null
+++ b/repository/org/eclipse/equinox/security/1.1.1.R37x_v20110822-1018/security-1.1.1.R37x_v20110822-1018.pom.md5
@@ -0,0 +1 @@
+801c339423ce3ccd27fd88406fff88a4
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/security/1.1.1.R37x_v20110822-1018/security-1.1.1.R37x_v20110822-1018.pom.sha1 b/repository/org/eclipse/equinox/security/1.1.1.R37x_v20110822-1018/security-1.1.1.R37x_v20110822-1018.pom.sha1
new file mode 100644
index 0000000..e6a8d03
--- /dev/null
+++ b/repository/org/eclipse/equinox/security/1.1.1.R37x_v20110822-1018/security-1.1.1.R37x_v20110822-1018.pom.sha1
@@ -0,0 +1 @@
+e5c00325b16034aecc41f9cfea93d0894ca57502
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/security/maven-metadata.xml b/repository/org/eclipse/equinox/security/maven-metadata.xml
index ca85f15..6d3fe9e 100644
--- a/repository/org/eclipse/equinox/security/maven-metadata.xml
+++ b/repository/org/eclipse/equinox/security/maven-metadata.xml
@@ -3,14 +3,15 @@
<groupId>org.eclipse.equinox</groupId>
<artifactId>security</artifactId>
<versioning>
- <release>1.1.0.v20110502</release>
+ <release>1.1.1.R37x_v20110822-1018</release>
<versions>
<version>1.0.200.v20100503</version>
<version>1.0.0.v20080512-1800</version>
<version>1.0.1.R34x_v20080721</version>
<version>1.0.100.v20090520-1800</version>
<version>1.1.0.v20110502</version>
+ <version>1.1.1.R37x_v20110822-1018</version>
</versions>
- <lastUpdated>20110718113117</lastUpdated>
+ <lastUpdated>20111206110529</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/equinox/security/maven-metadata.xml.md5 b/repository/org/eclipse/equinox/security/maven-metadata.xml.md5
index d2c6536..a4dd2ed 100644
--- a/repository/org/eclipse/equinox/security/maven-metadata.xml.md5
+++ b/repository/org/eclipse/equinox/security/maven-metadata.xml.md5
@@ -1 +1 @@
-20ebe41518115e9c43ab8f163dbeeb98
\ No newline at end of file
+a06db9ea0f5320182b878e7fdbb0d6a2
\ No newline at end of file
diff --git a/repository/org/eclipse/equinox/security/maven-metadata.xml.sha1 b/repository/org/eclipse/equinox/security/maven-metadata.xml.sha1
index c0d0b7f..5977bba 100644
--- a/repository/org/eclipse/equinox/security/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/equinox/security/maven-metadata.xml.sha1
@@ -1 +1 @@
-9c819ec4d56c2213144347116c2c9a6b93f70367
\ No newline at end of file
+a45211bc9a49bb540af8b88440e6248f54005ab8
\ No newline at end of file
diff --git a/repository/org/eclipse/help/base/3.6.0.v201106131736/base-3.6.0.v201106131736.jar.md5 b/repository/org/eclipse/help/base/3.6.0.v201106131736/base-3.6.0.v201106131736.jar.md5
deleted file mode 100644
index 7594ddf..0000000
--- a/repository/org/eclipse/help/base/3.6.0.v201106131736/base-3.6.0.v201106131736.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-0e81f63f4a2d2e187a7aac78be13ca77
\ No newline at end of file
diff --git a/repository/org/eclipse/help/base/3.6.0.v201106131736/base-3.6.0.v201106131736.jar.sha1 b/repository/org/eclipse/help/base/3.6.0.v201106131736/base-3.6.0.v201106131736.jar.sha1
deleted file mode 100644
index 08bd77a..0000000
--- a/repository/org/eclipse/help/base/3.6.0.v201106131736/base-3.6.0.v201106131736.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2357497a887c7543fa1d2d13e706a64c0e4fa0e3
\ No newline at end of file
diff --git a/repository/org/eclipse/help/base/3.6.0.v201106131736/base-3.6.0.v201106131736.pom.md5 b/repository/org/eclipse/help/base/3.6.0.v201106131736/base-3.6.0.v201106131736.pom.md5
deleted file mode 100644
index 90eec62..0000000
--- a/repository/org/eclipse/help/base/3.6.0.v201106131736/base-3.6.0.v201106131736.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-aaf18431ec38e1dbe7b8371f6ec06cde
\ No newline at end of file
diff --git a/repository/org/eclipse/help/base/3.6.0.v201106131736/base-3.6.0.v201106131736.pom.sha1 b/repository/org/eclipse/help/base/3.6.0.v201106131736/base-3.6.0.v201106131736.pom.sha1
deleted file mode 100644
index 6f50fad..0000000
--- a/repository/org/eclipse/help/base/3.6.0.v201106131736/base-3.6.0.v201106131736.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-85e51731bba16232fd62873520e6b5f65ea25d0a
\ No newline at end of file
diff --git a/repository/org/eclipse/help/base/3.6.0.v201106131736/base-3.6.0.v201106131736.jar b/repository/org/eclipse/help/base/3.6.1.v201109091335/base-3.6.1.v201109091335.jar
similarity index 80%
rename from repository/org/eclipse/help/base/3.6.0.v201106131736/base-3.6.0.v201106131736.jar
rename to repository/org/eclipse/help/base/3.6.1.v201109091335/base-3.6.1.v201109091335.jar
index a7bff40..946c11f 100644
--- a/repository/org/eclipse/help/base/3.6.0.v201106131736/base-3.6.0.v201106131736.jar
+++ b/repository/org/eclipse/help/base/3.6.1.v201109091335/base-3.6.1.v201109091335.jar
Binary files differ
diff --git a/repository/org/eclipse/help/base/3.6.1.v201109091335/base-3.6.1.v201109091335.jar.md5 b/repository/org/eclipse/help/base/3.6.1.v201109091335/base-3.6.1.v201109091335.jar.md5
new file mode 100644
index 0000000..905f671
--- /dev/null
+++ b/repository/org/eclipse/help/base/3.6.1.v201109091335/base-3.6.1.v201109091335.jar.md5
@@ -0,0 +1 @@
+379cb5e6c0b23f39749574a1203513d7
\ No newline at end of file
diff --git a/repository/org/eclipse/help/base/3.6.1.v201109091335/base-3.6.1.v201109091335.jar.sha1 b/repository/org/eclipse/help/base/3.6.1.v201109091335/base-3.6.1.v201109091335.jar.sha1
new file mode 100644
index 0000000..cae5a98
--- /dev/null
+++ b/repository/org/eclipse/help/base/3.6.1.v201109091335/base-3.6.1.v201109091335.jar.sha1
@@ -0,0 +1 @@
+7fb4f01901d85892f2967abb783770203b8c8e55
\ No newline at end of file
diff --git a/repository/org/eclipse/help/base/3.6.0.v201106131736/base-3.6.0.v201106131736.pom b/repository/org/eclipse/help/base/3.6.1.v201109091335/base-3.6.1.v201109091335.pom
similarity index 89%
rename from repository/org/eclipse/help/base/3.6.0.v201106131736/base-3.6.0.v201106131736.pom
rename to repository/org/eclipse/help/base/3.6.1.v201109091335/base-3.6.1.v201109091335.pom
index dbe2868..163d61b 100644
--- a/repository/org/eclipse/help/base/3.6.0.v201106131736/base-3.6.0.v201106131736.pom
+++ b/repository/org/eclipse/help/base/3.6.1.v201109091335/base-3.6.1.v201109091335.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.help</groupId>
<artifactId>base</artifactId>
- <version>3.6.0.v201106131736</version>
+ <version>3.6.1.v201109091335</version>
</project>
diff --git a/repository/org/eclipse/help/base/3.6.1.v201109091335/base-3.6.1.v201109091335.pom.md5 b/repository/org/eclipse/help/base/3.6.1.v201109091335/base-3.6.1.v201109091335.pom.md5
new file mode 100644
index 0000000..ff30f19
--- /dev/null
+++ b/repository/org/eclipse/help/base/3.6.1.v201109091335/base-3.6.1.v201109091335.pom.md5
@@ -0,0 +1 @@
+eb2f05e4404a2cad7b9a844f14867a62
\ No newline at end of file
diff --git a/repository/org/eclipse/help/base/3.6.1.v201109091335/base-3.6.1.v201109091335.pom.sha1 b/repository/org/eclipse/help/base/3.6.1.v201109091335/base-3.6.1.v201109091335.pom.sha1
new file mode 100644
index 0000000..211cda2
--- /dev/null
+++ b/repository/org/eclipse/help/base/3.6.1.v201109091335/base-3.6.1.v201109091335.pom.sha1
@@ -0,0 +1 @@
+651609c224e60421449bf5ed477cbcd1a8cb5963
\ No newline at end of file
diff --git a/repository/org/eclipse/help/base/maven-metadata.xml b/repository/org/eclipse/help/base/maven-metadata.xml
index ebf1643..16bae78 100644
--- a/repository/org/eclipse/help/base/maven-metadata.xml
+++ b/repository/org/eclipse/help/base/maven-metadata.xml
@@ -3,7 +3,7 @@
<groupId>org.eclipse.help</groupId>
<artifactId>base</artifactId>
<versioning>
- <release>3.6.0.v201106131736</release>
+ <release>3.6.1.v201109091335</release>
<versions>
<version>3.5.2.v201009090800</version>
<version>3.3.1.v20070813_33x</version>
@@ -12,7 +12,8 @@
<version>3.4.0.v200906111540</version>
<version>3.4.0.v201002111343</version>
<version>3.6.0.v201106131736</version>
+ <version>3.6.1.v201109091335</version>
</versions>
- <lastUpdated>20110718113201</lastUpdated>
+ <lastUpdated>20111206110534</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/help/base/maven-metadata.xml.md5 b/repository/org/eclipse/help/base/maven-metadata.xml.md5
index 9215115..ffa3e8c 100644
--- a/repository/org/eclipse/help/base/maven-metadata.xml.md5
+++ b/repository/org/eclipse/help/base/maven-metadata.xml.md5
@@ -1 +1 @@
-dff1f346361e4d7e7eae5e2c40bb97c7
\ No newline at end of file
+59b5211065cf2e2af04cc7d89d2f596e
\ No newline at end of file
diff --git a/repository/org/eclipse/help/base/maven-metadata.xml.sha1 b/repository/org/eclipse/help/base/maven-metadata.xml.sha1
index 1443b6d..f37ede7 100644
--- a/repository/org/eclipse/help/base/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/help/base/maven-metadata.xml.sha1
@@ -1 +1 @@
-eef7070ae887dc2ef5d8bb51c0791e454013923a
\ No newline at end of file
+b715edcb4c524f4f7df54497c22ff829950991e9
\ No newline at end of file
diff --git a/repository/org/eclipse/help/ui/3.5.100.v20110425/ui-3.5.100.v20110425.jar.md5 b/repository/org/eclipse/help/ui/3.5.100.v20110425/ui-3.5.100.v20110425.jar.md5
deleted file mode 100644
index 543f852..0000000
--- a/repository/org/eclipse/help/ui/3.5.100.v20110425/ui-3.5.100.v20110425.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-0d259ac5fc2c1bca40b42326f6aa7e52
\ No newline at end of file
diff --git a/repository/org/eclipse/help/ui/3.5.100.v20110425/ui-3.5.100.v20110425.jar.sha1 b/repository/org/eclipse/help/ui/3.5.100.v20110425/ui-3.5.100.v20110425.jar.sha1
deleted file mode 100644
index 1c5a946..0000000
--- a/repository/org/eclipse/help/ui/3.5.100.v20110425/ui-3.5.100.v20110425.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9e96e97b6a4812c6a476400bdd9803a8c2abacfd
\ No newline at end of file
diff --git a/repository/org/eclipse/help/ui/3.5.100.v20110425/ui-3.5.100.v20110425.pom.md5 b/repository/org/eclipse/help/ui/3.5.100.v20110425/ui-3.5.100.v20110425.pom.md5
deleted file mode 100644
index dfbd09a..0000000
--- a/repository/org/eclipse/help/ui/3.5.100.v20110425/ui-3.5.100.v20110425.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-222f8165830e7b7a9275281cc2ca4296
\ No newline at end of file
diff --git a/repository/org/eclipse/help/ui/3.5.100.v20110425/ui-3.5.100.v20110425.pom.sha1 b/repository/org/eclipse/help/ui/3.5.100.v20110425/ui-3.5.100.v20110425.pom.sha1
deleted file mode 100644
index 5cbd274..0000000
--- a/repository/org/eclipse/help/ui/3.5.100.v20110425/ui-3.5.100.v20110425.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bdc0f5fd5d0e84674a161a8f7c7c08e8d3ffe874
\ No newline at end of file
diff --git a/repository/org/eclipse/help/ui/3.5.100.v20110425/ui-3.5.100.v20110425.jar b/repository/org/eclipse/help/ui/3.5.101.r37_20110819/ui-3.5.101.r37_20110819.jar
similarity index 77%
rename from repository/org/eclipse/help/ui/3.5.100.v20110425/ui-3.5.100.v20110425.jar
rename to repository/org/eclipse/help/ui/3.5.101.r37_20110819/ui-3.5.101.r37_20110819.jar
index 69ac966..9946dfd 100644
--- a/repository/org/eclipse/help/ui/3.5.100.v20110425/ui-3.5.100.v20110425.jar
+++ b/repository/org/eclipse/help/ui/3.5.101.r37_20110819/ui-3.5.101.r37_20110819.jar
Binary files differ
diff --git a/repository/org/eclipse/help/ui/3.5.101.r37_20110819/ui-3.5.101.r37_20110819.jar.md5 b/repository/org/eclipse/help/ui/3.5.101.r37_20110819/ui-3.5.101.r37_20110819.jar.md5
new file mode 100644
index 0000000..0fd05d4
--- /dev/null
+++ b/repository/org/eclipse/help/ui/3.5.101.r37_20110819/ui-3.5.101.r37_20110819.jar.md5
@@ -0,0 +1 @@
+053a721eae3f3e23566263ab924ea5c0
\ No newline at end of file
diff --git a/repository/org/eclipse/help/ui/3.5.101.r37_20110819/ui-3.5.101.r37_20110819.jar.sha1 b/repository/org/eclipse/help/ui/3.5.101.r37_20110819/ui-3.5.101.r37_20110819.jar.sha1
new file mode 100644
index 0000000..4e55db5
--- /dev/null
+++ b/repository/org/eclipse/help/ui/3.5.101.r37_20110819/ui-3.5.101.r37_20110819.jar.sha1
@@ -0,0 +1 @@
+594e6cd6c431e09ad2845ccee493814ba30151c5
\ No newline at end of file
diff --git a/repository/org/eclipse/help/ui/3.5.100.v20110425/ui-3.5.100.v20110425.pom b/repository/org/eclipse/help/ui/3.5.101.r37_20110819/ui-3.5.101.r37_20110819.pom
similarity index 89%
rename from repository/org/eclipse/help/ui/3.5.100.v20110425/ui-3.5.100.v20110425.pom
rename to repository/org/eclipse/help/ui/3.5.101.r37_20110819/ui-3.5.101.r37_20110819.pom
index c3d0eba..2c0ae6e 100644
--- a/repository/org/eclipse/help/ui/3.5.100.v20110425/ui-3.5.100.v20110425.pom
+++ b/repository/org/eclipse/help/ui/3.5.101.r37_20110819/ui-3.5.101.r37_20110819.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.help</groupId>
<artifactId>ui</artifactId>
- <version>3.5.100.v20110425</version>
+ <version>3.5.101.r37_20110819</version>
</project>
diff --git a/repository/org/eclipse/help/ui/3.5.101.r37_20110819/ui-3.5.101.r37_20110819.pom.md5 b/repository/org/eclipse/help/ui/3.5.101.r37_20110819/ui-3.5.101.r37_20110819.pom.md5
new file mode 100644
index 0000000..aa3e233
--- /dev/null
+++ b/repository/org/eclipse/help/ui/3.5.101.r37_20110819/ui-3.5.101.r37_20110819.pom.md5
@@ -0,0 +1 @@
+a85f052a41d4802e14eeb7cd209f921f
\ No newline at end of file
diff --git a/repository/org/eclipse/help/ui/3.5.101.r37_20110819/ui-3.5.101.r37_20110819.pom.sha1 b/repository/org/eclipse/help/ui/3.5.101.r37_20110819/ui-3.5.101.r37_20110819.pom.sha1
new file mode 100644
index 0000000..63d2aa7
--- /dev/null
+++ b/repository/org/eclipse/help/ui/3.5.101.r37_20110819/ui-3.5.101.r37_20110819.pom.sha1
@@ -0,0 +1 @@
+e383f5d003b457ec0798b6ea4c42ec2973e7547f
\ No newline at end of file
diff --git a/repository/org/eclipse/help/ui/maven-metadata.xml b/repository/org/eclipse/help/ui/maven-metadata.xml
index 36dcb2f..9e33c57 100644
--- a/repository/org/eclipse/help/ui/maven-metadata.xml
+++ b/repository/org/eclipse/help/ui/maven-metadata.xml
@@ -3,7 +3,7 @@
<groupId>org.eclipse.help</groupId>
<artifactId>ui</artifactId>
<versioning>
- <release>3.5.100.v20110425</release>
+ <release>3.5.101.r37_20110819</release>
<versions>
<version>3.5.2.r36_v20100702</version>
<version>3.3.2.v20071126_33x</version>
@@ -12,7 +12,8 @@
<version>3.4.0.v20090528</version>
<version>3.4.1.v20090819_35x</version>
<version>3.5.100.v20110425</version>
+ <version>3.5.101.r37_20110819</version>
</versions>
- <lastUpdated>20110718113213</lastUpdated>
+ <lastUpdated>20111206110539</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/help/ui/maven-metadata.xml.md5 b/repository/org/eclipse/help/ui/maven-metadata.xml.md5
index cb24049..6c27937 100644
--- a/repository/org/eclipse/help/ui/maven-metadata.xml.md5
+++ b/repository/org/eclipse/help/ui/maven-metadata.xml.md5
@@ -1 +1 @@
-c7a97cbae6ac4e9944100cb16d7de8fc
\ No newline at end of file
+55d2dbf11da22699468ee7e55f4da5ba
\ No newline at end of file
diff --git a/repository/org/eclipse/help/ui/maven-metadata.xml.sha1 b/repository/org/eclipse/help/ui/maven-metadata.xml.sha1
index db594b2..d0ac913 100644
--- a/repository/org/eclipse/help/ui/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/help/ui/maven-metadata.xml.sha1
@@ -1 +1 @@
-80caeee36ba92422b9b4552204eb51843c5d32f0
\ No newline at end of file
+081c8279f3cc996ad2f1ca014c54dc873322c2c6
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/core/3.7.0.v_B61/core-3.7.0.v_B61.jar b/repository/org/eclipse/jdt/core/3.7.0.v_B61/core-3.7.0.v_B61.jar
deleted file mode 100644
index 95cabdb..0000000
--- a/repository/org/eclipse/jdt/core/3.7.0.v_B61/core-3.7.0.v_B61.jar
+++ /dev/null
Binary files differ
diff --git a/repository/org/eclipse/jdt/core/3.7.0.v_B61/core-3.7.0.v_B61.jar.md5 b/repository/org/eclipse/jdt/core/3.7.0.v_B61/core-3.7.0.v_B61.jar.md5
deleted file mode 100644
index 4c64a07..0000000
--- a/repository/org/eclipse/jdt/core/3.7.0.v_B61/core-3.7.0.v_B61.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-b8cc8b7c97a393fae70adfea20f1c8e0
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/core/3.7.0.v_B61/core-3.7.0.v_B61.jar.sha1 b/repository/org/eclipse/jdt/core/3.7.0.v_B61/core-3.7.0.v_B61.jar.sha1
deleted file mode 100644
index 6b18cae..0000000
--- a/repository/org/eclipse/jdt/core/3.7.0.v_B61/core-3.7.0.v_B61.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9b1e66ee768b4e422cc3bb2d1c84320d7d116575
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/core/3.7.0.v_B61/core-3.7.0.v_B61.pom.md5 b/repository/org/eclipse/jdt/core/3.7.0.v_B61/core-3.7.0.v_B61.pom.md5
deleted file mode 100644
index f8f798a..0000000
--- a/repository/org/eclipse/jdt/core/3.7.0.v_B61/core-3.7.0.v_B61.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-9eaca7db205b4af1198c770a3b5d1f23
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/core/3.7.0.v_B61/core-3.7.0.v_B61.pom.sha1 b/repository/org/eclipse/jdt/core/3.7.0.v_B61/core-3.7.0.v_B61.pom.sha1
deleted file mode 100644
index 6f5f3aa..0000000
--- a/repository/org/eclipse/jdt/core/3.7.0.v_B61/core-3.7.0.v_B61.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5dcebd4bdb7aa1ca07a3b524439202f212811712
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/core/3.7.1.v_B76_R37x/core-3.7.1.v_B76_R37x.jar b/repository/org/eclipse/jdt/core/3.7.1.v_B76_R37x/core-3.7.1.v_B76_R37x.jar
new file mode 100644
index 0000000..2beb9e9
--- /dev/null
+++ b/repository/org/eclipse/jdt/core/3.7.1.v_B76_R37x/core-3.7.1.v_B76_R37x.jar
Binary files differ
diff --git a/repository/org/eclipse/jdt/core/3.7.1.v_B76_R37x/core-3.7.1.v_B76_R37x.jar.md5 b/repository/org/eclipse/jdt/core/3.7.1.v_B76_R37x/core-3.7.1.v_B76_R37x.jar.md5
new file mode 100644
index 0000000..8786210
--- /dev/null
+++ b/repository/org/eclipse/jdt/core/3.7.1.v_B76_R37x/core-3.7.1.v_B76_R37x.jar.md5
@@ -0,0 +1 @@
+7e414469cec096cf93272ab2528c840e
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/core/3.7.1.v_B76_R37x/core-3.7.1.v_B76_R37x.jar.sha1 b/repository/org/eclipse/jdt/core/3.7.1.v_B76_R37x/core-3.7.1.v_B76_R37x.jar.sha1
new file mode 100644
index 0000000..a3bbf84
--- /dev/null
+++ b/repository/org/eclipse/jdt/core/3.7.1.v_B76_R37x/core-3.7.1.v_B76_R37x.jar.sha1
@@ -0,0 +1 @@
+5b8c16187a8cdf21b34cce0dd1b11820d8b273f7
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/core/3.7.0.v_B61/core-3.7.0.v_B61.pom b/repository/org/eclipse/jdt/core/3.7.1.v_B76_R37x/core-3.7.1.v_B76_R37x.pom
similarity index 89%
rename from repository/org/eclipse/jdt/core/3.7.0.v_B61/core-3.7.0.v_B61.pom
rename to repository/org/eclipse/jdt/core/3.7.1.v_B76_R37x/core-3.7.1.v_B76_R37x.pom
index 6fed6fc..bb510e1 100644
--- a/repository/org/eclipse/jdt/core/3.7.0.v_B61/core-3.7.0.v_B61.pom
+++ b/repository/org/eclipse/jdt/core/3.7.1.v_B76_R37x/core-3.7.1.v_B76_R37x.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jdt</groupId>
<artifactId>core</artifactId>
- <version>3.7.0.v_B61</version>
+ <version>3.7.1.v_B76_R37x</version>
</project>
diff --git a/repository/org/eclipse/jdt/core/3.7.1.v_B76_R37x/core-3.7.1.v_B76_R37x.pom.md5 b/repository/org/eclipse/jdt/core/3.7.1.v_B76_R37x/core-3.7.1.v_B76_R37x.pom.md5
new file mode 100644
index 0000000..9d44e8e
--- /dev/null
+++ b/repository/org/eclipse/jdt/core/3.7.1.v_B76_R37x/core-3.7.1.v_B76_R37x.pom.md5
@@ -0,0 +1 @@
+c15d35236916da93b12b9f59888cf734
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/core/3.7.1.v_B76_R37x/core-3.7.1.v_B76_R37x.pom.sha1 b/repository/org/eclipse/jdt/core/3.7.1.v_B76_R37x/core-3.7.1.v_B76_R37x.pom.sha1
new file mode 100644
index 0000000..d7c7200
--- /dev/null
+++ b/repository/org/eclipse/jdt/core/3.7.1.v_B76_R37x/core-3.7.1.v_B76_R37x.pom.sha1
@@ -0,0 +1 @@
+8206c3ef2596f70cef07d2ec93acee35495478bc
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/core/maven-metadata.xml b/repository/org/eclipse/jdt/core/maven-metadata.xml
index b811f52..023bdef 100644
--- a/repository/org/eclipse/jdt/core/maven-metadata.xml
+++ b/repository/org/eclipse/jdt/core/maven-metadata.xml
@@ -3,7 +3,7 @@
<groupId>org.eclipse.jdt</groupId>
<artifactId>core</artifactId>
<versioning>
- <release>3.7.0.v_B61</release>
+ <release>3.7.1.v_B76_R37x</release>
<versions>
<version>3.6.1.v_A68_R36x</version>
<version>3.3.3.v_793_R33x</version>
@@ -12,7 +12,8 @@
<version>3.5.0.v_963</version>
<version>3.5.2.v_981_R35x</version>
<version>3.7.0.v_B61</version>
+ <version>3.7.1.v_B76_R37x</version>
</versions>
- <lastUpdated>20110718113314</lastUpdated>
+ <lastUpdated>20111206110544</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/jdt/core/maven-metadata.xml.md5 b/repository/org/eclipse/jdt/core/maven-metadata.xml.md5
index 0b7c7ab..df904fe 100644
--- a/repository/org/eclipse/jdt/core/maven-metadata.xml.md5
+++ b/repository/org/eclipse/jdt/core/maven-metadata.xml.md5
@@ -1 +1 @@
-2328eb6c08ab74f7123332c5b3e92b5f
\ No newline at end of file
+9a69fc60a37edeeec06c1d7e162aa25e
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/core/maven-metadata.xml.sha1 b/repository/org/eclipse/jdt/core/maven-metadata.xml.sha1
index fd68912..64bc112 100644
--- a/repository/org/eclipse/jdt/core/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/jdt/core/maven-metadata.xml.sha1
@@ -1 +1 @@
-5cbefaf87c53069565207bf7b3e1597cb7631de0
\ No newline at end of file
+8958617e139bfe93251d7c760436be13b454fd5c
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/debug/3.7.0.v20110509/debug-3.7.0.v20110509.pom.md5 b/repository/org/eclipse/jdt/debug/3.7.0.v20110509/debug-3.7.0.v20110509.pom.md5
deleted file mode 100644
index 4788640..0000000
--- a/repository/org/eclipse/jdt/debug/3.7.0.v20110509/debug-3.7.0.v20110509.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-940a863c3a498d0c1c5ccaa3ae1529a1
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/debug/3.7.0.v20110509/debug-3.7.0.v20110509.pom.sha1 b/repository/org/eclipse/jdt/debug/3.7.0.v20110509/debug-3.7.0.v20110509.pom.sha1
deleted file mode 100644
index f85c4e7..0000000
--- a/repository/org/eclipse/jdt/debug/3.7.0.v20110509/debug-3.7.0.v20110509.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-887ad8f7e8b01864e72f3a07928b20392c615630
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/debug/3.7.0.v20110509/debug-3.7.0.v20110509.zip b/repository/org/eclipse/jdt/debug/3.7.0.v20110509/debug-3.7.0.v20110509.zip
deleted file mode 100644
index a9706a5..0000000
--- a/repository/org/eclipse/jdt/debug/3.7.0.v20110509/debug-3.7.0.v20110509.zip
+++ /dev/null
Binary files differ
diff --git a/repository/org/eclipse/jdt/debug/3.7.0.v20110509/debug-3.7.0.v20110509.zip.md5 b/repository/org/eclipse/jdt/debug/3.7.0.v20110509/debug-3.7.0.v20110509.zip.md5
deleted file mode 100644
index 39fcfcf..0000000
--- a/repository/org/eclipse/jdt/debug/3.7.0.v20110509/debug-3.7.0.v20110509.zip.md5
+++ /dev/null
@@ -1 +0,0 @@
-63d7e4ad584d26290dc847470a083f06
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/debug/3.7.0.v20110509/debug-3.7.0.v20110509.zip.sha1 b/repository/org/eclipse/jdt/debug/3.7.0.v20110509/debug-3.7.0.v20110509.zip.sha1
deleted file mode 100644
index 52ca9fd..0000000
--- a/repository/org/eclipse/jdt/debug/3.7.0.v20110509/debug-3.7.0.v20110509.zip.sha1
+++ /dev/null
@@ -1 +0,0 @@
-780de4157f3ec48de877214319f83006a9eed8aa
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/debug/3.7.0.v20110509/debug-3.7.0.v20110509.pom b/repository/org/eclipse/jdt/debug/3.7.1.v20110802_r371/debug-3.7.1.v20110802_r371.pom
similarity index 89%
rename from repository/org/eclipse/jdt/debug/3.7.0.v20110509/debug-3.7.0.v20110509.pom
rename to repository/org/eclipse/jdt/debug/3.7.1.v20110802_r371/debug-3.7.1.v20110802_r371.pom
index 4c6d46a..cc21db1 100644
--- a/repository/org/eclipse/jdt/debug/3.7.0.v20110509/debug-3.7.0.v20110509.pom
+++ b/repository/org/eclipse/jdt/debug/3.7.1.v20110802_r371/debug-3.7.1.v20110802_r371.pom
@@ -4,6 +4,6 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jdt</groupId>
<artifactId>debug</artifactId>
- <version>3.7.0.v20110509</version>
+ <version>3.7.1.v20110802_r371</version>
<packaging>zip</packaging>
</project>
diff --git a/repository/org/eclipse/jdt/debug/3.7.1.v20110802_r371/debug-3.7.1.v20110802_r371.pom.md5 b/repository/org/eclipse/jdt/debug/3.7.1.v20110802_r371/debug-3.7.1.v20110802_r371.pom.md5
new file mode 100644
index 0000000..ad8d3fd
--- /dev/null
+++ b/repository/org/eclipse/jdt/debug/3.7.1.v20110802_r371/debug-3.7.1.v20110802_r371.pom.md5
@@ -0,0 +1 @@
+e837a2644a35f24e9e0c98c837d76f13
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/debug/3.7.1.v20110802_r371/debug-3.7.1.v20110802_r371.pom.sha1 b/repository/org/eclipse/jdt/debug/3.7.1.v20110802_r371/debug-3.7.1.v20110802_r371.pom.sha1
new file mode 100644
index 0000000..94047cf
--- /dev/null
+++ b/repository/org/eclipse/jdt/debug/3.7.1.v20110802_r371/debug-3.7.1.v20110802_r371.pom.sha1
@@ -0,0 +1 @@
+b379c53bff964ac0a4bdce7ce433ef17c5774c5e
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/debug/3.7.1.v20110802_r371/debug-3.7.1.v20110802_r371.zip b/repository/org/eclipse/jdt/debug/3.7.1.v20110802_r371/debug-3.7.1.v20110802_r371.zip
new file mode 100644
index 0000000..75f5160
--- /dev/null
+++ b/repository/org/eclipse/jdt/debug/3.7.1.v20110802_r371/debug-3.7.1.v20110802_r371.zip
Binary files differ
diff --git a/repository/org/eclipse/jdt/debug/3.7.1.v20110802_r371/debug-3.7.1.v20110802_r371.zip.md5 b/repository/org/eclipse/jdt/debug/3.7.1.v20110802_r371/debug-3.7.1.v20110802_r371.zip.md5
new file mode 100644
index 0000000..a72a26f
--- /dev/null
+++ b/repository/org/eclipse/jdt/debug/3.7.1.v20110802_r371/debug-3.7.1.v20110802_r371.zip.md5
@@ -0,0 +1 @@
+1969d16a632d2523ba8cdf55432d8801
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/debug/3.7.1.v20110802_r371/debug-3.7.1.v20110802_r371.zip.sha1 b/repository/org/eclipse/jdt/debug/3.7.1.v20110802_r371/debug-3.7.1.v20110802_r371.zip.sha1
new file mode 100644
index 0000000..c9eb335
--- /dev/null
+++ b/repository/org/eclipse/jdt/debug/3.7.1.v20110802_r371/debug-3.7.1.v20110802_r371.zip.sha1
@@ -0,0 +1 @@
+6f62db457ed5951a590b95baf182eb5481c8c78b
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/debug/maven-metadata.xml b/repository/org/eclipse/jdt/debug/maven-metadata.xml
index bd85e9d..f33a49a 100644
--- a/repository/org/eclipse/jdt/debug/maven-metadata.xml
+++ b/repository/org/eclipse/jdt/debug/maven-metadata.xml
@@ -3,7 +3,7 @@
<groupId>org.eclipse.jdt</groupId>
<artifactId>debug</artifactId>
<versioning>
- <release>3.7.0.v20110509</release>
+ <release>3.7.1.v20110802_r371</release>
<versions>
<version>3.6.1.v20100715_r361</version>
<version>3.3.1.v20070719_r331</version>
@@ -11,7 +11,8 @@
<version>3.4.1.v20081216_r342</version>
<version>3.5.0.v20090526</version>
<version>3.7.0.v20110509</version>
+ <version>3.7.1.v20110802_r371</version>
</versions>
- <lastUpdated>20110718113327</lastUpdated>
+ <lastUpdated>20111206110550</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/jdt/debug/maven-metadata.xml.md5 b/repository/org/eclipse/jdt/debug/maven-metadata.xml.md5
index afcf330..0245832 100644
--- a/repository/org/eclipse/jdt/debug/maven-metadata.xml.md5
+++ b/repository/org/eclipse/jdt/debug/maven-metadata.xml.md5
@@ -1 +1 @@
-9a7061fd803f6e5a165036a53b3bcc43
\ No newline at end of file
+30c343519d70545ef2b80b6a2c6c5001
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/debug/maven-metadata.xml.sha1 b/repository/org/eclipse/jdt/debug/maven-metadata.xml.sha1
index 24629f9..8857ebe 100644
--- a/repository/org/eclipse/jdt/debug/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/jdt/debug/maven-metadata.xml.sha1
@@ -1 +1 @@
-475276dd1389c9f6d68f08db32fbbda3a963d49f
\ No newline at end of file
+31e9f127d7e5ff97ca3d2036a7ec0687e6ed176c
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/debug/ui/3.6.0.v20110512-studio/ui-3.6.0.v20110512-studio.jar.md5 b/repository/org/eclipse/jdt/debug/ui/3.6.0.v20110512-studio/ui-3.6.0.v20110512-studio.jar.md5
deleted file mode 100644
index bd22394..0000000
--- a/repository/org/eclipse/jdt/debug/ui/3.6.0.v20110512-studio/ui-3.6.0.v20110512-studio.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-9bffc527f6848f90dfc68a76a328b70d
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/debug/ui/3.6.0.v20110512-studio/ui-3.6.0.v20110512-studio.jar.sha1 b/repository/org/eclipse/jdt/debug/ui/3.6.0.v20110512-studio/ui-3.6.0.v20110512-studio.jar.sha1
deleted file mode 100644
index 7699112..0000000
--- a/repository/org/eclipse/jdt/debug/ui/3.6.0.v20110512-studio/ui-3.6.0.v20110512-studio.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9ae64cd44e7ef315defb9c8ac6cdb0c2adfe3583
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/debug/ui/3.6.0.v20110512-studio/ui-3.6.0.v20110512-studio.pom.md5 b/repository/org/eclipse/jdt/debug/ui/3.6.0.v20110512-studio/ui-3.6.0.v20110512-studio.pom.md5
deleted file mode 100644
index e7b6fc0..0000000
--- a/repository/org/eclipse/jdt/debug/ui/3.6.0.v20110512-studio/ui-3.6.0.v20110512-studio.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-9f557e1fda6d66a788a847010f001a79
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/debug/ui/3.6.0.v20110512-studio/ui-3.6.0.v20110512-studio.pom.sha1 b/repository/org/eclipse/jdt/debug/ui/3.6.0.v20110512-studio/ui-3.6.0.v20110512-studio.pom.sha1
deleted file mode 100644
index 381e669..0000000
--- a/repository/org/eclipse/jdt/debug/ui/3.6.0.v20110512-studio/ui-3.6.0.v20110512-studio.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e297538c79b090f8ade4fec671ae6c48f012dbc0
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/debug/ui/3.6.0.v20110512-studio/ui-3.6.0.v20110512-studio.jar b/repository/org/eclipse/jdt/debug/ui/3.6.1.v20110803_r371-studio/ui-3.6.1.v20110803_r371-studio.jar
similarity index 81%
rename from repository/org/eclipse/jdt/debug/ui/3.6.0.v20110512-studio/ui-3.6.0.v20110512-studio.jar
rename to repository/org/eclipse/jdt/debug/ui/3.6.1.v20110803_r371-studio/ui-3.6.1.v20110803_r371-studio.jar
index c37d0ee..7e4846a 100644
--- a/repository/org/eclipse/jdt/debug/ui/3.6.0.v20110512-studio/ui-3.6.0.v20110512-studio.jar
+++ b/repository/org/eclipse/jdt/debug/ui/3.6.1.v20110803_r371-studio/ui-3.6.1.v20110803_r371-studio.jar
Binary files differ
diff --git a/repository/org/eclipse/jdt/debug/ui/3.6.1.v20110803_r371-studio/ui-3.6.1.v20110803_r371-studio.jar.md5 b/repository/org/eclipse/jdt/debug/ui/3.6.1.v20110803_r371-studio/ui-3.6.1.v20110803_r371-studio.jar.md5
new file mode 100644
index 0000000..e17b7f9
--- /dev/null
+++ b/repository/org/eclipse/jdt/debug/ui/3.6.1.v20110803_r371-studio/ui-3.6.1.v20110803_r371-studio.jar.md5
@@ -0,0 +1 @@
+76500ad18908e0119a7f5e732a97c48f
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/debug/ui/3.6.1.v20110803_r371-studio/ui-3.6.1.v20110803_r371-studio.jar.sha1 b/repository/org/eclipse/jdt/debug/ui/3.6.1.v20110803_r371-studio/ui-3.6.1.v20110803_r371-studio.jar.sha1
new file mode 100644
index 0000000..477bc23
--- /dev/null
+++ b/repository/org/eclipse/jdt/debug/ui/3.6.1.v20110803_r371-studio/ui-3.6.1.v20110803_r371-studio.jar.sha1
@@ -0,0 +1 @@
+825318ff5529d19ee4f7a1a90316a7bf91036ea7
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/debug/ui/3.6.0.v20110512-studio/ui-3.6.0.v20110512-studio.pom b/repository/org/eclipse/jdt/debug/ui/3.6.1.v20110803_r371-studio/ui-3.6.1.v20110803_r371-studio.pom
similarity index 87%
rename from repository/org/eclipse/jdt/debug/ui/3.6.0.v20110512-studio/ui-3.6.0.v20110512-studio.pom
rename to repository/org/eclipse/jdt/debug/ui/3.6.1.v20110803_r371-studio/ui-3.6.1.v20110803_r371-studio.pom
index 0f5d02e..6300b51 100644
--- a/repository/org/eclipse/jdt/debug/ui/3.6.0.v20110512-studio/ui-3.6.0.v20110512-studio.pom
+++ b/repository/org/eclipse/jdt/debug/ui/3.6.1.v20110803_r371-studio/ui-3.6.1.v20110803_r371-studio.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jdt.debug</groupId>
<artifactId>ui</artifactId>
- <version>3.6.0.v20110512-studio</version>
+ <version>3.6.1.v20110803_r371-studio</version>
</project>
diff --git a/repository/org/eclipse/jdt/debug/ui/3.6.1.v20110803_r371-studio/ui-3.6.1.v20110803_r371-studio.pom.md5 b/repository/org/eclipse/jdt/debug/ui/3.6.1.v20110803_r371-studio/ui-3.6.1.v20110803_r371-studio.pom.md5
new file mode 100644
index 0000000..2febf6a
--- /dev/null
+++ b/repository/org/eclipse/jdt/debug/ui/3.6.1.v20110803_r371-studio/ui-3.6.1.v20110803_r371-studio.pom.md5
@@ -0,0 +1 @@
+9d848a80f4307211bbc5eb96c4bb3e29
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/debug/ui/3.6.1.v20110803_r371-studio/ui-3.6.1.v20110803_r371-studio.pom.sha1 b/repository/org/eclipse/jdt/debug/ui/3.6.1.v20110803_r371-studio/ui-3.6.1.v20110803_r371-studio.pom.sha1
new file mode 100644
index 0000000..d965728
--- /dev/null
+++ b/repository/org/eclipse/jdt/debug/ui/3.6.1.v20110803_r371-studio/ui-3.6.1.v20110803_r371-studio.pom.sha1
@@ -0,0 +1 @@
+1757dbbfa2b0fc82cfc9fc7d9467b550f465c4a5
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/debug/ui/maven-metadata.xml b/repository/org/eclipse/jdt/debug/ui/maven-metadata.xml
index ba6f5e3..b639177 100644
--- a/repository/org/eclipse/jdt/debug/ui/maven-metadata.xml
+++ b/repository/org/eclipse/jdt/debug/ui/maven-metadata.xml
@@ -3,7 +3,7 @@
<groupId>org.eclipse.jdt.debug</groupId>
<artifactId>ui</artifactId>
<versioning>
- <release>3.6.0.v20110512-studio</release>
+ <release>3.6.1.v20110803_r371-studio</release>
<versions>
<version>3.5.0.v20100602-0830-studio</version>
<version>3.5.0.v20100602-0830</version>
@@ -17,7 +17,8 @@
<version>3.4.1.v20090811_r351-studio</version>
<version>3.6.0.v20110512</version>
<version>3.6.0.v20110512-studio</version>
+ <version>3.6.1.v20110803_r371-studio</version>
</versions>
- <lastUpdated>20110719135558</lastUpdated>
+ <lastUpdated>20111206131928</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/jdt/debug/ui/maven-metadata.xml.md5 b/repository/org/eclipse/jdt/debug/ui/maven-metadata.xml.md5
index 00e725d..0052b13 100644
--- a/repository/org/eclipse/jdt/debug/ui/maven-metadata.xml.md5
+++ b/repository/org/eclipse/jdt/debug/ui/maven-metadata.xml.md5
@@ -1 +1 @@
-d95af928eaa8994c7692715dd5512793
\ No newline at end of file
+cc82adad235025d8dfeb482ebae1922d
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/debug/ui/maven-metadata.xml.sha1 b/repository/org/eclipse/jdt/debug/ui/maven-metadata.xml.sha1
index 90b849c..bb359bb 100644
--- a/repository/org/eclipse/jdt/debug/ui/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/jdt/debug/ui/maven-metadata.xml.sha1
@@ -1 +1 @@
-3de9d8321e9659f4f96176c4cd4276e86a4719e0
\ No newline at end of file
+17a019972e1947a71c9b890636971b7e2c5e1e6a
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/launching/3.6.0.v20110509/launching-3.6.0.v20110509.jar.md5 b/repository/org/eclipse/jdt/launching/3.6.0.v20110509/launching-3.6.0.v20110509.jar.md5
deleted file mode 100644
index 5870aa3..0000000
--- a/repository/org/eclipse/jdt/launching/3.6.0.v20110509/launching-3.6.0.v20110509.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-f17408f262b3d21adaa49687dd63fbac
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/launching/3.6.0.v20110509/launching-3.6.0.v20110509.jar.sha1 b/repository/org/eclipse/jdt/launching/3.6.0.v20110509/launching-3.6.0.v20110509.jar.sha1
deleted file mode 100644
index 7916260..0000000
--- a/repository/org/eclipse/jdt/launching/3.6.0.v20110509/launching-3.6.0.v20110509.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-be57926a81888fbfa03833b81b97ed7160482eb5
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/launching/3.6.0.v20110509/launching-3.6.0.v20110509.pom.md5 b/repository/org/eclipse/jdt/launching/3.6.0.v20110509/launching-3.6.0.v20110509.pom.md5
deleted file mode 100644
index b83c824..0000000
--- a/repository/org/eclipse/jdt/launching/3.6.0.v20110509/launching-3.6.0.v20110509.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-58d1d8fc558603863224114815dcf115
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/launching/3.6.0.v20110509/launching-3.6.0.v20110509.pom.sha1 b/repository/org/eclipse/jdt/launching/3.6.0.v20110509/launching-3.6.0.v20110509.pom.sha1
deleted file mode 100644
index c04b115..0000000
--- a/repository/org/eclipse/jdt/launching/3.6.0.v20110509/launching-3.6.0.v20110509.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e4f71ad4fa262ddf6c5cb6dbe3afa4bd1f0d76de
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/launching/3.6.0.v20110509/launching-3.6.0.v20110509.jar b/repository/org/eclipse/jdt/launching/3.6.1.v20110803_r371/launching-3.6.1.v20110803_r371.jar
similarity index 83%
rename from repository/org/eclipse/jdt/launching/3.6.0.v20110509/launching-3.6.0.v20110509.jar
rename to repository/org/eclipse/jdt/launching/3.6.1.v20110803_r371/launching-3.6.1.v20110803_r371.jar
index 789c07e..c5a3c4a 100644
--- a/repository/org/eclipse/jdt/launching/3.6.0.v20110509/launching-3.6.0.v20110509.jar
+++ b/repository/org/eclipse/jdt/launching/3.6.1.v20110803_r371/launching-3.6.1.v20110803_r371.jar
Binary files differ
diff --git a/repository/org/eclipse/jdt/launching/3.6.1.v20110803_r371/launching-3.6.1.v20110803_r371.jar.md5 b/repository/org/eclipse/jdt/launching/3.6.1.v20110803_r371/launching-3.6.1.v20110803_r371.jar.md5
new file mode 100644
index 0000000..7d745ba
--- /dev/null
+++ b/repository/org/eclipse/jdt/launching/3.6.1.v20110803_r371/launching-3.6.1.v20110803_r371.jar.md5
@@ -0,0 +1 @@
+a65d016cc0dc092bdb1cb04fbca57888
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/launching/3.6.1.v20110803_r371/launching-3.6.1.v20110803_r371.jar.sha1 b/repository/org/eclipse/jdt/launching/3.6.1.v20110803_r371/launching-3.6.1.v20110803_r371.jar.sha1
new file mode 100644
index 0000000..134b3b8
--- /dev/null
+++ b/repository/org/eclipse/jdt/launching/3.6.1.v20110803_r371/launching-3.6.1.v20110803_r371.jar.sha1
@@ -0,0 +1 @@
+9b270014c824be686aac38d7f2dd145893515249
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/launching/3.6.0.v20110509/launching-3.6.0.v20110509.pom b/repository/org/eclipse/jdt/launching/3.6.1.v20110803_r371/launching-3.6.1.v20110803_r371.pom
similarity index 89%
rename from repository/org/eclipse/jdt/launching/3.6.0.v20110509/launching-3.6.0.v20110509.pom
rename to repository/org/eclipse/jdt/launching/3.6.1.v20110803_r371/launching-3.6.1.v20110803_r371.pom
index 376ff40..66feb8c 100644
--- a/repository/org/eclipse/jdt/launching/3.6.0.v20110509/launching-3.6.0.v20110509.pom
+++ b/repository/org/eclipse/jdt/launching/3.6.1.v20110803_r371/launching-3.6.1.v20110803_r371.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jdt</groupId>
<artifactId>launching</artifactId>
- <version>3.6.0.v20110509</version>
+ <version>3.6.1.v20110803_r371</version>
</project>
diff --git a/repository/org/eclipse/jdt/launching/3.6.1.v20110803_r371/launching-3.6.1.v20110803_r371.pom.md5 b/repository/org/eclipse/jdt/launching/3.6.1.v20110803_r371/launching-3.6.1.v20110803_r371.pom.md5
new file mode 100644
index 0000000..3c18c22
--- /dev/null
+++ b/repository/org/eclipse/jdt/launching/3.6.1.v20110803_r371/launching-3.6.1.v20110803_r371.pom.md5
@@ -0,0 +1 @@
+19bb13358923167c40b47f1bbedc32ac
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/launching/3.6.1.v20110803_r371/launching-3.6.1.v20110803_r371.pom.sha1 b/repository/org/eclipse/jdt/launching/3.6.1.v20110803_r371/launching-3.6.1.v20110803_r371.pom.sha1
new file mode 100644
index 0000000..c0af862
--- /dev/null
+++ b/repository/org/eclipse/jdt/launching/3.6.1.v20110803_r371/launching-3.6.1.v20110803_r371.pom.sha1
@@ -0,0 +1 @@
+81f1ccbf36113958fea992178bf950bd4386265a
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/launching/maven-metadata.xml b/repository/org/eclipse/jdt/launching/maven-metadata.xml
index 781cbc5..ca45949 100644
--- a/repository/org/eclipse/jdt/launching/maven-metadata.xml
+++ b/repository/org/eclipse/jdt/launching/maven-metadata.xml
@@ -3,7 +3,7 @@
<groupId>org.eclipse.jdt</groupId>
<artifactId>launching</artifactId>
<versioning>
- <release>3.6.0.v20110509</release>
+ <release>3.6.1.v20110803_r371</release>
<versions>
<version>3.5.100.v20100526</version>
<version>3.3.2.v20080115_r332</version>
@@ -12,7 +12,8 @@
<version>3.5.0.v20090527</version>
<version>3.5.1.v20100108_r352</version>
<version>3.6.0.v20110509</version>
+ <version>3.6.1.v20110803_r371</version>
</versions>
- <lastUpdated>20110718113351</lastUpdated>
+ <lastUpdated>20111206110554</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/jdt/launching/maven-metadata.xml.md5 b/repository/org/eclipse/jdt/launching/maven-metadata.xml.md5
index ff3683c..122344e 100644
--- a/repository/org/eclipse/jdt/launching/maven-metadata.xml.md5
+++ b/repository/org/eclipse/jdt/launching/maven-metadata.xml.md5
@@ -1 +1 @@
-cf6c71e3c960fca76ff19c1246d06a37
\ No newline at end of file
+8557df064bd49fccbdd281a6bd2ffceb
\ No newline at end of file
diff --git a/repository/org/eclipse/jdt/launching/maven-metadata.xml.sha1 b/repository/org/eclipse/jdt/launching/maven-metadata.xml.sha1
index 1698a62..54eeb3b 100644
--- a/repository/org/eclipse/jdt/launching/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/jdt/launching/maven-metadata.xml.sha1
@@ -1 +1 @@
-b946015051a24e946265085f85d7a3b4d8e27faa
\ No newline at end of file
+64ff129cedb0035c4455dbecc72cbdfd5ff9882b
\ No newline at end of file
diff --git a/repository/org/eclipse/jface/text/3.7.0.v20110505-0800/text-3.7.0.v20110505-0800.jar.md5 b/repository/org/eclipse/jface/text/3.7.0.v20110505-0800/text-3.7.0.v20110505-0800.jar.md5
deleted file mode 100644
index e50f536..0000000
--- a/repository/org/eclipse/jface/text/3.7.0.v20110505-0800/text-3.7.0.v20110505-0800.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-1ce7a61eda45acf4c7a138b0686e3f55
\ No newline at end of file
diff --git a/repository/org/eclipse/jface/text/3.7.0.v20110505-0800/text-3.7.0.v20110505-0800.jar.sha1 b/repository/org/eclipse/jface/text/3.7.0.v20110505-0800/text-3.7.0.v20110505-0800.jar.sha1
deleted file mode 100644
index 1e31574..0000000
--- a/repository/org/eclipse/jface/text/3.7.0.v20110505-0800/text-3.7.0.v20110505-0800.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e8015e5d5e45c84100f44fad3f5b2395e102b9e4
\ No newline at end of file
diff --git a/repository/org/eclipse/jface/text/3.7.0.v20110505-0800/text-3.7.0.v20110505-0800.pom.md5 b/repository/org/eclipse/jface/text/3.7.0.v20110505-0800/text-3.7.0.v20110505-0800.pom.md5
deleted file mode 100644
index 001f971..0000000
--- a/repository/org/eclipse/jface/text/3.7.0.v20110505-0800/text-3.7.0.v20110505-0800.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-7000400401d6abd6ea67264a1c51f819
\ No newline at end of file
diff --git a/repository/org/eclipse/jface/text/3.7.0.v20110505-0800/text-3.7.0.v20110505-0800.pom.sha1 b/repository/org/eclipse/jface/text/3.7.0.v20110505-0800/text-3.7.0.v20110505-0800.pom.sha1
deleted file mode 100644
index 535110c..0000000
--- a/repository/org/eclipse/jface/text/3.7.0.v20110505-0800/text-3.7.0.v20110505-0800.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2cda57a7dc61d99b0757500eed40effab23f2239
\ No newline at end of file
diff --git a/repository/org/eclipse/jface/text/3.7.0.v20110505-0800/text-3.7.0.v20110505-0800.jar b/repository/org/eclipse/jface/text/3.7.1.r371_v20110825-0800/text-3.7.1.r371_v20110825-0800.jar
similarity index 82%
rename from repository/org/eclipse/jface/text/3.7.0.v20110505-0800/text-3.7.0.v20110505-0800.jar
rename to repository/org/eclipse/jface/text/3.7.1.r371_v20110825-0800/text-3.7.1.r371_v20110825-0800.jar
index 0d0efbb..4dd7e64 100644
--- a/repository/org/eclipse/jface/text/3.7.0.v20110505-0800/text-3.7.0.v20110505-0800.jar
+++ b/repository/org/eclipse/jface/text/3.7.1.r371_v20110825-0800/text-3.7.1.r371_v20110825-0800.jar
Binary files differ
diff --git a/repository/org/eclipse/jface/text/3.7.1.r371_v20110825-0800/text-3.7.1.r371_v20110825-0800.jar.md5 b/repository/org/eclipse/jface/text/3.7.1.r371_v20110825-0800/text-3.7.1.r371_v20110825-0800.jar.md5
new file mode 100644
index 0000000..d677269
--- /dev/null
+++ b/repository/org/eclipse/jface/text/3.7.1.r371_v20110825-0800/text-3.7.1.r371_v20110825-0800.jar.md5
@@ -0,0 +1 @@
+f5053318ad72d2862f92462de0891650
\ No newline at end of file
diff --git a/repository/org/eclipse/jface/text/3.7.1.r371_v20110825-0800/text-3.7.1.r371_v20110825-0800.jar.sha1 b/repository/org/eclipse/jface/text/3.7.1.r371_v20110825-0800/text-3.7.1.r371_v20110825-0800.jar.sha1
new file mode 100644
index 0000000..fbc44f6
--- /dev/null
+++ b/repository/org/eclipse/jface/text/3.7.1.r371_v20110825-0800/text-3.7.1.r371_v20110825-0800.jar.sha1
@@ -0,0 +1 @@
+f66e1bbef4ea064a0f12c7586137879d0b2db74d
\ No newline at end of file
diff --git a/repository/org/eclipse/jface/text/3.7.0.v20110505-0800/text-3.7.0.v20110505-0800.pom b/repository/org/eclipse/jface/text/3.7.1.r371_v20110825-0800/text-3.7.1.r371_v20110825-0800.pom
similarity index 88%
rename from repository/org/eclipse/jface/text/3.7.0.v20110505-0800/text-3.7.0.v20110505-0800.pom
rename to repository/org/eclipse/jface/text/3.7.1.r371_v20110825-0800/text-3.7.1.r371_v20110825-0800.pom
index bd85367..902316b 100644
--- a/repository/org/eclipse/jface/text/3.7.0.v20110505-0800/text-3.7.0.v20110505-0800.pom
+++ b/repository/org/eclipse/jface/text/3.7.1.r371_v20110825-0800/text-3.7.1.r371_v20110825-0800.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jface</groupId>
<artifactId>text</artifactId>
- <version>3.7.0.v20110505-0800</version>
+ <version>3.7.1.r371_v20110825-0800</version>
</project>
diff --git a/repository/org/eclipse/jface/text/3.7.1.r371_v20110825-0800/text-3.7.1.r371_v20110825-0800.pom.md5 b/repository/org/eclipse/jface/text/3.7.1.r371_v20110825-0800/text-3.7.1.r371_v20110825-0800.pom.md5
new file mode 100644
index 0000000..0c632b6
--- /dev/null
+++ b/repository/org/eclipse/jface/text/3.7.1.r371_v20110825-0800/text-3.7.1.r371_v20110825-0800.pom.md5
@@ -0,0 +1 @@
+0f4379cd335d174999653eb026db7eba
\ No newline at end of file
diff --git a/repository/org/eclipse/jface/text/3.7.1.r371_v20110825-0800/text-3.7.1.r371_v20110825-0800.pom.sha1 b/repository/org/eclipse/jface/text/3.7.1.r371_v20110825-0800/text-3.7.1.r371_v20110825-0800.pom.sha1
new file mode 100644
index 0000000..7013230
--- /dev/null
+++ b/repository/org/eclipse/jface/text/3.7.1.r371_v20110825-0800/text-3.7.1.r371_v20110825-0800.pom.sha1
@@ -0,0 +1 @@
+2b61b492a7829789712ca33cbe674ba25e6631cc
\ No newline at end of file
diff --git a/repository/org/eclipse/jface/text/maven-metadata.xml b/repository/org/eclipse/jface/text/maven-metadata.xml
index d776187..2a9aaff 100644
--- a/repository/org/eclipse/jface/text/maven-metadata.xml
+++ b/repository/org/eclipse/jface/text/maven-metadata.xml
@@ -3,7 +3,7 @@
<groupId>org.eclipse.jface</groupId>
<artifactId>text</artifactId>
<versioning>
- <release>3.7.0.v20110505-0800</release>
+ <release>3.7.1.r371_v20110825-0800</release>
<versions>
<version>3.6.1.r361_v20100825-0800</version>
<version>3.3.2.r332_20071017-0800</version>
@@ -12,7 +12,8 @@
<version>3.5.0.v20090602</version>
<version>3.5.2.r352_v20091118-0800</version>
<version>3.7.0.v20110505-0800</version>
+ <version>3.7.1.r371_v20110825-0800</version>
</versions>
- <lastUpdated>20110718113433</lastUpdated>
+ <lastUpdated>20111206110559</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/jface/text/maven-metadata.xml.md5 b/repository/org/eclipse/jface/text/maven-metadata.xml.md5
index 85ddce5..31ea2dd 100644
--- a/repository/org/eclipse/jface/text/maven-metadata.xml.md5
+++ b/repository/org/eclipse/jface/text/maven-metadata.xml.md5
@@ -1 +1 @@
-312050539f51c61cfb3806da4bdb159b
\ No newline at end of file
+54e0c86b9064d7415b82bd1ac0696c77
\ No newline at end of file
diff --git a/repository/org/eclipse/jface/text/maven-metadata.xml.sha1 b/repository/org/eclipse/jface/text/maven-metadata.xml.sha1
index 71ca16f..38dc232 100644
--- a/repository/org/eclipse/jface/text/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/jface/text/maven-metadata.xml.sha1
@@ -1 +1 @@
-2fa562c43e2a333725f06b0eca5b306441c6a4f7
\ No newline at end of file
+d2582c2fce3dc865d327d4fcdf80e9976bd936ee
\ No newline at end of file
diff --git a/repository/org/eclipse/ltk/core/refactoring/3.5.200.v20110505-0800/refactoring-3.5.200.v20110505-0800.jar.md5 b/repository/org/eclipse/ltk/core/refactoring/3.5.200.v20110505-0800/refactoring-3.5.200.v20110505-0800.jar.md5
deleted file mode 100644
index bfe7ac8..0000000
--- a/repository/org/eclipse/ltk/core/refactoring/3.5.200.v20110505-0800/refactoring-3.5.200.v20110505-0800.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-d81c2c718b81d62c14018be584746fe6
\ No newline at end of file
diff --git a/repository/org/eclipse/ltk/core/refactoring/3.5.200.v20110505-0800/refactoring-3.5.200.v20110505-0800.jar.sha1 b/repository/org/eclipse/ltk/core/refactoring/3.5.200.v20110505-0800/refactoring-3.5.200.v20110505-0800.jar.sha1
deleted file mode 100644
index c15b1d3..0000000
--- a/repository/org/eclipse/ltk/core/refactoring/3.5.200.v20110505-0800/refactoring-3.5.200.v20110505-0800.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ed2bda0e155cc36b7160419a6e256caf67fa7b76
\ No newline at end of file
diff --git a/repository/org/eclipse/ltk/core/refactoring/3.5.200.v20110505-0800/refactoring-3.5.200.v20110505-0800.pom.md5 b/repository/org/eclipse/ltk/core/refactoring/3.5.200.v20110505-0800/refactoring-3.5.200.v20110505-0800.pom.md5
deleted file mode 100644
index 4d91dbd..0000000
--- a/repository/org/eclipse/ltk/core/refactoring/3.5.200.v20110505-0800/refactoring-3.5.200.v20110505-0800.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-06d416300f5667d9e0222cd48d6d5a2f
\ No newline at end of file
diff --git a/repository/org/eclipse/ltk/core/refactoring/3.5.200.v20110505-0800/refactoring-3.5.200.v20110505-0800.pom.sha1 b/repository/org/eclipse/ltk/core/refactoring/3.5.200.v20110505-0800/refactoring-3.5.200.v20110505-0800.pom.sha1
deleted file mode 100644
index 661ab42..0000000
--- a/repository/org/eclipse/ltk/core/refactoring/3.5.200.v20110505-0800/refactoring-3.5.200.v20110505-0800.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-aa1cf301025c52246c311320abca8b5d7b34ba43
\ No newline at end of file
diff --git a/repository/org/eclipse/ltk/core/refactoring/3.5.200.v20110505-0800/refactoring-3.5.200.v20110505-0800.jar b/repository/org/eclipse/ltk/core/refactoring/3.5.201.r371_v20110824-0800/refactoring-3.5.201.r371_v20110824-0800.jar
similarity index 81%
rename from repository/org/eclipse/ltk/core/refactoring/3.5.200.v20110505-0800/refactoring-3.5.200.v20110505-0800.jar
rename to repository/org/eclipse/ltk/core/refactoring/3.5.201.r371_v20110824-0800/refactoring-3.5.201.r371_v20110824-0800.jar
index 66de82f..b018124 100644
--- a/repository/org/eclipse/ltk/core/refactoring/3.5.200.v20110505-0800/refactoring-3.5.200.v20110505-0800.jar
+++ b/repository/org/eclipse/ltk/core/refactoring/3.5.201.r371_v20110824-0800/refactoring-3.5.201.r371_v20110824-0800.jar
Binary files differ
diff --git a/repository/org/eclipse/ltk/core/refactoring/3.5.201.r371_v20110824-0800/refactoring-3.5.201.r371_v20110824-0800.jar.md5 b/repository/org/eclipse/ltk/core/refactoring/3.5.201.r371_v20110824-0800/refactoring-3.5.201.r371_v20110824-0800.jar.md5
new file mode 100644
index 0000000..b263e77
--- /dev/null
+++ b/repository/org/eclipse/ltk/core/refactoring/3.5.201.r371_v20110824-0800/refactoring-3.5.201.r371_v20110824-0800.jar.md5
@@ -0,0 +1 @@
+8df39e5c0e214147de7f621bc9026236
\ No newline at end of file
diff --git a/repository/org/eclipse/ltk/core/refactoring/3.5.201.r371_v20110824-0800/refactoring-3.5.201.r371_v20110824-0800.jar.sha1 b/repository/org/eclipse/ltk/core/refactoring/3.5.201.r371_v20110824-0800/refactoring-3.5.201.r371_v20110824-0800.jar.sha1
new file mode 100644
index 0000000..3f8003a
--- /dev/null
+++ b/repository/org/eclipse/ltk/core/refactoring/3.5.201.r371_v20110824-0800/refactoring-3.5.201.r371_v20110824-0800.jar.sha1
@@ -0,0 +1 @@
+1efe1f54cc7039027d30619e95e79a26c213d963
\ No newline at end of file
diff --git a/repository/org/eclipse/ltk/core/refactoring/3.5.200.v20110505-0800/refactoring-3.5.200.v20110505-0800.pom b/repository/org/eclipse/ltk/core/refactoring/3.5.201.r371_v20110824-0800/refactoring-3.5.201.r371_v20110824-0800.pom
similarity index 87%
rename from repository/org/eclipse/ltk/core/refactoring/3.5.200.v20110505-0800/refactoring-3.5.200.v20110505-0800.pom
rename to repository/org/eclipse/ltk/core/refactoring/3.5.201.r371_v20110824-0800/refactoring-3.5.201.r371_v20110824-0800.pom
index 520bd44..c405831 100644
--- a/repository/org/eclipse/ltk/core/refactoring/3.5.200.v20110505-0800/refactoring-3.5.200.v20110505-0800.pom
+++ b/repository/org/eclipse/ltk/core/refactoring/3.5.201.r371_v20110824-0800/refactoring-3.5.201.r371_v20110824-0800.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.ltk.core</groupId>
<artifactId>refactoring</artifactId>
- <version>3.5.200.v20110505-0800</version>
+ <version>3.5.201.r371_v20110824-0800</version>
</project>
diff --git a/repository/org/eclipse/ltk/core/refactoring/3.5.201.r371_v20110824-0800/refactoring-3.5.201.r371_v20110824-0800.pom.md5 b/repository/org/eclipse/ltk/core/refactoring/3.5.201.r371_v20110824-0800/refactoring-3.5.201.r371_v20110824-0800.pom.md5
new file mode 100644
index 0000000..c97c22e
--- /dev/null
+++ b/repository/org/eclipse/ltk/core/refactoring/3.5.201.r371_v20110824-0800/refactoring-3.5.201.r371_v20110824-0800.pom.md5
@@ -0,0 +1 @@
+85039f305ae3a455a294c496b194e827
\ No newline at end of file
diff --git a/repository/org/eclipse/ltk/core/refactoring/3.5.201.r371_v20110824-0800/refactoring-3.5.201.r371_v20110824-0800.pom.sha1 b/repository/org/eclipse/ltk/core/refactoring/3.5.201.r371_v20110824-0800/refactoring-3.5.201.r371_v20110824-0800.pom.sha1
new file mode 100644
index 0000000..c3514c1
--- /dev/null
+++ b/repository/org/eclipse/ltk/core/refactoring/3.5.201.r371_v20110824-0800/refactoring-3.5.201.r371_v20110824-0800.pom.sha1
@@ -0,0 +1 @@
+0c2f4dd7e2caa4d3e49509cd8fe175068f19360f
\ No newline at end of file
diff --git a/repository/org/eclipse/ltk/core/refactoring/maven-metadata.xml b/repository/org/eclipse/ltk/core/refactoring/maven-metadata.xml
index e794bfd..692abf3 100644
--- a/repository/org/eclipse/ltk/core/refactoring/maven-metadata.xml
+++ b/repository/org/eclipse/ltk/core/refactoring/maven-metadata.xml
@@ -3,7 +3,7 @@
<groupId>org.eclipse.ltk.core</groupId>
<artifactId>refactoring</artifactId>
<versioning>
- <release>3.5.200.v20110505-0800</release>
+ <release>3.5.201.r371_v20110824-0800</release>
<versions>
<version>3.5.100.v20100526-0800</version>
<version>3.3.1.r332_20080128</version>
@@ -11,7 +11,8 @@
<version>3.4.2.r342_v20081028-0800</version>
<version>3.5.0.v20090513-2000</version>
<version>3.5.200.v20110505-0800</version>
+ <version>3.5.201.r371_v20110824-0800</version>
</versions>
- <lastUpdated>20110718113457</lastUpdated>
+ <lastUpdated>20111206110604</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/ltk/core/refactoring/maven-metadata.xml.md5 b/repository/org/eclipse/ltk/core/refactoring/maven-metadata.xml.md5
index dfb8eab..fd3c51e 100644
--- a/repository/org/eclipse/ltk/core/refactoring/maven-metadata.xml.md5
+++ b/repository/org/eclipse/ltk/core/refactoring/maven-metadata.xml.md5
@@ -1 +1 @@
-017cef4e994e29d06f52e64acac3834c
\ No newline at end of file
+ee3f9e0dd2fb9b9da2501654969dcd10
\ No newline at end of file
diff --git a/repository/org/eclipse/ltk/core/refactoring/maven-metadata.xml.sha1 b/repository/org/eclipse/ltk/core/refactoring/maven-metadata.xml.sha1
index 346f502..bada7a7 100644
--- a/repository/org/eclipse/ltk/core/refactoring/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/ltk/core/refactoring/maven-metadata.xml.sha1
@@ -1 +1 @@
-adaf5917bb44bc98fd1bd05645cfad815ed406af
\ No newline at end of file
+08cd266f277c0ebc0cff359e4730751ef45e38bc
\ No newline at end of file
diff --git a/repository/org/eclipse/osgi/3.7.0.v20110613/osgi-3.7.0.v20110613.jar.md5 b/repository/org/eclipse/osgi/3.7.0.v20110613/osgi-3.7.0.v20110613.jar.md5
deleted file mode 100644
index 902656c..0000000
--- a/repository/org/eclipse/osgi/3.7.0.v20110613/osgi-3.7.0.v20110613.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-48af3a67643ee897a070d85931b3823e
\ No newline at end of file
diff --git a/repository/org/eclipse/osgi/3.7.0.v20110613/osgi-3.7.0.v20110613.jar.sha1 b/repository/org/eclipse/osgi/3.7.0.v20110613/osgi-3.7.0.v20110613.jar.sha1
deleted file mode 100644
index 1856929..0000000
--- a/repository/org/eclipse/osgi/3.7.0.v20110613/osgi-3.7.0.v20110613.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ef485a22c7657fad4e7b2aebd8d377410dfd13d2
\ No newline at end of file
diff --git a/repository/org/eclipse/osgi/3.7.0.v20110613/osgi-3.7.0.v20110613.pom.md5 b/repository/org/eclipse/osgi/3.7.0.v20110613/osgi-3.7.0.v20110613.pom.md5
deleted file mode 100644
index 07c7367..0000000
--- a/repository/org/eclipse/osgi/3.7.0.v20110613/osgi-3.7.0.v20110613.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-c1bd97a4d5a379d4e8d99da9076bab66
\ No newline at end of file
diff --git a/repository/org/eclipse/osgi/3.7.0.v20110613/osgi-3.7.0.v20110613.pom.sha1 b/repository/org/eclipse/osgi/3.7.0.v20110613/osgi-3.7.0.v20110613.pom.sha1
deleted file mode 100644
index a024c60..0000000
--- a/repository/org/eclipse/osgi/3.7.0.v20110613/osgi-3.7.0.v20110613.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dbf3cefd181428faa2b69f08ddc2631c3a6621df
\ No newline at end of file
diff --git a/repository/org/eclipse/osgi/3.7.0.v20110613/osgi-3.7.0.v20110613.jar b/repository/org/eclipse/osgi/3.7.1.R37x_v20110808-1106/osgi-3.7.1.R37x_v20110808-1106.jar
similarity index 67%
rename from repository/org/eclipse/osgi/3.7.0.v20110613/osgi-3.7.0.v20110613.jar
rename to repository/org/eclipse/osgi/3.7.1.R37x_v20110808-1106/osgi-3.7.1.R37x_v20110808-1106.jar
index ebf23d5..53d36fe 100644
--- a/repository/org/eclipse/osgi/3.7.0.v20110613/osgi-3.7.0.v20110613.jar
+++ b/repository/org/eclipse/osgi/3.7.1.R37x_v20110808-1106/osgi-3.7.1.R37x_v20110808-1106.jar
Binary files differ
diff --git a/repository/org/eclipse/osgi/3.7.1.R37x_v20110808-1106/osgi-3.7.1.R37x_v20110808-1106.jar.md5 b/repository/org/eclipse/osgi/3.7.1.R37x_v20110808-1106/osgi-3.7.1.R37x_v20110808-1106.jar.md5
new file mode 100644
index 0000000..3f3d552
--- /dev/null
+++ b/repository/org/eclipse/osgi/3.7.1.R37x_v20110808-1106/osgi-3.7.1.R37x_v20110808-1106.jar.md5
@@ -0,0 +1 @@
+00dde65d75c57c118710f448b2dfcfe6
\ No newline at end of file
diff --git a/repository/org/eclipse/osgi/3.7.1.R37x_v20110808-1106/osgi-3.7.1.R37x_v20110808-1106.jar.sha1 b/repository/org/eclipse/osgi/3.7.1.R37x_v20110808-1106/osgi-3.7.1.R37x_v20110808-1106.jar.sha1
new file mode 100644
index 0000000..6d353aa
--- /dev/null
+++ b/repository/org/eclipse/osgi/3.7.1.R37x_v20110808-1106/osgi-3.7.1.R37x_v20110808-1106.jar.sha1
@@ -0,0 +1 @@
+2d80f93b8803250f232902c46eba850bf1f3e67f
\ No newline at end of file
diff --git a/repository/org/eclipse/osgi/3.7.0.v20110613/osgi-3.7.0.v20110613.pom b/repository/org/eclipse/osgi/3.7.1.R37x_v20110808-1106/osgi-3.7.1.R37x_v20110808-1106.pom
similarity index 87%
rename from repository/org/eclipse/osgi/3.7.0.v20110613/osgi-3.7.0.v20110613.pom
rename to repository/org/eclipse/osgi/3.7.1.R37x_v20110808-1106/osgi-3.7.1.R37x_v20110808-1106.pom
index 4835cea..0649892 100644
--- a/repository/org/eclipse/osgi/3.7.0.v20110613/osgi-3.7.0.v20110613.pom
+++ b/repository/org/eclipse/osgi/3.7.1.R37x_v20110808-1106/osgi-3.7.1.R37x_v20110808-1106.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse</groupId>
<artifactId>osgi</artifactId>
- <version>3.7.0.v20110613</version>
+ <version>3.7.1.R37x_v20110808-1106</version>
</project>
diff --git a/repository/org/eclipse/osgi/3.7.1.R37x_v20110808-1106/osgi-3.7.1.R37x_v20110808-1106.pom.md5 b/repository/org/eclipse/osgi/3.7.1.R37x_v20110808-1106/osgi-3.7.1.R37x_v20110808-1106.pom.md5
new file mode 100644
index 0000000..236eb88
--- /dev/null
+++ b/repository/org/eclipse/osgi/3.7.1.R37x_v20110808-1106/osgi-3.7.1.R37x_v20110808-1106.pom.md5
@@ -0,0 +1 @@
+404b9fff2bb0d13c35f468e6dfd3d1f8
\ No newline at end of file
diff --git a/repository/org/eclipse/osgi/3.7.1.R37x_v20110808-1106/osgi-3.7.1.R37x_v20110808-1106.pom.sha1 b/repository/org/eclipse/osgi/3.7.1.R37x_v20110808-1106/osgi-3.7.1.R37x_v20110808-1106.pom.sha1
new file mode 100644
index 0000000..2e98849
--- /dev/null
+++ b/repository/org/eclipse/osgi/3.7.1.R37x_v20110808-1106/osgi-3.7.1.R37x_v20110808-1106.pom.sha1
@@ -0,0 +1 @@
+f4bc79814bf457b81c132c48cef125f40952706f
\ No newline at end of file
diff --git a/repository/org/eclipse/osgi/maven-metadata.xml b/repository/org/eclipse/osgi/maven-metadata.xml
index dccafa0..7d34001 100644
--- a/repository/org/eclipse/osgi/maven-metadata.xml
+++ b/repository/org/eclipse/osgi/maven-metadata.xml
@@ -3,7 +3,7 @@
<groupId>org.eclipse</groupId>
<artifactId>osgi</artifactId>
<versioning>
- <release>3.7.0.v20110613</release>
+ <release>3.7.1.R37x_v20110808-1106</release>
<versions>
<version>3.6.1.R36x_v20100806</version>
<version>3.3.2.R33x_v20080105</version>
@@ -12,7 +12,8 @@
<version>3.5.0.v20090520</version>
<version>3.5.2.R35x_v20100126</version>
<version>3.7.0.v20110613</version>
+ <version>3.7.1.R37x_v20110808-1106</version>
</versions>
- <lastUpdated>20110718113545</lastUpdated>
+ <lastUpdated>20111206110609</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/osgi/maven-metadata.xml.md5 b/repository/org/eclipse/osgi/maven-metadata.xml.md5
index eba1304..851f32b 100644
--- a/repository/org/eclipse/osgi/maven-metadata.xml.md5
+++ b/repository/org/eclipse/osgi/maven-metadata.xml.md5
@@ -1 +1 @@
-15d2654831b1d534522906aacad3facc
\ No newline at end of file
+2301bba9c9aaa619e1e53ba87dde4ea8
\ No newline at end of file
diff --git a/repository/org/eclipse/osgi/maven-metadata.xml.sha1 b/repository/org/eclipse/osgi/maven-metadata.xml.sha1
index 52219d8..750ba30 100644
--- a/repository/org/eclipse/osgi/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/osgi/maven-metadata.xml.sha1
@@ -1 +1 @@
-480eff510a1f73be4e623a4994cd585c8ffc01ff
\ No newline at end of file
+f909e8deadfcb16df7b8edbf6a643991b5cedbc6
\ No newline at end of file
diff --git a/repository/org/eclipse/rcp/3.7.0.v201106131736/rcp-3.7.0.v201106131736.jar b/repository/org/eclipse/rcp/3.7.0.v201106131736/rcp-3.7.0.v201106131736.jar
deleted file mode 100644
index b19243e..0000000
--- a/repository/org/eclipse/rcp/3.7.0.v201106131736/rcp-3.7.0.v201106131736.jar
+++ /dev/null
Binary files differ
diff --git a/repository/org/eclipse/rcp/3.7.0.v201106131736/rcp-3.7.0.v201106131736.jar.md5 b/repository/org/eclipse/rcp/3.7.0.v201106131736/rcp-3.7.0.v201106131736.jar.md5
deleted file mode 100644
index 86bff83..0000000
--- a/repository/org/eclipse/rcp/3.7.0.v201106131736/rcp-3.7.0.v201106131736.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-37980c72149f3b1c918f1647305ef478
\ No newline at end of file
diff --git a/repository/org/eclipse/rcp/3.7.0.v201106131736/rcp-3.7.0.v201106131736.jar.sha1 b/repository/org/eclipse/rcp/3.7.0.v201106131736/rcp-3.7.0.v201106131736.jar.sha1
deleted file mode 100644
index 9318970..0000000
--- a/repository/org/eclipse/rcp/3.7.0.v201106131736/rcp-3.7.0.v201106131736.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3b34045a8207d32b832c1d1515944566c9746e38
\ No newline at end of file
diff --git a/repository/org/eclipse/rcp/3.7.0.v201106131736/rcp-3.7.0.v201106131736.pom.md5 b/repository/org/eclipse/rcp/3.7.0.v201106131736/rcp-3.7.0.v201106131736.pom.md5
deleted file mode 100644
index 7e974ff..0000000
--- a/repository/org/eclipse/rcp/3.7.0.v201106131736/rcp-3.7.0.v201106131736.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-bf843c4ad2d3d09e43538d014c2915dc
\ No newline at end of file
diff --git a/repository/org/eclipse/rcp/3.7.0.v201106131736/rcp-3.7.0.v201106131736.pom.sha1 b/repository/org/eclipse/rcp/3.7.0.v201106131736/rcp-3.7.0.v201106131736.pom.sha1
deleted file mode 100644
index 729d7de..0000000
--- a/repository/org/eclipse/rcp/3.7.0.v201106131736/rcp-3.7.0.v201106131736.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3a1d5cd272c493487354f7a5e5b32f6584eb8f79
\ No newline at end of file
diff --git a/repository/org/eclipse/rcp/3.7.0.v201109091335/rcp-3.7.0.v201109091335.jar b/repository/org/eclipse/rcp/3.7.0.v201109091335/rcp-3.7.0.v201109091335.jar
new file mode 100644
index 0000000..7a96433
--- /dev/null
+++ b/repository/org/eclipse/rcp/3.7.0.v201109091335/rcp-3.7.0.v201109091335.jar
Binary files differ
diff --git a/repository/org/eclipse/rcp/3.7.0.v201109091335/rcp-3.7.0.v201109091335.jar.md5 b/repository/org/eclipse/rcp/3.7.0.v201109091335/rcp-3.7.0.v201109091335.jar.md5
new file mode 100644
index 0000000..39660b3
--- /dev/null
+++ b/repository/org/eclipse/rcp/3.7.0.v201109091335/rcp-3.7.0.v201109091335.jar.md5
@@ -0,0 +1 @@
+b00626c4dba37a86c176748df1c36f10
\ No newline at end of file
diff --git a/repository/org/eclipse/rcp/3.7.0.v201109091335/rcp-3.7.0.v201109091335.jar.sha1 b/repository/org/eclipse/rcp/3.7.0.v201109091335/rcp-3.7.0.v201109091335.jar.sha1
new file mode 100644
index 0000000..a73e4d3
--- /dev/null
+++ b/repository/org/eclipse/rcp/3.7.0.v201109091335/rcp-3.7.0.v201109091335.jar.sha1
@@ -0,0 +1 @@
+450cacf2a45342d834e9f222d661b34c5337a073
\ No newline at end of file
diff --git a/repository/org/eclipse/rcp/3.7.0.v201106131736/rcp-3.7.0.v201106131736.pom b/repository/org/eclipse/rcp/3.7.0.v201109091335/rcp-3.7.0.v201109091335.pom
similarity index 89%
rename from repository/org/eclipse/rcp/3.7.0.v201106131736/rcp-3.7.0.v201106131736.pom
rename to repository/org/eclipse/rcp/3.7.0.v201109091335/rcp-3.7.0.v201109091335.pom
index f2ba928..00b1922 100644
--- a/repository/org/eclipse/rcp/3.7.0.v201106131736/rcp-3.7.0.v201106131736.pom
+++ b/repository/org/eclipse/rcp/3.7.0.v201109091335/rcp-3.7.0.v201109091335.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse</groupId>
<artifactId>rcp</artifactId>
- <version>3.7.0.v201106131736</version>
+ <version>3.7.0.v201109091335</version>
</project>
diff --git a/repository/org/eclipse/rcp/3.7.0.v201109091335/rcp-3.7.0.v201109091335.pom.md5 b/repository/org/eclipse/rcp/3.7.0.v201109091335/rcp-3.7.0.v201109091335.pom.md5
new file mode 100644
index 0000000..3096df2
--- /dev/null
+++ b/repository/org/eclipse/rcp/3.7.0.v201109091335/rcp-3.7.0.v201109091335.pom.md5
@@ -0,0 +1 @@
+7cb612e0640dfee4272939353b5256c5
\ No newline at end of file
diff --git a/repository/org/eclipse/rcp/3.7.0.v201109091335/rcp-3.7.0.v201109091335.pom.sha1 b/repository/org/eclipse/rcp/3.7.0.v201109091335/rcp-3.7.0.v201109091335.pom.sha1
new file mode 100644
index 0000000..5c93b05
--- /dev/null
+++ b/repository/org/eclipse/rcp/3.7.0.v201109091335/rcp-3.7.0.v201109091335.pom.sha1
@@ -0,0 +1 @@
+74dfb0e544efc77750ebe74f9ab9010e11db5f2e
\ No newline at end of file
diff --git a/repository/org/eclipse/rcp/maven-metadata.xml b/repository/org/eclipse/rcp/maven-metadata.xml
index a15d119..a57e982 100644
--- a/repository/org/eclipse/rcp/maven-metadata.xml
+++ b/repository/org/eclipse/rcp/maven-metadata.xml
@@ -3,7 +3,7 @@
<groupId>org.eclipse</groupId>
<artifactId>rcp</artifactId>
<versioning>
- <release>3.7.0.v201106131736</release>
+ <release>3.7.0.v201109091335</release>
<versions>
<version>3.6.0.v201009090800</version>
<version>3.2.1.r33x_r20080131</version>
@@ -12,7 +12,8 @@
<version>3.5.0.v200906111540</version>
<version>3.5.0.v201002111343</version>
<version>3.7.0.v201106131736</version>
+ <version>3.7.0.v201109091335</version>
</versions>
- <lastUpdated>20110718113556</lastUpdated>
+ <lastUpdated>20111206110615</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/rcp/maven-metadata.xml.md5 b/repository/org/eclipse/rcp/maven-metadata.xml.md5
index 017ebcf..454a06b 100644
--- a/repository/org/eclipse/rcp/maven-metadata.xml.md5
+++ b/repository/org/eclipse/rcp/maven-metadata.xml.md5
@@ -1 +1 @@
-243aff2cc513a6ca6671b1e4995c41a7
\ No newline at end of file
+933ac7da85008601995f01ce98f60282
\ No newline at end of file
diff --git a/repository/org/eclipse/rcp/maven-metadata.xml.sha1 b/repository/org/eclipse/rcp/maven-metadata.xml.sha1
index 2d6b304..fb7027b 100644
--- a/repository/org/eclipse/rcp/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/rcp/maven-metadata.xml.sha1
@@ -1 +1 @@
-e0b00e233cce310116f824f8bd4023bcd993cf23
\ No newline at end of file
+1214f7aae44a0d13f5c6084e426fd868766ad53c
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/3.7.0.v3735b/swt-3.7.0.v3735b.jar.md5 b/repository/org/eclipse/swt/3.7.0.v3735b/swt-3.7.0.v3735b.jar.md5
deleted file mode 100644
index 652f0b0..0000000
--- a/repository/org/eclipse/swt/3.7.0.v3735b/swt-3.7.0.v3735b.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-96aac9557b412c7adeb7128231627eeb
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/3.7.0.v3735b/swt-3.7.0.v3735b.jar.sha1 b/repository/org/eclipse/swt/3.7.0.v3735b/swt-3.7.0.v3735b.jar.sha1
deleted file mode 100644
index 08481cd..0000000
--- a/repository/org/eclipse/swt/3.7.0.v3735b/swt-3.7.0.v3735b.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a248ae1f2a42bae65e8845ed51a7726d85318982
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/3.7.0.v3735b/swt-3.7.0.v3735b.pom.md5 b/repository/org/eclipse/swt/3.7.0.v3735b/swt-3.7.0.v3735b.pom.md5
deleted file mode 100644
index a6c00fa..0000000
--- a/repository/org/eclipse/swt/3.7.0.v3735b/swt-3.7.0.v3735b.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-a27f575b7d9708886e257402a841084a
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/3.7.0.v3735b/swt-3.7.0.v3735b.pom.sha1 b/repository/org/eclipse/swt/3.7.0.v3735b/swt-3.7.0.v3735b.pom.sha1
deleted file mode 100644
index e8c5e81..0000000
--- a/repository/org/eclipse/swt/3.7.0.v3735b/swt-3.7.0.v3735b.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ab0bd21a6f93a1c8e0481ca59be20621552fb7a3
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/3.7.0.v3735b/swt-3.7.0.v3735b.jar b/repository/org/eclipse/swt/3.7.1.v3738a/swt-3.7.1.v3738a.jar
similarity index 64%
rename from repository/org/eclipse/swt/3.7.0.v3735b/swt-3.7.0.v3735b.jar
rename to repository/org/eclipse/swt/3.7.1.v3738a/swt-3.7.1.v3738a.jar
index 0b0e37c..72e9045 100644
--- a/repository/org/eclipse/swt/3.7.0.v3735b/swt-3.7.0.v3735b.jar
+++ b/repository/org/eclipse/swt/3.7.1.v3738a/swt-3.7.1.v3738a.jar
Binary files differ
diff --git a/repository/org/eclipse/swt/3.7.1.v3738a/swt-3.7.1.v3738a.jar.md5 b/repository/org/eclipse/swt/3.7.1.v3738a/swt-3.7.1.v3738a.jar.md5
new file mode 100644
index 0000000..56d6a28
--- /dev/null
+++ b/repository/org/eclipse/swt/3.7.1.v3738a/swt-3.7.1.v3738a.jar.md5
@@ -0,0 +1 @@
+97131cdcea380abdb16be1e8d091c138
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/3.7.1.v3738a/swt-3.7.1.v3738a.jar.sha1 b/repository/org/eclipse/swt/3.7.1.v3738a/swt-3.7.1.v3738a.jar.sha1
new file mode 100644
index 0000000..5095264
--- /dev/null
+++ b/repository/org/eclipse/swt/3.7.1.v3738a/swt-3.7.1.v3738a.jar.sha1
@@ -0,0 +1 @@
+848821bcd70575019f78d712321c6b995af33bcf
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/3.7.0.v3735b/swt-3.7.0.v3735b.pom b/repository/org/eclipse/swt/3.7.1.v3738a/swt-3.7.1.v3738a.pom
similarity index 90%
rename from repository/org/eclipse/swt/3.7.0.v3735b/swt-3.7.0.v3735b.pom
rename to repository/org/eclipse/swt/3.7.1.v3738a/swt-3.7.1.v3738a.pom
index 28c34ff..aa315de 100644
--- a/repository/org/eclipse/swt/3.7.0.v3735b/swt-3.7.0.v3735b.pom
+++ b/repository/org/eclipse/swt/3.7.1.v3738a/swt-3.7.1.v3738a.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse</groupId>
<artifactId>swt</artifactId>
- <version>3.7.0.v3735b</version>
+ <version>3.7.1.v3738a</version>
</project>
diff --git a/repository/org/eclipse/swt/3.7.1.v3738a/swt-3.7.1.v3738a.pom.md5 b/repository/org/eclipse/swt/3.7.1.v3738a/swt-3.7.1.v3738a.pom.md5
new file mode 100644
index 0000000..2ec8051
--- /dev/null
+++ b/repository/org/eclipse/swt/3.7.1.v3738a/swt-3.7.1.v3738a.pom.md5
@@ -0,0 +1 @@
+3993cfc4bf534d57827f9240be1a7859
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/3.7.1.v3738a/swt-3.7.1.v3738a.pom.sha1 b/repository/org/eclipse/swt/3.7.1.v3738a/swt-3.7.1.v3738a.pom.sha1
new file mode 100644
index 0000000..ed71c70
--- /dev/null
+++ b/repository/org/eclipse/swt/3.7.1.v3738a/swt-3.7.1.v3738a.pom.sha1
@@ -0,0 +1 @@
+214d781dd269d079e4b2093553641737e2613fe6
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/cocoa/macosx/3.7.0.v3735b/macosx-3.7.0.v3735b.jar.md5 b/repository/org/eclipse/swt/cocoa/macosx/3.7.0.v3735b/macosx-3.7.0.v3735b.jar.md5
deleted file mode 100644
index 782df6e..0000000
--- a/repository/org/eclipse/swt/cocoa/macosx/3.7.0.v3735b/macosx-3.7.0.v3735b.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-d1ca8b8424dc796209c5e03b385a7dca
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/cocoa/macosx/3.7.0.v3735b/macosx-3.7.0.v3735b.jar.sha1 b/repository/org/eclipse/swt/cocoa/macosx/3.7.0.v3735b/macosx-3.7.0.v3735b.jar.sha1
deleted file mode 100644
index 84be0d5..0000000
--- a/repository/org/eclipse/swt/cocoa/macosx/3.7.0.v3735b/macosx-3.7.0.v3735b.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e96339feede89a44cefc8f442158af6a57be75ed
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/cocoa/macosx/3.7.0.v3735b/macosx-3.7.0.v3735b.pom.md5 b/repository/org/eclipse/swt/cocoa/macosx/3.7.0.v3735b/macosx-3.7.0.v3735b.pom.md5
deleted file mode 100644
index 16da6d5..0000000
--- a/repository/org/eclipse/swt/cocoa/macosx/3.7.0.v3735b/macosx-3.7.0.v3735b.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-1296cffbed3be247ba9b72fe91a96bc2
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/cocoa/macosx/3.7.0.v3735b/macosx-3.7.0.v3735b.pom.sha1 b/repository/org/eclipse/swt/cocoa/macosx/3.7.0.v3735b/macosx-3.7.0.v3735b.pom.sha1
deleted file mode 100644
index 972a45c..0000000
--- a/repository/org/eclipse/swt/cocoa/macosx/3.7.0.v3735b/macosx-3.7.0.v3735b.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2f595a9819494e91d938a3d54b266395df7f879a
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/cocoa/macosx/3.7.0.v3735b/macosx-3.7.0.v3735b.jar b/repository/org/eclipse/swt/cocoa/macosx/3.7.1.v3738a/macosx-3.7.1.v3738a.jar
similarity index 68%
rename from repository/org/eclipse/swt/cocoa/macosx/3.7.0.v3735b/macosx-3.7.0.v3735b.jar
rename to repository/org/eclipse/swt/cocoa/macosx/3.7.1.v3738a/macosx-3.7.1.v3738a.jar
index 8c5d355..acdca6f 100644
--- a/repository/org/eclipse/swt/cocoa/macosx/3.7.0.v3735b/macosx-3.7.0.v3735b.jar
+++ b/repository/org/eclipse/swt/cocoa/macosx/3.7.1.v3738a/macosx-3.7.1.v3738a.jar
Binary files differ
diff --git a/repository/org/eclipse/swt/cocoa/macosx/3.7.1.v3738a/macosx-3.7.1.v3738a.jar.md5 b/repository/org/eclipse/swt/cocoa/macosx/3.7.1.v3738a/macosx-3.7.1.v3738a.jar.md5
new file mode 100644
index 0000000..0801ede
--- /dev/null
+++ b/repository/org/eclipse/swt/cocoa/macosx/3.7.1.v3738a/macosx-3.7.1.v3738a.jar.md5
@@ -0,0 +1 @@
+948412e686bf4b7a4af0d303a54557a7
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/cocoa/macosx/3.7.1.v3738a/macosx-3.7.1.v3738a.jar.sha1 b/repository/org/eclipse/swt/cocoa/macosx/3.7.1.v3738a/macosx-3.7.1.v3738a.jar.sha1
new file mode 100644
index 0000000..f56d689
--- /dev/null
+++ b/repository/org/eclipse/swt/cocoa/macosx/3.7.1.v3738a/macosx-3.7.1.v3738a.jar.sha1
@@ -0,0 +1 @@
+91680d413370db282274d6efc6c63fb7f335e182
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/cocoa/macosx/3.7.0.v3735b/macosx-3.7.0.v3735b.pom b/repository/org/eclipse/swt/cocoa/macosx/3.7.1.v3738a/macosx-3.7.1.v3738a.pom
similarity index 91%
rename from repository/org/eclipse/swt/cocoa/macosx/3.7.0.v3735b/macosx-3.7.0.v3735b.pom
rename to repository/org/eclipse/swt/cocoa/macosx/3.7.1.v3738a/macosx-3.7.1.v3738a.pom
index c48a6a3..9b1d9a8 100644
--- a/repository/org/eclipse/swt/cocoa/macosx/3.7.0.v3735b/macosx-3.7.0.v3735b.pom
+++ b/repository/org/eclipse/swt/cocoa/macosx/3.7.1.v3738a/macosx-3.7.1.v3738a.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.swt.cocoa</groupId>
<artifactId>macosx</artifactId>
- <version>3.7.0.v3735b</version>
+ <version>3.7.1.v3738a</version>
</project>
diff --git a/repository/org/eclipse/swt/cocoa/macosx/3.7.1.v3738a/macosx-3.7.1.v3738a.pom.md5 b/repository/org/eclipse/swt/cocoa/macosx/3.7.1.v3738a/macosx-3.7.1.v3738a.pom.md5
new file mode 100644
index 0000000..87ef9c8
--- /dev/null
+++ b/repository/org/eclipse/swt/cocoa/macosx/3.7.1.v3738a/macosx-3.7.1.v3738a.pom.md5
@@ -0,0 +1 @@
+fb5d27545e4d273dcd2d4e317a6e3ccf
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/cocoa/macosx/3.7.1.v3738a/macosx-3.7.1.v3738a.pom.sha1 b/repository/org/eclipse/swt/cocoa/macosx/3.7.1.v3738a/macosx-3.7.1.v3738a.pom.sha1
new file mode 100644
index 0000000..c396716
--- /dev/null
+++ b/repository/org/eclipse/swt/cocoa/macosx/3.7.1.v3738a/macosx-3.7.1.v3738a.pom.sha1
@@ -0,0 +1 @@
+4dcef12e076bd82392b2aad01c8c745177b6ad2c
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/cocoa/macosx/maven-metadata.xml b/repository/org/eclipse/swt/cocoa/macosx/maven-metadata.xml
index 5fb99c0..862f970 100644
--- a/repository/org/eclipse/swt/cocoa/macosx/maven-metadata.xml
+++ b/repository/org/eclipse/swt/cocoa/macosx/maven-metadata.xml
@@ -3,11 +3,12 @@
<groupId>org.eclipse.swt.cocoa</groupId>
<artifactId>macosx</artifactId>
<versioning>
- <release>3.7.0.v3735b</release>
+ <release>3.7.1.v3738a</release>
<versions>
<version>3.6.1.v3655c</version>
<version>3.7.0.v3735b</version>
+ <version>3.7.1.v3738a</version>
</versions>
- <lastUpdated>20110718162005</lastUpdated>
+ <lastUpdated>20111206122015</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/swt/cocoa/macosx/maven-metadata.xml.md5 b/repository/org/eclipse/swt/cocoa/macosx/maven-metadata.xml.md5
index 141d860..048bed9 100644
--- a/repository/org/eclipse/swt/cocoa/macosx/maven-metadata.xml.md5
+++ b/repository/org/eclipse/swt/cocoa/macosx/maven-metadata.xml.md5
@@ -1 +1 @@
-c6b1ea1a1d4504eebaa9b3b54a2a9788
\ No newline at end of file
+95eb87085d1bba1498c05ff3867d675f
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/cocoa/macosx/maven-metadata.xml.sha1 b/repository/org/eclipse/swt/cocoa/macosx/maven-metadata.xml.sha1
index 6911c57..06c2015 100644
--- a/repository/org/eclipse/swt/cocoa/macosx/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/swt/cocoa/macosx/maven-metadata.xml.sha1
@@ -1 +1 @@
-5d1d6f4d05b3e7db2334fc5f459fc69a733de56b
\ No newline at end of file
+84c687a5c1e8c988a8c5b095df5bea74862be05b
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar.md5 b/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar.md5
deleted file mode 100644
index c5c7d9c..0000000
--- a/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-39d1af5e511bd77db3fc6c9dc2d40c33
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar.sha1 b/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar.sha1
deleted file mode 100644
index b51726b..0000000
--- a/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-409203389ca7310b68b8b8ae37f01bcf1083e767
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom.md5 b/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom.md5
deleted file mode 100644
index 55a8ac2..0000000
--- a/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-1fe92ce2e0f573faa8a0203a42515743
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom.sha1 b/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom.sha1
deleted file mode 100644
index 2e6fd48..0000000
--- a/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4358ef83f22461c23dce0cd60333f68c81bfadcb
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar b/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar
similarity index 72%
rename from repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar
rename to repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar
index 955f53d..41c0774 100644
--- a/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar
+++ b/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar
Binary files differ
diff --git a/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar.md5 b/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar.md5
new file mode 100644
index 0000000..c55fcad
--- /dev/null
+++ b/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar.md5
@@ -0,0 +1 @@
+2de083fb311355f655f95adf7a2a6e9b
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar.sha1 b/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar.sha1
new file mode 100644
index 0000000..a7c584e
--- /dev/null
+++ b/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar.sha1
@@ -0,0 +1 @@
+2c9de79ac364814957b5ce060fd2321b921b89a2
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom b/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom
similarity index 91%
rename from repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom
rename to repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom
index 792762b..b4b4b91 100644
--- a/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom
+++ b/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.swt.cocoa.macosx</groupId>
<artifactId>x86_64</artifactId>
- <version>3.7.0.v3735b</version>
+ <version>3.7.1.v3738a</version>
</project>
diff --git a/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom.md5 b/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom.md5
new file mode 100644
index 0000000..356a22e
--- /dev/null
+++ b/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom.md5
@@ -0,0 +1 @@
+c3589af05fe127ea1ab88054ce3dd4a7
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom.sha1 b/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom.sha1
new file mode 100644
index 0000000..835080a
--- /dev/null
+++ b/repository/org/eclipse/swt/cocoa/macosx/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom.sha1
@@ -0,0 +1 @@
+07ec621fde4d7f06062a47354faba16473b623ea
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/cocoa/macosx/x86_64/maven-metadata.xml b/repository/org/eclipse/swt/cocoa/macosx/x86_64/maven-metadata.xml
index 0150a04..ed75df9 100644
--- a/repository/org/eclipse/swt/cocoa/macosx/x86_64/maven-metadata.xml
+++ b/repository/org/eclipse/swt/cocoa/macosx/x86_64/maven-metadata.xml
@@ -3,12 +3,13 @@
<groupId>org.eclipse.swt.cocoa.macosx</groupId>
<artifactId>x86_64</artifactId>
<versioning>
- <release>3.7.0.v3735b</release>
+ <release>3.7.1.v3738a</release>
<versions>
<version>3.6.1.v3655c</version>
<version>3.5.2.v3557f</version>
<version>3.7.0.v3735b</version>
+ <version>3.7.1.v3738a</version>
</versions>
- <lastUpdated>20110718113621</lastUpdated>
+ <lastUpdated>20111206110620</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/swt/cocoa/macosx/x86_64/maven-metadata.xml.md5 b/repository/org/eclipse/swt/cocoa/macosx/x86_64/maven-metadata.xml.md5
index f027516..0cf44e4 100644
--- a/repository/org/eclipse/swt/cocoa/macosx/x86_64/maven-metadata.xml.md5
+++ b/repository/org/eclipse/swt/cocoa/macosx/x86_64/maven-metadata.xml.md5
@@ -1 +1 @@
-229ecbbef3ea5ac3c0c45b844736bf8e
\ No newline at end of file
+ce53d84ef57ec3bd8524ece3daa32858
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/cocoa/macosx/x86_64/maven-metadata.xml.sha1 b/repository/org/eclipse/swt/cocoa/macosx/x86_64/maven-metadata.xml.sha1
index 87f2975..b0d3cd4 100644
--- a/repository/org/eclipse/swt/cocoa/macosx/x86_64/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/swt/cocoa/macosx/x86_64/maven-metadata.xml.sha1
@@ -1 +1 @@
-aa6177dbf4ef93731304b9dd14ae2583d1bc60ee
\ No newline at end of file
+777fb3478e68045875dbc6a86136ef3ca723f4ca
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/gtk/linux/x86/3.7.0.v3735b/x86-3.7.0.v3735b.jar.md5 b/repository/org/eclipse/swt/gtk/linux/x86/3.7.0.v3735b/x86-3.7.0.v3735b.jar.md5
deleted file mode 100644
index 2e2c192..0000000
--- a/repository/org/eclipse/swt/gtk/linux/x86/3.7.0.v3735b/x86-3.7.0.v3735b.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-331a11f883eb3da1952f7f761bb1d670
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/gtk/linux/x86/3.7.0.v3735b/x86-3.7.0.v3735b.jar.sha1 b/repository/org/eclipse/swt/gtk/linux/x86/3.7.0.v3735b/x86-3.7.0.v3735b.jar.sha1
deleted file mode 100644
index f38c4ef..0000000
--- a/repository/org/eclipse/swt/gtk/linux/x86/3.7.0.v3735b/x86-3.7.0.v3735b.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b7eff04691384b44c585a27b3dd109e458832ca3
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/gtk/linux/x86/3.7.0.v3735b/x86-3.7.0.v3735b.pom.md5 b/repository/org/eclipse/swt/gtk/linux/x86/3.7.0.v3735b/x86-3.7.0.v3735b.pom.md5
deleted file mode 100644
index aabdd98..0000000
--- a/repository/org/eclipse/swt/gtk/linux/x86/3.7.0.v3735b/x86-3.7.0.v3735b.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-5cf24e9cca02be0ef507e63d64d2b11c
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/gtk/linux/x86/3.7.0.v3735b/x86-3.7.0.v3735b.pom.sha1 b/repository/org/eclipse/swt/gtk/linux/x86/3.7.0.v3735b/x86-3.7.0.v3735b.pom.sha1
deleted file mode 100644
index 5810cd8..0000000
--- a/repository/org/eclipse/swt/gtk/linux/x86/3.7.0.v3735b/x86-3.7.0.v3735b.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-23e13038cd712dfe902c4504dce29319f128a8ab
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/gtk/linux/x86/3.7.0.v3735b/x86-3.7.0.v3735b.jar b/repository/org/eclipse/swt/gtk/linux/x86/3.7.1.v3738a/x86-3.7.1.v3738a.jar
similarity index 79%
rename from repository/org/eclipse/swt/gtk/linux/x86/3.7.0.v3735b/x86-3.7.0.v3735b.jar
rename to repository/org/eclipse/swt/gtk/linux/x86/3.7.1.v3738a/x86-3.7.1.v3738a.jar
index 34e80e2..89e1be3 100644
--- a/repository/org/eclipse/swt/gtk/linux/x86/3.7.0.v3735b/x86-3.7.0.v3735b.jar
+++ b/repository/org/eclipse/swt/gtk/linux/x86/3.7.1.v3738a/x86-3.7.1.v3738a.jar
Binary files differ
diff --git a/repository/org/eclipse/swt/gtk/linux/x86/3.7.1.v3738a/x86-3.7.1.v3738a.jar.md5 b/repository/org/eclipse/swt/gtk/linux/x86/3.7.1.v3738a/x86-3.7.1.v3738a.jar.md5
new file mode 100644
index 0000000..5360dd9
--- /dev/null
+++ b/repository/org/eclipse/swt/gtk/linux/x86/3.7.1.v3738a/x86-3.7.1.v3738a.jar.md5
@@ -0,0 +1 @@
+e415304c489d2ba2b9d8440be460651f
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/gtk/linux/x86/3.7.1.v3738a/x86-3.7.1.v3738a.jar.sha1 b/repository/org/eclipse/swt/gtk/linux/x86/3.7.1.v3738a/x86-3.7.1.v3738a.jar.sha1
new file mode 100644
index 0000000..85003c4
--- /dev/null
+++ b/repository/org/eclipse/swt/gtk/linux/x86/3.7.1.v3738a/x86-3.7.1.v3738a.jar.sha1
@@ -0,0 +1 @@
+d4c304b4fc556d0f8612513c6aa51013c0c7db17
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/gtk/linux/x86/3.7.0.v3735b/x86-3.7.0.v3735b.pom b/repository/org/eclipse/swt/gtk/linux/x86/3.7.1.v3738a/x86-3.7.1.v3738a.pom
similarity index 91%
rename from repository/org/eclipse/swt/gtk/linux/x86/3.7.0.v3735b/x86-3.7.0.v3735b.pom
rename to repository/org/eclipse/swt/gtk/linux/x86/3.7.1.v3738a/x86-3.7.1.v3738a.pom
index 7ac839d..2477387 100644
--- a/repository/org/eclipse/swt/gtk/linux/x86/3.7.0.v3735b/x86-3.7.0.v3735b.pom
+++ b/repository/org/eclipse/swt/gtk/linux/x86/3.7.1.v3738a/x86-3.7.1.v3738a.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.swt.gtk.linux</groupId>
<artifactId>x86</artifactId>
- <version>3.7.0.v3735b</version>
+ <version>3.7.1.v3738a</version>
</project>
diff --git a/repository/org/eclipse/swt/gtk/linux/x86/3.7.1.v3738a/x86-3.7.1.v3738a.pom.md5 b/repository/org/eclipse/swt/gtk/linux/x86/3.7.1.v3738a/x86-3.7.1.v3738a.pom.md5
new file mode 100644
index 0000000..554e381
--- /dev/null
+++ b/repository/org/eclipse/swt/gtk/linux/x86/3.7.1.v3738a/x86-3.7.1.v3738a.pom.md5
@@ -0,0 +1 @@
+8f00b1c410944d32cafe0aab9694b200
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/gtk/linux/x86/3.7.1.v3738a/x86-3.7.1.v3738a.pom.sha1 b/repository/org/eclipse/swt/gtk/linux/x86/3.7.1.v3738a/x86-3.7.1.v3738a.pom.sha1
new file mode 100644
index 0000000..8480661
--- /dev/null
+++ b/repository/org/eclipse/swt/gtk/linux/x86/3.7.1.v3738a/x86-3.7.1.v3738a.pom.sha1
@@ -0,0 +1 @@
+811065e17118a2f1c3934cd2d3783cb11b038178
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/gtk/linux/x86/maven-metadata.xml b/repository/org/eclipse/swt/gtk/linux/x86/maven-metadata.xml
index 70c7b33..c2ebbd1 100644
--- a/repository/org/eclipse/swt/gtk/linux/x86/maven-metadata.xml
+++ b/repository/org/eclipse/swt/gtk/linux/x86/maven-metadata.xml
@@ -3,7 +3,7 @@
<groupId>org.eclipse.swt.gtk.linux</groupId>
<artifactId>x86</artifactId>
<versioning>
- <release>3.7.0.v3735b</release>
+ <release>3.7.1.v3738a</release>
<versions>
<version>3.6.1.v3655c</version>
<version>3.3.2.v3349</version>
@@ -12,7 +12,8 @@
<version>3.5.0.v3550b</version>
<version>3.5.2.v3557f</version>
<version>3.7.0.v3735b</version>
+ <version>3.7.1.v3738a</version>
</versions>
- <lastUpdated>20110718163901</lastUpdated>
+ <lastUpdated>20111206122019</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/swt/gtk/linux/x86/maven-metadata.xml.md5 b/repository/org/eclipse/swt/gtk/linux/x86/maven-metadata.xml.md5
index a1b91cc..9b2237a 100644
--- a/repository/org/eclipse/swt/gtk/linux/x86/maven-metadata.xml.md5
+++ b/repository/org/eclipse/swt/gtk/linux/x86/maven-metadata.xml.md5
@@ -1 +1 @@
-d53e628de962862bc59c60432989e0c9
\ No newline at end of file
+4bff03d3d8d23c4b95eaeed8a7297015
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/gtk/linux/x86/maven-metadata.xml.sha1 b/repository/org/eclipse/swt/gtk/linux/x86/maven-metadata.xml.sha1
index 729d4a8..56b6b65 100644
--- a/repository/org/eclipse/swt/gtk/linux/x86/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/swt/gtk/linux/x86/maven-metadata.xml.sha1
@@ -1 +1 @@
-774c56b0a289922c8aa84efda27cfe6335116674
\ No newline at end of file
+21e18dce9b428eed412460f90c581d94e6e0fadd
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar.md5 b/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar.md5
deleted file mode 100644
index aa7dfd3..0000000
--- a/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-642cc669bda0d6b18e26c3a189ad948e
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar.sha1 b/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar.sha1
deleted file mode 100644
index 6b62a4c..0000000
--- a/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e941b88fa282c960cbb6960e3fad38609c9d16ad
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom.md5 b/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom.md5
deleted file mode 100644
index a9417d2..0000000
--- a/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-1e17a15a094334d779151bc81415fcd5
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom.sha1 b/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom.sha1
deleted file mode 100644
index 6980048..0000000
--- a/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b6e320c5723c9af599c214d23172e01b36c303db
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar b/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar
similarity index 79%
rename from repository/org/eclipse/swt/gtk/linux/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar
rename to repository/org/eclipse/swt/gtk/linux/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar
index e08f85a..9f548f6 100644
--- a/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar
+++ b/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar
Binary files differ
diff --git a/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar.md5 b/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar.md5
new file mode 100644
index 0000000..3fcb4e0
--- /dev/null
+++ b/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar.md5
@@ -0,0 +1 @@
+5c04a78bbcd1317339a83a847004fddf
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar.sha1 b/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar.sha1
new file mode 100644
index 0000000..f6c85f4
--- /dev/null
+++ b/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar.sha1
@@ -0,0 +1 @@
+904e9a4eb37d0edbbdb3beb47dcdb4402d3470eb
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom b/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom
similarity index 91%
rename from repository/org/eclipse/swt/gtk/linux/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom
rename to repository/org/eclipse/swt/gtk/linux/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom
index 467b98b..556f7af 100644
--- a/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom
+++ b/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.swt.gtk.linux</groupId>
<artifactId>x86_64</artifactId>
- <version>3.7.0.v3735b</version>
+ <version>3.7.1.v3738a</version>
</project>
diff --git a/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom.md5 b/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom.md5
new file mode 100644
index 0000000..1d05712
--- /dev/null
+++ b/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom.md5
@@ -0,0 +1 @@
+842c3a88c9b24428605cea69646e60ca
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom.sha1 b/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom.sha1
new file mode 100644
index 0000000..622e94c
--- /dev/null
+++ b/repository/org/eclipse/swt/gtk/linux/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom.sha1
@@ -0,0 +1 @@
+0dbe8055df73c036e503f6bec9b488b47dc7375e
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/gtk/linux/x86_64/maven-metadata.xml b/repository/org/eclipse/swt/gtk/linux/x86_64/maven-metadata.xml
index c7ad8d9..d8103f4 100644
--- a/repository/org/eclipse/swt/gtk/linux/x86_64/maven-metadata.xml
+++ b/repository/org/eclipse/swt/gtk/linux/x86_64/maven-metadata.xml
@@ -3,7 +3,7 @@
<groupId>org.eclipse.swt.gtk.linux</groupId>
<artifactId>x86_64</artifactId>
<versioning>
- <release>3.7.0.v3735b</release>
+ <release>3.7.1.v3738a</release>
<versions>
<version>3.6.1.v3655c</version>
<version>3.3.2.v3349</version>
@@ -12,7 +12,8 @@
<version>3.5.0.v3550b</version>
<version>3.5.2.v3557f</version>
<version>3.7.0.v3735b</version>
+ <version>3.7.1.v3738a</version>
</versions>
- <lastUpdated>20110718163910</lastUpdated>
+ <lastUpdated>20111206122106</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/swt/gtk/linux/x86_64/maven-metadata.xml.md5 b/repository/org/eclipse/swt/gtk/linux/x86_64/maven-metadata.xml.md5
index bd770c9..d3677ae 100644
--- a/repository/org/eclipse/swt/gtk/linux/x86_64/maven-metadata.xml.md5
+++ b/repository/org/eclipse/swt/gtk/linux/x86_64/maven-metadata.xml.md5
@@ -1 +1 @@
-8b048c1888739391db275f02fc23869f
\ No newline at end of file
+8162dfce71bf5c42ae225c2171789c50
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/gtk/linux/x86_64/maven-metadata.xml.sha1 b/repository/org/eclipse/swt/gtk/linux/x86_64/maven-metadata.xml.sha1
index 294079b..88ac975 100644
--- a/repository/org/eclipse/swt/gtk/linux/x86_64/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/swt/gtk/linux/x86_64/maven-metadata.xml.sha1
@@ -1 +1 @@
-2836d3597604db805d4631b6033191e27c65faf8
\ No newline at end of file
+755f01621233fb41055e95fa732d9b15b12f1b73
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/maven-metadata.xml b/repository/org/eclipse/swt/maven-metadata.xml
index 24db39c..7065620 100644
--- a/repository/org/eclipse/swt/maven-metadata.xml
+++ b/repository/org/eclipse/swt/maven-metadata.xml
@@ -3,7 +3,7 @@
<groupId>org.eclipse</groupId>
<artifactId>swt</artifactId>
<versioning>
- <release>3.7.0.v3735b</release>
+ <release>3.7.1.v3738a</release>
<versions>
<version>3.6.1.v3655c</version>
<version>3.3.2.v3349d</version>
@@ -12,7 +12,8 @@
<version>3.5.0.v3550b</version>
<version>3.5.2.v3557f</version>
<version>3.7.0.v3735b</version>
+ <version>3.7.1.v3738a</version>
</versions>
- <lastUpdated>20110718113635</lastUpdated>
+ <lastUpdated>20111206110624</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/swt/maven-metadata.xml.md5 b/repository/org/eclipse/swt/maven-metadata.xml.md5
index d1d3c10..26e84fd 100644
--- a/repository/org/eclipse/swt/maven-metadata.xml.md5
+++ b/repository/org/eclipse/swt/maven-metadata.xml.md5
@@ -1 +1 @@
-1d0f61a4a088ffefdb2dff2a8e33b3e7
\ No newline at end of file
+ff903e989e6878c88127a8ce20c1532a
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/maven-metadata.xml.sha1 b/repository/org/eclipse/swt/maven-metadata.xml.sha1
index 28e7395..54ae3bc 100644
--- a/repository/org/eclipse/swt/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/swt/maven-metadata.xml.sha1
@@ -1 +1 @@
-6128dbd660d908765c571b9ecec70a76eeb181c9
\ No newline at end of file
+d35b0a9a93144238f308a800c77f14880e28682a
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/win32/win32/x86/3.7.0.v3735b/x86-3.7.0.v3735b.jar.md5 b/repository/org/eclipse/swt/win32/win32/x86/3.7.0.v3735b/x86-3.7.0.v3735b.jar.md5
deleted file mode 100644
index c22279c..0000000
--- a/repository/org/eclipse/swt/win32/win32/x86/3.7.0.v3735b/x86-3.7.0.v3735b.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-5fe0458975f5e09dc9bc3a1bce5d5fc2
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/win32/win32/x86/3.7.0.v3735b/x86-3.7.0.v3735b.jar.sha1 b/repository/org/eclipse/swt/win32/win32/x86/3.7.0.v3735b/x86-3.7.0.v3735b.jar.sha1
deleted file mode 100644
index 1512d5d..0000000
--- a/repository/org/eclipse/swt/win32/win32/x86/3.7.0.v3735b/x86-3.7.0.v3735b.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-82ad0ee1ecfb53fb40e2ea92dcac247d2e5cdb81
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/win32/win32/x86/3.7.0.v3735b/x86-3.7.0.v3735b.pom.md5 b/repository/org/eclipse/swt/win32/win32/x86/3.7.0.v3735b/x86-3.7.0.v3735b.pom.md5
deleted file mode 100644
index e384bb4..0000000
--- a/repository/org/eclipse/swt/win32/win32/x86/3.7.0.v3735b/x86-3.7.0.v3735b.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-68dcefa4260e41d69ba21b60dd6b9a9f
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/win32/win32/x86/3.7.0.v3735b/x86-3.7.0.v3735b.pom.sha1 b/repository/org/eclipse/swt/win32/win32/x86/3.7.0.v3735b/x86-3.7.0.v3735b.pom.sha1
deleted file mode 100644
index dcdda5b..0000000
--- a/repository/org/eclipse/swt/win32/win32/x86/3.7.0.v3735b/x86-3.7.0.v3735b.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b4164793f1512617991d97a9032f4dd7051bfb4d
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/win32/win32/x86/3.7.0.v3735b/x86-3.7.0.v3735b.jar b/repository/org/eclipse/swt/win32/win32/x86/3.7.1.v3738a/x86-3.7.1.v3738a.jar
similarity index 76%
rename from repository/org/eclipse/swt/win32/win32/x86/3.7.0.v3735b/x86-3.7.0.v3735b.jar
rename to repository/org/eclipse/swt/win32/win32/x86/3.7.1.v3738a/x86-3.7.1.v3738a.jar
index fdf01db..3684bac 100644
--- a/repository/org/eclipse/swt/win32/win32/x86/3.7.0.v3735b/x86-3.7.0.v3735b.jar
+++ b/repository/org/eclipse/swt/win32/win32/x86/3.7.1.v3738a/x86-3.7.1.v3738a.jar
Binary files differ
diff --git a/repository/org/eclipse/swt/win32/win32/x86/3.7.1.v3738a/x86-3.7.1.v3738a.jar.md5 b/repository/org/eclipse/swt/win32/win32/x86/3.7.1.v3738a/x86-3.7.1.v3738a.jar.md5
new file mode 100644
index 0000000..bf62f3b
--- /dev/null
+++ b/repository/org/eclipse/swt/win32/win32/x86/3.7.1.v3738a/x86-3.7.1.v3738a.jar.md5
@@ -0,0 +1 @@
+ac348ef25fab070a4dcfb2831f9950b2
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/win32/win32/x86/3.7.1.v3738a/x86-3.7.1.v3738a.jar.sha1 b/repository/org/eclipse/swt/win32/win32/x86/3.7.1.v3738a/x86-3.7.1.v3738a.jar.sha1
new file mode 100644
index 0000000..bb1fbf9
--- /dev/null
+++ b/repository/org/eclipse/swt/win32/win32/x86/3.7.1.v3738a/x86-3.7.1.v3738a.jar.sha1
@@ -0,0 +1 @@
+d02b17c4e708eafb24da631c93cbd20fd26b4074
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/win32/win32/x86/3.7.0.v3735b/x86-3.7.0.v3735b.pom b/repository/org/eclipse/swt/win32/win32/x86/3.7.1.v3738a/x86-3.7.1.v3738a.pom
similarity index 91%
rename from repository/org/eclipse/swt/win32/win32/x86/3.7.0.v3735b/x86-3.7.0.v3735b.pom
rename to repository/org/eclipse/swt/win32/win32/x86/3.7.1.v3738a/x86-3.7.1.v3738a.pom
index f72bda0..f84f5a0 100644
--- a/repository/org/eclipse/swt/win32/win32/x86/3.7.0.v3735b/x86-3.7.0.v3735b.pom
+++ b/repository/org/eclipse/swt/win32/win32/x86/3.7.1.v3738a/x86-3.7.1.v3738a.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.swt.win32.win32</groupId>
<artifactId>x86</artifactId>
- <version>3.7.0.v3735b</version>
+ <version>3.7.1.v3738a</version>
</project>
diff --git a/repository/org/eclipse/swt/win32/win32/x86/3.7.1.v3738a/x86-3.7.1.v3738a.pom.md5 b/repository/org/eclipse/swt/win32/win32/x86/3.7.1.v3738a/x86-3.7.1.v3738a.pom.md5
new file mode 100644
index 0000000..e6833c9
--- /dev/null
+++ b/repository/org/eclipse/swt/win32/win32/x86/3.7.1.v3738a/x86-3.7.1.v3738a.pom.md5
@@ -0,0 +1 @@
+6c29c05233a32938f6930e39454753eb
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/win32/win32/x86/3.7.1.v3738a/x86-3.7.1.v3738a.pom.sha1 b/repository/org/eclipse/swt/win32/win32/x86/3.7.1.v3738a/x86-3.7.1.v3738a.pom.sha1
new file mode 100644
index 0000000..221c881
--- /dev/null
+++ b/repository/org/eclipse/swt/win32/win32/x86/3.7.1.v3738a/x86-3.7.1.v3738a.pom.sha1
@@ -0,0 +1 @@
+4da78754667b9bd2ee66034ed2edf1bf0c113d39
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/win32/win32/x86/maven-metadata.xml b/repository/org/eclipse/swt/win32/win32/x86/maven-metadata.xml
index b8804c8..a8f5592 100644
--- a/repository/org/eclipse/swt/win32/win32/x86/maven-metadata.xml
+++ b/repository/org/eclipse/swt/win32/win32/x86/maven-metadata.xml
@@ -3,7 +3,7 @@
<groupId>org.eclipse.swt.win32.win32</groupId>
<artifactId>x86</artifactId>
<versioning>
- <release>3.7.0.v3735b</release>
+ <release>3.7.1.v3738a</release>
<versions>
<version>3.6.1.v3655c</version>
<version>3.3.3.v3349</version>
@@ -12,7 +12,8 @@
<version>3.5.0.v3550b</version>
<version>3.5.2.v3557f</version>
<version>3.7.0.v3735b</version>
+ <version>3.7.1.v3738a</version>
</versions>
- <lastUpdated>20110719091357</lastUpdated>
+ <lastUpdated>20111206122110</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/swt/win32/win32/x86/maven-metadata.xml.md5 b/repository/org/eclipse/swt/win32/win32/x86/maven-metadata.xml.md5
index 3f7eaac..d95d4f7 100644
--- a/repository/org/eclipse/swt/win32/win32/x86/maven-metadata.xml.md5
+++ b/repository/org/eclipse/swt/win32/win32/x86/maven-metadata.xml.md5
@@ -1 +1 @@
-384c3005fc11d18b6923e5f59b9c0289
\ No newline at end of file
+0f19c293c491aa82fa28588173fda3b5
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/win32/win32/x86/maven-metadata.xml.sha1 b/repository/org/eclipse/swt/win32/win32/x86/maven-metadata.xml.sha1
index e14678e..bddd4e7 100644
--- a/repository/org/eclipse/swt/win32/win32/x86/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/swt/win32/win32/x86/maven-metadata.xml.sha1
@@ -1 +1 @@
-2c26e7b311b093756c9ebab45a0c5db2f4a09e63
\ No newline at end of file
+78905f12fc88c340f3e718376de9ee508db0e7cd
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/win32/win32/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar.md5 b/repository/org/eclipse/swt/win32/win32/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar.md5
deleted file mode 100644
index cedcd98..0000000
--- a/repository/org/eclipse/swt/win32/win32/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-a670f7ea6ea5ab4a155844f4781645ee
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/win32/win32/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar.sha1 b/repository/org/eclipse/swt/win32/win32/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar.sha1
deleted file mode 100644
index 812a6f1..0000000
--- a/repository/org/eclipse/swt/win32/win32/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bae526c58020ad0f4a2d88744d0b9e13e8a5fa91
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/win32/win32/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom.md5 b/repository/org/eclipse/swt/win32/win32/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom.md5
deleted file mode 100644
index 030dbb8..0000000
--- a/repository/org/eclipse/swt/win32/win32/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-d17f6fd39182c12c5d83b9a01a83ea4c
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/win32/win32/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom.sha1 b/repository/org/eclipse/swt/win32/win32/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom.sha1
deleted file mode 100644
index a14b59d..0000000
--- a/repository/org/eclipse/swt/win32/win32/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-83bae2209c39ba39f829e599a7ef712194bb9abd
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/win32/win32/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar b/repository/org/eclipse/swt/win32/win32/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar
similarity index 77%
rename from repository/org/eclipse/swt/win32/win32/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar
rename to repository/org/eclipse/swt/win32/win32/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar
index 5d9917c..0b71429 100644
--- a/repository/org/eclipse/swt/win32/win32/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.jar
+++ b/repository/org/eclipse/swt/win32/win32/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar
Binary files differ
diff --git a/repository/org/eclipse/swt/win32/win32/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar.md5 b/repository/org/eclipse/swt/win32/win32/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar.md5
new file mode 100644
index 0000000..f9c7638
--- /dev/null
+++ b/repository/org/eclipse/swt/win32/win32/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar.md5
@@ -0,0 +1 @@
+2ace287f91911727de917657d50ab59a
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/win32/win32/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar.sha1 b/repository/org/eclipse/swt/win32/win32/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar.sha1
new file mode 100644
index 0000000..d930b45
--- /dev/null
+++ b/repository/org/eclipse/swt/win32/win32/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.jar.sha1
@@ -0,0 +1 @@
+8f16ee118b9b33b1689ed3650f859a50f954a7a3
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/win32/win32/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom b/repository/org/eclipse/swt/win32/win32/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom
similarity index 91%
rename from repository/org/eclipse/swt/win32/win32/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom
rename to repository/org/eclipse/swt/win32/win32/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom
index 8cec7ee..1bff05a 100644
--- a/repository/org/eclipse/swt/win32/win32/x86_64/3.7.0.v3735b/x86_64-3.7.0.v3735b.pom
+++ b/repository/org/eclipse/swt/win32/win32/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.swt.win32.win32</groupId>
<artifactId>x86_64</artifactId>
- <version>3.7.0.v3735b</version>
+ <version>3.7.1.v3738a</version>
</project>
diff --git a/repository/org/eclipse/swt/win32/win32/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom.md5 b/repository/org/eclipse/swt/win32/win32/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom.md5
new file mode 100644
index 0000000..eaff4f5
--- /dev/null
+++ b/repository/org/eclipse/swt/win32/win32/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom.md5
@@ -0,0 +1 @@
+a568e131d217b62cc88dd9179c3a34b5
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/win32/win32/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom.sha1 b/repository/org/eclipse/swt/win32/win32/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom.sha1
new file mode 100644
index 0000000..6bd0473
--- /dev/null
+++ b/repository/org/eclipse/swt/win32/win32/x86_64/3.7.1.v3738a/x86_64-3.7.1.v3738a.pom.sha1
@@ -0,0 +1 @@
+e48d1d67195ffba93cb8e7bffbb720051525e387
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/win32/win32/x86_64/maven-metadata.xml b/repository/org/eclipse/swt/win32/win32/x86_64/maven-metadata.xml
index 1abf6e2..a0e1ddf 100644
--- a/repository/org/eclipse/swt/win32/win32/x86_64/maven-metadata.xml
+++ b/repository/org/eclipse/swt/win32/win32/x86_64/maven-metadata.xml
@@ -3,11 +3,12 @@
<groupId>org.eclipse.swt.win32.win32</groupId>
<artifactId>x86_64</artifactId>
<versioning>
- <release>3.7.0.v3735b</release>
+ <release>3.7.1.v3738a</release>
<versions>
<version>3.6.1.v3655c</version>
<version>3.7.0.v3735b</version>
+ <version>3.7.1.v3738a</version>
</versions>
- <lastUpdated>20110719093311</lastUpdated>
+ <lastUpdated>20111206122114</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/swt/win32/win32/x86_64/maven-metadata.xml.md5 b/repository/org/eclipse/swt/win32/win32/x86_64/maven-metadata.xml.md5
index ac6e539..de3afa1 100644
--- a/repository/org/eclipse/swt/win32/win32/x86_64/maven-metadata.xml.md5
+++ b/repository/org/eclipse/swt/win32/win32/x86_64/maven-metadata.xml.md5
@@ -1 +1 @@
-17cbf70db51f7ead02a3a37df9f55d54
\ No newline at end of file
+83a0445989a6d8e08654d4f43b7c98b1
\ No newline at end of file
diff --git a/repository/org/eclipse/swt/win32/win32/x86_64/maven-metadata.xml.sha1 b/repository/org/eclipse/swt/win32/win32/x86_64/maven-metadata.xml.sha1
index 86b09a9..bba295b 100644
--- a/repository/org/eclipse/swt/win32/win32/x86_64/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/swt/win32/win32/x86_64/maven-metadata.xml.sha1
@@ -1 +1 @@
-c429b8f69c0ce1c976bfaf3a855e7fee937834ba
\ No newline at end of file
+c33744eaba3fd70f5fac9dc032e9fe770bb7888c
\ No newline at end of file
diff --git a/repository/org/eclipse/team/ui/maven-metadata.xml b/repository/org/eclipse/team/ui/maven-metadata.xml
index 210d4bd..7e3590c 100644
--- a/repository/org/eclipse/team/ui/maven-metadata.xml
+++ b/repository/org/eclipse/team/ui/maven-metadata.xml
@@ -17,6 +17,6 @@
<version>3.6.100.I20110525-0800-studio</version>
<version>3.6.100.I20110525-0800-2-studio</version>
</versions>
- <lastUpdated>20111122181629</lastUpdated>
+ <lastUpdated>20111122183151</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/team/ui/maven-metadata.xml.md5 b/repository/org/eclipse/team/ui/maven-metadata.xml.md5
index f4b84dd..8db51ae 100644
--- a/repository/org/eclipse/team/ui/maven-metadata.xml.md5
+++ b/repository/org/eclipse/team/ui/maven-metadata.xml.md5
@@ -1 +1 @@
-480db93785cbd9fac934a2d1b4741190
\ No newline at end of file
+2725387344f840d23d4d3332d81c2ab3
\ No newline at end of file
diff --git a/repository/org/eclipse/team/ui/maven-metadata.xml.sha1 b/repository/org/eclipse/team/ui/maven-metadata.xml.sha1
index 69d1092..72cef6c 100644
--- a/repository/org/eclipse/team/ui/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/team/ui/maven-metadata.xml.sha1
@@ -1 +1 @@
-02aba5f10bce6d38916b7df24e8f59cb31f0535e
\ No newline at end of file
+7992181e52ad4f4a6b93c21cdff470df43872a60
\ No newline at end of file
diff --git a/repository/org/eclipse/text/3.5.100.v20110505-0800/text-3.5.100.v20110505-0800.jar.md5 b/repository/org/eclipse/text/3.5.100.v20110505-0800/text-3.5.100.v20110505-0800.jar.md5
deleted file mode 100644
index 9ec7ab1..0000000
--- a/repository/org/eclipse/text/3.5.100.v20110505-0800/text-3.5.100.v20110505-0800.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-716a66b8aaf1882badd4c2f9acf3fb3e
\ No newline at end of file
diff --git a/repository/org/eclipse/text/3.5.100.v20110505-0800/text-3.5.100.v20110505-0800.jar.sha1 b/repository/org/eclipse/text/3.5.100.v20110505-0800/text-3.5.100.v20110505-0800.jar.sha1
deleted file mode 100644
index cdef1c2..0000000
--- a/repository/org/eclipse/text/3.5.100.v20110505-0800/text-3.5.100.v20110505-0800.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3dc1f98d887201bb243136f81b2c641c1ae442e9
\ No newline at end of file
diff --git a/repository/org/eclipse/text/3.5.100.v20110505-0800/text-3.5.100.v20110505-0800.pom.md5 b/repository/org/eclipse/text/3.5.100.v20110505-0800/text-3.5.100.v20110505-0800.pom.md5
deleted file mode 100644
index f9d8f18..0000000
--- a/repository/org/eclipse/text/3.5.100.v20110505-0800/text-3.5.100.v20110505-0800.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-3e333c30119c203fade510e37f6cefbb
\ No newline at end of file
diff --git a/repository/org/eclipse/text/3.5.100.v20110505-0800/text-3.5.100.v20110505-0800.pom.sha1 b/repository/org/eclipse/text/3.5.100.v20110505-0800/text-3.5.100.v20110505-0800.pom.sha1
deleted file mode 100644
index 149688d..0000000
--- a/repository/org/eclipse/text/3.5.100.v20110505-0800/text-3.5.100.v20110505-0800.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-47a5760c4bfb88c59f430e0e8f7102453807a797
\ No newline at end of file
diff --git a/repository/org/eclipse/text/3.5.100.v20110505-0800/text-3.5.100.v20110505-0800.jar b/repository/org/eclipse/text/3.5.101.r371_v20110810-0800/text-3.5.101.r371_v20110810-0800.jar
similarity index 61%
rename from repository/org/eclipse/text/3.5.100.v20110505-0800/text-3.5.100.v20110505-0800.jar
rename to repository/org/eclipse/text/3.5.101.r371_v20110810-0800/text-3.5.101.r371_v20110810-0800.jar
index 3d9bd7c..6d0f6ea 100644
--- a/repository/org/eclipse/text/3.5.100.v20110505-0800/text-3.5.100.v20110505-0800.jar
+++ b/repository/org/eclipse/text/3.5.101.r371_v20110810-0800/text-3.5.101.r371_v20110810-0800.jar
Binary files differ
diff --git a/repository/org/eclipse/text/3.5.101.r371_v20110810-0800/text-3.5.101.r371_v20110810-0800.jar.md5 b/repository/org/eclipse/text/3.5.101.r371_v20110810-0800/text-3.5.101.r371_v20110810-0800.jar.md5
new file mode 100644
index 0000000..d208535
--- /dev/null
+++ b/repository/org/eclipse/text/3.5.101.r371_v20110810-0800/text-3.5.101.r371_v20110810-0800.jar.md5
@@ -0,0 +1 @@
+eac52d93eff9cd5c575708dec1fdc7dd
\ No newline at end of file
diff --git a/repository/org/eclipse/text/3.5.101.r371_v20110810-0800/text-3.5.101.r371_v20110810-0800.jar.sha1 b/repository/org/eclipse/text/3.5.101.r371_v20110810-0800/text-3.5.101.r371_v20110810-0800.jar.sha1
new file mode 100644
index 0000000..45d6606
--- /dev/null
+++ b/repository/org/eclipse/text/3.5.101.r371_v20110810-0800/text-3.5.101.r371_v20110810-0800.jar.sha1
@@ -0,0 +1 @@
+54a442442c575e6809c18f7dfc848755a58ab955
\ No newline at end of file
diff --git a/repository/org/eclipse/text/3.5.100.v20110505-0800/text-3.5.100.v20110505-0800.pom b/repository/org/eclipse/text/3.5.101.r371_v20110810-0800/text-3.5.101.r371_v20110810-0800.pom
similarity index 87%
rename from repository/org/eclipse/text/3.5.100.v20110505-0800/text-3.5.100.v20110505-0800.pom
rename to repository/org/eclipse/text/3.5.101.r371_v20110810-0800/text-3.5.101.r371_v20110810-0800.pom
index 08e3055..3a66f7c 100644
--- a/repository/org/eclipse/text/3.5.100.v20110505-0800/text-3.5.100.v20110505-0800.pom
+++ b/repository/org/eclipse/text/3.5.101.r371_v20110810-0800/text-3.5.101.r371_v20110810-0800.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse</groupId>
<artifactId>text</artifactId>
- <version>3.5.100.v20110505-0800</version>
+ <version>3.5.101.r371_v20110810-0800</version>
</project>
diff --git a/repository/org/eclipse/text/3.5.101.r371_v20110810-0800/text-3.5.101.r371_v20110810-0800.pom.md5 b/repository/org/eclipse/text/3.5.101.r371_v20110810-0800/text-3.5.101.r371_v20110810-0800.pom.md5
new file mode 100644
index 0000000..e4424a1
--- /dev/null
+++ b/repository/org/eclipse/text/3.5.101.r371_v20110810-0800/text-3.5.101.r371_v20110810-0800.pom.md5
@@ -0,0 +1 @@
+7ebb749d187d032928e877a83f95578c
\ No newline at end of file
diff --git a/repository/org/eclipse/text/3.5.101.r371_v20110810-0800/text-3.5.101.r371_v20110810-0800.pom.sha1 b/repository/org/eclipse/text/3.5.101.r371_v20110810-0800/text-3.5.101.r371_v20110810-0800.pom.sha1
new file mode 100644
index 0000000..84b402e
--- /dev/null
+++ b/repository/org/eclipse/text/3.5.101.r371_v20110810-0800/text-3.5.101.r371_v20110810-0800.pom.sha1
@@ -0,0 +1 @@
+a5eb62866398c0b481a841dc42571acf9a73cf41
\ No newline at end of file
diff --git a/repository/org/eclipse/text/maven-metadata.xml b/repository/org/eclipse/text/maven-metadata.xml
index e8c7bfb..219677a 100644
--- a/repository/org/eclipse/text/maven-metadata.xml
+++ b/repository/org/eclipse/text/maven-metadata.xml
@@ -3,14 +3,15 @@
<groupId>org.eclipse</groupId>
<artifactId>text</artifactId>
<versioning>
- <release>3.5.100.v20110505-0800</release>
+ <release>3.5.101.r371_v20110810-0800</release>
<versions>
<version>3.5.0.v20100601-1300</version>
<version>3.3.0-v20070606-0010</version>
<version>3.4.0.v20080605-1800</version>
<version>3.5.0.v20090513-2000</version>
<version>3.5.100.v20110505-0800</version>
+ <version>3.5.101.r371_v20110810-0800</version>
</versions>
- <lastUpdated>20110718113708</lastUpdated>
+ <lastUpdated>20111206110629</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/text/maven-metadata.xml.md5 b/repository/org/eclipse/text/maven-metadata.xml.md5
index b96e4fa..4609568 100644
--- a/repository/org/eclipse/text/maven-metadata.xml.md5
+++ b/repository/org/eclipse/text/maven-metadata.xml.md5
@@ -1 +1 @@
-86b5c8ea437181cfd8b8cb3cf8c5d1da
\ No newline at end of file
+0405c66c0366bae94eae51c6d28eb88e
\ No newline at end of file
diff --git a/repository/org/eclipse/text/maven-metadata.xml.sha1 b/repository/org/eclipse/text/maven-metadata.xml.sha1
index b09c242..a89c123 100644
--- a/repository/org/eclipse/text/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/text/maven-metadata.xml.sha1
@@ -1 +1 @@
-a767963e39f0dec41d29918712a60b1e779e09b6
\ No newline at end of file
+c65729dd2d7f8198b02611bdf3adab85b7f86cb7
\ No newline at end of file
diff --git a/repository/org/eclipse/ui/ide/3.7.0.I20110519-0100-studio/ide-3.7.0.I20110519-0100-studio.jar.md5 b/repository/org/eclipse/ui/ide/3.7.0.I20110519-0100-studio/ide-3.7.0.I20110519-0100-studio.jar.md5
deleted file mode 100644
index 99f9347..0000000
--- a/repository/org/eclipse/ui/ide/3.7.0.I20110519-0100-studio/ide-3.7.0.I20110519-0100-studio.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-2e66bf32aa34c7b014f327f9dd1b058a
\ No newline at end of file
diff --git a/repository/org/eclipse/ui/ide/3.7.0.I20110519-0100-studio/ide-3.7.0.I20110519-0100-studio.jar.sha1 b/repository/org/eclipse/ui/ide/3.7.0.I20110519-0100-studio/ide-3.7.0.I20110519-0100-studio.jar.sha1
deleted file mode 100644
index c21fb34..0000000
--- a/repository/org/eclipse/ui/ide/3.7.0.I20110519-0100-studio/ide-3.7.0.I20110519-0100-studio.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0e474c56cc564f136fa921d5ef51bb502d308608
\ No newline at end of file
diff --git a/repository/org/eclipse/ui/ide/3.7.0.I20110519-0100-studio/ide-3.7.0.I20110519-0100-studio.pom.md5 b/repository/org/eclipse/ui/ide/3.7.0.I20110519-0100-studio/ide-3.7.0.I20110519-0100-studio.pom.md5
deleted file mode 100644
index 0f60189..0000000
--- a/repository/org/eclipse/ui/ide/3.7.0.I20110519-0100-studio/ide-3.7.0.I20110519-0100-studio.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-971cefd3f75f4c94c5d9ec4c5aba00fb
\ No newline at end of file
diff --git a/repository/org/eclipse/ui/ide/3.7.0.I20110519-0100-studio/ide-3.7.0.I20110519-0100-studio.pom.sha1 b/repository/org/eclipse/ui/ide/3.7.0.I20110519-0100-studio/ide-3.7.0.I20110519-0100-studio.pom.sha1
deleted file mode 100644
index 9c348ba..0000000
--- a/repository/org/eclipse/ui/ide/3.7.0.I20110519-0100-studio/ide-3.7.0.I20110519-0100-studio.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c21c454411d50ae669e551dddef621325e164137
\ No newline at end of file
diff --git a/repository/org/eclipse/ui/ide/3.7.0.I20110519-0100-studio/ide-3.7.0.I20110519-0100-studio.jar b/repository/org/eclipse/ui/ide/3.7.0.v20110809-1737-studio/ide-3.7.0.v20110809-1737-studio.jar
similarity index 69%
rename from repository/org/eclipse/ui/ide/3.7.0.I20110519-0100-studio/ide-3.7.0.I20110519-0100-studio.jar
rename to repository/org/eclipse/ui/ide/3.7.0.v20110809-1737-studio/ide-3.7.0.v20110809-1737-studio.jar
index a6420a6..96896a3 100644
--- a/repository/org/eclipse/ui/ide/3.7.0.I20110519-0100-studio/ide-3.7.0.I20110519-0100-studio.jar
+++ b/repository/org/eclipse/ui/ide/3.7.0.v20110809-1737-studio/ide-3.7.0.v20110809-1737-studio.jar
Binary files differ
diff --git a/repository/org/eclipse/ui/ide/3.7.0.v20110809-1737-studio/ide-3.7.0.v20110809-1737-studio.jar.md5 b/repository/org/eclipse/ui/ide/3.7.0.v20110809-1737-studio/ide-3.7.0.v20110809-1737-studio.jar.md5
new file mode 100644
index 0000000..5b1ed52
--- /dev/null
+++ b/repository/org/eclipse/ui/ide/3.7.0.v20110809-1737-studio/ide-3.7.0.v20110809-1737-studio.jar.md5
@@ -0,0 +1 @@
+6501ecedc4837d6f39050a9ad95c3933
\ No newline at end of file
diff --git a/repository/org/eclipse/ui/ide/3.7.0.v20110809-1737-studio/ide-3.7.0.v20110809-1737-studio.jar.sha1 b/repository/org/eclipse/ui/ide/3.7.0.v20110809-1737-studio/ide-3.7.0.v20110809-1737-studio.jar.sha1
new file mode 100644
index 0000000..3eeaa18
--- /dev/null
+++ b/repository/org/eclipse/ui/ide/3.7.0.v20110809-1737-studio/ide-3.7.0.v20110809-1737-studio.jar.sha1
@@ -0,0 +1 @@
+f9686ca27f0b9fb5c84c2ab5403eaf21629b199f
\ No newline at end of file
diff --git a/repository/org/eclipse/ui/ide/3.7.0.I20110519-0100-studio/ide-3.7.0.I20110519-0100-studio.pom b/repository/org/eclipse/ui/ide/3.7.0.v20110809-1737-studio/ide-3.7.0.v20110809-1737-studio.pom
similarity index 87%
rename from repository/org/eclipse/ui/ide/3.7.0.I20110519-0100-studio/ide-3.7.0.I20110519-0100-studio.pom
rename to repository/org/eclipse/ui/ide/3.7.0.v20110809-1737-studio/ide-3.7.0.v20110809-1737-studio.pom
index 1f3feb2..c08ff03 100644
--- a/repository/org/eclipse/ui/ide/3.7.0.I20110519-0100-studio/ide-3.7.0.I20110519-0100-studio.pom
+++ b/repository/org/eclipse/ui/ide/3.7.0.v20110809-1737-studio/ide-3.7.0.v20110809-1737-studio.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.ui</groupId>
<artifactId>ide</artifactId>
- <version>3.7.0.I20110519-0100-studio</version>
+ <version>3.7.0.v20110809-1737-studio</version>
</project>
diff --git a/repository/org/eclipse/ui/ide/3.7.0.v20110809-1737-studio/ide-3.7.0.v20110809-1737-studio.pom.md5 b/repository/org/eclipse/ui/ide/3.7.0.v20110809-1737-studio/ide-3.7.0.v20110809-1737-studio.pom.md5
new file mode 100644
index 0000000..4a4a822
--- /dev/null
+++ b/repository/org/eclipse/ui/ide/3.7.0.v20110809-1737-studio/ide-3.7.0.v20110809-1737-studio.pom.md5
@@ -0,0 +1 @@
+13fe6be4a0062195cbabeec3e50fb9c9
\ No newline at end of file
diff --git a/repository/org/eclipse/ui/ide/3.7.0.v20110809-1737-studio/ide-3.7.0.v20110809-1737-studio.pom.sha1 b/repository/org/eclipse/ui/ide/3.7.0.v20110809-1737-studio/ide-3.7.0.v20110809-1737-studio.pom.sha1
new file mode 100644
index 0000000..3962b73
--- /dev/null
+++ b/repository/org/eclipse/ui/ide/3.7.0.v20110809-1737-studio/ide-3.7.0.v20110809-1737-studio.pom.sha1
@@ -0,0 +1 @@
+00f6fe7b2412a264f03e4c7df274644195e670c1
\ No newline at end of file
diff --git a/repository/org/eclipse/ui/ide/maven-metadata.xml b/repository/org/eclipse/ui/ide/maven-metadata.xml
index 285884b..52b34b2 100644
--- a/repository/org/eclipse/ui/ide/maven-metadata.xml
+++ b/repository/org/eclipse/ui/ide/maven-metadata.xml
@@ -3,7 +3,7 @@
<groupId>org.eclipse.ui</groupId>
<artifactId>ide</artifactId>
<versioning>
- <release>3.7.0.I20110519-0100-studio</release>
+ <release>3.7.0.v20110809-1737-studio</release>
<versions>
<version>3.6.1.M20100825-0800-studio</version>
<version>3.6.1.M20100825-0800</version>
@@ -17,7 +17,8 @@
<version>3.5.2.M20100113-0800-studio</version>
<version>3.7.0.I20110519-0100</version>
<version>3.7.0.I20110519-0100-studio</version>
+ <version>3.7.0.v20110809-1737-studio</version>
</versions>
- <lastUpdated>20110720111916</lastUpdated>
+ <lastUpdated>20111206131932</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/ui/ide/maven-metadata.xml.md5 b/repository/org/eclipse/ui/ide/maven-metadata.xml.md5
index 0520fac..634b74e 100644
--- a/repository/org/eclipse/ui/ide/maven-metadata.xml.md5
+++ b/repository/org/eclipse/ui/ide/maven-metadata.xml.md5
@@ -1 +1 @@
-808757ed279d4cc392864ca031ae9dda
\ No newline at end of file
+c4b4e8773f4d436f18b12c4fce0d2307
\ No newline at end of file
diff --git a/repository/org/eclipse/ui/ide/maven-metadata.xml.sha1 b/repository/org/eclipse/ui/ide/maven-metadata.xml.sha1
index fe79c7d..424dac6 100644
--- a/repository/org/eclipse/ui/ide/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/ui/ide/maven-metadata.xml.sha1
@@ -1 +1 @@
-81b43af0a8088ced2f26b4487d0f4f9e358b90b6
\ No newline at end of file
+a112fbb67e20c80c6ad4a43f0831ae0a74ad1563
\ No newline at end of file
diff --git a/repository/org/eclipse/ui/navigator/3.5.100.I20110524-0800/navigator-3.5.100.I20110524-0800.jar.md5 b/repository/org/eclipse/ui/navigator/3.5.100.I20110524-0800/navigator-3.5.100.I20110524-0800.jar.md5
deleted file mode 100644
index 8425197..0000000
--- a/repository/org/eclipse/ui/navigator/3.5.100.I20110524-0800/navigator-3.5.100.I20110524-0800.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-98cc3dc394a6ad00669f158a0db5e9d3
\ No newline at end of file
diff --git a/repository/org/eclipse/ui/navigator/3.5.100.I20110524-0800/navigator-3.5.100.I20110524-0800.jar.sha1 b/repository/org/eclipse/ui/navigator/3.5.100.I20110524-0800/navigator-3.5.100.I20110524-0800.jar.sha1
deleted file mode 100644
index a5f2bca..0000000
--- a/repository/org/eclipse/ui/navigator/3.5.100.I20110524-0800/navigator-3.5.100.I20110524-0800.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3930f78260a60152893c9d4b9245d95477d42714
\ No newline at end of file
diff --git a/repository/org/eclipse/ui/navigator/3.5.100.I20110524-0800/navigator-3.5.100.I20110524-0800.pom.md5 b/repository/org/eclipse/ui/navigator/3.5.100.I20110524-0800/navigator-3.5.100.I20110524-0800.pom.md5
deleted file mode 100644
index 0a47e3b..0000000
--- a/repository/org/eclipse/ui/navigator/3.5.100.I20110524-0800/navigator-3.5.100.I20110524-0800.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-fa1cd46ff4d8bb86e92fe5fd659903ba
\ No newline at end of file
diff --git a/repository/org/eclipse/ui/navigator/3.5.100.I20110524-0800/navigator-3.5.100.I20110524-0800.pom.sha1 b/repository/org/eclipse/ui/navigator/3.5.100.I20110524-0800/navigator-3.5.100.I20110524-0800.pom.sha1
deleted file mode 100644
index 2974330..0000000
--- a/repository/org/eclipse/ui/navigator/3.5.100.I20110524-0800/navigator-3.5.100.I20110524-0800.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-da08e4b6a1a1fcff6b835c0689207e5935d6a3d4
\ No newline at end of file
diff --git a/repository/org/eclipse/ui/navigator/3.5.100.I20110524-0800/navigator-3.5.100.I20110524-0800.jar b/repository/org/eclipse/ui/navigator/3.5.100.v20110809-2227/navigator-3.5.100.v20110809-2227.jar
similarity index 60%
rename from repository/org/eclipse/ui/navigator/3.5.100.I20110524-0800/navigator-3.5.100.I20110524-0800.jar
rename to repository/org/eclipse/ui/navigator/3.5.100.v20110809-2227/navigator-3.5.100.v20110809-2227.jar
index 0452152..418931e 100644
--- a/repository/org/eclipse/ui/navigator/3.5.100.I20110524-0800/navigator-3.5.100.I20110524-0800.jar
+++ b/repository/org/eclipse/ui/navigator/3.5.100.v20110809-2227/navigator-3.5.100.v20110809-2227.jar
Binary files differ
diff --git a/repository/org/eclipse/ui/navigator/3.5.100.v20110809-2227/navigator-3.5.100.v20110809-2227.jar.md5 b/repository/org/eclipse/ui/navigator/3.5.100.v20110809-2227/navigator-3.5.100.v20110809-2227.jar.md5
new file mode 100644
index 0000000..473abe0
--- /dev/null
+++ b/repository/org/eclipse/ui/navigator/3.5.100.v20110809-2227/navigator-3.5.100.v20110809-2227.jar.md5
@@ -0,0 +1 @@
+6ddf9a1965343b9c2374291624832af3
\ No newline at end of file
diff --git a/repository/org/eclipse/ui/navigator/3.5.100.v20110809-2227/navigator-3.5.100.v20110809-2227.jar.sha1 b/repository/org/eclipse/ui/navigator/3.5.100.v20110809-2227/navigator-3.5.100.v20110809-2227.jar.sha1
new file mode 100644
index 0000000..e666484
--- /dev/null
+++ b/repository/org/eclipse/ui/navigator/3.5.100.v20110809-2227/navigator-3.5.100.v20110809-2227.jar.sha1
@@ -0,0 +1 @@
+4838a16f73c9da8e49621829549f1f4b84d7ab29
\ No newline at end of file
diff --git a/repository/org/eclipse/ui/navigator/3.5.100.I20110524-0800/navigator-3.5.100.I20110524-0800.pom b/repository/org/eclipse/ui/navigator/3.5.100.v20110809-2227/navigator-3.5.100.v20110809-2227.pom
similarity index 88%
rename from repository/org/eclipse/ui/navigator/3.5.100.I20110524-0800/navigator-3.5.100.I20110524-0800.pom
rename to repository/org/eclipse/ui/navigator/3.5.100.v20110809-2227/navigator-3.5.100.v20110809-2227.pom
index 5a813e9..912414e 100644
--- a/repository/org/eclipse/ui/navigator/3.5.100.I20110524-0800/navigator-3.5.100.I20110524-0800.pom
+++ b/repository/org/eclipse/ui/navigator/3.5.100.v20110809-2227/navigator-3.5.100.v20110809-2227.pom
@@ -4,5 +4,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.ui</groupId>
<artifactId>navigator</artifactId>
- <version>3.5.100.I20110524-0800</version>
+ <version>3.5.100.v20110809-2227</version>
</project>
diff --git a/repository/org/eclipse/ui/navigator/3.5.100.v20110809-2227/navigator-3.5.100.v20110809-2227.pom.md5 b/repository/org/eclipse/ui/navigator/3.5.100.v20110809-2227/navigator-3.5.100.v20110809-2227.pom.md5
new file mode 100644
index 0000000..242d6aa
--- /dev/null
+++ b/repository/org/eclipse/ui/navigator/3.5.100.v20110809-2227/navigator-3.5.100.v20110809-2227.pom.md5
@@ -0,0 +1 @@
+5a507c268dfca9796b8959f977537384
\ No newline at end of file
diff --git a/repository/org/eclipse/ui/navigator/3.5.100.v20110809-2227/navigator-3.5.100.v20110809-2227.pom.sha1 b/repository/org/eclipse/ui/navigator/3.5.100.v20110809-2227/navigator-3.5.100.v20110809-2227.pom.sha1
new file mode 100644
index 0000000..cca7f75
--- /dev/null
+++ b/repository/org/eclipse/ui/navigator/3.5.100.v20110809-2227/navigator-3.5.100.v20110809-2227.pom.sha1
@@ -0,0 +1 @@
+4720184a31c02106920f03cf2ac66fe655bfab98
\ No newline at end of file
diff --git a/repository/org/eclipse/ui/navigator/maven-metadata.xml b/repository/org/eclipse/ui/navigator/maven-metadata.xml
index 6c48e8c..e82d5e1 100644
--- a/repository/org/eclipse/ui/navigator/maven-metadata.xml
+++ b/repository/org/eclipse/ui/navigator/maven-metadata.xml
@@ -3,7 +3,7 @@
<groupId>org.eclipse.ui</groupId>
<artifactId>navigator</artifactId>
<versioning>
- <release>3.5.100.I20110524-0800</release>
+ <release>3.5.100.v20110809-2227</release>
<versions>
<version>3.5.0.I20100601-0800</version>
<version>3.3.2.M20080207-0800</version>
@@ -12,7 +12,8 @@
<version>3.4.0.I20090525-2000</version>
<version>3.4.2.M20100120-0800</version>
<version>3.5.100.I20110524-0800</version>
+ <version>3.5.100.v20110809-2227</version>
</versions>
- <lastUpdated>20110718113901</lastUpdated>
+ <lastUpdated>20111206110634</lastUpdated>
</versioning>
</metadata>
diff --git a/repository/org/eclipse/ui/navigator/maven-metadata.xml.md5 b/repository/org/eclipse/ui/navigator/maven-metadata.xml.md5
index a6aabfa..4795640 100644
--- a/repository/org/eclipse/ui/navigator/maven-metadata.xml.md5
+++ b/repository/org/eclipse/ui/navigator/maven-metadata.xml.md5
@@ -1 +1 @@
-7a092d59e6498685f34900a0a60fc837
\ No newline at end of file
+bf3ee921447fb32a423690ff7e6ff5c0
\ No newline at end of file
diff --git a/repository/org/eclipse/ui/navigator/maven-metadata.xml.sha1 b/repository/org/eclipse/ui/navigator/maven-metadata.xml.sha1
index dbc1bba..0e3880f 100644
--- a/repository/org/eclipse/ui/navigator/maven-metadata.xml.sha1
+++ b/repository/org/eclipse/ui/navigator/maven-metadata.xml.sha1
@@ -1 +1 @@
-a31a1af2b0bc9c71421324cb0aca998c3f4f0eed
\ No newline at end of file
+31ee947f9ad1dbacdfea864aa5fe3134c757e7ad
\ No newline at end of file
diff --git a/repository/pom.xml b/repository/pom.xml
index f1235b5..8ca01cb 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -734,6 +734,17 @@
<groupId>org.openoffice</groupId>
<artifactId>odfdom</artifactId>
</dependency>
+
+ <!-- Apache Directory Studio external dependencies -->
+ <dependency>
+ <groupId>com.bandlem.eclipse.fullscreen</groupId>
+ <artifactId>feature</artifactId>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>com.bandlem.eclipse.fullscreen</groupId>
+ <artifactId>ui</artifactId>
+ </dependency>
</dependencies>
