Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 86086 invoked from network); 10 Aug 2010 17:18:53 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 10 Aug 2010 17:18:53 -0000 Received: (qmail 25283 invoked by uid 500); 10 Aug 2010 17:18:53 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 25222 invoked by uid 500); 10 Aug 2010 17:18:53 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 25215 invoked by uid 99); 10 Aug 2010 17:18:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Aug 2010 17:18:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Aug 2010 17:18:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 24BE02388A1C; Tue, 10 Aug 2010 17:17:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100810171733.24BE02388A1C@eris.apache.org> 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 @@ - + org.apache.directory.studio - common.ui + org.apache.directory.shared.ldap provided org.apache.directory.studio - jars + org.apache.directory.shared.ldapconstants + provided + + + + + org.apache.directory.studio + common.ui provided 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}" org.apache.directory.studio.apacheds.configuration.* ! @@ -145,10 +146,15 @@ - + org.apache.directory.studio - jars + org.apache.directory.shared.ldap + provided + + + org.apache.directory.studio + org.dom4j.dom4j provided 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}" *;scope=compile|runtime lib @@ -1280,31 +1283,37 @@ - + - org.apache.mina - mina-core + org.apache.directory.studio + org.apache.commons.io + provided - - org.apache.directory.studio - jars + org.apache.mina.core provided org.apache.directory.studio - apacheds.configuration + org.apache.logging.log4j provided org.apache.directory.studio - connection.core + org.dom4j.dom4j + provided + + + + + org.apache.directory.studio + apacheds.configuration provided org.apache.directory.studio - apacheds-launcher + connection.core provided 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 @@ ${plugins-dir} + + + org.apache.directory.studio + org.antlr.antlr + + + org.apache.directory.studio + org.apache.commons.codec + + + org.apache.directory.studio + org.apache.commons.codec + + + org.apache.directory.studio + org.apache.commons.collections + + + org.apache.directory.studio + org.apache.commons.io + + + org.apache.directory.studio + org.apache.commons.lang + + + org.apache.directory.studio + org.apache.commons.logging + + + org.apache.directory.studio + org.apache.directory.shared.asn1 + + + org.apache.directory.studio + org.apache.directory.shared.dsmlparser + + + org.apache.directory.studio + org.apache.directory.shared.ldap + + + org.apache.directory.studio + org.apache.directory.shared.ldapconstants + + + org.apache.directory.studio + org.apache.httpcomponents.httpclient + + + org.apache.directory.studio + org.apache.httpcomponents.httpcore + + + org.apache.directory.studio + org.apache.logging.log4j + + + org.apache.directory.studio + org.apache.mina.core + + + org.apache.directory.studio + org.bouncycastle.bcprovjdk15 + + + org.apache.directory.studio + org.dom4j.dom4j + + + org.apache.directory.studio + org.slf4j.api + + + org.apache.directory.studio + org.slf4j.log4j12 + + + org.apache.directory.studio + org.xpp3.xpp3 + + + org.apache.directory.studio org.apache.mina.core @@ -91,10 +174,6 @@ org.apache.directory.studio - jars - - - org.apache.directory.studio ldapbrowser.core 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 @@ plugin true org.eclipse.core.runtime, -org.apache.directory.studio.jars - + org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}" org.apache.directory.studio.* ! ! @@ -130,10 +129,10 @@ org.apache.directory.studio.jars - + org.apache.directory.studio - jars + org.apache.commons.lang provided 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 @@ true org.apache.directory.studio.connection.core.ConnectionCorePlugin 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 - + org.apache.directory.studio.ldifparser, + org.apache.httpcomponents.httpclient;bundle-version="${org.apache.httpcomponents.version}", + org.dom4j.dom4j;bundle-version="${org.dom4j.version}" org.apache.directory.studio.connection.core.* ! ! @@ -137,15 +141,42 @@ - + org.apache.directory.studio - common.core + org.apache.commons.codec + provided + + + org.apache.directory.studio + org.apache.commons.io + provided + + + org.apache.directory.studio + org.apache.commons.lang provided org.apache.directory.studio - jars + org.apache.directory.shared.ldap + provided + + + org.apache.directory.studio + org.apache.httpcomponents.httpclient + provided + + + org.apache.directory.studio + org.dom4j.dom4j + provided + + + + + org.apache.directory.studio + common.core provided 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 org.apache.directory.studio.* ! @@ -164,9 +167,26 @@ connection.core provided + + + + org.apache.directory.studio + org.bouncycastle.bcprovjdk15 + provided + + + org.apache.directory.studio + org.apache.commons.lang + provided + + + org.apache.directory.studio + org.apache.commons.codec + provided + org.apache.directory.studio - jars + org.apache.directory.shared.ldap provided 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 - + 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}" org.apache.directory.studio.ldapbrowser.common.*, org.apache.directory.studio.valueeditors.* ! ! @@ -150,6 +153,33 @@ + + + org.apache.directory.studio + org.apache.commons.io + provided + + + org.apache.directory.studio + org.apache.commons.lang + provided + + + org.apache.directory.studio + org.apache.directory.shared.ldap + provided + + + org.apache.directory.studio + org.apache.directory.shared.ldapconstants + provided + + + org.apache.directory.studio + org.slf4j.log4j12 + provided + + org.apache.directory.studio @@ -173,11 +203,6 @@ org.apache.directory.studio - jars - provided - - - org.apache.directory.studio ldapbrowser.core provided 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 - + 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}" *;scope=compile|runtime lib true @@ -158,21 +167,73 @@ xerces xercesImpl - - + + org.apache.directory.studio - connection.core + org.apache.commons.codec provided org.apache.directory.studio - common.core + org.apache.commons.collections + provided + + + org.apache.directory.studio + org.apache.commons.io + provided + + + org.apache.directory.studio + org.apache.commons.lang + provided + + + org.apache.directory.studio + org.apache.directory.shared.asn1 + provided + + + org.apache.directory.studio + org.apache.directory.shared.ldap + provided + + + org.apache.directory.studio + org.apache.directory.shared.ldapconstants provided org.apache.directory.studio - jars + org.apache.directory.shared.dsmlparser + provided + + + org.apache.directory.studio + org.dom4j.dom4j + provided + + + org.apache.directory.studio + org.slf4j.log4j12 + provided + + + org.apache.directory.studio + org.xpp3.xpp3 + provided + + + + + org.apache.directory.studio + connection.core + provided + + + org.apache.directory.studio + common.core provided 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 @@ - + org.apache.directory.studio - common.core + org.apache.commons.io provided org.apache.directory.studio - common.ui + org.apache.commons.lang + provided + + + org.apache.directory.studio + org.apache.directory.shared.ldap provided org.apache.directory.studio - jars + org.apache.directory.shared.ldapconstants + provided + + + + + org.apache.directory.studio + common.core + provided + + + org.apache.directory.studio + common.ui provided 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}" org.apache.directory.studio.* ! @@ -400,25 +400,27 @@ - + org.apache.directory.studio - apacheds.configuration + org.dom4j.dom4j provided + + org.apache.directory.studio - common.core + apacheds.configuration provided org.apache.directory.studio - common.ui + common.core provided org.apache.directory.studio - jars + common.ui provided 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}" org.apache.directory.studio.* ! @@ -420,25 +420,27 @@ - + org.apache.directory.studio - apacheds.configuration + org.dom4j.dom4j provided + + org.apache.directory.studio - common.core + apacheds.configuration provided org.apache.directory.studio - common.ui + common.core provided org.apache.directory.studio - jars + common.ui provided 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}" org.apache.directory.studio.* ! @@ -430,25 +430,27 @@ - + org.apache.directory.studio - apacheds.configuration + org.dom4j.dom4j provided + + org.apache.directory.studio - common.core + apacheds.configuration provided org.apache.directory.studio - common.ui + common.core provided org.apache.directory.studio - jars + common.ui provided 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}" org.apache.directory.studio.* ! @@ -524,25 +524,27 @@ - + org.apache.directory.studio - apacheds.configuration + org.dom4j.dom4j provided + + org.apache.directory.studio - common.core + apacheds.configuration provided org.apache.directory.studio - common.ui + common.core provided org.apache.directory.studio - jars + common.ui provided 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}" *;scope=compile|runtime lib @@ -158,10 +160,15 @@ - + org.apache.directory.studio - common.core + org.apache.commons.collections + provided + + + org.apache.directory.studio + org.apache.commons.io provided @@ -171,12 +178,19 @@ org.apache.directory.studio - common.ui + org.dom4j.dom4j provided + + org.apache.directory.studio - jars + common.core + provided + + + org.apache.directory.studio + common.ui provided 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 @@ -160,20 +160,22 @@ - + org.apache.directory.studio - common.core + org.apache.directory.shared.ldap provided + + org.apache.directory.studio - common.ui + common.core provided - + org.apache.directory.studio - jars + common.ui provided 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 @@ ${groupId}.${artifactId};singleton:=true plugin - org.apache.directory.studio.jars + 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}" org.apache.directory.studio.ldifparser.* ! ! @@ -114,10 +116,20 @@ - + org.apache.directory.studio - jars + org.apache.commons.codec + provided + + + org.apache.directory.studio + org.apache.directory.shared.ldap + provided + + + org.apache.directory.studio + org.slf4j.log4j12 provided 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 @@ org.apache.directory.studio org.slf4j.api - provided 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 @@ org.apache.directory.studio org.antlr.antlr - provided org.apache.directory.studio org.apache.commons.collections - provided org.apache.directory.studio org.apache.directory.shared.asn1 - provided org.apache.directory.studio org.apache.directory.shared.ldap - provided org.apache.directory.studio org.apache.directory.shared.ldapconstants - provided org.apache.directory.studio org.dom4j.dom4j - provided org.apache.directory.studio org.xpp3.xpp3 - provided 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}" + org.slf4j.api;bundle-version="${org.slf4j.version}", + org.slf4j.log4j12;bundle-version="${org.slf4j.version}" * ! ! @@ -129,27 +130,26 @@ org.apache.directory.studio org.antlr.antlr - provided org.apache.directory.studio org.apache.commons.collections - provided org.apache.directory.studio org.apache.directory.shared.asn1 - provided org.apache.directory.studio org.apache.directory.shared.ldapconstants - provided org.apache.directory.studio org.slf4j.api - provided + + + org.apache.directory.studio + org.slf4j.log4j12 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 @@ org.apache.directory.studio org.slf4j.api - provided 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 @@ org.apache.directory.studio org.apache.commons.codec - provided org.apache.directory.studio org.apache.commons.logging - provided org.apache.directory.studio org.apache.httpcomponents.httpcore - provided 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 @@ org.apache.mina.core - ${org.apache.mina.core.version} + ${org.apache.mina.core.validversion} Apache MINA Core (for Apache Directory Studio) jar 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 @@ org.apache.directory.studio org.apache.logging.log4j - provided org.apache.directory.studio org.slf4j.api - provided 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 @@ 4.0 0.9.17 2.0.0-M6 + 2.0.0.M6 140 1.6.1 1.5.6 @@ -116,7 +117,6 @@ common.ui connection.core connection.ui - jars ldapbrowser.core ldapbrowser.common ldapbrowser.ui @@ -288,7 +288,7 @@ org.apache.directory.studio org.apache.mina.core - ${org.apache.mina.core.version} + ${org.apache.mina.core.validversion} org.apache.directory.studio @@ -379,11 +379,6 @@ org.apache.directory.studio - jars - ${pom.version} - - - org.apache.directory.studio ldapbrowser.common ${pom.version} 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}" *;scope=compile|runtime lib @@ -167,6 +172,38 @@ + + + org.apache.directory.studio + org.apache.commons.io + provided + + + org.apache.directory.studio + org.apache.commons.collections + provided + + + org.apache.directory.studio + org.apache.directory.shared.asn1 + provided + + + org.apache.directory.studio + org.apache.directory.shared.ldap + provided + + + org.apache.directory.studio + org.apache.logging.log4j + provided + + + org.apache.directory.studio + org.dom4j.dom4j + provided + + org.apache.directory.studio @@ -188,11 +225,6 @@ connection.ui provided - - org.apache.directory.studio - jars - provided - 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 @@ org.apache.directory.studio.valueeditors.ValueEditorsActivator 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 @@ -159,15 +161,27 @@ - + org.apache.directory.studio - common.ui + org.apache.commons.codec provided org.apache.directory.studio - jars + org.apache.commons.io + provided + + + org.apache.directory.studio + org.apache.directory.shared.ldap + provided + + + + + org.apache.directory.studio + common.ui provided