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 [11/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.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/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.ui.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.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/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.ui.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.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/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.ui.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.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/preferences/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/preferences/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/preferences/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/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.ui.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.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/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.ui.dialogs.properties.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.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/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.ui.editors.entry.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.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/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.ui.editors.schemabrowser.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.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/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.ui.editors.searchresult.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.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/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.ui.views.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.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/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.ui.views.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.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/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.ui.views.modificationlogs.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.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/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.ui.views.searchlogs.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.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/Messages.java?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/Messages.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/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.ui.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
Propchange: directory/studio/trunk/plugins/ldapservers/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 17:59:02 2015
@@ -1,6 +1,7 @@
target
maven-eclipse.xml
lib
+bin
.externalToolBuilders
felix-cache
.project
Propchange: directory/studio/trunk/plugins/ldapservers.apacheds.v153/
------------------------------------------------------------------------------
--- 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/ldapservers.apacheds.v153/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v153/pom.xml?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v153/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v153/pom.xml Mon Mar 23 17:59:02 2015
@@ -24,136 +24,32 @@
<groupId>org.apache.directory.studio</groupId>
<artifactId>parent-plugins</artifactId>
<version>2.0.0-SNAPSHOT</version>
+ <relativePath>../</relativePath>
</parent>
- <artifactId>ldapservers.apacheds.v153</artifactId>
+ <artifactId>org.apache.directory.studio.ldapservers.apacheds.v153</artifactId>
<name>Apache Directory Studio ApacheDS 1.5.3 LDAP Server Adapter</name>
- <packaging>jar</packaging>
+ <packaging>eclipse-plugin</packaging>
<description />
<build>
- <resources>
- <resource>
- <directory>.</directory>
- <includes>
- <include>plugin*.properties</include>
- <include>plugin.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>resources</directory>
- <targetPath>resources</targetPath>
- </resource>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- </resources>
-
<plugins>
+ <!-- Copying ApacheDS 1.5.3 Libraries -->
<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.ldapservers.apacheds.v153.ApacheDS153Plugin</Bundle-Activator>
- <Require-Bundle>org.apache.directory.studio.apacheds.configuration,
- 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.ldapservers,
- org.apache.mina.core;bundle-version="${org.apache.mina.version}",
- org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.eclipse.debug.ui,
- org.eclipse.jdt.launching,
- org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.ui.editors,
- org.eclipse.ui.ide</Require-Bundle>
- <Export-Package>org.apache.directory.studio.ldapservers.apacheds.v153.*</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>
+ <artifactId>maven-clean-plugin</artifactId>
<configuration>
- <skip>true</skip>
+ <filesets>
+ <fileset>
+ <directory>.</directory>
+ <includes>
+ <include>resources/libs/**</include>
+ </includes>
+ </fileset>
+ </filesets>
</configuration>
</plugin>
- <!-- Copying ApacheDS 1.5.3 Libraries -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -165,228 +61,272 @@
<goal>copy</goal>
</goals>
<configuration>
- <outputDirectory>target/classes/resources/libs</outputDirectory>
+ <outputDirectory>resources/libs</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>2.7.7</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-bootstrap-extract</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-bootstrap-partition</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-btree-base</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-constants</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-entry</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-shared</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-jdbm</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-jdbm-store</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-kerberos-shared</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.studio</groupId>
<artifactId>apacheds-launcher</artifactId>
<version>1.2.0</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-changepw</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-dns</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-kerberos</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-ldap</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-ntp</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-shared</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-schema-bootstrap</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-schema-extras</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-schema-registries</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-server-jndi</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-server-xml</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-utils</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-xbean-spring</artifactId>
<version>1.5.3</version>
</artifactItem>
+
<artifactItem>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.1</version>
</artifactItem>
+
<artifactItem>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2</version>
</artifactItem>
+
<artifactItem>
<groupId>commons-daemon</groupId>
<artifactId>commons-daemon</artifactId>
<version>1.0.1</version>
</artifactItem>
+
<artifactItem>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.daemon</groupId>
<artifactId>daemon-bootstrappers</artifactId>
<version>1.1.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.slf4j</groupId>
<artifactId>jcl104-over-slf4j</artifactId>
<version>1.4.3</version>
</artifactItem>
+
<artifactItem>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
<version>1.1.6</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.mina</groupId>
<artifactId>mina-filter-ssl</artifactId>
<version>1.1.6</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-asn1</artifactId>
<version>0.9.11</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-asn1-codec</artifactId>
<version>0.9.11</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-bouncycastle-reduced</artifactId>
<version>0.9.11</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap</artifactId>
<version>0.9.11</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-constants</artifactId>
<version>0.9.11</version>
</artifactItem>
+
<artifactItem>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.4.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.4.3</version>
</artifactItem>
+
<artifactItem>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>2.0.6</version>
</artifactItem>
+
<artifactItem>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>2.0.6</version>
</artifactItem>
+
<artifactItem>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>2.0.6</version>
</artifactItem>
+
<artifactItem>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
@@ -396,168 +336,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
</build>
-
- <dependencies>
- <!-- Apache Directory Studio library plugins dependencies -->
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.dom4j.dom4j</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Apache Mina dependencies -->
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Apache Directory Studio plugins dependencies -->
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>apacheds.configuration</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>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>ldapservers</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>jobs</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>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>resources</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>expressions</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.debug</groupId>
- <artifactId>core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.debug</groupId>
- <artifactId>ui</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>launching</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>
\ No newline at end of file
+</project>
Propchange: directory/studio/trunk/plugins/ldapservers.apacheds.v154/
------------------------------------------------------------------------------
--- 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/ldapservers.apacheds.v154/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v154/pom.xml?rev=1668692&r1=1668691&r2=1668692&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v154/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v154/pom.xml Mon Mar 23 17:59:02 2015
@@ -24,136 +24,150 @@
<groupId>org.apache.directory.studio</groupId>
<artifactId>parent-plugins</artifactId>
<version>2.0.0-SNAPSHOT</version>
+ <relativePath>../</relativePath>
</parent>
- <artifactId>ldapservers.apacheds.v154</artifactId>
+ <artifactId>org.apache.directory.studio.ldapservers.apacheds.v154</artifactId>
<name>Apache Directory Studio ApacheDS 1.5.4 LDAP Server Adapter</name>
- <packaging>jar</packaging>
+ <packaging>eclipse-plugin</packaging>
<description />
<build>
- <resources>
- <resource>
- <directory>.</directory>
- <includes>
- <include>plugin*.properties</include>
- <include>plugin.xml</include>
- </includes>
- </resource>
- <resource>
- <directory>resources</directory>
- <targetPath>resources</targetPath>
- </resource>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- </resources>
-
+<!-- <resources> -->
+<!-- <resource> -->
+<!-- <directory>.</directory> -->
+<!-- <includes> -->
+<!-- <include>plugin*.properties</include> -->
+<!-- <include>plugin.xml</include> -->
+<!-- </includes> -->
+<!-- </resource> -->
+<!-- <resource> -->
+<!-- <directory>resources</directory> -->
+<!-- <targetPath>resources</targetPath> -->
+<!-- </resource> -->
+<!-- <resource> -->
+<!-- <directory>src/main/java</directory> -->
+<!-- <includes> -->
+<!-- <include>**/*.properties</include> -->
+<!-- </includes> -->
+<!-- </resource> -->
+<!-- </resources> -->
+<!-- -->
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- <pde>true</pde>
- <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>
+<!-- <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.ldapservers.apacheds.v154.ApacheDS154Plugin</Bundle-Activator>
- <Require-Bundle>org.apache.directory.studio.apacheds.configuration,
- 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.ldapservers,
- org.apache.mina.core;bundle-version="${org.apache.mina.version}",
- org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.eclipse.debug.ui,
- org.eclipse.jdt.launching,
- org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.ui.editors,
- org.eclipse.ui.ide</Require-Bundle>
- <Export-Package>org.apache.directory.studio.ldapservers.apacheds.v154.*</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>
+<!-- <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.ldapservers.apacheds.v154.ApacheDS154Plugin</Bundle-Activator> -->
+<!-- <Require-Bundle>org.apache.directory.studio.apacheds.configuration, -->
+<!-- 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.ldapservers, -->
+<!-- org.apache.mina.core;bundle-version="${org.apache.mina.version}", -->
+<!-- org.dom4j.dom4j;bundle-version="${org.dom4j.version}", -->
+<!-- org.eclipse.core.runtime, -->
+<!-- org.eclipse.core.resources, -->
+<!-- org.eclipse.debug.core, -->
+<!-- org.eclipse.debug.ui, -->
+<!-- org.eclipse.jdt.launching, -->
+<!-- org.eclipse.jface.text, -->
+<!-- org.eclipse.ui, -->
+<!-- org.eclipse.ui.editors, -->
+<!-- org.eclipse.ui.ide</Require-Bundle> -->
+<!-- <Export-Package>org.apache.directory.studio.ldapservers.apacheds.v154.*</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> -->
+ <!-- Copying ApacheDS 1.5.4 Libraries -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-clean-plugin</artifactId>
<configuration>
- <skip>true</skip>
+ <filesets>
+ <fileset>
+ <directory>.</directory>
+ <includes>
+ <include>resources/libs/**</include>
+ </includes>
+ </fileset>
+ </filesets>
</configuration>
</plugin>
- <!-- Copying ApacheDS 1.5.4 Libraries -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -165,7 +179,7 @@
<goal>copy</goal>
</goals>
<configuration>
- <outputDirectory>target/classes/resources/libs</outputDirectory>
+ <outputDirectory>resources/libs</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>antlr</groupId>
@@ -416,168 +430,168 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
</build>
-
- <dependencies>
+<!-- -->
+<!-- <dependencies> -->
<!-- Apache Directory Studio library plugins dependencies -->
- <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.dom4j.dom4j</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- -->
<!-- Apache Mina dependencies -->
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <scope>provided</scope>
- </dependency>
-
+<!-- <dependency> -->
+<!-- <groupId>org.apache.mina</groupId> -->
+<!-- <artifactId>mina-core</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- -->
<!-- Apache Directory Studio plugins dependencies -->
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>apacheds.configuration</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>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>ldapservers</artifactId>
- <scope>provided</scope>
- </dependency>
-
+<!-- <dependency> -->
+<!-- <groupId>org.apache.directory.studio</groupId> -->
+<!-- <artifactId>apacheds.configuration</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>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>ldapservers</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>jobs</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>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>resources</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>expressions</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.debug</groupId>
- <artifactId>core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.debug</groupId>
- <artifactId>ui</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>launching</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>
\ No newline at end of file
+<!-- <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>jobs</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>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>resources</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.eclipse.core</groupId> -->
+<!-- <artifactId>expressions</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.eclipse.debug</groupId> -->
+<!-- <artifactId>core</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.eclipse.debug</groupId> -->
+<!-- <artifactId>ui</artifactId> -->
+<!-- <scope>provided</scope> -->
+<!-- </dependency> -->
+<!-- <dependency> -->
+<!-- <groupId>org.eclipse.jdt</groupId> -->
+<!-- <artifactId>launching</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>
Propchange: directory/studio/trunk/plugins/ldapservers.apacheds.v155/
------------------------------------------------------------------------------
--- 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