Return-Path: 
 <commits-return-30900-apmail-directory-commits-archive=directory.apache.org@directory.apache.org>
Delivered-To: apmail-directory-commits-archive@www.apache.org
Received: (qmail 51292 invoked from network); 14 Feb 2011 22:28:10 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 14 Feb 2011 22:28:10 -0000
Received: (qmail 78388 invoked by uid 500); 14 Feb 2011 22:28:10 -0000
Delivered-To: apmail-directory-commits-archive@directory.apache.org
Received: (qmail 78332 invoked by uid 500); 14 Feb 2011 22:28:10 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 78325 invoked by uid 99); 14 Feb 2011 22:28:10 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Feb 2011 22:28:10 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Feb 2011 22:28:07 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 85CB023889E7; Mon, 14 Feb 2011 22:27:45 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1070687 - in /directory/studio/branches/m1:
 plugins/aciitemeditor/ plugins/apacheds.configuration/
 plugins/connection.ui/ plugins/ldapbrowser.common/ plugins/ldapbrowser.ui/
 plugins/ldifeditor/ plugins/ldifparser/ plugins/schemaeditor/ plu...
Date: Mon, 14 Feb 2011 22:27:45 -0000
To: commits@directory.apache.org
From: akarasulu@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110214222745.85CB023889E7@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: akarasulu
Date: Mon Feb 14 22:27:44 2011
New Revision: 1070687

URL: http://svn.apache.org/viewvc?rev=1070687&view=rev
Log:
fixing various dependency and bundle requirements

Modified:
    directory/studio/branches/m1/plugins/aciitemeditor/pom.xml
    directory/studio/branches/m1/plugins/apacheds.configuration/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.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
    directory/studio/branches/m1/tests/test.integration.ui/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=1070687&r1=1070686&r2=1070687&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/aciitemeditor/pom.xml (original)
+++ directory/studio/branches/m1/plugins/aciitemeditor/pom.xml Mon Feb 14 22:27:44 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.model;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap.extras.aci;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.ui,
  org.apache.directory.studio.connection.core,
  org.apache.directory.studio.connection.ui,

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=1070687&r1=1070686&r2=1070687&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/apacheds.configuration/pom.xml (original)
+++ directory/studio/branches/m1/plugins/apacheds.configuration/pom.xml Mon Feb 14 22:27:44 2011
@@ -110,7 +110,8 @@
             <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.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,

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=1070687&r1=1070686&r2=1070687&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/connection.ui/pom.xml (original)
+++ directory/studio/branches/m1/plugins/connection.ui/pom.xml Mon Feb 14 22:27:44 2011
@@ -150,6 +150,12 @@
   </build>
 
   <dependencies>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-model</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
     <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>

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=1070687&r1=1070686&r2=1070687&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/ldapbrowser.common/pom.xml (original)
+++ directory/studio/branches/m1/plugins/ldapbrowser.common/pom.xml Mon Feb 14 22:27:44 2011
@@ -151,6 +151,12 @@
   </build>
 
   <dependencies>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-model</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
     <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>

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=1070687&r1=1070686&r2=1070687&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/ldapbrowser.ui/pom.xml (original)
+++ directory/studio/branches/m1/plugins/ldapbrowser.ui/pom.xml Mon Feb 14 22:27:44 2011
@@ -164,6 +164,11 @@
   </build>
 
   <dependencies>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-model</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.shared</groupId>

Modified: directory/studio/branches/m1/plugins/ldifeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/ldifeditor/pom.xml?rev=1070687&r1=1070686&r2=1070687&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/ldifeditor/pom.xml (original)
+++ directory/studio/branches/m1/plugins/ldifeditor/pom.xml Mon Feb 14 22:27:44 2011
@@ -113,7 +113,8 @@
             <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.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,
@@ -160,14 +161,14 @@
   </build>
 
   <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 -->
+
+    <!-- Apache Directory Studio library plugins dependencies -->
+    <!-- Apache Directory Studio plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>common.core</artifactId>

Modified: directory/studio/branches/m1/plugins/ldifparser/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/ldifparser/pom.xml?rev=1070687&r1=1070686&r2=1070687&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/ldifparser/pom.xml (original)
+++ directory/studio/branches/m1/plugins/ldifparser/pom.xml Mon Feb 14 22:27:44 2011
@@ -118,6 +118,12 @@
   <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.codec</artifactId>
       <scope>provided</scope>

Modified: directory/studio/branches/m1/plugins/schemaeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/schemaeditor/pom.xml?rev=1070687&r1=1070686&r2=1070687&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/schemaeditor/pom.xml (original)
+++ directory/studio/branches/m1/plugins/schemaeditor/pom.xml Mon Feb 14 22:27:44 2011
@@ -116,6 +116,7 @@
             <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.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}",

Modified: directory/studio/branches/m1/plugins/valueeditors/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/valueeditors/pom.xml?rev=1070687&r1=1070686&r2=1070687&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/valueeditors/pom.xml (original)
+++ directory/studio/branches/m1/plugins/valueeditors/pom.xml Mon Feb 14 22:27:44 2011
@@ -174,6 +174,11 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-util</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>org.apache.commons.codec</artifactId>
       <scope>provided</scope>

Modified: directory/studio/branches/m1/tests/test.integration.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/tests/test.integration.ui/pom.xml?rev=1070687&r1=1070686&r2=1070687&view=diff
==============================================================================
--- directory/studio/branches/m1/tests/test.integration.ui/pom.xml (original)
+++ directory/studio/branches/m1/tests/test.integration.ui/pom.xml Mon Feb 14 22:27:44 2011
@@ -274,7 +274,6 @@
  org.apache.directory.studio.ldapbrowser.ui,
  org.apache.directory.studio.apacheds,
  org.apache.directory.shared.i18n,
- org.apache.directory.shared.ldap,
  org.apache.directory.shared.ldap.schema,
  org.apache.directory.shared.ldap.client.api,
  org.apache.mina.core,