directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r984134 - in /directory/studio/trunk: ./ aciitemeditor/ apacheds.configuration/ apacheds/ application/application-plugins/ common.core/ connection.core/ connection.ui/ jars/ ldapbrowser.common/ ldapbrowser.core/ ldapbrowser.ui/ ldapservers....
Date Tue, 10 Aug 2010 17:17:32 GMT
Author: pamarcelot
Date: Tue Aug 10 17:17:31 2010
New Revision: 984134

URL: http://svn.apache.org/viewvc?rev=984134&view=rev
Log:
Removed the 'jars' plugin. Updated all other plugins to use the new library plugins.

Removed:
    directory/studio/trunk/jars/
Modified:
    directory/studio/trunk/aciitemeditor/pom.xml
    directory/studio/trunk/apacheds.configuration/pom.xml
    directory/studio/trunk/apacheds/pom.xml
    directory/studio/trunk/application/application-plugins/pom.xml
    directory/studio/trunk/common.core/pom.xml
    directory/studio/trunk/connection.core/pom.xml
    directory/studio/trunk/connection.ui/pom.xml
    directory/studio/trunk/ldapbrowser.common/pom.xml
    directory/studio/trunk/ldapbrowser.core/pom.xml
    directory/studio/trunk/ldapbrowser.ui/pom.xml
    directory/studio/trunk/ldapservers.apacheds.v153/pom.xml
    directory/studio/trunk/ldapservers.apacheds.v154/pom.xml
    directory/studio/trunk/ldapservers.apacheds.v155/pom.xml
    directory/studio/trunk/ldapservers.apacheds.v156/pom.xml
    directory/studio/trunk/ldapservers/pom.xml
    directory/studio/trunk/ldifeditor/pom.xml
    directory/studio/trunk/ldifparser/pom.xml
    directory/studio/trunk/org.apache.directory.shared.asn1/pom.xml
    directory/studio/trunk/org.apache.directory.shared.dsmlparser/pom.xml
    directory/studio/trunk/org.apache.directory.shared.ldap/pom.xml
    directory/studio/trunk/org.apache.directory.shared.ldapconstants/pom.xml
    directory/studio/trunk/org.apache.httpcomponents.httpclient/pom.xml
    directory/studio/trunk/org.apache.mina.core/pom.xml
    directory/studio/trunk/org.slf4j.log4j12/pom.xml
    directory/studio/trunk/pom.xml
    directory/studio/trunk/schemaeditor/pom.xml
    directory/studio/trunk/valueeditors/pom.xml

Modified: directory/studio/trunk/aciitemeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/aciitemeditor/pom.xml (original)
+++ directory/studio/trunk/aciitemeditor/pom.xml Tue Aug 10 17:17:31 2010
@@ -116,10 +116,11 @@
  org.eclipse.core.resources,
  org.eclipse.ui.editors,
  org.eclipse.ui.workbench.texteditor,
+ org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
+ org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
  org.apache.directory.studio.common.ui,
  org.apache.directory.studio.connection.core,
  org.apache.directory.studio.connection.ui,
- org.apache.directory.studio.jars,
  org.apache.directory.studio.ldapbrowser.common,
  org.apache.directory.studio.ldapbrowser.core,
  org.apache.directory.studio.valueeditors
@@ -150,15 +151,22 @@
   </build>
 
   <dependencies>
-  	<!-- Apache Directory Studio plugins dependencies -->
+    <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>common.ui</artifactId>
+      <artifactId>org.apache.directory.shared.ldap</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>jars</artifactId>
+      <artifactId>org.apache.directory.shared.ldapconstants</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    
+  	<!-- Apache Directory Studio plugins dependencies -->
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>common.ui</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: directory/studio/trunk/apacheds.configuration/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds.configuration/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/apacheds.configuration/pom.xml (original)
+++ directory/studio/trunk/apacheds.configuration/pom.xml Tue Aug 10 17:17:31 2010
@@ -116,7 +116,8 @@
  org.eclipse.jface.text,
  org.eclipse.ui.ide,
  org.eclipse.core.resources,
- org.apache.directory.studio.jars
+ org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}"
             </Require-Bundle>
             <Export-Package>org.apache.directory.studio.apacheds.configuration.*</Export-Package>
             <Import-Package>!</Import-Package>
@@ -145,10 +146,15 @@
   </build>
 
   <dependencies>
-  	<!-- Apache Directory Studio plugins dependencies -->
+  	<!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>jars</artifactId>
+      <artifactId>org.apache.directory.shared.ldap</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.dom4j.dom4j</artifactId>
       <scope>provided</scope>
     </dependency>
     

Modified: directory/studio/trunk/apacheds/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/pom.xml (original)
+++ directory/studio/trunk/apacheds/pom.xml Tue Aug 10 17:17:31 2010
@@ -118,9 +118,12 @@
  org.eclipse.jdt.launching,
  org.eclipse.debug.core,
  org.eclipse.debug.ui,
- org.apache.directory.studio.jars,
  org.apache.directory.studio.apacheds.configuration,
- org.apache.directory.studio.connection.core;resolution:=optional
+ org.apache.directory.studio.connection.core;resolution:=optional,
+ org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
+ org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
+ org.apache.mina.core;bundle-version="${org.apache.mina.core.validversion}",
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}"
             </Require-Bundle>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
@@ -1280,31 +1283,37 @@
   </build>
   
   <dependencies>
-  	<!-- Libraries dependencies -->
+    <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
-      <groupId>org.apache.mina</groupId>
-      <artifactId>mina-core</artifactId>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.apache.commons.io</artifactId>
+      <scope>provided</scope>
     </dependency>
-    
-  	<!-- Apache Directory Studio plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>jars</artifactId>
+      <artifactId>org.apache.mina.core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>apacheds.configuration</artifactId>
+      <artifactId>org.apache.logging.log4j</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>connection.core</artifactId>
+      <artifactId>org.dom4j.dom4j</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    
+  	<!-- Apache Directory Studio plugins dependencies -->
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>apacheds.configuration</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>apacheds-launcher</artifactId>
+      <artifactId>connection.core</artifactId>
       <scope>provided</scope>
     </dependency>
     

Modified: directory/studio/trunk/application/application-plugins/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-plugins/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/application/application-plugins/pom.xml (original)
+++ directory/studio/trunk/application/application-plugins/pom.xml Tue Aug 10 17:17:31 2010
@@ -49,6 +49,89 @@
             <configuration>
               <destinationDirectory>${plugins-dir}</destinationDirectory>
               <artifactItems>
+                <!-- Apache Directory Studio library plugins dependencies -->
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>org.antlr.antlr</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>org.apache.commons.codec</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>org.apache.commons.codec</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>org.apache.commons.collections</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>org.apache.commons.io</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>org.apache.commons.lang</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>org.apache.commons.logging</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>org.apache.directory.shared.asn1</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>org.apache.directory.shared.dsmlparser</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>org.apache.directory.shared.ldap</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>org.apache.directory.shared.ldapconstants</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>org.apache.httpcomponents.httpclient</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>org.apache.httpcomponents.httpcore</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>org.apache.logging.log4j</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>org.apache.mina.core</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>org.bouncycastle.bcprovjdk15</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>org.dom4j.dom4j</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>org.slf4j.api</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>org.slf4j.log4j12</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>org.xpp3.xpp3</artifactId>
+                </artifactItem>
+                
+                <!-- Apache Directory Studio plugins dependencies -->
                 <artifactItem>
                   <groupId>org.apache.directory.studio</groupId>
                   <artifactId>org.apache.mina.core</artifactId>
@@ -91,10 +174,6 @@
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.directory.studio</groupId>
-                  <artifactId>jars</artifactId>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.apache.directory.studio</groupId>
                   <artifactId>ldapbrowser.core</artifactId>
                 </artifactItem>
                 <artifactItem>

Modified: directory/studio/trunk/common.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/common.core/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/common.core/pom.xml (original)
+++ directory/studio/trunk/common.core/pom.xml Tue Aug 10 17:17:31 2010
@@ -101,8 +101,7 @@
             <Bundle-Localization>plugin</Bundle-Localization>
             <Eclipse-LazyStart>true</Eclipse-LazyStart>
             <Require-Bundle>org.eclipse.core.runtime,
-org.apache.directory.studio.jars
-            </Require-Bundle>
+ org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}"</Require-Bundle>
             <Export-Package>org.apache.directory.studio.*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>
@@ -130,10 +129,10 @@ org.apache.directory.studio.jars
   </build>
 
   <dependencies>
-    <!-- Apache Directory Studio plugins dependencies -->
+    <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>jars</artifactId>
+      <artifactId>org.apache.commons.lang</artifactId>
       <scope>provided</scope>
     </dependency>
     

Modified: directory/studio/trunk/connection.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection.core/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/connection.core/pom.xml (original)
+++ directory/studio/trunk/connection.core/pom.xml Tue Aug 10 17:17:31 2010
@@ -106,10 +106,14 @@
             <Eclipse-LazyStart>true</Eclipse-LazyStart>
             <Bundle-Activator>org.apache.directory.studio.connection.core.ConnectionCorePlugin</Bundle-Activator>
             <Require-Bundle>org.eclipse.core.runtime,
+ 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.version}",
  org.apache.directory.studio.common.core,
- org.apache.directory.studio.jars,
- org.apache.directory.studio.ldifparser
-            </Require-Bundle>
+ org.apache.directory.studio.ldifparser,
+ org.apache.httpcomponents.httpclient;bundle-version="${org.apache.httpcomponents.version}",
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}"</Require-Bundle>
             <Export-Package>org.apache.directory.studio.connection.core.*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>
@@ -137,15 +141,42 @@
   </build>
 
   <dependencies>
-  	<!-- Apache Directory Studio plugins dependencies -->
+    <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>common.core</artifactId>
+      <artifactId>org.apache.commons.codec</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>jars</artifactId>
+      <artifactId>org.apache.directory.shared.ldap</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.apache.httpcomponents.httpclient</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.dom4j.dom4j</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    
+    <!-- Apache Directory Studio plugins dependencies -->
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>common.core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: directory/studio/trunk/connection.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection.ui/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/connection.ui/pom.xml (original)
+++ directory/studio/trunk/connection.ui/pom.xml Tue Aug 10 17:17:31 2010
@@ -116,10 +116,13 @@
  org.eclipse.ui.forms,
  org.eclipse.core.runtime,
  org.eclipse.ui.workbench.texteditor,
+ org.bouncycastle.bcprovjdk15;bundle-version="${org.bouncycastle.bcprovjdk15.version}",
+ 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.version}",
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.common.ui,
- org.apache.directory.studio.connection.core,
- org.apache.directory.studio.jars
+ org.apache.directory.studio.connection.core
             </Require-Bundle>
             <Export-Package>org.apache.directory.studio.*</Export-Package>
             <Import-Package>!</Import-Package>
@@ -164,9 +167,26 @@
       <artifactId>connection.core</artifactId>
       <scope>provided</scope>
     </dependency>
+    
+    <!-- Apache Directory Studio library plugins dependencies -->
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.bouncycastle.bcprovjdk15</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.codec</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>jars</artifactId>
+      <artifactId>org.apache.directory.shared.ldap</artifactId>
       <scope>provided</scope>
     </dependency>
     

Modified: directory/studio/trunk/ldapbrowser.common/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.common/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.common/pom.xml (original)
+++ directory/studio/trunk/ldapbrowser.common/pom.xml Tue Aug 10 17:17:31 2010
@@ -119,10 +119,13 @@
  org.apache.directory.studio.common.ui,
  org.apache.directory.studio.connection.core,
  org.apache.directory.studio.connection.ui,
- org.apache.directory.studio.jars,
  org.apache.directory.studio.ldapbrowser.core,
- org.apache.directory.studio.ldifparser
-            </Require-Bundle>
+ 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.version}",
+ org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
+ org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Export-Package>org.apache.directory.studio.ldapbrowser.common.*, org.apache.directory.studio.valueeditors.*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>
@@ -150,6 +153,33 @@
   </build>
 
   <dependencies>
+    <!-- Apache Directory Studio library plugins dependencies -->
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.apache.commons.io</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.apache.commons.lang</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.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.ldapconstants</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.slf4j.log4j12</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    
   	<!-- Apache Directory Studio plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
@@ -173,11 +203,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>jars</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
       <artifactId>ldapbrowser.core</artifactId>
       <scope>provided</scope>
     </dependency>

Modified: directory/studio/trunk/ldapbrowser.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/pom.xml (original)
+++ directory/studio/trunk/ldapbrowser.core/pom.xml Tue Aug 10 17:17:31 2010
@@ -110,9 +110,18 @@
  org.eclipse.search,
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.connection.core,
- org.apache.directory.studio.jars,
- org.apache.directory.studio.ldifparser
-            </Require-Bundle>
+ org.apache.directory.studio.ldifparser,
+ org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
+ org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
+ org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
+ org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
+ org.apache.directory.shared.asn1;bundle-version="${org.apache.directory.shared.version}",
+ org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
+ org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
+ org.apache.directory.shared.dsmlparser;bundle-version="${org.apache.directory.shared.version}",
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
+ org.slf4j.log4j12;bundle-version="${org.slf4j.version}",
+ 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>
@@ -158,21 +167,73 @@
       <groupId>xerces</groupId>
       <artifactId>xercesImpl</artifactId>
     </dependency>
-  
-  	<!-- Apache Directory Studio plugins dependencies -->
+    
+    <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>connection.core</artifactId>
+      <artifactId>org.apache.commons.codec</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>common.core</artifactId>
+      <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.shared.asn1</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.ldapconstants</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>jars</artifactId>
+      <artifactId>org.apache.directory.shared.dsmlparser</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.dom4j.dom4j</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.slf4j.log4j12</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.xpp3.xpp3</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  
+  	<!-- Apache Directory Studio plugins dependencies -->
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>connection.core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>common.core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: directory/studio/trunk/ldapbrowser.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.ui/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.ui/pom.xml (original)
+++ directory/studio/trunk/ldapbrowser.ui/pom.xml Tue Aug 10 17:17:31 2010
@@ -126,11 +126,14 @@
  org.eclipse.ui.views,
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.search,
+ 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.version}",
+ org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.common.ui,
  org.apache.directory.studio.connection.core,
  org.apache.directory.studio.connection.ui,
- org.apache.directory.studio.jars,
  org.apache.directory.studio.ldapbrowser.core,
  org.apache.directory.studio.ldapbrowser.common,
  org.apache.directory.studio.ldifeditor,
@@ -162,20 +165,37 @@
   </build>
 
   <dependencies>
-  	<!-- Apache Directory Studio plugins dependencies -->
+    <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>common.core</artifactId>
+      <artifactId>org.apache.commons.io</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>common.ui</artifactId>
+      <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>jars</artifactId>
+      <artifactId>org.apache.directory.shared.ldapconstants</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    
+  	<!-- Apache Directory Studio plugins dependencies -->
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>common.core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>common.ui</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: directory/studio/trunk/ldapservers.apacheds.v153/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapservers.apacheds.v153/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/ldapservers.apacheds.v153/pom.xml (original)
+++ directory/studio/trunk/ldapservers.apacheds.v153/pom.xml Tue Aug 10 17:17:31 2010
@@ -125,8 +125,8 @@
  org.apache.directory.studio.apacheds.configuration,
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.common.ui,
- org.apache.directory.studio.jars,
- org.apache.directory.studio.ldapservers
+ org.apache.directory.studio.ldapservers,
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}"
             </Require-Bundle>
             <Export-Package>org.apache.directory.studio.*</Export-Package>
             <Import-Package>!</Import-Package>
@@ -400,25 +400,27 @@
   </build>
 
   <dependencies>
-  	<!-- Apache Directory Studio plugins dependencies -->
+    <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>apacheds.configuration</artifactId>
+      <artifactId>org.dom4j.dom4j</artifactId>
       <scope>provided</scope>
     </dependency>
+    
+  	<!-- Apache Directory Studio plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>common.core</artifactId>
+      <artifactId>apacheds.configuration</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>common.ui</artifactId>
+      <artifactId>common.core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>jars</artifactId>
+      <artifactId>common.ui</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: directory/studio/trunk/ldapservers.apacheds.v154/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapservers.apacheds.v154/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/ldapservers.apacheds.v154/pom.xml (original)
+++ directory/studio/trunk/ldapservers.apacheds.v154/pom.xml Tue Aug 10 17:17:31 2010
@@ -125,8 +125,8 @@
  org.apache.directory.studio.apacheds.configuration,
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.common.ui,
- org.apache.directory.studio.jars,
- org.apache.directory.studio.ldapservers
+ org.apache.directory.studio.ldapservers,
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}"
             </Require-Bundle>
             <Export-Package>org.apache.directory.studio.*</Export-Package>
             <Import-Package>!</Import-Package>
@@ -420,25 +420,27 @@
   </build>
 
   <dependencies>
-  	<!-- Apache Directory Studio plugins dependencies -->
+    <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>apacheds.configuration</artifactId>
+      <artifactId>org.dom4j.dom4j</artifactId>
       <scope>provided</scope>
     </dependency>
+    
+  	<!-- Apache Directory Studio plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>common.core</artifactId>
+      <artifactId>apacheds.configuration</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>common.ui</artifactId>
+      <artifactId>common.core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>jars</artifactId>
+      <artifactId>common.ui</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: directory/studio/trunk/ldapservers.apacheds.v155/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapservers.apacheds.v155/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/ldapservers.apacheds.v155/pom.xml (original)
+++ directory/studio/trunk/ldapservers.apacheds.v155/pom.xml Tue Aug 10 17:17:31 2010
@@ -125,8 +125,8 @@
  org.apache.directory.studio.apacheds.configuration,
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.common.ui,
- org.apache.directory.studio.jars,
- org.apache.directory.studio.ldapservers
+ org.apache.directory.studio.ldapservers,
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}"
             </Require-Bundle>
             <Export-Package>org.apache.directory.studio.*</Export-Package>
             <Import-Package>!</Import-Package>
@@ -430,25 +430,27 @@
   </build>
 
   <dependencies>
-  	<!-- Apache Directory Studio plugins dependencies -->
+    <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>apacheds.configuration</artifactId>
+      <artifactId>org.dom4j.dom4j</artifactId>
       <scope>provided</scope>
     </dependency>
+    
+  	<!-- Apache Directory Studio plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>common.core</artifactId>
+      <artifactId>apacheds.configuration</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>common.ui</artifactId>
+      <artifactId>common.core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>jars</artifactId>
+      <artifactId>common.ui</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: directory/studio/trunk/ldapservers.apacheds.v156/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapservers.apacheds.v156/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/ldapservers.apacheds.v156/pom.xml (original)
+++ directory/studio/trunk/ldapservers.apacheds.v156/pom.xml Tue Aug 10 17:17:31 2010
@@ -125,8 +125,8 @@
  org.apache.directory.studio.apacheds.configuration,
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.common.ui,
- org.apache.directory.studio.jars,
- org.apache.directory.studio.ldapservers
+ org.apache.directory.studio.ldapservers,
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}"
             </Require-Bundle>
             <Export-Package>org.apache.directory.studio.*</Export-Package>
             <Import-Package>!</Import-Package>
@@ -524,25 +524,27 @@
   </build>
 
   <dependencies>
-  	<!-- Apache Directory Studio plugins dependencies -->
+    <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>apacheds.configuration</artifactId>
+      <artifactId>org.dom4j.dom4j</artifactId>
       <scope>provided</scope>
     </dependency>
+    
+  	<!-- Apache Directory Studio plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>common.core</artifactId>
+      <artifactId>apacheds.configuration</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>common.ui</artifactId>
+      <artifactId>common.core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>jars</artifactId>
+      <artifactId>common.ui</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: directory/studio/trunk/ldapservers/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapservers/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/ldapservers/pom.xml (original)
+++ directory/studio/trunk/ldapservers/pom.xml Tue Aug 10 17:17:31 2010
@@ -122,10 +122,12 @@
  org.eclipse.jface.text,
  org.eclipse.ui,
  org.eclipse.ui.ide,
- org.apache.mina.core,
+ 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,
- org.apache.directory.studio.jars
+ org.apache.mina.core;bundle-version="${org.apache.mina.core.validversion}",
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}"
             </Require-Bundle>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
@@ -158,10 +160,15 @@
   </build>
 
   <dependencies>
-  	<!-- Apache Directory Studio plugins dependencies -->
+    <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>common.core</artifactId>
+      <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>
@@ -171,12 +178,19 @@
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>common.ui</artifactId>
+      <artifactId>org.dom4j.dom4j</artifactId>
       <scope>provided</scope>
     </dependency>
+    
+  	<!-- Apache Directory Studio plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>jars</artifactId>
+      <artifactId>common.core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>common.ui</artifactId>
       <scope>provided</scope>
     </dependency>
     

Modified: directory/studio/trunk/ldifeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/ldifeditor/pom.xml (original)
+++ directory/studio/trunk/ldifeditor/pom.xml Tue Aug 10 17:17:31 2010
@@ -125,11 +125,11 @@
  org.eclipse.jface.text,
  org.eclipse.ui.ide,
  org.eclipse.core.resources,
+ org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.common.ui,
  org.apache.directory.studio.connection.core,
  org.apache.directory.studio.connection.ui,
- org.apache.directory.studio.jars,
  org.apache.directory.studio.ldapbrowser.core,
  org.apache.directory.studio.ldapbrowser.common,
  org.apache.directory.studio.ldifparser</Require-Bundle>
@@ -160,20 +160,22 @@
   </build>
 
   <dependencies>
-  	<!-- Apache Directory Studio plugins dependencies -->
+    <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>common.core</artifactId>
+      <artifactId>org.apache.directory.shared.ldap</artifactId>
       <scope>provided</scope>
     </dependency>
+    
+  	<!-- Apache Directory Studio plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>common.ui</artifactId>
+      <artifactId>common.core</artifactId>
       <scope>provided</scope>
     </dependency>
-  	<dependency>
+    <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>jars</artifactId>
+      <artifactId>common.ui</artifactId>
       <scope>provided</scope>
     </dependency>
   	<dependency>

Modified: directory/studio/trunk/ldifparser/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifparser/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/ldifparser/pom.xml (original)
+++ directory/studio/trunk/ldifparser/pom.xml Tue Aug 10 17:17:31 2010
@@ -94,7 +94,9 @@
           <instructions>            
             <Bundle-SymbolicName>${groupId}.${artifactId};singleton:=true</Bundle-SymbolicName>
             <Bundle-Localization>plugin</Bundle-Localization>
-            <Require-Bundle>org.apache.directory.studio.jars</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.version}",
+ org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Export-Package>org.apache.directory.studio.ldifparser.*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>
@@ -114,10 +116,20 @@
   </build>
 
   <dependencies>
-  	<!-- Apache Directory Studio plugins dependencies -->
+    <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>jars</artifactId>
+      <artifactId>org.apache.commons.codec</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.log4j12</artifactId>
       <scope>provided</scope>
     </dependency>
     

Modified: directory/studio/trunk/org.apache.directory.shared.asn1/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.directory.shared.asn1/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.directory.shared.asn1/pom.xml (original)
+++ directory/studio/trunk/org.apache.directory.shared.asn1/pom.xml Tue Aug 10 17:17:31 2010
@@ -125,7 +125,6 @@
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>org.slf4j.api</artifactId>
-      <scope>provided</scope>
     </dependency>
   </dependencies>
   

Modified: directory/studio/trunk/org.apache.directory.shared.dsmlparser/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.directory.shared.dsmlparser/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.directory.shared.dsmlparser/pom.xml (original)
+++ directory/studio/trunk/org.apache.directory.shared.dsmlparser/pom.xml Tue Aug 10 17:17:31 2010
@@ -132,37 +132,30 @@
     <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.directory.shared.asn1</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.ldapconstants</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>org.dom4j.dom4j</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>org.xpp3.xpp3</artifactId>
-      <scope>provided</scope>
     </dependency>
   </dependencies>
   

Modified: directory/studio/trunk/org.apache.directory.shared.ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.directory.shared.ldap/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.directory.shared.ldap/pom.xml (original)
+++ directory/studio/trunk/org.apache.directory.shared.ldap/pom.xml Tue Aug 10 17:17:31 2010
@@ -74,7 +74,8 @@
  org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
  org.apache.directory.shared.asn1;bundle-version="${org.apache.directory.shared.version}",
  org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
- org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
+ org.slf4j.api;bundle-version="${org.slf4j.version}",
+ org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>
@@ -129,27 +130,26 @@
     <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.directory.shared.asn1</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>org.apache.directory.shared.ldapconstants</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.slf4j.log4j12</artifactId>
     </dependency>
   </dependencies>
   

Modified: directory/studio/trunk/org.apache.directory.shared.ldapconstants/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.directory.shared.ldapconstants/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.directory.shared.ldapconstants/pom.xml (original)
+++ directory/studio/trunk/org.apache.directory.shared.ldapconstants/pom.xml Tue Aug 10 17:17:31 2010
@@ -125,7 +125,6 @@
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>org.slf4j.api</artifactId>
-      <scope>provided</scope>
     </dependency>
   </dependencies>
   

Modified: directory/studio/trunk/org.apache.httpcomponents.httpclient/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.httpcomponents.httpclient/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.httpcomponents.httpclient/pom.xml (original)
+++ directory/studio/trunk/org.apache.httpcomponents.httpclient/pom.xml Tue Aug 10 17:17:31 2010
@@ -127,17 +127,14 @@
     <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>
   

Modified: directory/studio/trunk/org.apache.mina.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.mina.core/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.mina.core/pom.xml (original)
+++ directory/studio/trunk/org.apache.mina.core/pom.xml Tue Aug 10 17:17:31 2010
@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>org.apache.mina.core</artifactId>
-  <version>${org.apache.mina.core.version}</version>
+  <version>${org.apache.mina.core.validversion}</version>
   
   <name>Apache MINA Core (for Apache Directory Studio)</name>
   <packaging>jar</packaging>

Modified: directory/studio/trunk/org.slf4j.log4j12/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.slf4j.log4j12/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/org.slf4j.log4j12/pom.xml (original)
+++ directory/studio/trunk/org.slf4j.log4j12/pom.xml Tue Aug 10 17:17:31 2010
@@ -126,12 +126,10 @@
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>org.apache.logging.log4j</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>org.slf4j.api</artifactId>
-      <scope>provided</scope>
     </dependency>
   </dependencies>
   

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Tue Aug 10 17:17:31 2010
@@ -77,6 +77,7 @@
     <org.apache.httpcomponents.version>4.0</org.apache.httpcomponents.version>
     <org.apache.directory.shared.version>0.9.17</org.apache.directory.shared.version>
     <org.apache.mina.core.version>2.0.0-M6</org.apache.mina.core.version>
+    <org.apache.mina.core.validversion>2.0.0.M6</org.apache.mina.core.validversion>
     <org.bouncycastle.bcprovjdk15.version>140</org.bouncycastle.bcprovjdk15.version>
     <org.dom4j.version>1.6.1</org.dom4j.version>
     <org.slf4j.version>1.5.6</org.slf4j.version>
@@ -116,7 +117,6 @@
     <module>common.ui</module>
     <module>connection.core</module>
     <module>connection.ui</module>
-    <module>jars</module>
     <module>ldapbrowser.core</module>
     <module>ldapbrowser.common</module>
     <module>ldapbrowser.ui</module>
@@ -288,7 +288,7 @@
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>org.apache.mina.core</artifactId>
-        <version>${org.apache.mina.core.version}</version>
+        <version>${org.apache.mina.core.validversion}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
@@ -379,11 +379,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>jars</artifactId>
-        <version>${pom.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.directory.studio</groupId>
         <artifactId>ldapbrowser.common</artifactId>
         <version>${pom.version}</version>
       </dependency>

Modified: directory/studio/trunk/schemaeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/pom.xml (original)
+++ directory/studio/trunk/schemaeditor/pom.xml Tue Aug 10 17:17:31 2010
@@ -119,11 +119,16 @@
  org.eclipse.search,
  org.eclipse.ui,
  org.eclipse.ui.forms,
+ 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;bundle-version="${org.apache.directory.shared.version}",
+ org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.common.ui,
  org.apache.directory.studio.connection.core,
  org.apache.directory.studio.connection.ui,
- org.apache.directory.studio.jars
+ org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}"
             </Require-Bundle>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
@@ -167,6 +172,38 @@
       </exclusions>
     </dependency>
     
+    <!-- Apache Directory Studio library plugins dependencies -->
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.apache.commons.io</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.apache.commons.collections</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.apache.directory.shared.asn1</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.logging.log4j</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.dom4j.dom4j</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    
   	<!-- Apache Directory Studio plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
@@ -188,11 +225,6 @@
       <artifactId>connection.ui</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>jars</artifactId>
-      <scope>provided</scope>
-    </dependency>
     
 	<!-- Eclipse plugins dependencies -->
     <dependency>

Modified: directory/studio/trunk/valueeditors/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/valueeditors/pom.xml?rev=984134&r1=984133&r2=984134&view=diff
==============================================================================
--- directory/studio/trunk/valueeditors/pom.xml (original)
+++ directory/studio/trunk/valueeditors/pom.xml Tue Aug 10 17:17:31 2010
@@ -114,10 +114,12 @@
             <Bundle-Activator>org.apache.directory.studio.valueeditors.ValueEditorsActivator</Bundle-Activator>
             <Require-Bundle>org.eclipse.ui,
  org.eclipse.core.runtime,
+ 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.version}",
  org.apache.directory.studio.common.ui,
  org.apache.directory.studio.connection.core,
  org.apache.directory.studio.connection.ui,
- org.apache.directory.studio.jars,
  org.apache.directory.studio.ldapbrowser.core,
  org.apache.directory.studio.ldapbrowser.common
             </Require-Bundle>
@@ -159,15 +161,27 @@
   </build>
 
   <dependencies>
-  	<!-- Apache Directory Studio plugins dependencies -->
+    <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>common.ui</artifactId>
+      <artifactId>org.apache.commons.codec</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>jars</artifactId>
+      <artifactId>org.apache.commons.io</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.apache.directory.shared.ldap</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    
+  	<!-- Apache Directory Studio plugins dependencies -->
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>common.ui</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>



Mime
View raw message