You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2015/03/23 18:59:06 UTC
svn commit: r1668692 [4/16] - in /directory/studio/trunk: ./
eclipse-target-platform/ features/ features/apacheds.feature/
features/ldapbrowser.feature/ features/ldifeditor.feature/
features/rcp.feature/ features/schemaeditor.feature/ helps/ helps/apac...
Modified: directory/studio/trunk/helps/schemaeditor.help/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/helps/schemaeditor.help/pom.xml?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/helps/schemaeditor.help/pom.xml (original)
+++ directory/studio/trunk/helps/schemaeditor.help/pom.xml Mon Mar 23 17:59:02 2015
@@ -24,575 +24,11 @@
<groupId>org.apache.directory.studio</groupId>
<artifactId>parent-helps</artifactId>
<version>2.0.0-SNAPSHOT</version>
+ <relativePath>../</relativePath>
</parent>
- <artifactId>schemaeditor.help</artifactId>
+ <artifactId>org.apache.directory.studio.schemaeditor.help</artifactId>
<name>Apache Directory Studio Schema Editor Help</name>
- <packaging>jar</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.5</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>
- <!-- OTHER_EXCLUDES -->
- <exclude>**/src/main/resources/html/rfcs/*.txt</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </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>
- <tasks>
- <!-- 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" />
- </tasks>
- </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>
+ <packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Propchange: directory/studio/trunk/plugins/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 17:59:02 2015
@@ -1,6 +1,7 @@
target
maven-eclipse.xml
lib
+bin
.externalToolBuilders
felix-cache
.project
Propchange: directory/studio/trunk/plugins/aciitemeditor/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 17:59:02 2015
@@ -1,6 +1,7 @@
target
maven-eclipse.xml
lib
+bin
.externalToolBuilders
felix-cache
.project
Modified: directory/studio/trunk/plugins/aciitemeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/pom.xml?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/pom.xml (original)
+++ directory/studio/trunk/plugins/aciitemeditor/pom.xml Mon Mar 23 17:59:02 2015
@@ -24,232 +24,11 @@
<groupId>org.apache.directory.studio</groupId>
<artifactId>parent-plugins</artifactId>
<version>2.0.0-SNAPSHOT</version>
+ <relativePath>../</relativePath>
</parent>
- <artifactId>aciitemeditor</artifactId>
+ <artifactId>org.apache.directory.studio.aciitemeditor</artifactId>
<name>Apache Directory Studio ACI Item Editor</name>
- <packaging>jar</packaging>
-
+ <packaging>eclipse-plugin</packaging>
<description />
-
- <build>
- <resources>
- <resource>
- <directory>.</directory>
- <includes>
- <include>plugin*.properties</include>
- <include>plugin.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>resources</directory>
- <targetPath>resources</targetPath>
- </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>
- <Bundle-Activator>org.apache.directory.studio.aciitemeditor.Activator</Bundle-Activator>
- <Require-Bundle>org.apache.directory.api.ldap.extras.aci;bundle-version="${org.apache.directory.api.validversion}",
- org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.validversion}",
- org.apache.directory.studio.common.ui,
- org.apache.directory.studio.connection.core,
- org.apache.directory.studio.connection.ui,
- org.apache.directory.studio.ldapbrowser.common,
- org.apache.directory.studio.ldapbrowser.core,
- org.apache.directory.studio.valueeditors,
- org.eclipse.core.expressions,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor</Require-Bundle>
- <Export-Package>!*</Export-Package>
- <Import-Package>!*</Import-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>
- <!-- Apache Directory Studio library plugins dependencies -->
- <dependency>
- <groupId>org.apache.directory.api</groupId>
- <artifactId>api-ldap-model</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.api</groupId>
- <artifactId>api-ldap-extras-aci</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Apache Directory Studio plugins dependencies -->
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>common.ui</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>connection.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>connection.ui</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>ldapbrowser.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>ldapbrowser.common</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>valueeditors</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Eclipse plugins dependencies -->
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>commands</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>jface</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jface</groupId>
- <artifactId>text</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.swt.gtk.linux</groupId>
- <artifactId>x86</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>common</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>text</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>editors</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>workbench</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui.workbench</groupId>
- <artifactId>texteditor</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
</project>
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/Messages.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/Messages.java Mon Mar 23 17:59:02 2015
@@ -24,18 +24,23 @@ import java.util.MissingResourceExceptio
import java.util.ResourceBundle;
+/**
+ * This class get messages from the resources file.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
public class Messages
{
- private static final String BUNDLE_NAME = "org.apache.directory.studio.aciitemeditor.dialogs.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle( BUNDLE_NAME );
-
-
- private Messages()
- {
- }
-
-
+ /** The resource name */
+ private static final ResourceBundle RESOURCE_BUNDLE =
+ ResourceBundle.getBundle( Messages.class.getPackage().getName() + ".messages" );
+
+ /**
+ * Get back a message from the resource file given a key
+ *
+ * @param key The key associated with the message
+ * @return The found message
+ */
public static String getString( String key )
{
try
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/Messages.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/Messages.java Mon Mar 23 17:59:02 2015
@@ -24,18 +24,23 @@ import java.util.MissingResourceExceptio
import java.util.ResourceBundle;
+/**
+ * This class get messages from the resources file.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
public class Messages
{
- private static final String BUNDLE_NAME = "org.apache.directory.studio.aciitemeditor.model.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle( BUNDLE_NAME );
-
-
- private Messages()
- {
- }
-
-
+ /** The resource name */
+ private static final ResourceBundle RESOURCE_BUNDLE =
+ ResourceBundle.getBundle( Messages.class.getPackage().getName() + ".messages" );
+
+ /**
+ * Get back a message from the resource file given a key
+ *
+ * @param key The key associated with the message
+ * @return The found message
+ */
public static String getString( String key )
{
try
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACITextAttributeProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACITextAttributeProvider.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACITextAttributeProvider.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACITextAttributeProvider.java Mon Mar 23 17:59:02 2015
@@ -23,6 +23,8 @@ package org.apache.directory.studio.acii
import java.util.HashMap;
import java.util.Map;
+import org.apache.directory.studio.common.ui.CommonUIConstants;
+import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
import org.eclipse.jface.text.TextAttribute;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
@@ -58,32 +60,29 @@ public class ACITextAttributeProvider
*/
public ACITextAttributeProvider()
{
- attributes.put( DEFAULT_ATTRIBUTE, new TextAttribute( new Color( Display.getCurrent(), new RGB( 0, 0, 0 ) ) ) );
+ attributes.put( DEFAULT_ATTRIBUTE, new TextAttribute( new Color( Display.getCurrent(), CommonUIConstants.BLACK ) ) );
- attributes.put( KEYWORD_ATTRIBUTE, new TextAttribute( new Color( Display.getCurrent(), new RGB( 127, 0, 85 ) ),
+ attributes.put( KEYWORD_ATTRIBUTE, new TextAttribute( new Color( Display.getCurrent(), new RGB( 128, 0, 96 ) ),
null, SWT.BOLD ) );
- attributes.put( STRING_ATTRIBUTE, new TextAttribute( new Color( Display.getCurrent(), new RGB( 0, 0, 255 ) ) ) );
+ attributes.put( STRING_ATTRIBUTE, new TextAttribute( new Color( Display.getCurrent(), CommonUIConstants.BLUE ) ) );
- attributes.put( GRANT_DENY_ATTRIBUTE, new TextAttribute( new Color( Display.getCurrent(), new RGB( 125, 125,
- 125 ) ) ) );
+ attributes.put( GRANT_DENY_ATTRIBUTE, new TextAttribute( new Color( Display.getCurrent(), CommonUIConstants.M_GREY ) ) );
- attributes.put( GRANT_VALUE, new TextAttribute( new Color( Display.getCurrent(), new RGB( 0, 150, 0 ) ) ) );
- attributes.put( DENY_VALUE, new TextAttribute( new Color( Display.getCurrent(), new RGB( 150, 0, 0 ) ) ) );
+ attributes.put( GRANT_VALUE, new TextAttribute( new Color( Display.getCurrent(), CommonUIConstants.ML_GREEN ) ) );
+ attributes.put( DENY_VALUE, new TextAttribute( new Color( Display.getCurrent(), CommonUIConstants.ML_RED ) ) );
- attributes.put( IDENTIFICATION_ATTRIBUTE, new TextAttribute( new Color( Display.getCurrent(), new RGB( 125, 0,
- 0 ) ), null, SWT.BOLD ) );
+ attributes.put( IDENTIFICATION_ATTRIBUTE, new TextAttribute( new Color( Display.getCurrent(), CommonUIConstants.M_RED ), null, SWT.BOLD ) );
attributes.put( PRECEDENCE_ATTRIBUTE, new TextAttribute(
- new Color( Display.getCurrent(), new RGB( 0, 0, 125 ) ), null, SWT.BOLD ) );
+ new Color( Display.getCurrent(), CommonUIConstants.M_BLUE ), null, SWT.BOLD ) );
- attributes.put( AUTHENTICATIONLEVEL_ATTRIBUTE, new TextAttribute( new Color( Display.getCurrent(), new RGB( 0,
- 125, 0 ) ), null, SWT.BOLD ) );
+ attributes.put( AUTHENTICATIONLEVEL_ATTRIBUTE, new TextAttribute( new Color( Display.getCurrent(), CommonUIConstants.M_GREEN ), null, SWT.BOLD ) );
- attributes.put( ITEMORUSERFIRST_ATTRIBUTE, new TextAttribute( new Color( Display.getCurrent(), new RGB( 125, 0,
- 125 ) ), null, SWT.BOLD ) );
+ attributes.put( ITEMORUSERFIRST_ATTRIBUTE, new TextAttribute( new Color( Display.getCurrent(), new RGB( 128, 0,
+ 128 ) ), null, SWT.BOLD ) );
- attributes.put( USER_ATTRIBUTE, new TextAttribute( new Color( Display.getCurrent(), new RGB( 0, 122, 255 ) ),
+ attributes.put( USER_ATTRIBUTE, new TextAttribute( new Color( Display.getCurrent(), new RGB( 0, 128, 255 ) ),
null, SWT.BOLD ) );
}
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/Messages.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/Messages.java Mon Mar 23 17:59:02 2015
@@ -24,18 +24,23 @@ import java.util.MissingResourceExceptio
import java.util.ResourceBundle;
+/**
+ * This class get messages from the resources file.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
public class Messages
{
- private static final String BUNDLE_NAME = "org.apache.directory.studio.aciitemeditor.valueeditors.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle( BUNDLE_NAME );
-
-
- private Messages()
- {
- }
-
-
+ /** The resource name */
+ private static final ResourceBundle RESOURCE_BUNDLE =
+ ResourceBundle.getBundle( Messages.class.getPackage().getName() + ".messages" );
+
+ /**
+ * Get back a message from the resource file given a key
+ *
+ * @param key The key associated with the message
+ * @return The found message
+ */
public static String getString( String key )
{
try
Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/Messages.java (original)
+++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/Messages.java Mon Mar 23 17:59:02 2015
@@ -23,19 +23,23 @@ package org.apache.directory.studio.acii
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-
+/**
+ * This class get messages from the resources file.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
public class Messages
{
- private static final String BUNDLE_NAME = "org.apache.directory.studio.aciitemeditor.widgets.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle( BUNDLE_NAME );
-
-
- private Messages()
- {
- }
-
-
+ /** The resource name */
+ private static final ResourceBundle RESOURCE_BUNDLE =
+ ResourceBundle.getBundle( Messages.class.getPackage().getName() + ".messages" );
+
+ /**
+ * Get back a message from the resource file given a key
+ *
+ * @param key The key associated with the message
+ * @return The found message
+ */
public static String getString( String key )
{
try
Propchange: directory/studio/trunk/plugins/apacheds.configuration/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 17:59:02 2015
@@ -1,6 +1,7 @@
target
maven-eclipse.xml
lib
+bin
.externalToolBuilders
felix-cache
.project
Propchange: directory/studio/trunk/plugins/apacheds.configuration.v2/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 17:59:02 2015
@@ -1,6 +1,7 @@
target
maven-eclipse.xml
lib
+bin
.externalToolBuilders
felix-cache
.project
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/pom.xml?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/pom.xml (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/pom.xml Mon Mar 23 17:59:02 2015
@@ -24,329 +24,12 @@
<groupId>org.apache.directory.studio</groupId>
<artifactId>parent-plugins</artifactId>
<version>2.0.0-SNAPSHOT</version>
+ <relativePath>../</relativePath>
</parent>
- <artifactId>apacheds.configuration.v2</artifactId>
+ <artifactId>org.apache.directory.studio.apacheds.configuration.v2</artifactId>
<name>Apache Directory Studio ApacheDS 2.0 Configuration</name>
- <packaging>jar</packaging>
+ <packaging>eclipse-plugin</packaging>
<description />
-
- <build>
- <resources>
- <resource>
- <directory>.</directory>
- <includes>
- <include>plugin.xml</include>
- <include>plugin*.properties</include>
- <include>about.ini</include>
- <include>studio.png</include>
- </includes>
- </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>
- <additionalProjectnatures>
- <projectnature>org.eclipse.pde.PluginNature</projectnature>
- <projectnature>org.eclipse.jdt.core.javanature</projectnature>
- </additionalProjectnatures>
- <classpathContainers>
- <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>
- <Bundle-Activator>org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPlugin</Bundle-Activator>
- <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.config;bundle-version="${org.apache.directory.server.validversion}",
- org.apache.directory.server.kerberos.codec;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.api.ldap.model;bundle-version="${org.apache.directory.api.validversion}",
- org.apache.directory.api.ldap.schema;bundle-version="${org.apache.directory.api.validversion}",
- org.apache.directory.studio.common.core,
- org.apache.directory.studio.common.ui,
- org.apache.directory.studio.connection.core,
- org.apache.directory.studio.connection.ui,
- org.apache.directory.studio.ldapbrowser.common,
- org.apache.directory.studio.ldapbrowser.core,
- org.eclipse.core.contenttype,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.ui.editors,
- org.eclipse.ui.forms,
- org.eclipse.ui.ide,
- org.slf4j.api;bundle-version="${org.slf4j.version}",
- net.sf.ehcache.core;bundle-version="${net.sf.ehcache.version}"</Require-Bundle>
- <Export-Package>org.apache.directory.studio.apacheds.configuration.v2*</Export-Package>
- <Import-Package>!*</Import-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>
- <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>
- <!-- OTHER_EXCLUDES -->
- <exclude>src/main/resources/org/apache/directory/studio/apacheds/configuration/v2/config.ldif</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <dependencies>
- <!-- Apache Directory Studio library plugins dependencies -->
- <dependency>
- <groupId>org.apache.directory.api</groupId>
- <artifactId>api-ldap-model</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.api</groupId>
- <artifactId>api-ldap-schema-data</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.server</groupId>
- <artifactId>apacheds-core-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-kerberos-codec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-ldif-partition</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-server-config</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-xdbm-partition</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Apache Directory Studio plugins dependencies -->
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>common.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>common.ui</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>connection.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>connection.ui</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>ldapbrowser.common</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>ldapbrowser.core</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Eclipse plugins dependencies -->
- <dependency>
- <groupId>org.eclipse.swt.gtk.linux</groupId>
- <artifactId>x86</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>workbench</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>commands</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>contenttype</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>jobs</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>registry</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>common</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>jface</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>ui</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>editors</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>forms</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>ide</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>resources</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
</project>
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.java Mon Mar 23 17:59:02 2015
@@ -29,6 +29,7 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.ldif.LdifEntry;
import org.apache.directory.api.ldap.model.ldif.LdifReader;
import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.core.runtime.content.IContentDescription;
import org.eclipse.core.runtime.content.ITextContentDescriber;
@@ -59,7 +60,7 @@ public class ApacheDS2ConfigurationConte
// Initializing DNs
try
{
- configEntryDn = new Dn( "ou=config" ); //$NON-NLS-1$
+ configEntryDn = new Dn( ServerDNConstants.CONFIG_DN ); //$NON-NLS-1$
directoryServiceDn = new Dn( "ads-directoryServiceId=default,ou=config" ); //$NON-NLS-1$
}
catch ( LdapInvalidDnException e )
@@ -75,9 +76,11 @@ public class ApacheDS2ConfigurationConte
public int describe( Reader contents, IContentDescription description ) throws IOException
{
LdifReader reader = null;
+
try
{
reader = new LdifReader( contents );
+
return isValid( reader );
}
catch ( LdapException e )
@@ -100,9 +103,11 @@ public class ApacheDS2ConfigurationConte
public int describe( InputStream contents, IContentDescription description ) throws IOException
{
LdifReader reader = null;
+
try
{
reader = new LdifReader( contents );
+
return isValid( reader );
}
catch ( LdapException e )
@@ -129,10 +134,10 @@ public class ApacheDS2ConfigurationConte
/**
- * Indicates if the given {@link Reader} is a valid server configuration.
+ * Indicates if the given {@link Reader} is a valid server configuration. It can either
+ * contain the "ou=config" entry or the "ads-directoryServiceId=default,ou=config" entry
*
- * @param reader
- * the LDIF reader
+ * @param reader the LDIF reader
* @return
* <code>ITextContentDescriber.VALID</code> if the given LDIF reader is a valid server
* configuration, <code>ITextContentDescriber.INVALID</code> if not
@@ -155,23 +160,19 @@ public class ApacheDS2ConfigurationConte
checkedEntries++;
// Checking if this is the config entry
- if ( !configEntryFound )
+ if ( ( !configEntryFound ) &&
+ ( configEntryDn.getName().equalsIgnoreCase( entry.getDn().getNormName() ) ) )
{
- if ( configEntryDn.getName().equalsIgnoreCase( entry.getDn().getNormName() ) )
- {
- configEntryFound = true;
- continue;
- }
+ configEntryFound = true;
+ continue;
}
// Checking if this is the directory service entry
- if ( !directoryServiceEntryFound )
+ if ( ( !directoryServiceEntryFound ) &&
+ ( directoryServiceDn.getName().equalsIgnoreCase( entry.getDn().getNormName() ) ) )
{
- if ( directoryServiceDn.getName().equalsIgnoreCase( entry.getDn().getNormName() ) )
- {
- directoryServiceEntryFound = true;
- continue;
- }
+ directoryServiceEntryFound = true;
+ continue;
}
}
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java Mon Mar 23 17:59:02 2015
@@ -26,8 +26,8 @@ import java.util.PropertyResourceBundle;
import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.api.ldap.model.schema.registries.SchemaLoader;
-import org.apache.directory.api.ldap.schemaloader.JarLdifSchemaLoader;
-import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager;
+import org.apache.directory.api.ldap.schema.loader.JarLdifSchemaLoader;
+import org.apache.directory.api.ldap.schema.manager.impl.DefaultSchemaManager;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
@@ -84,10 +84,8 @@ public class ApacheDS2ConfigurationPlugi
/**
* Gets the schema manager.
*
- * @return
- * the schema manager
- * @throws Exception
- * if an error occurs when initializing the schema manager
+ * @return the schema manager
+ * @throws Exception if an error occurs when initializing the schema manager
*/
public SchemaManager getSchemaManager() throws Exception
{
@@ -115,8 +113,7 @@ public class ApacheDS2ConfigurationPlugi
/**
* Returns the shared instance.
*
- * @return
- * the shared instance
+ * @return the shared instance
*/
public static ApacheDS2ConfigurationPlugin getDefault()
{
@@ -128,8 +125,7 @@ public class ApacheDS2ConfigurationPlugi
* Use this method to get SWT images. Use the IMG_ constants from
* PluginConstants for the key.
*
- * @param key
- * The key (relative path to the image in filesystem)
+ * @param key The key (relative path to the image in filesystem)
* @return The image descriptor or null
*/
public ImageDescriptor getImageDescriptor( String key )
@@ -137,10 +133,15 @@ public class ApacheDS2ConfigurationPlugi
if ( key != null )
{
URL url = FileLocator.find( getBundle(), new Path( key ), null );
+
if ( url != null )
+ {
return ImageDescriptor.createFromURL( url );
+ }
else
+ {
return null;
+ }
}
else
{
@@ -157,22 +158,24 @@ public class ApacheDS2ConfigurationPlugi
* Note: Don't dispose the returned SWT Image. It is disposed
* automatically when the plugin is stopped.
*
- * @param key
- * The key (relative path to the image in filesystem)
+ * @param keynThe key (relative path to the image in filesystem)
* @return The SWT Image or null
*/
public Image getImage( String key )
{
Image image = getImageRegistry().get( key );
+
if ( image == null )
{
ImageDescriptor id = getImageDescriptor( key );
+
if ( id != null )
{
image = id.createImage();
getImageRegistry().put( key, image );
}
}
+
return image;
}
@@ -180,8 +183,7 @@ public class ApacheDS2ConfigurationPlugi
/**
* Gets the plugin properties.
*
- * @return
- * the plugin properties
+ * @return the plugin properties
*/
public PropertyResourceBundle getPluginProperties()
{
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPluginConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPluginConstants.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPluginConstants.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPluginConstants.java Mon Mar 23 17:59:02 2015
@@ -48,4 +48,8 @@ public interface ApacheDS2ConfigurationP
public static final String IMG_PASSWORD_POLICY_DEFAULT = "resources/icons/password_policy_default.gif"; //$NON-NLS-1$
public static final String IMG_REPLICATION_CONSUMER = "resources/icons/replication_consumer.gif"; //$NON-NLS-1$
public static final String IMG_VERTICAL_ORIENTATION = "resources/icons/vertical_orientation.gif"; //$NON-NLS-1$
+
+ public static final String CONFIG_LDIF = "config.ldif"; //$NON-NLS-1$
+ public static final String OU_CONFIG_LDIF = "ou=config.ldif"; //$NON-NLS-1$
+
}
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/Messages.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/Messages.java Mon Mar 23 17:59:02 2015
@@ -24,18 +24,23 @@ import java.util.MissingResourceExceptio
import java.util.ResourceBundle;
+/**
+ * The class that returns messages based on a given key.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
public class Messages
{
- private static final String BUNDLE_NAME = "org.apache.directory.studio.apacheds.configuration.v2.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle( BUNDLE_NAME );
-
-
- private Messages()
- {
- }
-
-
+ /** The resource name */
+ private static final ResourceBundle RESOURCE_BUNDLE =
+ ResourceBundle.getBundle( Messages.class.getPackage().getName() + ".messages" );
+
+ /**
+ * Get back a message from the resource file given a key
+ *
+ * @param key The key associated with the message
+ * @return The found message
+ */
public static String getString( String key )
{
try
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorExportConfigurationAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorExportConfigurationAction.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorExportConfigurationAction.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorExportConfigurationAction.java Mon Mar 23 17:59:02 2015
@@ -26,6 +26,7 @@ import org.apache.directory.studio.apach
import org.apache.directory.studio.apacheds.configuration.v2.editor.ServerConfigurationEditor;
import org.apache.directory.studio.apacheds.configuration.v2.editor.ServerConfigurationEditorUtils;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.resource.ImageDescriptor;
@@ -33,7 +34,7 @@ import org.eclipse.osgi.util.NLS;
/**
- * This class implements the create connection action for an ApacheDS 1.5.7 server.
+ * This class implements the create connection action for an ApacheDS 2.0 server.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@@ -82,10 +83,13 @@ public class EditorExportConfigurationAc
try
{
ServerConfigurationEditorUtils.saveAs( new NullProgressMonitor(), editor.getSite()
- .getShell(), editor.getEditorInput(), editor.getConfigWriter(), false );
+ .getShell(), editor.getEditorInput(), editor.getConfigWriter(), editor.getConfiguration(), false );
}
catch ( Exception e )
{
+ ApacheDS2ConfigurationPlugin.getDefault().getLog().log(
+ new Status( Status.ERROR, "org.apache.directory.studio.apacheds.configuration.v2",
+ e.getMessage() ) );
MessageDialog
.openError( editor.getSite().getShell(),
Messages.getString( "EditorExportConfigurationAction.ErrorExportingConfigurationFile" ), //$NON-NLS-1$
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorImportConfigurationAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorImportConfigurationAction.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorImportConfigurationAction.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorImportConfigurationAction.java Mon Mar 23 17:59:02 2015
@@ -22,12 +22,10 @@ package org.apache.directory.studio.apac
import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import org.apache.directory.server.config.beans.ConfigBean;
import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPlugin;
import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPluginConstants;
+import org.apache.directory.studio.apacheds.configuration.v2.editor.Configuration;
import org.apache.directory.studio.apacheds.configuration.v2.editor.ServerConfigurationEditor;
import org.apache.directory.studio.apacheds.configuration.v2.jobs.LoadConfigurationRunnable;
import org.apache.directory.studio.common.ui.CommonUIUtils;
@@ -49,7 +47,7 @@ import org.eclipse.ui.model.WorkbenchLab
/**
- * This class implements the create connection action for an ApacheDS 1.5.7 server.
+ * This class implements the create connection action for an ApacheDS 2.0 server.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@@ -65,8 +63,7 @@ public class EditorImportConfigurationAc
/**
* Creates a new instance of EditorImportConfigurationAction.
*
- * @param editor
- * the associated editor
+ * @param editor the associated editor
*/
public EditorImportConfigurationAction( ServerConfigurationEditor editor )
{
@@ -115,22 +112,25 @@ public class EditorImportConfigurationAc
}
}
- // The input stream that will be used to load the configuration
- InputStream inputStream = null;
+ // The file that will be used to load the configuration
+ File file = null;
// detect IDE or RCP:
boolean isIDE = CommonUIUtils.isIDEEnvironment();
+
if ( isIDE )
{
// Opening a dialog for file selection
ElementTreeSelectionDialog dialog = createWorkspaceFileSelectionDialog();
+
if ( dialog.open() == Dialog.OK )
{
// Getting the input stream for the selected file
Object firstResult = dialog.getFirstResult();
+
if ( ( firstResult != null ) && ( firstResult instanceof IFile ) )
{
- inputStream = ( ( IFile ) firstResult ).getContents();
+ file = ( ( IFile ) firstResult ).getLocation().toFile();
}
}
else
@@ -146,6 +146,7 @@ public class EditorImportConfigurationAc
dialog.setText( DIALOG_TITLE );
dialog.setFilterPath( System.getProperty( "user.home" ) ); //$NON-NLS-1$
String filePath = dialog.open();
+
if ( filePath == null )
{
// Cancel button has been clicked
@@ -153,19 +154,17 @@ public class EditorImportConfigurationAc
}
// Checking the file
- File file = new File( filePath );
+ file = new File( filePath );
+
if ( !file.exists() || !file.isFile() || !file.canRead() )
{
// This is not a valid file
return;
}
-
- // Getting the input stream for the selected file
- inputStream = new FileInputStream( file );
}
// Checking if we found an input stream
- if ( inputStream == null )
+ if ( file == null )
{
return;
}
@@ -182,13 +181,17 @@ public class EditorImportConfigurationAc
}
// Reading the configuration of the file
- ConfigBean configBean = LoadConfigurationRunnable.readConfiguration( inputStream );
+ Configuration configuration = LoadConfigurationRunnable.readConfiguration( file );
// Resetting the configuration back to the editor
- editor.resetConfiguration( configBean );
+ editor.resetConfiguration( configuration );
}
catch ( Exception e )
{
+ ApacheDS2ConfigurationPlugin.getDefault().getLog().log(
+ new Status( Status.ERROR, "org.apache.directory.studio.apacheds.configuration.v2",
+ e.getMessage() ) );
+
MessageDialog
.openError(
editor.getSite().getShell(),
@@ -204,8 +207,7 @@ public class EditorImportConfigurationAc
/**
* Creates a {@link Dialog} to select a single file in the workspace.
*
- * @return
- * a {@link Dialog} to select a single file in the workspace
+ * @return a {@link Dialog} to select a single file in the workspace
*/
private ElementTreeSelectionDialog createWorkspaceFileSelectionDialog()
{
@@ -226,7 +228,6 @@ public class EditorImportConfigurationAc
private Status notValidated = new Status( IStatus.ERROR, ApacheDS2ConfigurationPluginConstants.PLUGIN_ID,
IStatus.ERROR, "", null ); //$NON-NLS-1$
-
public IStatus validate( Object[] selection )
{
if ( selection != null )
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/Messages.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/Messages.java Mon Mar 23 17:59:02 2015
@@ -24,18 +24,23 @@ import java.util.MissingResourceExceptio
import java.util.ResourceBundle;
+/**
+ * This class get messages from the resources file.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
public class Messages
{
- private static final String BUNDLE_NAME = "org.apache.directory.studio.apacheds.configuration.v2.actions.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle( BUNDLE_NAME );
-
-
- private Messages()
- {
- }
-
-
+ /** The resource name */
+ private static final ResourceBundle RESOURCE_BUNDLE =
+ ResourceBundle.getBundle( Messages.class.getPackage().getName() + ".messages" );
+
+ /**
+ * Get back a message from the resource file given a key
+ *
+ * @param key The key associated with the message
+ * @return The found message
+ */
public static String getString( String key )
{
try
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/OpenConfigurationAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/OpenConfigurationAction.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/OpenConfigurationAction.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/OpenConfigurationAction.java Mon Mar 23 17:59:02 2015
@@ -21,9 +21,11 @@
package org.apache.directory.studio.apacheds.configuration.v2.actions;
+import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPlugin;
import org.apache.directory.studio.apacheds.configuration.v2.editor.ConnectionServerConfigurationInput;
import org.apache.directory.studio.apacheds.configuration.v2.editor.ServerConfigurationEditor;
import org.apache.directory.studio.connection.core.Connection;
+import org.eclipse.core.runtime.Status;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredSelection;
@@ -55,6 +57,7 @@ public class OpenConfigurationAction imp
try
{
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+
try
{
page.openEditor( new ConnectionServerConfigurationInput( selectedConnection ),
@@ -62,14 +65,16 @@ public class OpenConfigurationAction imp
}
catch ( PartInitException e )
{
- // TODO Auto-generated catch block
- e.printStackTrace();
+ ApacheDS2ConfigurationPlugin.getDefault().getLog().log(
+ new Status( Status.ERROR, "org.apache.directory.studio.apacheds.configuration.v2",
+ e.getMessage() ) );
}
}
catch ( Exception e )
{
- // TODO Auto-generated catch block
- e.printStackTrace();
+ ApacheDS2ConfigurationPlugin.getDefault().getLog().log(
+ new Status( Status.ERROR, "org.apache.directory.studio.apacheds.configuration.v2",
+ e.getMessage() ) );
}
}
}
@@ -81,6 +86,7 @@ public class OpenConfigurationAction imp
public void selectionChanged( IAction action, ISelection selection )
{
StructuredSelection structuredSelection = ( StructuredSelection ) selection;
+
if ( ( structuredSelection.size() == 1 ) && ( structuredSelection.getFirstElement() instanceof Connection ) )
{
selectedConnection = ( Connection ) structuredSelection.getFirstElement();
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/dialogs/AttributeDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/dialogs/AttributeDialog.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/dialogs/AttributeDialog.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/dialogs/AttributeDialog.java Mon Mar 23 17:59:02 2015
@@ -110,10 +110,12 @@ public class AttributeDialog extends Dia
Composite c = BaseWidgetUtils.createColumnContainer( composite, 2, 1 );
BaseWidgetUtils.createLabel( c, Messages.getString( "AttributeDialog.AttributeTypeOrOID" ), 1 ); //$NON-NLS-1$
typeOrOidCombo = BaseWidgetUtils.createCombo( c, attributeTypesAndOids, -1, 1 );
+
if ( attribute != null )
{
typeOrOidCombo.setText( attribute );
}
+
typeOrOidCombo.addModifyListener( new ModifyListener()
{
public void modifyText( ModifyEvent e )
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/dialogs/AttributeValueDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/dialogs/AttributeValueDialog.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/dialogs/AttributeValueDialog.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/dialogs/AttributeValueDialog.java Mon Mar 23 17:59:02 2015
@@ -74,6 +74,13 @@ public class AttributeValueDialog extend
/**
+ * This create a dialog like :
+ *
+ * <pre>
+ * +------------------------------------------------+
+ * | Attribute: [ ] Value: [ ] |
+ * +------------------------------------------------+
+ * </pre>
* {@inheritDoc}
*/
protected Control createDialogArea( Composite parent )
@@ -153,8 +160,7 @@ public class AttributeValueDialog extend
/**
* Gets the Attribute Value Object.
*
- * @return
- * the Attribute Value Object
+ * @return the Attribute Value Object
*/
public AttributeValueObject getAttributeValueObject()
{
@@ -165,8 +171,7 @@ public class AttributeValueDialog extend
/**
* Returns the dirty flag of the dialog.
*
- * @return
- * the dirty flag of the dialog
+ * @return the dirty flag of the dialog
*/
public boolean isDirty()
{
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/dialogs/JdbmIndexDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/dialogs/JdbmIndexDialog.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/dialogs/JdbmIndexDialog.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/dialogs/JdbmIndexDialog.java Mon Mar 23 17:59:02 2015
@@ -76,6 +76,13 @@ public class JdbmIndexDialog extends Dia
/**
+ * This create a dialog like :
+ *
+ * <pre>
+ * +-----------------------------------------------------+
+ * | Attribute ID: [ ] Cache Size: [ ] |
+ * +-----------------------------------------------------+
+ * </pre>
* {@inheritDoc}
*/
protected Control createDialogArea( Composite parent )
@@ -99,12 +106,14 @@ public class JdbmIndexDialog extends Dia
{
public void verifyText( VerifyEvent e )
{
+ // The cache size must be a numeric
if ( !e.text.matches( "[0-9]*" ) ) //$NON-NLS-1$
{
e.doit = false;
}
}
} );
+
cacheSizeText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
initFromInput();
@@ -154,6 +163,7 @@ public class JdbmIndexDialog extends Dia
protected void okPressed()
{
index.setIndexAttributeId( attributeIdText.getText() );
+
try
{
index.setIndexCacheSize( Integer.parseInt( cacheSizeText.getText() ) );
@@ -170,8 +180,7 @@ public class JdbmIndexDialog extends Dia
/**
* Gets the Indexed Attribute.
*
- * @return
- * the Indexed Attribute
+ * @return the Indexed Attribute
*/
public JdbmIndexBean getIndex()
{
@@ -182,8 +191,7 @@ public class JdbmIndexDialog extends Dia
/**
* Returns the dirty flag of the dialog.
*
- * @return
- * the dirty flag of the dialog
+ * @return the dirty flag of the dialog
*/
public boolean isDirty()
{