You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/11/25 14:28:46 UTC
svn commit: r1039033 - in /directory/studio/trunk:
libraries/net.sf.ehcache.core/ libraries/org.apache.directory.server.config/
libraries/org.apache.directory.server.core.api/
libraries/org.apache.directory.server.core.avl/
libraries/org.apache.directo...
Author: pamarcelot
Date: Thu Nov 25 13:28:45 2010
New Revision: 1039033
URL: http://svn.apache.org/viewvc?rev=1039033&view=rev
Log:
Cleaning in dependencies in pom.xml files.
Modified:
directory/studio/trunk/libraries/net.sf.ehcache.core/pom.xml
directory/studio/trunk/libraries/org.apache.directory.server.config/pom.xml
directory/studio/trunk/libraries/org.apache.directory.server.core.api/pom.xml
directory/studio/trunk/libraries/org.apache.directory.server.core.avl/pom.xml
directory/studio/trunk/libraries/org.apache.directory.server.core.constants/pom.xml
directory/studio/trunk/libraries/org.apache.directory.server.core/pom.xml
directory/studio/trunk/libraries/org.apache.directory.server.i18n/pom.xml
directory/studio/trunk/libraries/org.apache.directory.server.ldif.partition/pom.xml
directory/studio/trunk/libraries/org.apache.directory.server.xdbm.partition/pom.xml
directory/studio/trunk/libraries/org.apache.directory.shared.dsml.parser/pom.xml
directory/studio/trunk/libraries/org.apache.directory.shared.i18n/pom.xml
directory/studio/trunk/libraries/org.apache.directory.shared.ldap.client.api/pom.xml
directory/studio/trunk/libraries/org.apache.directory.shared.ldap.schema/pom.xml
directory/studio/trunk/libraries/org.apache.directory.shared.ldap/pom.xml
directory/studio/trunk/libraries/org.apache.httpcomponents.httpclient/pom.xml
directory/studio/trunk/libraries/org.apache.mina.core/pom.xml
directory/studio/trunk/plugins/aciitemeditor/pom.xml
directory/studio/trunk/plugins/apacheds.configuration.v2/pom.xml
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorAddPageAction.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java
directory/studio/trunk/plugins/apacheds.configuration/pom.xml
directory/studio/trunk/plugins/apacheds/pom.xml
directory/studio/trunk/plugins/common.core/pom.xml
directory/studio/trunk/plugins/common.ui/pom.xml
directory/studio/trunk/plugins/connection.core/pom.xml
directory/studio/trunk/plugins/connection.ui/pom.xml
directory/studio/trunk/plugins/ldapbrowser.common/pom.xml
directory/studio/trunk/plugins/ldapbrowser.core/pom.xml
directory/studio/trunk/plugins/ldapbrowser.ui/pom.xml
directory/studio/trunk/plugins/ldapservers.apacheds.v153/pom.xml
directory/studio/trunk/plugins/ldapservers.apacheds.v154/pom.xml
directory/studio/trunk/plugins/ldapservers.apacheds.v155/pom.xml
directory/studio/trunk/plugins/ldapservers.apacheds.v156/pom.xml
directory/studio/trunk/plugins/ldapservers.apacheds.v157/pom.xml
directory/studio/trunk/plugins/ldapservers/pom.xml
directory/studio/trunk/plugins/ldifeditor/pom.xml
directory/studio/trunk/plugins/ldifparser/pom.xml
directory/studio/trunk/plugins/schemaeditor/pom.xml
directory/studio/trunk/plugins/valueeditors/pom.xml
Modified: directory/studio/trunk/libraries/net.sf.ehcache.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/net.sf.ehcache.core/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/libraries/net.sf.ehcache.core/pom.xml (original)
+++ directory/studio/trunk/libraries/net.sf.ehcache.core/pom.xml Thu Nov 25 13:28:45 2010
@@ -125,6 +125,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.slf4j.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: directory/studio/trunk/libraries/org.apache.directory.server.config/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.config/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.config/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.config/pom.xml Thu Nov 25 13:28:45 2010
@@ -145,6 +145,31 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.server.core.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.server.i18n</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.server.xdbm.partition</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.ldap</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.slf4j.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: directory/studio/trunk/libraries/org.apache.directory.server.core.api/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.core.api/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.core.api/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.core.api/pom.xml Thu Nov 25 13:28:45 2010
@@ -96,10 +96,7 @@
org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.shared.ldap.client.api;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.mina.core;bundle-version="${org.apache.mina.core.version}",
- org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
- org.slf4j.api;bundle-version="${org.slf4j.version}",
- org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
+ org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
@@ -178,6 +175,61 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>net.sf.ehcache.core</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.apache.directory.server.core.constants</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.server.i18n</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.i18n</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.ldap</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.ldap.client.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.ldap.schema</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.i18n</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: directory/studio/trunk/libraries/org.apache.directory.server.core.avl/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.core.avl/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.core.avl/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.core.avl/pom.xml Thu Nov 25 13:28:45 2010
@@ -140,6 +140,26 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.i18n</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.apache.directory.shared.ldap</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.slf4j.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: directory/studio/trunk/libraries/org.apache.directory.server.core.constants/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.core.constants/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.core.constants/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.core.constants/pom.xml Thu Nov 25 13:28:45 2010
@@ -125,6 +125,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.slf4j.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: directory/studio/trunk/libraries/org.apache.directory.server.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.core/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.core/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.core/pom.xml Thu Nov 25 13:28:45 2010
@@ -142,10 +142,6 @@
</exclusion>
<exclusion>
<groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-api</artifactId>
</exclusion>
<exclusion>
@@ -174,6 +170,56 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.bouncycastle.bcprov.jdk15</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.lang</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.server.core.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.server.i18n</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.server.xdbm.partition</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.i18n</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.ldap</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.ldap.schema</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.slf4j.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: directory/studio/trunk/libraries/org.apache.directory.server.i18n/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.i18n/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.i18n/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.i18n/pom.xml Thu Nov 25 13:28:45 2010
@@ -125,6 +125,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.slf4j.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: directory/studio/trunk/libraries/org.apache.directory.server.ldif.partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.ldif.partition/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.ldif.partition/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.ldif.partition/pom.xml Thu Nov 25 13:28:45 2010
@@ -170,6 +170,56 @@
</exclusion>
</exclusions>
</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.apache.directory.server.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.server.core.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.server.i18n</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.server.xdbm.partition</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.i18n</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.ldap</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.ldap.schema</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.slf4j.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: directory/studio/trunk/libraries/org.apache.directory.server.xdbm.partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.xdbm.partition/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.xdbm.partition/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.xdbm.partition/pom.xml Thu Nov 25 13:28:45 2010
@@ -164,6 +164,51 @@
</exclusion>
</exclusions>
</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.directory.server.core.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.server.core.avl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.server.i18n</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.i18n</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.ldap</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.ldap.client.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.ldap.schema</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.slf4j.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: directory/studio/trunk/libraries/org.apache.directory.shared.dsml.parser/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.shared.dsml.parser/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.shared.dsml.parser/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.shared.dsml.parser/pom.xml Thu Nov 25 13:28:45 2010
@@ -86,14 +86,11 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Require-Bundle>org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
- org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
+ <Require-Bundle>org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}",
- org.slf4j.api;bundle-version="${org.slf4j.version}",
- org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
+ org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
@@ -152,6 +149,31 @@
</exclusion>
</exclusions>
</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.apache.directory.shared.i18n</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.ldap</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.slf4j.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.xpp3.xpp3</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: directory/studio/trunk/libraries/org.apache.directory.shared.i18n/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.shared.i18n/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.shared.i18n/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.shared.i18n/pom.xml Thu Nov 25 13:28:45 2010
@@ -125,6 +125,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.slf4j.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: directory/studio/trunk/libraries/org.apache.directory.shared.ldap.client.api/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.shared.ldap.client.api/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.shared.ldap.client.api/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.shared.ldap.client.api/pom.xml Thu Nov 25 13:28:45 2010
@@ -145,6 +145,31 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.commons.pool</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.ldap</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.ldap.schema</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.mina.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.slf4j.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: directory/studio/trunk/libraries/org.apache.directory.shared.ldap.schema/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.shared.ldap.schema/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.shared.ldap.schema/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.shared.ldap.schema/pom.xml Thu Nov 25 13:28:45 2010
@@ -86,14 +86,9 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.version}",
- org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
- org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
- org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
+ <Require-Bundle>org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
- org.slf4j.api;bundle-version="${org.slf4j.version}",
- org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
+ org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
@@ -140,6 +135,21 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.i18n</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.ldap</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.slf4j.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: directory/studio/trunk/libraries/org.apache.directory.shared.ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.shared.ldap/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.shared.ldap/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.shared.ldap/pom.xml Thu Nov 25 13:28:45 2010
@@ -91,9 +91,7 @@
org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.mina.core;bundle-version="${org.apache.mina.core.version}",
- org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
- org.slf4j.api;bundle-version="${org.slf4j.version}",
- org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
+ org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
@@ -143,10 +141,6 @@
<artifactId>shared-i18n</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-constants</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
</exclusion>
@@ -156,6 +150,36 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.antlr.antlr</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.apache.commons.collections</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.i18n</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.mina.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.slf4j.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: directory/studio/trunk/libraries/org.apache.httpcomponents.httpclient/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.httpcomponents.httpclient/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.httpcomponents.httpclient/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.httpcomponents.httpclient/pom.xml Thu Nov 25 13:28:45 2010
@@ -135,6 +135,21 @@
</exclusion>
</exclusions>
</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.logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.httpcomponents.httpcore</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: directory/studio/trunk/libraries/org.apache.mina.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.mina.core/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.mina.core/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.mina.core/pom.xml Thu Nov 25 13:28:45 2010
@@ -86,9 +86,7 @@
<manifestLocation>META-INF</manifestLocation>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Require-Bundle>org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
- org.slf4j.api;bundle-version="${org.slf4j.version}",
- org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
+ <Require-Bundle>org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
Modified: directory/studio/trunk/plugins/aciitemeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/pom.xml (original)
+++ directory/studio/trunk/plugins/aciitemeditor/pom.xml Thu Nov 25 13:28:45 2010
@@ -109,8 +109,7 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.aciitemeditor.Activator</Bundle-Activator>
- <Require-Bundle>
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
+ <Require-Bundle>org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.studio.common.ui,
org.apache.directory.studio.connection.core,
org.apache.directory.studio.connection.ui,
@@ -123,8 +122,7 @@
org.eclipse.jface.text,
org.eclipse.ui,
org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor
- </Require-Bundle>
+ org.eclipse.ui.workbench.texteditor</Require-Bundle>
<Export-Package>!*</Export-Package>
<Import-Package>!*</Import-Package>
</instructions>
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/pom.xml (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/pom.xml Thu Nov 25 13:28:45 2010
@@ -120,11 +120,11 @@
org.apache.directory.studio.common.core,
org.apache.directory.studio.connection.core,
org.apache.directory.studio.connection.ui,
+ org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.ui,
- org.eclipse.ui.forms
- </Require-Bundle>
+ org.eclipse.ui.forms</Require-Bundle>
<Export-Package>org.apache.directory.studio.apacheds.configuration.v2*</Export-Package>
<Import-Package>!</Import-Package>
<Private-Package>!</Private-Package>
@@ -188,6 +188,11 @@
<artifactId>org.apache.directory.shared.ldap.schema</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.logging.log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Apache Directory Studio plugins dependencies -->
<dependency>
@@ -267,7 +272,6 @@
<artifactId>resources</artifactId>
<scope>provided</scope>
</dependency>
-
</dependencies>
</project>
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java Thu Nov 25 13:28:45 2010
@@ -24,6 +24,8 @@ import java.io.IOException;
import java.net.URL;
import java.util.PropertyResourceBundle;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
@@ -63,6 +65,11 @@ public class ApacheDS2ConfigurationPlugi
public void start( BundleContext context ) throws Exception
{
super.start( context );
+
+ Logger rootLogger = Logger.getRootLogger();
+
+ System.out.println( rootLogger );
+ rootLogger.setLevel( Level.OFF );
}
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorAddPageAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorAddPageAction.java?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorAddPageAction.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/EditorAddPageAction.java Thu Nov 25 13:28:45 2010
@@ -21,13 +21,17 @@
package org.apache.directory.studio.apacheds.configuration.v2.actions;
+import java.io.File;
+
+import org.apache.directory.shared.ldap.schema.SchemaManager;
+import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader;
+import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager;
+import org.apache.directory.shared.ldap.schema.registries.SchemaLoader;
import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPlugin;
import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPluginConstants;
import org.apache.directory.studio.apacheds.configuration.v2.editor.ServerConfigurationEditor;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.forms.editor.FormPage;
/**
@@ -72,13 +76,25 @@ public class EditorAddPageAction extends
{
try
{
- editor.removePage( 0 );
- editor.addPage( new FormPage( "id", "title" ) );
+ long t1 = System.currentTimeMillis();
+ //SchemaLoader schemaLoader = new SingleLdifSchemaLoader();
+ SchemaLoader schemaLoader = new LdifSchemaLoader( new File(
+ "/Users/pajbam/Development/Apache/ApacheDS/shared/ldap-schema/src/main/resources/schema" ) );
+ SchemaManager schemaManager = new DefaultSchemaManager( schemaLoader );
+
+ // We have to load the schema now, otherwise we won't be able
+ // to initialize the Partitions, as we won't be able to parse
+ // and normalize their suffix DN
+ schemaManager.loadAllEnabled();
+ // schemaManager.loadWithDeps( "adsconfig" );
+
+ long t2 = System.currentTimeMillis();
+
+ System.out.println( "Time = " + ( t2 - t1 ) + "ms" );
}
- catch ( PartInitException e )
+ catch ( Exception e )
{
- // TODO Auto-generated catch block
- e.printStackTrace();
+ // TODO: handle exception
}
}
}
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorPage.java Thu Nov 25 13:28:45 2010
@@ -169,6 +169,7 @@ public abstract class ServerConfiguratio
toolbarManager.add( new EditorExportConfigurationAction() );
toolbarManager.add( new Separator() );
toolbarManager.add( new EditorAddPageAction( ( ServerConfigurationEditor ) getEditor() ) );
+
toolbarManager.update( true );
createFormContent( parent, toolkit );
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java Thu Nov 25 13:28:45 2010
@@ -29,7 +29,9 @@ import org.apache.directory.server.confi
import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.SchemaManager;
+import org.apache.directory.shared.ldap.schema.loader.ldif.JarLdifSchemaLoader;
import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader;
+import org.apache.directory.shared.ldap.schema.loader.ldif.SingleLdifSchemaLoader;
import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager;
import org.apache.directory.shared.ldap.schema.registries.SchemaLoader;
import org.apache.directory.shared.ldap.util.LdapExceptionUtils;
@@ -119,19 +121,19 @@ public class LoadConfigurationRunnable i
}
- private void initConfigBean() throws Exception
+ public void initConfigBean() throws Exception
{
- SchemaLoader loader = new LdifSchemaLoader( new File(
- "/Users/pajbam/Development/Apache/ApacheDS/shared/ldap-schema/src/main/resources/schema" ) );
- SchemaManager schemaManager = new DefaultSchemaManager( loader );
-
long t1 = System.currentTimeMillis();
+ //SchemaLoader schemaLoader = new SingleLdifSchemaLoader();
+ SchemaLoader schemaLoader = new JarLdifSchemaLoader();
+ SchemaManager schemaManager = new DefaultSchemaManager( schemaLoader );
+
// We have to load the schema now, otherwise we won't be able
// to initialize the Partitions, as we won't be able to parse
// and normalize their suffix DN
- //schemaManager.loadAllEnabled();
- schemaManager.loadWithDeps( "adsconfig" );
+ schemaManager.loadAllEnabled();
+// schemaManager.loadWithDeps( "adsconfig" );
long t2 = System.currentTimeMillis();
Modified: directory/studio/trunk/plugins/apacheds.configuration/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/pom.xml (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/pom.xml Thu Nov 25 13:28:45 2010
@@ -110,16 +110,14 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.apacheds.configuration.ApacheDSConfigurationPlugin</Bundle-Activator>
- <Require-Bundle>
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
+ <Require-Bundle>org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.jface.text,
org.eclipse.ui,
org.eclipse.ui.forms,
org.eclipse.ui.ide,
- org.dom4j.dom4j;bundle-version="${org.dom4j.version}"
- </Require-Bundle>
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}"</Require-Bundle>
<Export-Package>org.apache.directory.studio.apacheds.configuration.*</Export-Package>
<Import-Package>!</Import-Package>
<Private-Package>!</Private-Package>
Modified: directory/studio/trunk/plugins/apacheds/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds/pom.xml (original)
+++ directory/studio/trunk/plugins/apacheds/pom.xml Thu Nov 25 13:28:45 2010
@@ -108,8 +108,7 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.apacheds.ApacheDsPlugin</Bundle-Activator>
- <Require-Bundle>
- org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
+ <Require-Bundle>org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
org.apache.directory.studio.apacheds.configuration,
org.apache.directory.studio.connection.core;resolution:=optional,
org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
@@ -123,8 +122,7 @@
org.eclipse.jface.text,
org.eclipse.ui,
org.eclipse.ui.console,
- org.eclipse.ui.ide
- </Require-Bundle>
+ org.eclipse.ui.ide</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
Modified: directory/studio/trunk/plugins/common.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/common.core/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/common.core/pom.xml (original)
+++ directory/studio/trunk/plugins/common.core/pom.xml Thu Nov 25 13:28:45 2010
@@ -100,10 +100,8 @@
<Bundle-SymbolicName>${groupId}.${artifactId};singleton:=true</Bundle-SymbolicName>
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
- <Require-Bundle>
- org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
- org.eclipse.core.runtime
- </Require-Bundle>
+ <Require-Bundle>org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
+ org.eclipse.core.runtime</Require-Bundle>
<Export-Package>org.apache.directory.studio.*</Export-Package>
<Import-Package>!</Import-Package>
<Private-Package>!</Private-Package>
Modified: directory/studio/trunk/plugins/common.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/common.ui/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/common.ui/pom.xml (original)
+++ directory/studio/trunk/plugins/common.ui/pom.xml Thu Nov 25 13:28:45 2010
@@ -112,10 +112,8 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.common.ui.CommonUIPlugin</Bundle-Activator>
- <Require-Bundle>
- org.eclipse.core.runtime,
- org.eclipse.ui
- </Require-Bundle>
+ <Require-Bundle>org.eclipse.core.runtime,
+ org.eclipse.ui</Require-Bundle>
<Export-Package>org.apache.directory.studio.*</Export-Package>
<Import-Package>!</Import-Package>
<Private-Package>!</Private-Package>
Modified: directory/studio/trunk/plugins/connection.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/pom.xml (original)
+++ directory/studio/trunk/plugins/connection.core/pom.xml Thu Nov 25 13:28:45 2010
@@ -105,8 +105,7 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.connection.core.ConnectionCorePlugin</Bundle-Activator>
- <Require-Bundle>
- org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
+ <Require-Bundle>org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
@@ -115,8 +114,7 @@
org.apache.directory.studio.ldifparser,
org.apache.httpcomponents.httpclient;bundle-version="${org.apache.httpcomponents.version}",
org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
- org.eclipse.core.runtime
- </Require-Bundle>
+ org.eclipse.core.runtime</Require-Bundle>
<Export-Package>org.apache.directory.studio.connection.core.*</Export-Package>
<Import-Package>!</Import-Package>
<Private-Package>!</Private-Package>
Modified: directory/studio/trunk/plugins/connection.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.ui/pom.xml (original)
+++ directory/studio/trunk/plugins/connection.ui/pom.xml Thu Nov 25 13:28:45 2010
@@ -112,8 +112,7 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.connection.ui.ConnectionUIPlugin</Bundle-Activator>
- <Require-Bundle>
- org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
+ <Require-Bundle>org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.studio.common.core,
@@ -123,8 +122,7 @@
org.eclipse.core.runtime,
org.eclipse.ui,
org.eclipse.ui.forms,
- org.eclipse.ui.workbench.texteditor
- </Require-Bundle>
+ org.eclipse.ui.workbench.texteditor</Require-Bundle>
<Export-Package>org.apache.directory.studio.*</Export-Package>
<Import-Package>org.slf4j.impl;version="${org.slf4j.version}"</Import-Package>
<Private-Package>!</Private-Package>
Modified: directory/studio/trunk/plugins/ldapbrowser.common/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/pom.xml Thu Nov 25 13:28:45 2010
@@ -109,8 +109,7 @@
<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,
+ <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,
@@ -124,8 +123,7 @@
org.eclipse.jface.text,
org.eclipse.ui,
org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor
- </Require-Bundle>
+ org.eclipse.ui.workbench.texteditor</Require-Bundle>
<Export-Package>org.apache.directory.studio.ldapbrowser.common.*, org.apache.directory.studio.valueeditors.*</Export-Package>
<Import-Package>org.slf4j.impl;version="${org.slf4j.version}"</Import-Package>
<Private-Package>!</Private-Package>
Modified: directory/studio/trunk/plugins/ldapbrowser.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/pom.xml Thu Nov 25 13:28:45 2010
@@ -106,8 +106,7 @@
<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}",
+ <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}",
@@ -119,8 +118,7 @@
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>
+ 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>
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/pom.xml Thu Nov 25 13:28:45 2010
@@ -116,8 +116,7 @@
<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}",
+ <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.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.studio.common.core,
@@ -137,8 +136,7 @@
org.eclipse.ui.forms,
org.eclipse.ui.views,
org.eclipse.ui.workbench.texteditor,
- org.eclipse.search
- </Require-Bundle>
+ org.eclipse.search</Require-Bundle>
<Export-Package>org.apache.directory.studio.*</Export-Package>
<Import-Package>org.slf4j.impl;version="${org.slf4j.version}"</Import-Package>
<Private-Package>!</Private-Package>
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=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v153/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v153/pom.xml Thu Nov 25 13:28:45 2010
@@ -114,8 +114,7 @@
<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,
+ <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,
@@ -128,8 +127,7 @@
org.eclipse.jdt.launching,
org.eclipse.jface.text,
org.eclipse.ui,
- org.eclipse.ui.ide
- </Require-Bundle>
+ org.eclipse.ui.ide</Require-Bundle>
<Export-Package>org.apache.directory.studio.*</Export-Package>
<Import-Package>!</Import-Package>
<Private-Package>!</Private-Package>
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=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v154/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v154/pom.xml Thu Nov 25 13:28:45 2010
@@ -114,8 +114,7 @@
<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,
+ <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,
@@ -128,8 +127,7 @@
org.eclipse.jdt.launching,
org.eclipse.jface.text,
org.eclipse.ui,
- org.eclipse.ui.ide
- </Require-Bundle>
+ org.eclipse.ui.ide</Require-Bundle>
<Export-Package>org.apache.directory.studio.*</Export-Package>
<Import-Package>!</Import-Package>
<Private-Package>!</Private-Package>
Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v155/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v155/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v155/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v155/pom.xml Thu Nov 25 13:28:45 2010
@@ -114,8 +114,7 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.ldapservers.apacheds.v155.ApacheDS155Plugin</Bundle-Activator>
- <Require-Bundle>
- org.apache.directory.studio.apacheds.configuration,
+ <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,
@@ -128,8 +127,7 @@
org.eclipse.jdt.launching,
org.eclipse.jface.text,
org.eclipse.ui,
- org.eclipse.ui.ide
- </Require-Bundle>
+ org.eclipse.ui.ide</Require-Bundle>
<Export-Package>org.apache.directory.studio.*</Export-Package>
<Import-Package>!</Import-Package>
<Private-Package>!</Private-Package>
Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v156/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v156/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v156/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v156/pom.xml Thu Nov 25 13:28:45 2010
@@ -114,8 +114,7 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.ldapservers.apacheds.v156.ApacheDS156Plugin</Bundle-Activator>
- <Require-Bundle>
- org.apache.directory.studio.apacheds.configuration,
+ <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,
@@ -128,8 +127,7 @@
org.eclipse.jdt.launching,
org.eclipse.jface.text,
org.eclipse.ui,
- org.eclipse.ui.ide
- </Require-Bundle>
+ org.eclipse.ui.ide</Require-Bundle>
<Export-Package>org.apache.directory.studio.*</Export-Package>
<Import-Package>!</Import-Package>
<Private-Package>!</Private-Package>
Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v157/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v157/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v157/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v157/pom.xml Thu Nov 25 13:28:45 2010
@@ -114,8 +114,7 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.ldapservers.apacheds.v157.ApacheDS157Plugin</Bundle-Activator>
- <Require-Bundle>
- org.apache.directory.studio.apacheds.configuration,
+ <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,
@@ -128,8 +127,7 @@
org.eclipse.jdt.launching,
org.eclipse.jface.text,
org.eclipse.ui,
- org.eclipse.ui.ide
- </Require-Bundle>
+ org.eclipse.ui.ide</Require-Bundle>
<Export-Package>org.apache.directory.studio.*</Export-Package>
<Import-Package>!</Import-Package>
<Private-Package>!</Private-Package>
Modified: directory/studio/trunk/plugins/ldapservers/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapservers/pom.xml Thu Nov 25 13:28:45 2010
@@ -114,8 +114,7 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.ldapservers.LdapServersPlugin</Bundle-Activator>
- <Require-Bundle>
- org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
+ <Require-Bundle>org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
org.apache.directory.studio.common.core,
org.apache.directory.studio.common.ui,
@@ -130,8 +129,7 @@
org.eclipse.jface.text,
org.eclipse.ui,
org.eclipse.ui.console,
- org.eclipse.ui.ide
- </Require-Bundle>
+ org.eclipse.ui.ide</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
Modified: directory/studio/trunk/plugins/ldifeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifeditor/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifeditor/pom.xml (original)
+++ directory/studio/trunk/plugins/ldifeditor/pom.xml Thu Nov 25 13:28:45 2010
@@ -113,8 +113,7 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.ldifeditor.LdifEditorActivator</Bundle-Activator>
- <Require-Bundle>
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
+ <Require-Bundle>org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.studio.common.core,
org.apache.directory.studio.common.ui,
org.apache.directory.studio.connection.core,
@@ -133,8 +132,7 @@
org.eclipse.ui.forms,
org.eclipse.ui.views,
org.eclipse.ui.workbench.texteditor,
- org.eclipse.search
- </Require-Bundle>
+ org.eclipse.search</Require-Bundle>
<Export-Package>org.apache.directory.studio.ldifeditor.*</Export-Package>
<Import-Package>org.slf4j.impl;version="${org.slf4j.version}"</Import-Package>
<Private-Package>!</Private-Package>
Modified: directory/studio/trunk/plugins/ldifparser/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/pom.xml (original)
+++ directory/studio/trunk/plugins/ldifparser/pom.xml Thu Nov 25 13:28:45 2010
@@ -94,10 +94,8 @@
<instructions>
<Bundle-SymbolicName>${groupId}.${artifactId};singleton:=true</Bundle-SymbolicName>
<Bundle-Localization>plugin</Bundle-Localization>
- <Require-Bundle>
- org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}"
- </Require-Bundle>
+ <Require-Bundle>org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
+ org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}"</Require-Bundle>
<Export-Package>org.apache.directory.studio.ldifparser.*</Export-Package>
<Import-Package>!</Import-Package>
<Private-Package>!</Private-Package>
@@ -120,46 +118,74 @@
<!-- Apache Directory Studio library plugins dependencies -->
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.antlr.antlr</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.commons.codec</artifactId>
<scope>provided</scope>
</dependency>
+ <!-- start 'org.apache.directory.shared.ldap' and sub-dependencies -->
<dependency>
<groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.commons.collections</artifactId>
+ <artifactId>org.apache.directory.shared.ldap</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.antlr.antlr</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.lang</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.directory.shared.i18n</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.mina.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.slf4j.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- end 'org.apache.directory.shared.ldap' and sub-dependencies -->
+
+ <!-- JUnit for test only -->
<dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.directory.shared.ldap</artifactId>
- <scope>provided</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.logging.log4j</artifactId>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.slf4j.api</artifactId>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.slf4j.log4j12</artifactId>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
-
- <!-- JUnit for test only -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.apache.directory.studio</groupId>
+ <artifactId>org.apache.commons.collections</artifactId>
<scope>test</scope>
</dependency>
+
</dependencies>
</project>
\ No newline at end of file
Modified: directory/studio/trunk/plugins/schemaeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/pom.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/pom.xml Thu Nov 25 13:28:45 2010
@@ -113,8 +113,7 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.schemaeditor.Activator</Bundle-Activator>
- <Require-Bundle>
- org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
+ <Require-Bundle>org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.studio.common.core,
@@ -128,8 +127,7 @@
org.eclipse.jface.text,
org.eclipse.search,
org.eclipse.ui,
- org.eclipse.ui.forms
- </Require-Bundle>
+ org.eclipse.ui.forms</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>
Modified: directory/studio/trunk/plugins/valueeditors/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/pom.xml?rev=1039033&r1=1039032&r2=1039033&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/pom.xml (original)
+++ directory/studio/trunk/plugins/valueeditors/pom.xml Thu Nov 25 13:28:45 2010
@@ -112,8 +112,7 @@
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
<Bundle-Activator>org.apache.directory.studio.valueeditors.ValueEditorsActivator</Bundle-Activator>
- <Require-Bundle>
- org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
+ <Require-Bundle>org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.studio.common.ui,
@@ -122,8 +121,7 @@
org.apache.directory.studio.ldapbrowser.core,
org.apache.directory.studio.ldapbrowser.common,
org.eclipse.core.runtime,
- org.eclipse.ui
- </Require-Bundle>
+ org.eclipse.ui</Require-Bundle>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripGroup>true</Embed-StripGroup>