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 [14/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/apa...
Modified: directory/studio/trunk/plugins/ldifparser/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/pom.xml?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/pom.xml (original)
+++ directory/studio/trunk/plugins/ldifparser/pom.xml Mon Mar 23 17:59:02 2015
@@ -6,9 +6,9 @@
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.
@@ -24,120 +24,12 @@
<groupId>org.apache.directory.studio</groupId>
<artifactId>parent-plugins</artifactId>
<version>2.0.0-SNAPSHOT</version>
+ <relativePath>../</relativePath>
</parent>
-
- <artifactId>ldifparser</artifactId>
+
+ <artifactId>org.apache.directory.studio.ldifparser</artifactId>
<name>Apache Directory Studio LDIF Parser</name>
- <packaging>jar</packaging>
+ <packaging>eclipse-plugin</packaging>
<description />
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- <pde>true</pde>
- <buildcommands>
- <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
- <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
- <buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
- </buildcommands>
- <projectnatures>
- <projectnature>org.eclipse.pde.PluginNature</projectnature>
- <projectnature>org.eclipse.jdt.core.javanature</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>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </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>
- <Require-Bundle>org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
- org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.validversion}"</Require-Bundle>
- <Export-Package>org.apache.directory.studio.ldifparser.*</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>
- </plugins>
- </build>
-
- <dependencies>
- <!-- Apache Directory Studio library plugins dependencies -->
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.commons.codec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.api</groupId>
- <artifactId>api-ldap-model</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- JUnit for test only -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
</project>
Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java (original)
+++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java Mon Mar 23 17:59:02 2015
@@ -99,23 +99,14 @@ public class LdifUtils
public static String hexEncode( byte[] data )
{
if ( data == null )
+ {
return null;
+ }
char[] c = Hex.encodeHex( data );
String s = new String( c );
- return s;
- // StringBuffer sb = new StringBuffer(data.length*3);
- // for(int i=0; i<data.length; i++) {
- // int b = (int)data[i];
- // if(b<0) b=256+b;
- // String s = Integer.toHexString(b)/*.toUpperCase()*/;
- // if(s.length() ==1) s = "0" + s; //$NON-NLS-1$
- // sb.append(s);
- // if(i+1 < data.length)
- // sb.append(' ');
- // }
- // return(sb.toString());
+ return s;
}
@@ -176,7 +167,7 @@ public class LdifUtils
*/
public static boolean mustEncode( String value )
{
- if ( value == null || value.length() < 1 )
+ if ( ( value == null ) || ( value.length() < 1 ) )
{
return false;
}
@@ -185,6 +176,7 @@ public class LdifUtils
{
return true;
}
+
if ( value.endsWith( " " ) ) //$NON-NLS-1$
{
return true;
@@ -192,8 +184,8 @@ public class LdifUtils
for ( int i = 0; i < value.length(); i++ )
{
- if ( value.charAt( i ) == '\r' || value.charAt( i ) == '\n' || value.charAt( i ) == '\u0000'
- || value.charAt( i ) > '\u007F' )
+ if ( ( value.charAt( i ) == '\r' ) || ( value.charAt( i ) == '\n' ) || ( value.charAt( i ) == '\u0000' )
+ || ( value.charAt( i ) > '\u007F' ) )
{
return true;
}
@@ -201,5 +193,4 @@ public class LdifUtils
return false;
}
-
}
Modified: directory/studio/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/pom.xml?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/pom.xml (original)
+++ directory/studio/trunk/plugins/pom.xml Mon Mar 23 17:59:02 2015
@@ -6,9 +6,9 @@
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.
@@ -24,15 +24,16 @@
<groupId>org.apache.directory.studio</groupId>
<artifactId>parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
+ <relativePath>../</relativePath>
</parent>
-
+
<artifactId>parent-plugins</artifactId>
<name>Apache Directory Studio Plugins</name>
<packaging>pom</packaging>
<modules>
<module>aciitemeditor</module>
- <module>apacheds-launcher</module>
+ <!--module>apacheds-launcher</module-->
<module>apacheds.configuration</module>
<module>apacheds.configuration.v2</module>
<module>common.core</module>
@@ -43,65 +44,65 @@
<module>ldapbrowser.common</module>
<module>ldapbrowser.ui</module>
<module>ldapservers</module>
- <module>ldapservers.apacheds.v153</module>
- <module>ldapservers.apacheds.v154</module>
- <module>ldapservers.apacheds.v155</module>
- <module>ldapservers.apacheds.v156</module>
- <module>ldapservers.apacheds.v157</module>
+<!-- <module>ldapservers.apacheds.v153</module> -->
+<!-- <module>ldapservers.apacheds.v154</module> -->
+<!-- <module>ldapservers.apacheds.v155</module> -->
+<!-- <module>ldapservers.apacheds.v156</module> -->
+<!-- <module>ldapservers.apacheds.v157</module> -->
<module>ldapservers.apacheds.v200</module>
<module>ldifeditor</module>
<module>ldifparser</module>
<module>rcp</module>
- <module>schemaeditor</module>
- <module>valueeditors</module>
+ <module>schemaeditor</module>
+ <module>valueeditors</module>
</modules>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludeSubProjects>false</excludeSubProjects>
- <excludes>
+
+<!-- <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>
+<!-- <exclude>**/target/**/*</exclude> -->
+<!-- <exclude>**/cobertura.ser</exclude> -->
<!-- ECLIPSE_DEFAULT_EXCLUDES -->
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings/**/*</exclude>
+<!-- <exclude>**/.classpath</exclude> -->
+<!-- <exclude>**/.project</exclude> -->
+<!-- <exclude>**/.settings/**/*</exclude> -->
<!-- IDEA_DEFAULT_EXCLUDES -->
- <exclude>**/*.iml</exclude>
- <exclude>**/*.ipr</exclude>
- <exclude>**/*.iws</exclude>
+<!-- <exclude>**/*.iml</exclude> -->
+<!-- <exclude>**/*.ipr</exclude> -->
+<!-- <exclude>**/*.iws</exclude> -->
<!-- MANIFEST_MF_EXCLUDES -->
- <exclude>**/MANIFEST.MF</exclude>
+<!-- <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>
+<!-- <exclude>**/dependency-reduced-pom.xml</exclude> -->
<!-- GITIGNORE_EXCLUDES -->
- <exclude>**/.gitignore</exclude>
+<!-- <exclude>**/.gitignore</exclude> -->
<!-- ABOUT_EXCLUDES -->
- <exclude>**/about.ini</exclude>
- <exclude>**/about_files/*</exclude>
+<!-- <exclude>**/about.ini</exclude> -->
+<!-- <exclude>**/about_files/*</exclude> -->
<!-- LOG_FILES_EXCLUDES -->
- <exclude>**/*.log</exclude>
- <exclude>**/*.vm</exclude>
+<!-- <exclude>**/*.log</exclude> -->
+<!-- <exclude>**/*.vm</exclude> -->
<!-- OTHER_EXCLUDES -->
- <exclude>apacheds.configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/spring-beans.dtd</exclude>
- <exclude>apacheds.configuration.v2/src/main/resources/org/apache/directory/studio/apacheds/configuration/v2/config.ldif</exclude>
- <exclude>common.ui/src/main/java/org/apache/directory/studio/common/ui/filesystem/PathEditorInput.java</exclude>
- <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>
- </plugins>
- </pluginManagement>
- </build>
-
+<!-- <exclude>apacheds.configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/spring-beans.dtd</exclude> -->
+<!-- <exclude>apacheds.configuration.v2/src/main/resources/org/apache/directory/studio/apacheds/configuration/v2/config.ldif</exclude> -->
+<!-- <exclude>common.ui/src/main/java/org/apache/directory/studio/common/ui/filesystem/PathEditorInput.java</exclude> -->
+<!-- <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> -->
+<!-- </plugins> -->
+<!-- </pluginManagement> -->
+<!-- </build> -->
+
</project>
Modified: directory/studio/trunk/plugins/rcp/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/rcp/plugin.properties?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/rcp/plugin.properties (original)
+++ directory/studio/trunk/plugins/rcp/plugin.properties Mon Mar 23 17:59:02 2015
@@ -14,7 +14,7 @@
# 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-2013 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: 2.0.0\n\n\u00A9 2006-2013 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
Modified: directory/studio/trunk/plugins/rcp/plugin_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/rcp/plugin_de.properties?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/rcp/plugin_de.properties (original)
+++ directory/studio/trunk/plugins/rcp/plugin_de.properties Mon Mar 23 17:59:02 2015
@@ -14,5 +14,5 @@
# 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-2013 Apache Software Foundation - Alle Rechte vorbehalten.\n\Besuchen Sie http://directory.apache.org/studio\n\n\Dieses Produkt wird unter den Bedingungen der Apache License 2.0 lizenziert.\n\n\Einige Symbole stammen von FAMFAMFAM http://www.famfamfam.com/lab/icons/silk
+aboutText=Apache Directory Studio\n\n\Version: 2.0.0\n\n\u00A9 2006-2013 Apache Software Foundation - Alle Rechte vorbehalten.\n\Besuchen Sie http://directory.apache.org/studio\n\n\Dieses Produkt wird unter den Bedingungen der Apache License 2.0 lizenziert.\n\n\Einige Symbole stammen von FAMFAMFAM http://www.famfamfam.com/lab/icons/silk
PrefPage_ShutdownPreferencesPage_name=Beenden
Modified: directory/studio/trunk/plugins/rcp/plugin_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/rcp/plugin_fr.properties?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/rcp/plugin_fr.properties (original)
+++ directory/studio/trunk/plugins/rcp/plugin_fr.properties Mon Mar 23 17:59:02 2015
@@ -14,5 +14,5 @@
# 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-2013 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
+aboutText=Apache Directory Studio\n\n\Version: 2.0.0\n\n\u00A9 2006-2013 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
Modified: directory/studio/trunk/plugins/rcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/rcp/pom.xml?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/rcp/pom.xml (original)
+++ directory/studio/trunk/plugins/rcp/pom.xml Mon Mar 23 17:59:02 2015
@@ -24,259 +24,41 @@
<groupId>org.apache.directory.studio</groupId>
<artifactId>parent-plugins</artifactId>
<version>2.0.0-SNAPSHOT</version>
+ <relativePath>../</relativePath>
</parent>
- <artifactId>rcp</artifactId>
+ <artifactId>org.apache.directory.studio.rcp</artifactId>
<name>Apache Directory Studio RCP</name>
- <packaging>jar</packaging>
+ <packaging>eclipse-plugin</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.Activator</Bundle-Activator>
- <Require-Bundle>org.eclipse.core.runtime,
- org.eclipse.update.core,
- org.eclipse.update.ui,
- org.eclipse.ui,
- org.eclipse.ui.intro,
- org.eclipse.core.resources,
- org.eclipse.ui.ide,
- org.eclipse.core.filesystem,
- org.eclipse.core.net
- </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>
- <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>resources/icons/linux/studio.xpm</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.eclipse.swt.gtk.linux</groupId>
- <artifactId>x86</artifactId>
- <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>
- </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>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</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>jobs</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.update</groupId>
- <artifactId>core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>common</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.update</groupId>
- <artifactId>ui</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>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>filesystem</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>net</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>app</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+<!-- <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> -->
+<!-- </build> -->
</project>
Modified: directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/actions/AddExtensionAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/actions/AddExtensionAction.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/actions/AddExtensionAction.java (original)
+++ directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/actions/AddExtensionAction.java Mon Mar 23 17:59:02 2015
@@ -30,12 +30,12 @@ import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.swt.custom.BusyIndicator;
import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.update.search.BackLevelFilter;
-import org.eclipse.update.search.EnvironmentFilter;
-import org.eclipse.update.search.UpdateSearchRequest;
-import org.eclipse.update.search.UpdateSearchScope;
-import org.eclipse.update.ui.UpdateJob;
-import org.eclipse.update.ui.UpdateManagerUI;
+//import org.eclipse.update.search.BackLevelFilter;
+//import org.eclipse.update.search.EnvironmentFilter;
+//import org.eclipse.update.search.UpdateSearchRequest;
+//import org.eclipse.update.search.UpdateSearchScope;
+//import org.eclipse.update.ui.UpdateJob;
+//import org.eclipse.update.ui.UpdateManagerUI;
/**
@@ -73,35 +73,35 @@ public class AddExtensionAction extends
{
public void run()
{
- UpdateJob job = new UpdateJob(
- Messages.getString( "AddExtensionAction.Searching_new_extensions" ), getSearchRequest() ); //$NON-NLS-1$
- UpdateManagerUI.openInstaller( window.getShell(), job );
+// UpdateJob job = new UpdateJob(
+// Messages.getString( "AddExtensionAction.Searching_new_extensions" ), getSearchRequest() ); //$NON-NLS-1$
+// UpdateManagerUI.openInstaller( window.getShell(), job );
}
- private UpdateSearchRequest getSearchRequest()
- {
- UpdateSearchRequest result = new UpdateSearchRequest( UpdateSearchRequest
- .createDefaultSiteSearchCategory(), new UpdateSearchScope() );
- result.addFilter( new BackLevelFilter() );
- result.addFilter( new EnvironmentFilter() );
- UpdateSearchScope scope = new UpdateSearchScope();
- try
- {
- String homeBase = System
- .getProperty(
- "studio.homebase", Messages.getString( "AddExtensionAction.Apache_Directory_Studio_Home_Base" ) ); //$NON-NLS-1$ //$NON-NLS-2$
- URL url = new URL( homeBase );
- scope.addSearchSite(
- Messages.getString( "AddExtensionAction.Apache_Directory_Studio_Site" ), url, null ); //$NON-NLS-1$
- }
- catch ( MalformedURLException e )
- {
- // TODO: handle exception
- }
- result.setScope( scope );
- return result;
- }
+// private UpdateSearchRequest getSearchRequest()
+// {
+// UpdateSearchRequest result = new UpdateSearchRequest( UpdateSearchRequest
+// .createDefaultSiteSearchCategory(), new UpdateSearchScope() );
+// result.addFilter( new BackLevelFilter() );
+// result.addFilter( new EnvironmentFilter() );
+// UpdateSearchScope scope = new UpdateSearchScope();
+// try
+// {
+// String homeBase = System
+// .getProperty(
+// "studio.homebase", Messages.getString( "AddExtensionAction.Apache_Directory_Studio_Home_Base" ) ); //$NON-NLS-1$ //$NON-NLS-2$
+// URL url = new URL( homeBase );
+// scope.addSearchSite(
+// Messages.getString( "AddExtensionAction.Apache_Directory_Studio_Site" ), url, null ); //$NON-NLS-1$
+// }
+// catch ( MalformedURLException e )
+// {
+// // TODO: handle exception
+// }
+// result.setScope( scope );
+// return result;
+// }
} );
}
}
\ No newline at end of file
Modified: directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/actions/ManageConfigurationAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/actions/ManageConfigurationAction.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/actions/ManageConfigurationAction.java (original)
+++ directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/actions/ManageConfigurationAction.java Mon Mar 23 17:59:02 2015
@@ -27,7 +27,7 @@ import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.swt.custom.BusyIndicator;
import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.update.ui.UpdateManagerUI;
+//import org.eclipse.update.ui.UpdateManagerUI;
/**
@@ -65,7 +65,7 @@ public class ManageConfigurationAction e
{
public void run()
{
- UpdateManagerUI.openConfigurationManager( window.getShell() );
+// UpdateManagerUI.openConfigurationManager( window.getShell() );
}
} );
}
Modified: directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/actions/UpdateAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/actions/UpdateAction.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/actions/UpdateAction.java (original)
+++ directory/studio/trunk/plugins/rcp/src/main/java/org/apache/directory/studio/actions/UpdateAction.java Mon Mar 23 17:59:02 2015
@@ -27,8 +27,8 @@ import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.swt.custom.BusyIndicator;
import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.update.ui.UpdateJob;
-import org.eclipse.update.ui.UpdateManagerUI;
+//import org.eclipse.update.ui.UpdateJob;
+//import org.eclipse.update.ui.UpdateManagerUI;
/**
@@ -66,8 +66,8 @@ public class UpdateAction extends Action
{
public void run()
{
- UpdateJob job = new UpdateJob( Messages.getString( "UpdateAction.Searching_for_updates" ), false, false ); //$NON-NLS-1$
- UpdateManagerUI.openInstaller( window.getShell(), job );
+// UpdateJob job = new UpdateJob( Messages.getString( "UpdateAction.Searching_for_updates" ), false, false ); //$NON-NLS-1$
+// UpdateManagerUI.openInstaller( window.getShell(), job );
}
} );
}
Propchange: directory/studio/trunk/plugins/schemaeditor/
------------------------------------------------------------------------------
--- 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/schemaeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/pom.xml?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/pom.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/pom.xml Mon Mar 23 17:59:02 2015
@@ -26,340 +26,9 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
- <artifactId>schemaeditor</artifactId>
+ <artifactId>org.apache.directory.studio.schemaeditor</artifactId>
<name>Apache Directory Studio Schema Editor</name>
- <packaging>jar</packaging>
+ <packaging>eclipse-plugin</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>
- </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.pde.PluginNature</projectnature>
- <projectnature>org.eclipse.jdt.core.javanature</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>
- <Eclipse-BuddyPolicy>registered</Eclipse-BuddyPolicy>
- <Bundle-Localization>plugin</Bundle-Localization>
- <Eclipse-LazyStart>true</Eclipse-LazyStart>
- <Bundle-Activator>org.apache.directory.studio.schemaeditor.Activator</Bundle-Activator>
- <Require-Bundle>org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
- org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
- org.apache.directory.api.asn1.api;bundle-version="${org.apache.directory.api.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.api.ldap.schema.converter;bundle-version="${org.apache.directory.api.validversion}",
- org.apache.directory.api.util;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.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
- org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
- org.eclipse.core.runtime,
- org.eclipse.core.expressions,
- org.eclipse.jface.text,
- org.eclipse.search,
- org.eclipse.ui,
- org.eclipse.ui.forms</Require-Bundle>
- <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
- <Embed-Directory>lib</Embed-Directory>
- <Embed-StripGroup>true</Embed-StripGroup>
- <Embed-Transitive>true</Embed-Transitive>
- <Export-Package>org.apache.directory.studio.schemaeditor.model.*, org.apache.directory.studio.schemaeditor.model.io.*</Export-Package>
- <Import-Package>!*</Import-Package>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </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>
- <!-- OTHER_EXCLUDES -->
- <exclude>resources/schemas/openldap/*.xml</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <dependencies>
- <!-- Apache Directory Studio library plugins dependencies -->
- <dependency>
- <groupId>org.apache.directory.api</groupId>
- <artifactId>api-asn1-api</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.api</groupId>
- <artifactId>api-ldap-schema-converter</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.api</groupId>
- <artifactId>api-util</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.collections</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.logging.log4j</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.dom4j.dom4j</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>
-
- <!-- Eclipse plugins dependencies -->
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>commands</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>jobs</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>expressions</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.ui</groupId>
- <artifactId>forms</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>text</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>common</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>preferences</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>registry</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>ui</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</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.swt.gtk.linux</groupId>
- <artifactId>x86</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>search</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- JUnit for test only -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- SLF4J for test only -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
</project>
Modified: directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/pwdpolicy.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/pwdpolicy.xml?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/pwdpolicy.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/pwdpolicy.xml Mon Mar 23 17:59:02 2015
@@ -48,7 +48,7 @@
<alias>pwdGraceUseTime</alias>
</aliases>
<description>The timestamps of the grace authentication after the password has expired</description>
- <usage>USER_APPLICATIONS</usage>
+ <usage>DIRECTORY_OPERATION</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
<equality>generalizedTimeMatch</equality>
</attributetype>
@@ -65,7 +65,7 @@
<alias>pwdChangedTime</alias>
</aliases>
<description>The time the password was last changed</description>
- <usage>USER_APPLICATIONS</usage>
+ <usage>DIRECTORY_OPERATION</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
<equality>generalizedTimeMatch</equality>
<ordering>generalizedTimeOrderingMatch</ordering>
@@ -123,7 +123,7 @@
<alias>pwdPolicySubentry</alias>
</aliases>
<description>The pwdPolicy subentry in effect for this object</description>
- <usage>USER_APPLICATIONS</usage>
+ <usage>DIRECTORY_OPERATION</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
<equality>distinguishedNameMatch</equality>
</attributetype>
@@ -132,7 +132,7 @@
<alias>pwdAccountLockedTime</alias>
</aliases>
<description>The time an user account was locked</description>
- <usage>USER_APPLICATIONS</usage>
+ <usage>DIRECTORY_OPERATION</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
<equality>generalizedTimeMatch</equality>
<ordering>generalizedTimeOrderingMatch</ordering>
@@ -166,7 +166,7 @@
<alias>pwdEndTime</alias>
</aliases>
<description>The time the password becomes disabled</description>
- <usage>USER_APPLICATIONS</usage>
+ <usage>DIRECTORY_OPERATION</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
<equality>generalizedTimeMatch</equality>
<ordering>generalizedTimeOrderingMatch</ordering>
@@ -184,7 +184,7 @@
<alias>pwdFailureTime</alias>
</aliases>
<description>The timestamps of the last consecutive authentication failures</description>
- <usage>USER_APPLICATIONS</usage>
+ <usage>DIRECTORY_OPERATION</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
<equality>generalizedTimeMatch</equality>
<ordering>generalizedTimeOrderingMatch</ordering>
@@ -210,7 +210,7 @@
<alias>pwdHistory</alias>
</aliases>
<description>The history of user s passwords</description>
- <usage>USER_APPLICATIONS</usage>
+ <usage>DIRECTORY_OPERATION</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
<equality>octetStringMatch</equality>
</attributetype>
@@ -236,7 +236,7 @@
<alias>pwdStartTime</alias>
</aliases>
<description>The time the password becomes enabled</description>
- <usage>USER_APPLICATIONS</usage>
+ <usage>DIRECTORY_OPERATION</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
<equality>generalizedTimeMatch</equality>
<ordering>generalizedTimeOrderingMatch</ordering>
@@ -270,7 +270,7 @@
<alias>pwdLastSuccess</alias>
</aliases>
<description>The timestamp of the last successful authentication</description>
- <usage>USER_APPLICATIONS</usage>
+ <usage>DIRECTORY_OPERATION</usage>
<syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
<equality>generalizedTimeMatch</equality>
<ordering>generalizedTimeOrderingMatch</ordering>
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/Messages.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/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.schemaeditor.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/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/Messages.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/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.schemaeditor.controller.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/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/Messages.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/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.schemaeditor.controller.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/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Messages.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/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.schemaeditor.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/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/Messages.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/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.schemaeditor.model.io.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/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java Mon Mar 23 17:59:02 2015
@@ -32,7 +32,7 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.schema.ObjectClass;
import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.api.ldap.model.schema.SchemaObject;
-import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager;
+import org.apache.directory.api.ldap.schema.manager.impl.DefaultSchemaManager;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.controller.ProjectsHandlerAdapter;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/Messages.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/Messages.java Mon Mar 23 17:59:02 2015
@@ -25,18 +25,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.schemaeditor.view.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/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/Messages.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/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.schemaeditor.view.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/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/Messages.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/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.schemaeditor.view.editors.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/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/Messages.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/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.schemaeditor.view.editors.attributetype.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/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/Messages.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/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.schemaeditor.view.editors.objectclass.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/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/Messages.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/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.schemaeditor.view.editors.schema.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/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/Messages.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/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.schemaeditor.view.preferences.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/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/Messages.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/search/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.schemaeditor.view.search.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/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/Messages.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/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.schemaeditor.view.views.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/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/Messages.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/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.schemaeditor.view.widget.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/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/SchemaTextAttributeProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/SchemaTextAttributeProvider.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/SchemaTextAttributeProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/SchemaTextAttributeProvider.java Mon Mar 23 17:59:02 2015
@@ -23,6 +23,7 @@ package org.apache.directory.studio.sche
import java.util.HashMap;
import java.util.Map;
+import org.apache.directory.studio.common.ui.CommonUIConstants;
import org.eclipse.jface.text.TextAttribute;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
@@ -53,20 +54,20 @@ public class SchemaTextAttributeProvider
*/
public SchemaTextAttributeProvider()
{
- 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( ATTRIBUTETYPE_ATTRIBUTE, new TextAttribute( new Color( Display.getCurrent(), new RGB( 89, 71,
- 158 ) ), null, SWT.BOLD ) );
+ attributes.put( ATTRIBUTETYPE_ATTRIBUTE, new TextAttribute( new Color( Display.getCurrent(), new RGB( 96, 64,
+ 160 ) ), null, SWT.BOLD ) );
attributes.put( OBJECTCLASS_ATTRIBUTE, new TextAttribute( new Color( Display.getCurrent(),
- new RGB( 45, 124, 68 ) ), null, SWT.BOLD ) );
+ new RGB( 64, 128, 64 ) ), null, SWT.BOLD ) );
- attributes.put( OID_ATTRIBUTE, new TextAttribute( new Color( Display.getCurrent(), new RGB( 255, 0, 0 ) ) ) );
+ attributes.put( OID_ATTRIBUTE, new TextAttribute( new Color( Display.getCurrent(), CommonUIConstants.RED ) ) );
}
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java Mon Mar 23 17:59:02 2015
@@ -33,8 +33,8 @@ import java.util.Set;
import javax.naming.NamingException;
-import org.apache.directory.api.converter.schema.AttributeTypeHolder;
-import org.apache.directory.api.converter.schema.ObjectClassHolder;
+import org.apache.directory.api.ldap.schema.converter.AttributeTypeHolder;
+import org.apache.directory.api.ldap.schema.converter.ObjectClassHolder;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.api.ldap.model.name.Rdn;
Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/Messages.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/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.schemaeditor.view.wizards.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/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/Messages.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/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.schemaeditor.view.wrappers.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/valueeditors/
------------------------------------------------------------------------------
--- 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