directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1059980 - in /directory/studio/trunk: ./ application/application-plugins/ libraries/ libraries/org.apache.directory.server.config/ libraries/org.apache.directory.server.core.api/ libraries/org.apache.directory.server.core.avl/ libraries/or...
Date Mon, 17 Jan 2011 16:43:00 GMT
Author: pamarcelot
Date: Mon Jan 17 16:42:59 2011
New Revision: 1059980

URL: http://svn.apache.org/viewvc?rev=1059980&view=rev
Log:
Removed 'library plugins' for Shared modules.
Now using Shared bundles directly.

Removed:
    directory/studio/trunk/libraries/org.apache.directory.shared.dsmlv2.parser/
    directory/studio/trunk/libraries/org.apache.directory.shared.i18n/
    directory/studio/trunk/libraries/org.apache.directory.shared.ldap/
    directory/studio/trunk/libraries/org.apache.directory.shared.ldap.client.api/
    directory/studio/trunk/libraries/org.apache.directory.shared.ldap.schema/
Modified:
    directory/studio/trunk/application/application-plugins/pom.xml
    directory/studio/trunk/libraries/   (props changed)
    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/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/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/editor/NewServerConfigurationInput.java
    directory/studio/trunk/plugins/apacheds.configuration/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/ldifeditor/pom.xml
    directory/studio/trunk/plugins/ldifparser/pom.xml
    directory/studio/trunk/plugins/schemaeditor/pom.xml
    directory/studio/trunk/plugins/valueeditors/pom.xml
    directory/studio/trunk/pom.xml

Modified: directory/studio/trunk/application/application-plugins/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-plugins/pom.xml?rev=1059980&r1=1059979&r2=1059980&view=diff
==============================================================================
--- directory/studio/trunk/application/application-plugins/pom.xml (original)
+++ directory/studio/trunk/application/application-plugins/pom.xml Mon Jan 17 16:42:59 2011
@@ -51,6 +51,26 @@
               <artifactItems>
                 <!-- Apache Directory Studio library plugins dependencies -->
                 <artifactItem>
+                  <groupId>org.apache.directory.shared</groupId>
+                  <artifactId>ldap-client-api</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.shared</groupId>
+                  <artifactId>shared-dsml-parser</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.shared</groupId>
+                  <artifactId>shared-i18n</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.shared</groupId>
+                  <artifactId>shared-ldap</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.shared</groupId>
+                  <artifactId>shared-ldap-schema</artifactId>
+                </artifactItem>
+                <artifactItem>
                   <groupId>org.apache.directory.studio</groupId>
                   <artifactId>net.sf.ehcache.core</artifactId>
                 </artifactItem>
@@ -116,26 +136,6 @@
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.directory.studio</groupId>
-                  <artifactId>org.apache.directory.shared.dsmlv2.parser</artifactId>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.apache.directory.studio</groupId>
-                  <artifactId>org.apache.directory.shared.i18n</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.ldap.client.api</artifactId>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.apache.directory.studio</groupId>
-                  <artifactId>org.apache.directory.shared.ldap.schema</artifactId>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.apache.directory.studio</groupId>
                   <artifactId>org.apache.httpcomponents.httpclient</artifactId>
                 </artifactItem>
                 <artifactItem>

Propchange: directory/studio/trunk/libraries/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Mon Jan 17 16:42:59 2011
@@ -0,0 +1 @@
+shared	https://svn.apache.org/repos/asf/directory/shared/trunk/

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=1059980&r1=1059979&r2=1059980&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 Mon Jan 17 16:42:59 2011
@@ -151,23 +151,23 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.core.api</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.i18n</artifactId>
+      <artifactId>org.apache.directory.server.core.api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.xdbm.partition</artifactId>
+      <artifactId>org.apache.directory.server.i18n</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldap</artifactId>
+      <artifactId>org.apache.directory.server.xdbm.partition</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

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=1059980&r1=1059979&r2=1059980&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 Mon Jan 17 16:42:59 2011
@@ -206,28 +206,23 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.i18n</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>ldap-client-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldap</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-i18n</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldap.client.api</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>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.directory.shared.i18n</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-schema</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>

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=1059980&r1=1059979&r2=1059980&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 Mon Jan 17 16:42:59 2011
@@ -141,18 +141,18 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.i18n</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-i18n</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.lang</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldap</artifactId>
+      <artifactId>org.apache.commons.lang</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

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=1059980&r1=1059979&r2=1059980&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 Mon Jan 17 16:42:59 2011
@@ -171,48 +171,48 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.bouncycastle.bcprov.jdk15</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-i18n</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.collections</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.lang</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-schema</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.core.api</artifactId>
+      <artifactId>org.bouncycastle.bcprov.jdk15</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.i18n</artifactId>
+      <artifactId>org.apache.commons.collections</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.xdbm.partition</artifactId>
+      <artifactId>org.apache.commons.lang</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.i18n</artifactId>
+      <artifactId>org.apache.directory.server.core.api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldap</artifactId>
+      <artifactId>org.apache.directory.server.i18n</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldap.schema</artifactId>
+      <artifactId>org.apache.directory.server.xdbm.partition</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

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=1059980&r1=1059979&r2=1059980&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 Mon Jan 17 16:42:59 2011
@@ -171,48 +171,48 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.io</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-i18n</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.lang</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.core</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-schema</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.core.api</artifactId>
+      <artifactId>org.apache.commons.io</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.i18n</artifactId>
+      <artifactId>org.apache.commons.lang</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.xdbm.partition</artifactId>
+      <artifactId>org.apache.directory.server.core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.i18n</artifactId>
+      <artifactId>org.apache.directory.server.core.api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldap</artifactId>
+      <artifactId>org.apache.directory.server.i18n</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldap.schema</artifactId>
+      <artifactId>org.apache.directory.server.xdbm.partition</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

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=1059980&r1=1059979&r2=1059980&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 Mon Jan 17 16:42:59 2011
@@ -165,43 +165,43 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.io</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>ldap-client-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.core.api</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-i18n</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.core.avl</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.i18n</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-schema</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.i18n</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>
+      <artifactId>org.apache.directory.server.core.api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldap.client.api</artifactId>
+      <artifactId>org.apache.directory.server.core.avl</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldap.schema</artifactId>
+      <artifactId>org.apache.directory.server.i18n</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: directory/studio/trunk/libraries/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/pom.xml?rev=1059980&r1=1059979&r2=1059980&view=diff
==============================================================================
--- directory/studio/trunk/libraries/pom.xml (original)
+++ directory/studio/trunk/libraries/pom.xml Mon Jan 17 16:42:59 2011
@@ -47,11 +47,6 @@
     <module>org.apache.directory.server.i18n</module>
     <module>org.apache.directory.server.ldif.partition</module>
     <module>org.apache.directory.server.xdbm.partition</module>
-    <module>org.apache.directory.shared.dsmlv2.parser</module>
-    <module>org.apache.directory.shared.i18n</module>
-    <module>org.apache.directory.shared.ldap</module>
-    <module>org.apache.directory.shared.ldap.client.api</module>
-    <module>org.apache.directory.shared.ldap.schema</module>
     <module>org.apache.httpcomponents.httpclient</module>
     <module>org.apache.httpcomponents.httpcore</module>
     <module>org.apache.logging.log4j</module>
@@ -61,6 +56,7 @@
     <module>org.slf4j.api</module>
     <module>org.slf4j.log4j12</module>
     <module>org.xpp3.xpp3</module>
+    <module>shared</module>
   </modules>
 
   <build>

Modified: directory/studio/trunk/plugins/aciitemeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/pom.xml?rev=1059980&r1=1059979&r2=1059980&view=diff
==============================================================================
--- directory/studio/trunk/plugins/aciitemeditor/pom.xml (original)
+++ directory/studio/trunk/plugins/aciitemeditor/pom.xml Mon Jan 17 16:42:59 2011
@@ -151,8 +151,8 @@
   <dependencies>
     <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldap</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
       <scope>provided</scope>
     </dependency>
     

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=1059980&r1=1059979&r2=1059980&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/pom.xml (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/pom.xml Mon Jan 17 16:42:59 2011
@@ -158,38 +158,38 @@
   <dependencies>
   	<!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.io</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.core.api</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-schema</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.config</artifactId>
+      <artifactId>org.apache.commons.io</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.ldif.partition</artifactId>
+      <artifactId>org.apache.directory.server.core.api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.server.xdbm.partition</artifactId>
+      <artifactId>org.apache.directory.server.config</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldap</artifactId>
+      <artifactId>org.apache.directory.server.ldif.partition</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldap.schema</artifactId>
+      <artifactId>org.apache.directory.server.xdbm.partition</artifactId>
       <scope>provided</scope>
     </dependency>
     

Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/NewServerConfigurationInput.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/NewServerConfigurationInput.java?rev=1059980&r1=1059979&r2=1059980&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/NewServerConfigurationInput.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/NewServerConfigurationInput.java Mon Jan 17 16:42:59 2011
@@ -20,7 +20,6 @@
 package org.apache.directory.studio.apacheds.configuration.v2.editor;
 
 
-import org.apache.directory.server.config.beans.ConfigBean;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IPersistableElement;

Modified: directory/studio/trunk/plugins/apacheds.configuration/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/pom.xml?rev=1059980&r1=1059979&r2=1059980&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/pom.xml (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/pom.xml Mon Jan 17 16:42:59 2011
@@ -149,8 +149,8 @@
   <dependencies>
   	<!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldap</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: directory/studio/trunk/plugins/connection.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/pom.xml?rev=1059980&r1=1059979&r2=1059980&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/pom.xml (original)
+++ directory/studio/trunk/plugins/connection.core/pom.xml Mon Jan 17 16:42:59 2011
@@ -145,23 +145,23 @@
   <dependencies>
     <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.codec</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>ldap-client-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.io</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldap</artifactId>
+      <artifactId>org.apache.commons.codec</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldap.client.api</artifactId>
+      <artifactId>org.apache.commons.io</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -174,53 +174,6 @@
       <artifactId>org.dom4j.dom4j</artifactId>
       <scope>provided</scope>
     </dependency>
-    <!-- Start sub-dependencies of provided plugins -->
-    <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.commons.pool</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.schema</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.httpcomponents.httpcore</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 sub-dependencies of provided plugins -->
     
     <!-- Apache Directory Studio plugins dependencies -->
     <dependency>

Modified: directory/studio/trunk/plugins/connection.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/pom.xml?rev=1059980&r1=1059979&r2=1059980&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.ui/pom.xml (original)
+++ directory/studio/trunk/plugins/connection.ui/pom.xml Mon Jan 17 16:42:59 2011
@@ -152,23 +152,23 @@
   <dependencies>
     <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.bouncycastle.bcprov.jdk15</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.lang</artifactId>
+      <artifactId>org.bouncycastle.bcprov.jdk15</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.codec</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>
+      <artifactId>org.apache.commons.codec</artifactId>
       <scope>provided</scope>
     </dependency>
     

Modified: directory/studio/trunk/plugins/ldapbrowser.common/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/pom.xml?rev=1059980&r1=1059979&r2=1059980&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/pom.xml Mon Jan 17 16:42:59 2011
@@ -153,18 +153,18 @@
   <dependencies>
     <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.io</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.lang</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>
+      <artifactId>org.apache.commons.lang</artifactId>
       <scope>provided</scope>
     </dependency>
     

Modified: directory/studio/trunk/plugins/ldapbrowser.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/pom.xml?rev=1059980&r1=1059979&r2=1059980&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/pom.xml Mon Jan 17 16:42:59 2011
@@ -167,33 +167,33 @@
     
     <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.codec</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.collections</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-dsml-parser</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.io</artifactId>
+      <artifactId>org.apache.commons.codec</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.lang</artifactId>
+      <artifactId>org.apache.commons.collections</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldap</artifactId>
+      <artifactId>org.apache.commons.io</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.dsmlv2.parser</artifactId>
+      <artifactId>org.apache.commons.lang</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/pom.xml?rev=1059980&r1=1059979&r2=1059980&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/pom.xml Mon Jan 17 16:42:59 2011
@@ -166,18 +166,18 @@
   <dependencies>
     <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.io</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.lang</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>
+      <artifactId>org.apache.commons.lang</artifactId>
       <scope>provided</scope>
     </dependency>
     

Modified: directory/studio/trunk/plugins/ldifeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifeditor/pom.xml?rev=1059980&r1=1059979&r2=1059980&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifeditor/pom.xml (original)
+++ directory/studio/trunk/plugins/ldifeditor/pom.xml Mon Jan 17 16:42:59 2011
@@ -162,8 +162,8 @@
   <dependencies>
     <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldap</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
       <scope>provided</scope>
     </dependency>
     

Modified: directory/studio/trunk/plugins/ldifparser/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/pom.xml?rev=1059980&r1=1059979&r2=1059980&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifparser/pom.xml (original)
+++ directory/studio/trunk/plugins/ldifparser/pom.xml Mon Jan 17 16:42:59 2011
@@ -117,47 +117,15 @@
   <dependencies>
     <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.codec</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
       <scope>provided</scope>
     </dependency>
-    <!-- start 'org.apache.directory.shared.ldap' and sub-dependencies -->
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldap</artifactId>
+      <artifactId>org.apache.commons.codec</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>

Modified: directory/studio/trunk/plugins/schemaeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/pom.xml?rev=1059980&r1=1059979&r2=1059980&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/pom.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/pom.xml Mon Jan 17 16:42:59 2011
@@ -152,18 +152,18 @@
   <dependencies>
     <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.io</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.collections</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>
+      <artifactId>org.apache.commons.collections</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: directory/studio/trunk/plugins/valueeditors/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/pom.xml?rev=1059980&r1=1059979&r2=1059980&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/pom.xml (original)
+++ directory/studio/trunk/plugins/valueeditors/pom.xml Mon Jan 17 16:42:59 2011
@@ -162,18 +162,18 @@
   <dependencies>
     <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.codec</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.io</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>
+      <artifactId>org.apache.commons.io</artifactId>
       <scope>provided</scope>
     </dependency>
     

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=1059980&r1=1059979&r2=1059980&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Mon Jan 17 16:42:59 2011
@@ -264,31 +264,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>org.apache.directory.shared.dsmlv2.parser</artifactId>
-        <version>${org.apache.directory.shared.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.directory.studio</groupId>
-        <artifactId>org.apache.directory.shared.i18n</artifactId>
-        <version>${org.apache.directory.shared.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.directory.studio</groupId>
-        <artifactId>org.apache.directory.shared.ldap</artifactId>
-        <version>${org.apache.directory.shared.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.directory.studio</groupId>
-        <artifactId>org.apache.directory.shared.ldap.client.api</artifactId>
-        <version>${org.apache.directory.shared.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.directory.studio</groupId>
-        <artifactId>org.apache.directory.shared.ldap.schema</artifactId>
-        <version>${org.apache.directory.shared.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.directory.studio</groupId>
         <artifactId>org.apache.httpcomponents.httpclient</artifactId>
         <version>${org.apache.httpcomponents.version}</version>
       </dependency>
@@ -1384,27 +1359,27 @@
       <!-- Apache Directory Shared -->
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-dsml-parser</artifactId>
+        <artifactId>ldap-client-api</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-i18n</artifactId>
+        <artifactId>shared-dsml-parser</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap</artifactId>
+        <artifactId>shared-i18n</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-schema</artifactId>
+        <artifactId>shared-ldap</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>ldap-client-api</artifactId>
+        <artifactId>shared-ldap-schema</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
       



Mime
View raw message