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 [10/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/ldapbrowser.common/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/pom.xml?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/pom.xml Mon Mar 23 17:59:02 2015
@@ -24,265 +24,12 @@
<groupId>org.apache.directory.studio</groupId>
<artifactId>parent-plugins</artifactId>
<version>2.0.0-SNAPSHOT</version>
+ <relativePath>../</relativePath>
</parent>
- <artifactId>ldapbrowser.common</artifactId>
+ <artifactId>org.apache.directory.studio.ldapbrowser.common</artifactId>
<name>Apache Directory Studio LDAP Browser Common</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/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.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.ldapbrowser.common.BrowserCommonActivator</Bundle-Activator>
- <Require-Bundle>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.core,
- org.apache.directory.studio.ldifparser,
- org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
- org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
- org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.validversion}",
- org.apache.directory.api.util;bundle-version="${org.apache.directory.api.validversion}",
- org.eclipse.core.runtime,
- org.eclipse.core.expressions,
- org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor</Require-Bundle>
- <Export-Package>org.apache.directory.studio.ldapbrowser.common.*, org.apache.directory.studio.valueeditors.*</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.io</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.commons.lang</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <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-util</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.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>ldifparser</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Eclipse plugins dependencies -->
- <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</groupId>
- <artifactId>text</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui.workbench</groupId>
- <artifactId>texteditor</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>workbench</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>editors</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.core</groupId>
- <artifactId>runtime</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.update</groupId>
- <artifactId>core</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.equinox</groupId>
- <artifactId>registry</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>preferences</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.swt.gtk.linux</groupId>
- <artifactId>x86</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- JUnit for test only -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
</project>
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/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.ldapbrowser.common.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/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/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.ldapbrowser.common.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/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/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.ldapbrowser.common.dialogs.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/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterDamagerRepairer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterDamagerRepairer.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterDamagerRepairer.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterDamagerRepairer.java Mon Mar 23 17:59:02 2015
@@ -21,6 +21,8 @@
package org.apache.directory.studio.ldapbrowser.common.filtereditor;
+import org.apache.directory.studio.common.core.jobs.CommonCoreConstants;
+import org.apache.directory.studio.common.ui.CommonUIConstants;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.core.model.filter.parser.LdapFilterParser;
import org.apache.directory.studio.ldapbrowser.core.model.filter.parser.LdapFilterToken;
@@ -46,22 +48,22 @@ public class FilterDamagerRepairer imple
{
private static final TextAttribute DEFAULT_TEXT_ATTRIBUTE = new TextAttribute( BrowserCommonActivator.getDefault()
- .getColor( new RGB( 0, 0, 0 ) ) );
+ .getColor( CommonUIConstants.BLACK ) );
private static final TextAttribute AND_OR_NOT_TEXT_ATTRIBUTE = new TextAttribute( BrowserCommonActivator
- .getDefault().getColor( new RGB( 0, 127, 0 ) ), null, SWT.BOLD );
+ .getDefault().getColor( CommonUIConstants.M_GREEN ), null, SWT.BOLD );
private static final TextAttribute ATTRIBUTE_TEXT_ATTRIBUTE = new TextAttribute( BrowserCommonActivator
- .getDefault().getColor( new RGB( 127, 0, 85 ) ) );
+ .getDefault().getColor( new RGB( 128, 0, 96 ) ) );
private static final TextAttribute FILTER_TYPE_TEXT_ATTRIBUTE = new TextAttribute( BrowserCommonActivator
- .getDefault().getColor( new RGB( 255, 0, 0 ) ), null, SWT.BOLD );
+ .getDefault().getColor( CommonUIConstants.RED ), null, SWT.BOLD );
private static final TextAttribute VALUE_TEXT_ATTRIBUTE = new TextAttribute( BrowserCommonActivator.getDefault()
- .getColor( new RGB( 0, 0, 127 ) ) );
+ .getColor( CommonUIConstants.M_BLUE ) );
private static final TextAttribute PARENTHESIS_TEXT_ATTRIBUTE = new TextAttribute( BrowserCommonActivator
- .getDefault().getColor( new RGB( 0, 0, 0 ) ), null, SWT.BOLD );
+ .getDefault().getColor( CommonUIConstants.BLACK ), null, SWT.BOLD );
/** The filter parser. */
private LdapFilterParser parser;
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterReconcilingStrategy.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterReconcilingStrategy.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterReconcilingStrategy.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterReconcilingStrategy.java Mon Mar 23 17:59:02 2015
@@ -24,6 +24,7 @@ package org.apache.directory.studio.ldap
import java.util.ArrayList;
import java.util.List;
+import org.apache.directory.studio.common.ui.CommonUIConstants;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.core.model.filter.LdapFilter;
import org.apache.directory.studio.ldapbrowser.core.model.filter.parser.LdapFilterParser;
@@ -93,12 +94,12 @@ public class FilterReconcilingStrategy i
{
AnnotationPainter ap = new AnnotationPainter( sourceViewer, null );
ap.addAnnotationType( "DEFAULT" ); //$NON-NLS-1$
- ap.setAnnotationTypeColor( "DEFAULT", BrowserCommonActivator.getDefault().getColor( new RGB( 255, 0, 0 ) ) ); //$NON-NLS-1$
+ ap.setAnnotationTypeColor( "DEFAULT", BrowserCommonActivator.getDefault().getColor( CommonUIConstants.RED ) ); //$NON-NLS-1$
sourceViewer.getAnnotationModel().addAnnotationModelListener( ap );
FilterCharacterPairMatcher cpm = new FilterCharacterPairMatcher( sourceViewer, parser );
MatchingCharacterPainter mcp = new MatchingCharacterPainter( sourceViewer, cpm );
- mcp.setColor( BrowserCommonActivator.getDefault().getColor( new RGB( 159, 159, 159 ) ) );
+ mcp.setColor( BrowserCommonActivator.getDefault().getColor( CommonUIConstants.ML_GREY ) );
paintManager = new PaintManager( sourceViewer );
paintManager.addPainter( ap );
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/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.ldapbrowser.common.filtereditor.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/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/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.ldapbrowser.common.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
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/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.ldapbrowser.common.widgets.browser.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/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/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.ldapbrowser.common.widgets.connection.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/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/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.ldapbrowser.common.widgets.entryeditor.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/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/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.ldapbrowser.common.widgets.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/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/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.ldapbrowser.common.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/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java Mon Mar 23 17:59:02 2015
@@ -186,10 +186,11 @@ public class NewEntryDnWizardPage extend
boolean hasSelectedEntry = wizard.getSelectedEntry() != null;
boolean newEntryParentDnNotNullOrEmpty = !Dn.isNullOrEmpty( newEntry.getDn().getParent() );
- boolean newEntryDnEqualsSelectedEntryDn = newEntry.getDn().equals( wizard.getSelectedEntry().getDn() );
if ( hasSelectedEntry )
{
+ boolean newEntryDnEqualsSelectedEntryDn = newEntry.getDn().equals( wizard.getSelectedEntry().getDn() );
+
if ( newEntryDnEqualsSelectedEntryDn && newEntryParentDnNotNullOrEmpty )
{
parentDn = newEntry.getDn().getParent();
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/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.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
Propchange: directory/studio/trunk/plugins/ldapbrowser.core/
------------------------------------------------------------------------------
--- 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/ldapbrowser.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/pom.xml?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/pom.xml Mon Mar 23 17:59:02 2015
@@ -24,304 +24,70 @@
<groupId>org.apache.directory.studio</groupId>
<artifactId>parent-plugins</artifactId>
<version>2.0.0-SNAPSHOT</version>
+ <relativePath>../</relativePath>
</parent>
- <artifactId>ldapbrowser.core</artifactId>
+ <artifactId>org.apache.directory.studio.ldapbrowser.core</artifactId>
<name>Apache Directory Studio LDAP Browser Core</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>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.jdt.launching.JRE_CONTAINER</classpathContainer>
- <classpathContainer>org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1</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.ldapbrowser.core.BrowserCorePlugin</Bundle-Activator>
- <Require-Bundle>org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
- org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
- org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
- org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
- org.apache.directory.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.codec.core;bundle-version="${org.apache.directory.api.validversion}",
- org.apache.directory.api.dsmlv2.parser;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.connection.core,
- org.apache.directory.studio.ldifparser,
- org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
- org.eclipse.core.runtime,
- org.eclipse.search,
- org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}"</Require-Bundle>
- <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
- <Embed-Directory>lib</Embed-Directory>
- <Embed-StripGroup>true</Embed-StripGroup>
- <Export-Package>org.apache.directory.studio.ldapbrowser.core.*</Export-Package>
- <Import-Package>!*</Import-Package>
- </instructions>
- </configuration>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>generate-manifest</id>
- <phase>process-classes</phase>
+ <id>copy-embedded-libs</id>
+ <phase>process-resources</phase>
<goals>
- <goal>manifest</goal>
+ <goal>copy</goal>
</goals>
+ <configuration>
+ <outputDirectory>lib</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>3.9</version>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
</execution>
</executions>
</plugin>
</plugins>
+
<pluginManagement>
<plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
<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/default_schema.ldif</exclude>
- </excludes>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[2.8,)</versionRange>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</pluginManagement>
</build>
-
- <dependencies>
- <!-- Libraries dependencies -->
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.openoffice</groupId>
- <artifactId>odfdom</artifactId>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
-
- <!-- Apache Directory Studio library plugins dependencies -->
- <dependency>
- <groupId>org.apache.directory.api</groupId>
- <artifactId>api-dsml-parser</artifactId>
- <scope>provided</scope>
- </dependency>
- <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-codec-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <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-util</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.commons.codec</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.commons.io</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.commons.lang</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.dom4j.dom4j</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.xpp3.xpp3</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Apache Directory Studio plugins dependencies -->
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>connection.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>common.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>ldifparser</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Eclipse plugins dependencies -->
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>search</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>text</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.equinox</groupId>
- <artifactId>common</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>preferences</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- JUnit for test only -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
</project>
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java Mon Mar 23 17:59:02 2015
@@ -35,11 +35,11 @@ import javax.naming.directory.SearchResu
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.directory.api.dsmlv2.DsmlDecorator;
-import org.apache.directory.api.dsmlv2.reponse.BatchResponseDsml;
-import org.apache.directory.api.dsmlv2.reponse.SearchResponseDsml;
-import org.apache.directory.api.dsmlv2.reponse.SearchResultDoneDsml;
-import org.apache.directory.api.dsmlv2.reponse.SearchResultEntryDsml;
-import org.apache.directory.api.dsmlv2.reponse.SearchResultReferenceDsml;
+import org.apache.directory.api.dsmlv2.response.BatchResponseDsml;
+import org.apache.directory.api.dsmlv2.response.SearchResponseDsml;
+import org.apache.directory.api.dsmlv2.response.SearchResultDoneDsml;
+import org.apache.directory.api.dsmlv2.response.SearchResultEntryDsml;
+import org.apache.directory.api.dsmlv2.response.SearchResultReferenceDsml;
import org.apache.directory.api.dsmlv2.request.AddRequestDsml;
import org.apache.directory.api.dsmlv2.request.BatchRequestDsml;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java Mon Mar 23 17:59:02 2015
@@ -42,6 +42,7 @@ import org.apache.directory.studio.ldapb
import org.apache.directory.studio.ldifparser.model.container.LdifContainer;
import org.apache.directory.studio.ldifparser.model.container.LdifContentRecord;
import org.eclipse.core.runtime.Preferences;
+/*
import org.openoffice.odf.doc.OdfFileDom;
import org.openoffice.odf.doc.OdfSpreadsheetDocument;
import org.openoffice.odf.doc.element.table.OdfTable;
@@ -49,6 +50,7 @@ import org.openoffice.odf.doc.element.ta
import org.openoffice.odf.doc.element.table.OdfTableRow;
import org.openoffice.odf.dom.OdfNamespace;
import org.openoffice.odf.dom.type.office.OdfValueType;
+*/
import org.w3c.dom.Element;
@@ -136,6 +138,7 @@ public class ExportOdfRunnable implement
*/
public void run( StudioProgressMonitor monitor )
{
+ /*
monitor.beginTask( BrowserCoreMessages.jobs__export_odf_task, 2 );
monitor.reportProgress( " " ); //$NON-NLS-1$
monitor.worked( 1 );
@@ -194,6 +197,7 @@ public class ExportOdfRunnable implement
{
monitor.reportError( e );
}
+ */
}
@@ -214,6 +218,7 @@ public class ExportOdfRunnable implement
*
* @throws IOException Signals that an I/O exception has occurred.
*/
+/*
private static void exportToOdf( IBrowserConnection browserConnection, SearchParameter searchParameter,
OdfFileDom contentDoc, OdfTable table, OdfTableRow headerRow, int count, StudioProgressMonitor monitor,
LinkedHashMap<String, Short> attributeNameMap, String valueDelimiter, int binaryEncoding, boolean exportDn )
@@ -257,6 +262,7 @@ public class ExportOdfRunnable implement
monitor.reportError( e );
}
}
+*/
/**
@@ -272,6 +278,7 @@ public class ExportOdfRunnable implement
* @param binaryEncoding the binary encoding
* @param exportDn the export dn
*/
+/*
private static void recordToOdfRow( IBrowserConnection browserConnection, LdifContentRecord record,
OdfFileDom contentDoc, OdfTable table, OdfTableRow headerRow, Map<String, Short> headerRowAttributeNameMap,
String valueDelimiter, int binaryEncoding, boolean exportDn )
@@ -319,4 +326,6 @@ public class ExportOdfRunnable implement
row.appendCell( cell );
}
}
+*/
+
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java Mon Mar 23 17:59:02 2015
@@ -39,14 +39,14 @@ import org.apache.commons.codec.digest.D
import org.apache.directory.api.asn1.EncoderException;
import org.apache.directory.api.dsmlv2.DsmlDecorator;
import org.apache.directory.api.dsmlv2.Dsmlv2Parser;
-import org.apache.directory.api.dsmlv2.reponse.AddResponseDsml;
-import org.apache.directory.api.dsmlv2.reponse.BatchResponseDsml;
-import org.apache.directory.api.dsmlv2.reponse.BindResponseDsml;
-import org.apache.directory.api.dsmlv2.reponse.CompareResponseDsml;
-import org.apache.directory.api.dsmlv2.reponse.DelResponseDsml;
-import org.apache.directory.api.dsmlv2.reponse.ExtendedResponseDsml;
-import org.apache.directory.api.dsmlv2.reponse.ModDNResponseDsml;
-import org.apache.directory.api.dsmlv2.reponse.ModifyResponseDsml;
+import org.apache.directory.api.dsmlv2.response.AddResponseDsml;
+import org.apache.directory.api.dsmlv2.response.BatchResponseDsml;
+import org.apache.directory.api.dsmlv2.response.BindResponseDsml;
+import org.apache.directory.api.dsmlv2.response.CompareResponseDsml;
+import org.apache.directory.api.dsmlv2.response.DelResponseDsml;
+import org.apache.directory.api.dsmlv2.response.ExtendedResponseDsml;
+import org.apache.directory.api.dsmlv2.response.ModDNResponseDsml;
+import org.apache.directory.api.dsmlv2.response.ModifyResponseDsml;
import org.apache.directory.api.dsmlv2.request.BatchRequestDsml;
import org.apache.directory.api.dsmlv2.request.Dsmlv2Grammar;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java Mon Mar 23 17:59:02 2015
@@ -63,10 +63,16 @@ public class InitializeRootDSERunnable i
{
/** The requested attributes when reading the Root DSE. */
public static final String[] ROOT_DSE_ATTRIBUTES =
- { SchemaConstants.NAMING_CONTEXTS_AT, SchemaConstants.SUBSCHEMA_SUBENTRY_AT,
- SchemaConstants.SUPPORTED_LDAP_VERSION_AT, SchemaConstants.SUPPORTED_SASL_MECHANISMS_AT,
- SchemaConstants.SUPPORTED_EXTENSION_AT, SchemaConstants.SUPPORTED_CONTROL_AT,
- SchemaConstants.SUPPORTED_FEATURES_AT, SchemaConstants.VENDOR_NAME_AT, SchemaConstants.VENDOR_VERSION_AT,
+ {
+ SchemaConstants.NAMING_CONTEXTS_AT,
+ SchemaConstants.SUBSCHEMA_SUBENTRY_AT,
+ SchemaConstants.SUPPORTED_LDAP_VERSION_AT,
+ SchemaConstants.SUPPORTED_SASL_MECHANISMS_AT,
+ SchemaConstants.SUPPORTED_EXTENSION_AT,
+ SchemaConstants.SUPPORTED_CONTROL_AT,
+ SchemaConstants.SUPPORTED_FEATURES_AT,
+ SchemaConstants.VENDOR_NAME_AT,
+ SchemaConstants.VENDOR_VERSION_AT,
SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES };
private IRootDSE rootDSE;
@@ -165,6 +171,7 @@ public class InitializeRootDSERunnable i
// delete old attributes
IAttribute[] oldAttributes = browserConnection.getRootDSE().getAttributes();
+
if ( oldAttributes != null )
{
for ( IAttribute oldAttribute : oldAttributes )
@@ -179,7 +186,9 @@ public class InitializeRootDSERunnable i
Connection.ReferralHandlingMethod.IGNORE, false, null );
SearchRunnable.searchAndUpdateModel( browserConnection, search, monitor );
- // load all user attributes
+ // Load all user attributes. This is done because the BEA "LDAP server" (so called) is stupid
+ // enough not to accept searches where "+" and "*" are provided on the list of parameters.
+ // We have to do two searches...
search = new Search( null, browserConnection, Dn.EMPTY_DN, ISearch.FILTER_TRUE, new String[]
{ SchemaConstants.ALL_USER_ATTRIBUTES }, SearchScope.OBJECT, 0, 0,
Connection.AliasDereferencingMethod.NEVER, Connection.ReferralHandlingMethod.IGNORE, false, null );
@@ -195,6 +204,7 @@ public class InitializeRootDSERunnable i
// only add the specified base Dn
Dn dn = browserConnection.getBaseDN();
IEntry entry = browserConnection.getEntryFromCache( dn );
+
if ( entry == null )
{
entry = new BaseDNEntry( dn, browserConnection );
@@ -207,9 +217,11 @@ public class InitializeRootDSERunnable i
// get base DNs from namingContexts attribute
Set<String> namingContextSet = new HashSet<String>();
IAttribute attribute = browserConnection.getRootDSE().getAttribute( SchemaConstants.NAMING_CONTEXTS_AT );
+
if ( attribute != null )
{
String[] values = attribute.getStringValues();
+
for ( int i = 0; i < values.length; i++ )
{
namingContextSet.add( values[i] );
@@ -231,11 +243,13 @@ public class InitializeRootDSERunnable i
{
Dn dn = new Dn( namingContext );
IEntry entry = browserConnection.getEntryFromCache( dn );
+
if ( entry == null )
{
entry = new BaseDNEntry( dn, browserConnection );
browserConnection.cacheEntry( entry );
}
+
rootDseEntries.put( dn, entry );
}
catch ( LdapInvalidDnException e )
@@ -261,22 +275,26 @@ public class InitializeRootDSERunnable i
// 2nd: add schema sub-entry
IEntry[] schemaEntries = getDirectoryMetadataEntries( browserConnection, SchemaConstants.SUBSCHEMA_SUBENTRY_AT );
+
for ( IEntry entry : schemaEntries )
{
if ( entry instanceof DirectoryMetadataEntry )
{
( ( DirectoryMetadataEntry ) entry ).setSchemaEntry( true );
}
+
rootDseEntries.put( entry.getDn(), entry );
}
// get other meta data entries
IAttribute[] rootDseAttributes = browserConnection.getRootDSE().getAttributes();
+
if ( rootDseAttributes != null )
{
for ( IAttribute attribute : rootDseAttributes )
{
IEntry[] metadataEntries = getDirectoryMetadataEntries( browserConnection, attribute.getDescription() );
+
for ( IEntry entry : metadataEntries )
{
rootDseEntries.put( entry.getDn(), entry );
@@ -286,6 +304,7 @@ public class InitializeRootDSERunnable i
// try to init entries
StudioProgressMonitor dummyMonitor = new StudioProgressMonitor( monitor );
+
for ( IEntry entry : rootDseEntries.values() )
{
initBaseEntry( entry, dummyMonitor );
@@ -303,33 +322,43 @@ public class InitializeRootDSERunnable i
DetectedConnectionProperties detectedConnectionProperties = browserConnection.getConnection()
.getDetectedConnectionProperties();
IAttribute vendorNameAttribute = browserConnection.getRootDSE().getAttribute( "vendorName" ); //$NON-NLS-1$
+
if ( ( vendorNameAttribute != null ) && ( vendorNameAttribute.getValueSize() > 0 ) )
{
detectedConnectionProperties.setVendorName( vendorNameAttribute.getStringValue() );
}
+
IAttribute vendorVersionAttribute = browserConnection.getRootDSE().getAttribute( "vendorVersion" ); //$NON-NLS-1$
+
if ( ( vendorVersionAttribute != null ) && ( vendorVersionAttribute.getValueSize() > 0 ) )
{
detectedConnectionProperties.setVendorVersion( vendorVersionAttribute.getStringValue() );
}
+
IAttribute supportedControlAttribute = browserConnection.getRootDSE().getAttribute( "supportedControl" ); //$NON-NLS-1$
+
if ( ( supportedControlAttribute != null ) && ( supportedControlAttribute.getValueSize() > 0 ) )
{
detectedConnectionProperties.setSupportedControls( Arrays.asList( supportedControlAttribute
.getStringValues() ) );
}
+
IAttribute supportedExtensionAttribute = browserConnection.getRootDSE().getAttribute( "supportedExtension" ); //$NON-NLS-1$
+
if ( ( supportedExtensionAttribute != null ) && ( supportedExtensionAttribute.getValueSize() > 0 ) )
{
detectedConnectionProperties.setSupportedExtensions( Arrays.asList( supportedExtensionAttribute
.getStringValues() ) );
}
+
IAttribute supportedFeaturesAttribute = browserConnection.getRootDSE().getAttribute( "supportedFeatures" ); //$NON-NLS-1$
+
if ( ( supportedFeaturesAttribute != null ) && ( supportedFeaturesAttribute.getValueSize() > 0 ) )
{
detectedConnectionProperties.setSupportedFeatures( Arrays.asList( supportedFeaturesAttribute
.getStringValues() ) );
}
+
detectedConnectionProperties
.setServerType( ServerTypeDetector.detectServerType( browserConnection.getRootDSE() ) );
@@ -351,6 +380,7 @@ public class InitializeRootDSERunnable i
SearchRunnable.searchAndUpdateModel( browserConnection, search, monitor );
ISearchResult[] results = search.getSearchResults();
+
if ( results != null && results.length == 1 )
{
// add entry to Root DSE
@@ -371,9 +401,11 @@ public class InitializeRootDSERunnable i
{
List<Dn> metadataEntryDnList = new ArrayList<Dn>();
IAttribute attribute = browserConnection.getRootDSE().getAttribute( metadataAttributeName );
+
if ( attribute != null )
{
String[] values = attribute.getStringValues();
+
for ( String dn : values )
{
if ( dn != null && !"".equals( dn ) ) //$NON-NLS-1$
@@ -390,10 +422,12 @@ public class InitializeRootDSERunnable i
}
IEntry[] metadataEntries = new IEntry[metadataEntryDnList.size()];
+
for ( int i = 0; i < metadataEntryDnList.size(); i++ )
{
Dn dn = metadataEntryDnList.get( i );
metadataEntries[i] = browserConnection.getEntryFromCache( dn );
+
if ( metadataEntries[i] == null )
{
metadataEntries[i] = new DirectoryMetadataEntry( dn, browserConnection );
@@ -401,6 +435,7 @@ public class InitializeRootDSERunnable i
browserConnection.cacheEntry( metadataEntries[i] );
}
}
+
return metadataEntries;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/Messages.java Mon Mar 23 17:59:02 2015
@@ -23,6 +23,11 @@ package org.apache.directory.studio.ldap
import org.eclipse.osgi.util.NLS;
+/**
+ * This class get messages from the resources file.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
public class Messages extends NLS
{
private static final String BUNDLE_NAME = "org.apache.directory.studio.ldapbrowser.core.model.filter.messages"; //$NON-NLS-1$
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Messages.java Mon Mar 23 17:59:02 2015
@@ -23,6 +23,11 @@ package org.apache.directory.studio.ldap
import org.eclipse.osgi.util.NLS;
+/**
+ * This class get messages from the resources file.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
public class Messages extends NLS
{
private static final String BUNDLE_NAME = "org.apache.directory.studio.ldapbrowser.core.model.impl.messages"; //$NON-NLS-1$
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/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.ldapbrowser.core.model.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/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java Mon Mar 23 17:59:02 2015
@@ -129,7 +129,7 @@ public class Schema
private String modifyTimestamp;
- private Map<String, MutableObjectClass> ocdMapByNameOrNumericOid;
+ private Map<String, ObjectClass> ocdMapByNameOrNumericOid;
private Map<String, AttributeType> atdMapByNameOrNumericOid;
@@ -149,7 +149,7 @@ public class Schema
this.dn = null;
this.createTimestamp = null;
this.modifyTimestamp = null;
- this.ocdMapByNameOrNumericOid = new HashMap<String, MutableObjectClass>();
+ this.ocdMapByNameOrNumericOid = new HashMap<String, ObjectClass>();
this.atdMapByNameOrNumericOid = new HashMap<String, AttributeType>();
this.lsdMapByNumericOid = new HashMap<String, LdapSyntax>();
this.mrdMapByNameOrNumericOid = new HashMap<String, MatchingRule>();
@@ -261,7 +261,7 @@ public class Schema
{
if ( attributeName.equalsIgnoreCase( SchemaConstants.OBJECT_CLASSES_AT ) )
{
- MutableObjectClass ocd = ocdPparser.parseObjectClassDescription( value );
+ ObjectClass ocd = ocdPparser.parseObjectClassDescription( value );
ocd.addExtension( RAW_SCHEMA_DEFINITION_LDIF_VALUE, ldifValues );
addObjectClass( ocd );
}
@@ -330,12 +330,15 @@ public class Schema
}
// set extensibleObject may attributes
- MutableObjectClass extensibleObjectOcd = this
+ ObjectClass extensibleObjectOcd = this
.getObjectClassDescription( SchemaConstants.EXTENSIBLE_OBJECT_OC );
- Collection<AttributeType> userAtds = SchemaUtils.getUserAttributeDescriptions( this );
- Collection<String> atdNames = SchemaUtils.getNames( userAtds );
- List<String> atdNames2 = new ArrayList<String>( atdNames );
- extensibleObjectOcd.setMayAttributeTypeOids( atdNames2 );
+ if ( extensibleObjectOcd instanceof MutableObjectClass )
+ {
+ Collection<AttributeType> userAtds = SchemaUtils.getUserAttributeDescriptions( this );
+ Collection<String> atdNames = SchemaUtils.getNames( userAtds );
+ List<String> atdNames2 = new ArrayList<String>( atdNames );
+ ( ( MutableObjectClass ) extensibleObjectOcd ).setMayAttributeTypeOids( atdNames2 );
+ }
}
@@ -449,7 +452,7 @@ public class Schema
*
* @param ocd the object class description
*/
- private void addObjectClass( MutableObjectClass ocd )
+ private void addObjectClass( ObjectClass ocd )
{
if ( ocd.getOid() != null )
{
@@ -505,7 +508,7 @@ public class Schema
*
* @return the object class description, or the default or a dummy
*/
- public MutableObjectClass getObjectClassDescription( String nameOrOid )
+ public ObjectClass getObjectClassDescription( String nameOrOid )
{
if ( ocdMapByNameOrNumericOid.containsKey( Strings.toLowerCase( nameOrOid ) ) )
{
@@ -520,7 +523,7 @@ public class Schema
// DUMMY
List<String> names = new ArrayList<String>();
names.add( nameOrOid );
- MutableObjectClass ocd = new MutableObjectClass( nameOrOid );
+ ObjectClass ocd = new ObjectClass( nameOrOid );
ocd.setNames( names );
ocd.setExtensions( DUMMY_EXTENSIONS );
return ocd;
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Messages.java Mon Mar 23 17:59:02 2015
@@ -23,6 +23,11 @@ package org.apache.directory.studio.ldap
import org.eclipse.osgi.util.NLS;
+/**
+ * This class get messages from the resources file.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
public class Messages extends NLS
{
private static final String BUNDLE_NAME = "org.apache.directory.studio.ldapbrowser.core.utils.messages"; //$NON-NLS-1$
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/
------------------------------------------------------------------------------
--- 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/ldapbrowser.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/pom.xml?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/pom.xml Mon Mar 23 17:59:02 2015
@@ -24,313 +24,12 @@
<groupId>org.apache.directory.studio</groupId>
<artifactId>parent-plugins</artifactId>
<version>2.0.0-SNAPSHOT</version>
+ <relativePath>../</relativePath>
</parent>
- <artifactId>ldapbrowser.ui</artifactId>
+ <artifactId>org.apache.directory.studio.ldapbrowser.ui</artifactId>
<name>Apache Directory Studio LDAP Browser UI</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/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>
- <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.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.ldapbrowser.ui.BrowserUIPlugin</Bundle-Activator>
- <Require-Bundle>org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
- org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
- org.apache.directory.api.ldap.model;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.directory.studio.ldapbrowser.core,
- org.apache.directory.studio.ldapbrowser.common,
- org.apache.directory.studio.ldifeditor,
- org.apache.directory.studio.ldifparser,
- org.eclipse.core.expressions,
- org.eclipse.core.filesystem,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.ui.editors,
- org.eclipse.ui.forms,
- org.eclipse.ui.ide,
- org.eclipse.ui.views,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.search</Require-Bundle>
- <Export-Package>org.apache.directory.studio.*</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-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.lang</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>ldifparser</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>ldifeditor</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>osgi</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>jobs</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>preferences</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>search</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.core</groupId>
- <artifactId>expressions</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>registry</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</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>ide</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>views</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>
- <dependency>
- <groupId>org.eclipse.swt.gtk.linux</groupId>
- <artifactId>x86</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
</project>
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/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.entryeditors.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