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 2011/02/14 18:35:59 UTC
svn commit: r1070590 - in /directory/studio/branches/m1/plugins:
aciitemeditor/ apacheds.configuration.v2/ apacheds.configuration/
connection.core/ connection.ui/ ldapbrowser.common/ ldapbrowser.core/
ldapbrowser.ui/ ldifeditor/ ldifparser/ schemaedito...
Author: pamarcelot
Date: Mon Feb 14 17:35:59 2011
New Revision: 1070590
URL: http://svn.apache.org/viewvc?rev=1070590&view=rev
Log:
Updated dependencies and required bundles in pom.xml files for Studio plugins.
Modified:
directory/studio/branches/m1/plugins/aciitemeditor/pom.xml
directory/studio/branches/m1/plugins/apacheds.configuration.v2/pom.xml
directory/studio/branches/m1/plugins/apacheds.configuration/pom.xml
directory/studio/branches/m1/plugins/connection.core/pom.xml
directory/studio/branches/m1/plugins/connection.ui/pom.xml
directory/studio/branches/m1/plugins/ldapbrowser.common/pom.xml
directory/studio/branches/m1/plugins/ldapbrowser.core/pom.xml
directory/studio/branches/m1/plugins/ldapbrowser.ui/pom.xml
directory/studio/branches/m1/plugins/ldifeditor/pom.xml
directory/studio/branches/m1/plugins/ldifparser/pom.xml
directory/studio/branches/m1/plugins/schemaeditor/pom.xml
directory/studio/branches/m1/plugins/valueeditors/pom.xml
Modified: directory/studio/branches/m1/plugins/aciitemeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/aciitemeditor/pom.xml?rev=1070590&r1=1070589&r2=1070590&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/aciitemeditor/pom.xml (original)
+++ directory/studio/branches/m1/plugins/aciitemeditor/pom.xml Mon Feb 14 17:35:59 2011
@@ -109,8 +109,8 @@
<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}",
- org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
+ <Require-Bundle>org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.extras.aci;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,
@@ -153,6 +153,10 @@
<!-- Apache Directory Studio library plugins dependencies -->
<dependency>
<groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-extras-aci</artifactId>
</dependency>
Modified: directory/studio/branches/m1/plugins/apacheds.configuration.v2/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/apacheds.configuration.v2/pom.xml?rev=1070590&r1=1070589&r2=1070590&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/apacheds.configuration.v2/pom.xml (original)
+++ directory/studio/branches/m1/plugins/apacheds.configuration.v2/pom.xml Mon Feb 14 17:35:59 2011
@@ -115,7 +115,6 @@
org.apache.directory.server.config;bundle-version="${org.apache.directory.server.validversion}",
org.apache.directory.server.ldif.partition;bundle-version="${org.apache.directory.server.validversion}",
org.apache.directory.server.xdbm.partition;bundle-version="${org.apache.directory.server.validversion}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.studio.common.core,
Modified: directory/studio/branches/m1/plugins/apacheds.configuration/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/apacheds.configuration/pom.xml?rev=1070590&r1=1070589&r2=1070590&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/apacheds.configuration/pom.xml (original)
+++ directory/studio/branches/m1/plugins/apacheds.configuration/pom.xml Mon Feb 14 17:35:59 2011
@@ -110,8 +110,7 @@
<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}",
- org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
+ <Require-Bundle>org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.studio.common.ui,
org.eclipse.core.resources,
@@ -152,6 +151,11 @@
<!-- Apache Directory Studio library plugins dependencies -->
<dependency>
<groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-model</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-util</artifactId>
<scope>provided</scope>
</dependency>
Modified: directory/studio/branches/m1/plugins/connection.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/connection.core/pom.xml?rev=1070590&r1=1070589&r2=1070590&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/connection.core/pom.xml (original)
+++ directory/studio/branches/m1/plugins/connection.core/pom.xml Mon Feb 14 17:35:59 2011
@@ -109,7 +109,6 @@
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.asn1.api;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.shared.ldap.codec;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.shared.ldap.client.api;bundle-version="${org.apache.directory.shared.validversion}",
Modified: directory/studio/branches/m1/plugins/connection.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/connection.ui/pom.xml?rev=1070590&r1=1070589&r2=1070590&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/connection.ui/pom.xml (original)
+++ directory/studio/branches/m1/plugins/connection.ui/pom.xml Mon Feb 14 17:35:59 2011
@@ -114,7 +114,6 @@
<Bundle-Activator>org.apache.directory.studio.connection.ui.ConnectionUIPlugin</Bundle-Activator>
<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.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.studio.common.core,
org.apache.directory.studio.common.ui,
@@ -167,6 +166,11 @@
<artifactId>org.apache.commons.codec</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-model</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Apache Directory Studio plugins dependencies -->
<dependency>
Modified: directory/studio/branches/m1/plugins/ldapbrowser.common/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/ldapbrowser.common/pom.xml?rev=1070590&r1=1070589&r2=1070590&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/ldapbrowser.common/pom.xml (original)
+++ directory/studio/branches/m1/plugins/ldapbrowser.common/pom.xml Mon Feb 14 17:35:59 2011
@@ -117,7 +117,6 @@
org.apache.directory.studio.ldifparser,
org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
org.eclipse.core.runtime,
org.eclipse.core.expressions,
@@ -163,6 +162,11 @@
<artifactId>org.apache.commons.lang</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-model</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Apache Directory Studio plugins dependencies -->
<dependency>
Modified: directory/studio/branches/m1/plugins/ldapbrowser.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/ldapbrowser.core/pom.xml?rev=1070590&r1=1070589&r2=1070590&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/ldapbrowser.core/pom.xml (original)
+++ directory/studio/branches/m1/plugins/ldapbrowser.core/pom.xml Mon Feb 14 17:35:59 2011
@@ -111,7 +111,6 @@
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.asn1.api;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.shared.ldap.codec;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.shared.dsmlv2.parser;bundle-version="${org.apache.directory.shared.validversion}",
Modified: directory/studio/branches/m1/plugins/ldapbrowser.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/ldapbrowser.ui/pom.xml?rev=1070590&r1=1070589&r2=1070590&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/ldapbrowser.ui/pom.xml (original)
+++ directory/studio/branches/m1/plugins/ldapbrowser.ui/pom.xml Mon Feb 14 17:35:59 2011
@@ -118,7 +118,6 @@
<Bundle-Activator>org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin</Bundle-Activator>
<Require-Bundle>org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.studio.common.core,
org.apache.directory.studio.common.ui,
@@ -167,6 +166,11 @@
<dependencies>
<!-- Apache Directory Studio library plugins dependencies -->
<dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-model</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.commons.io</artifactId>
<scope>provided</scope>
Modified: directory/studio/branches/m1/plugins/ldifeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/ldifeditor/pom.xml?rev=1070590&r1=1070589&r2=1070590&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/ldifeditor/pom.xml (original)
+++ directory/studio/branches/m1/plugins/ldifeditor/pom.xml Mon Feb 14 17:35:59 2011
@@ -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}",
- org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
+ <Require-Bundle>org.apache.directory.shared.ldap.model;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,
@@ -162,6 +161,12 @@
<dependencies>
<!-- Apache Directory Studio library plugins dependencies -->
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-model</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- Apache Directory Studio plugins dependencies -->
<dependency>
<groupId>org.apache.directory.studio</groupId>
Modified: directory/studio/branches/m1/plugins/ldifparser/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/ldifparser/pom.xml?rev=1070590&r1=1070589&r2=1070590&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/ldifparser/pom.xml (original)
+++ directory/studio/branches/m1/plugins/ldifparser/pom.xml Mon Feb 14 17:35:59 2011
@@ -95,8 +95,7 @@
<Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton:=true</Bundle-SymbolicName>
<Bundle-Localization>plugin</Bundle-Localization>
<Require-Bundle>org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
- org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}"
+ org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}"
</Require-Bundle>
<Export-Package>org.apache.directory.studio.ldifparser.*</Export-Package>
<Import-Package>!</Import-Package>
@@ -123,6 +122,11 @@
<artifactId>org.apache.commons.codec</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-model</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- JUnit for test only -->
<dependency>
Modified: directory/studio/branches/m1/plugins/schemaeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/schemaeditor/pom.xml?rev=1070590&r1=1070589&r2=1070590&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/schemaeditor/pom.xml (original)
+++ directory/studio/branches/m1/plugins/schemaeditor/pom.xml Mon Feb 14 17:35:59 2011
@@ -116,9 +116,8 @@
<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.asn1.api;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.shared.ldap.schema.converter;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.studio.common.core,
Modified: directory/studio/branches/m1/plugins/valueeditors/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/valueeditors/pom.xml?rev=1070590&r1=1070589&r2=1070590&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/valueeditors/pom.xml (original)
+++ directory/studio/branches/m1/plugins/valueeditors/pom.xml Mon Feb 14 17:35:59 2011
@@ -114,7 +114,6 @@
<Bundle-Activator>org.apache.directory.studio.valueeditors.ValueEditorsActivator</Bundle-Activator>
<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.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.studio.common.ui,
@@ -166,6 +165,11 @@
<!-- Apache Directory Studio library plugins dependencies -->
<dependency>
<groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap-model</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-util</artifactId>
<scope>provided</scope>
</dependency>