directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r984674 - in /directory/studio/trunk: connection.core/ connection.ui/ ldapbrowser.common/ ldapbrowser.core/ ldapbrowser.ui/ ldifeditor/ ldifparser/ org.antlr.antlr/ org.apache.commons.codec/ org.apache.commons.collections/ org.apache.common...
Date Thu, 12 Aug 2010 07:59:00 GMT
Author: pamarcelot
Date: Thu Aug 12 07:58:59 2010
New Revision: 984674

URL: http://svn.apache.org/viewvc?rev=984674&view=rev
Log:
Updated pom.xml of bundled libraries and Studio plugins in order to make them work together
(works great in Eclipse 3.6 but still fails in Eclipse <=3.5 and RCP app - based on Eclipse
3.5)

Modified:
    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/ldifeditor/pom.xml
    directory/studio/trunk/ldifparser/pom.xml
    directory/studio/trunk/org.antlr.antlr/pom.xml
    directory/studio/trunk/org.apache.commons.codec/pom.xml
    directory/studio/trunk/org.apache.commons.collections/pom.xml
    directory/studio/trunk/org.apache.commons.io/pom.xml
    directory/studio/trunk/org.apache.commons.lang/pom.xml
    directory/studio/trunk/org.apache.commons.logging/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.httpcomponents.httpcore/pom.xml
    directory/studio/trunk/org.apache.logging.log4j/pom.xml
    directory/studio/trunk/org.apache.mina.core/pom.xml
    directory/studio/trunk/org.bouncycastle.bcprovjdk15/pom.xml
    directory/studio/trunk/org.dom4j.dom4j/pom.xml
    directory/studio/trunk/org.slf4j.api/pom.xml
    directory/studio/trunk/org.slf4j.log4j12/pom.xml
    directory/studio/trunk/org.xpp3.xpp3/pom.xml

Modified: directory/studio/trunk/connection.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection.core/pom.xml?rev=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/connection.core/pom.xml (original)
+++ directory/studio/trunk/connection.core/pom.xml Thu Aug 12 07:58:59 2010
@@ -105,17 +105,25 @@
             <Bundle-Localization>plugin</Bundle-Localization>
             <Eclipse-LazyStart>true</Eclipse-LazyStart>
             <Bundle-Activator>org.apache.directory.studio.connection.core.ConnectionCorePlugin</Bundle-Activator>
-            <Require-Bundle>org.eclipse.core.runtime,
+            <Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.version}",
  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.studio.common.core,
  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>
+ org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
+ org.eclipse.core.runtime,
+ org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}",
+ org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Export-Package>org.apache.directory.studio.connection.core.*</Export-Package>
-            <Import-Package>!</Import-Package>
+            <Import-Package>org.slf4j.impl;version="${org.slf4j.version}"</Import-Package>
             <Private-Package>!</Private-Package>
           </instructions>
         </configuration>
@@ -172,6 +180,11 @@
       <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>
     
     <!-- Apache Directory Studio plugins dependencies -->
     <dependency>

Modified: directory/studio/trunk/connection.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection.ui/pom.xml?rev=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/connection.ui/pom.xml (original)
+++ directory/studio/trunk/connection.ui/pom.xml Thu Aug 12 07:58:59 2010
@@ -112,20 +112,28 @@
             <Bundle-Localization>plugin</Bundle-Localization>
             <Eclipse-LazyStart>true</Eclipse-LazyStart>
             <Bundle-Activator>org.apache.directory.studio.connection.ui.ConnectionUIPlugin</Bundle-Activator>
-            <Require-Bundle>org.eclipse.ui,
- org.eclipse.ui.forms,
- org.eclipse.core.runtime,
- org.eclipse.ui.workbench.texteditor,
- org.bouncycastle.bcprovjdk15;bundle-version="${org.bouncycastle.bcprovjdk15.version}",
+            <Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.version}",
+ org.apache.commons.collections;bundle-version="${org.apache.commons.collections.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.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.studio.common.core,
  org.apache.directory.studio.common.ui,
- org.apache.directory.studio.connection.core
-            </Require-Bundle>
+ org.apache.directory.studio.connection.core,
+ org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
+ org.bouncycastle.bcprovjdk15;bundle-version="${org.bouncycastle.bcprovjdk15.version}",
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
+ org.eclipse.ui,
+ org.eclipse.ui.forms,
+ org.eclipse.core.runtime,
+ org.eclipse.ui.workbench.texteditor,
+ org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}",
+ org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Export-Package>org.apache.directory.studio.*</Export-Package>
-            <Import-Package>!</Import-Package>
+            <Import-Package>org.slf4j.impl;version="${org.slf4j.version}"</Import-Package>
             <Private-Package>!</Private-Package>
           </instructions>
         </configuration>
@@ -167,6 +175,11 @@
       <artifactId>connection.core</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.slf4j.log4j12</artifactId>
+      <scope>provided</scope>
+    </dependency>
     
     <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>

Modified: directory/studio/trunk/ldapbrowser.common/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.common/pom.xml?rev=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.common/pom.xml (original)
+++ directory/studio/trunk/ldapbrowser.common/pom.xml Thu Aug 12 07:58:59 2010
@@ -109,12 +109,7 @@
             <Bundle-Localization>plugin</Bundle-Localization>
             <Eclipse-LazyStart>true</Eclipse-LazyStart>
             <Bundle-Activator>org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator</Bundle-Activator>
-            <Require-Bundle>org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.expressions,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.editors,
+            <Require-Bundle>
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.common.ui,
  org.apache.directory.studio.connection.core,
@@ -123,11 +118,22 @@
  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.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.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
+ org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.expressions,
+ org.eclipse.jface.text,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.editors,
+ org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}",
+ org.slf4j.api;bundle-version="${org.slf4j.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>
+            <Import-Package>org.slf4j.impl;version="${org.slf4j.version}"</Import-Package>
             <Private-Package>!</Private-Package>
           </instructions>
         </configuration>

Modified: directory/studio/trunk/ldapbrowser.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.core/pom.xml?rev=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.core/pom.xml (original)
+++ directory/studio/trunk/ldapbrowser.core/pom.xml Thu Aug 12 07:58:59 2010
@@ -106,11 +106,7 @@
             <Bundle-Localization>plugin</Bundle-Localization>
             <Eclipse-LazyStart>true</Eclipse-LazyStart>
             <Bundle-Activator>org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin</Bundle-Activator>
-            <Require-Bundle>org.eclipse.core.runtime,
- org.eclipse.search,
- org.apache.directory.studio.common.core,
- org.apache.directory.studio.connection.core,
- org.apache.directory.studio.ldifparser,
+            <Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.version}",
  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}",
@@ -119,14 +115,22 @@
  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.apache.directory.studio.common.core,
+ org.apache.directory.studio.connection.core,
+ org.apache.directory.studio.ldifparser,
+ org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
  org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
+ org.eclipse.core.runtime,
+ org.eclipse.search,
  org.slf4j.log4j12;bundle-version="${org.slf4j.version}",
- org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}"</Require-Bundle>
+ org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}",
+ org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
             <Embed-StripGroup>true</Embed-StripGroup>
             <Export-Package>org.apache.directory.studio.ldapbrowser.core.*</Export-Package>
-            <Import-Package>!</Import-Package>
+            <Import-Package>org.slf4j.impl;version="${org.slf4j.version}"</Import-Package>
             <Private-Package>!</Private-Package>
           </instructions>
         </configuration>

Modified: directory/studio/trunk/ldapbrowser.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser.ui/pom.xml?rev=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser.ui/pom.xml (original)
+++ directory/studio/trunk/ldapbrowser.ui/pom.xml Thu Aug 12 07:58:59 2010
@@ -116,18 +116,11 @@
             <Bundle-Localization>plugin</Bundle-Localization>
             <Eclipse-LazyStart>true</Eclipse-LazyStart>
             <Bundle-Activator>org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin</Bundle-Activator>
-            <Require-Bundle>org.eclipse.core.expressions,
- org.eclipse.core.filesystem,
- org.eclipse.core.runtime,
- org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.ui.editors,
- org.eclipse.ui.forms,
- org.eclipse.ui.views,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.search,
+            <Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.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.studio.common.core,
@@ -137,9 +130,24 @@
  org.apache.directory.studio.ldapbrowser.core,
  org.apache.directory.studio.ldapbrowser.common,
  org.apache.directory.studio.ldifeditor,
- org.apache.directory.studio.ldifparser</Require-Bundle>
+ org.apache.directory.studio.ldifparser,
+ org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
+ org.eclipse.core.expressions,
+ org.eclipse.core.filesystem,
+ org.eclipse.core.runtime,
+ org.eclipse.jface.text,
+ org.eclipse.ui,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.forms,
+ org.eclipse.ui.views,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.search,
+ org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}",
+ org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Export-Package>org.apache.directory.studio.*</Export-Package>
-            <Import-Package>!</Import-Package>
+            <Import-Package>org.slf4j.impl;version="${org.slf4j.version}"</Import-Package>
             <Private-Package>!</Private-Package>
           </instructions>
         </configuration>
@@ -186,6 +194,11 @@
       <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>

Modified: directory/studio/trunk/ldifeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/pom.xml?rev=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/ldifeditor/pom.xml (original)
+++ directory/studio/trunk/ldifeditor/pom.xml Thu Aug 12 07:58:59 2010
@@ -113,7 +113,23 @@
             <Bundle-Localization>plugin</Bundle-Localization>
             <Eclipse-LazyStart>true</Eclipse-LazyStart>
             <Bundle-Activator>org.apache.directory.studio.ldifeditor.LdifEditorActivator</Bundle-Activator>
-            <Require-Bundle>org.eclipse.core.runtime,
+            <Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.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.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.ldapbrowser.core,
+ org.apache.directory.studio.ldapbrowser.common,
+ org.apache.directory.studio.ldifparser,
+ org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
+ org.eclipse.core.runtime,
  org.eclipse.core.expressions,
  org.eclipse.core.filesystem,
  org.eclipse.search,
@@ -125,16 +141,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.ldapbrowser.core,
- org.apache.directory.studio.ldapbrowser.common,
- org.apache.directory.studio.ldifparser</Require-Bundle>
+ org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}",
+ org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Export-Package>org.apache.directory.studio.ldifeditor.*</Export-Package>
-            <Import-Package>!</Import-Package>
+            <Import-Package>org.slf4j.impl;version="${org.slf4j.version}"</Import-Package>
             <Private-Package>!</Private-Package>
           </instructions>
         </configuration>

Modified: directory/studio/trunk/ldifparser/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifparser/pom.xml?rev=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/ldifparser/pom.xml (original)
+++ directory/studio/trunk/ldifparser/pom.xml Thu Aug 12 07:58:59 2010
@@ -94,8 +94,16 @@
           <instructions>            
             <Bundle-SymbolicName>${groupId}.${artifactId};singleton:=true</Bundle-SymbolicName>
             <Bundle-Localization>plugin</Bundle-Localization>
-            <Require-Bundle>org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
+            <Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.version}",
+ org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
+ 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.ldap;bundle-version="${org.apache.directory.shared.version}",
+ org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
+ org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
+ org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
+ org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}",
  org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Export-Package>org.apache.directory.studio.ldifparser.*</Export-Package>
             <Import-Package>!</Import-Package>

Modified: directory/studio/trunk/org.antlr.antlr/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.antlr.antlr/pom.xml?rev=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/org.antlr.antlr/pom.xml (original)
+++ directory/studio/trunk/org.antlr.antlr/pom.xml Thu Aug 12 07:58:59 2010
@@ -68,8 +68,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>            
-            <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
-            <Bundle-Localization>plugin</Bundle-Localization>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>

Modified: directory/studio/trunk/org.apache.commons.codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.commons.codec/pom.xml?rev=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.commons.codec/pom.xml (original)
+++ directory/studio/trunk/org.apache.commons.codec/pom.xml Thu Aug 12 07:58:59 2010
@@ -68,8 +68,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>            
-            <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
-            <Bundle-Localization>plugin</Bundle-Localization>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>

Modified: directory/studio/trunk/org.apache.commons.collections/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.commons.collections/pom.xml?rev=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.commons.collections/pom.xml (original)
+++ directory/studio/trunk/org.apache.commons.collections/pom.xml Thu Aug 12 07:58:59 2010
@@ -68,8 +68,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>            
-            <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
-            <Bundle-Localization>plugin</Bundle-Localization>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>

Modified: directory/studio/trunk/org.apache.commons.io/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.commons.io/pom.xml?rev=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.commons.io/pom.xml (original)
+++ directory/studio/trunk/org.apache.commons.io/pom.xml Thu Aug 12 07:58:59 2010
@@ -68,8 +68,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>            
-            <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
-            <Bundle-Localization>plugin</Bundle-Localization>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>

Modified: directory/studio/trunk/org.apache.commons.lang/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.commons.lang/pom.xml?rev=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.commons.lang/pom.xml (original)
+++ directory/studio/trunk/org.apache.commons.lang/pom.xml Thu Aug 12 07:58:59 2010
@@ -68,8 +68,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>            
-            <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
-            <Bundle-Localization>plugin</Bundle-Localization>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Export-Package>!org.apache.commons.lang.enum,*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>

Modified: directory/studio/trunk/org.apache.commons.logging/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.commons.logging/pom.xml?rev=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.commons.logging/pom.xml (original)
+++ directory/studio/trunk/org.apache.commons.logging/pom.xml Thu Aug 12 07:58:59 2010
@@ -68,8 +68,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>            
-            <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
-            <Bundle-Localization>plugin</Bundle-Localization>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>

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=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.directory.shared.asn1/pom.xml (original)
+++ directory/studio/trunk/org.apache.directory.shared.asn1/pom.xml Thu Aug 12 07:58:59 2010
@@ -68,9 +68,10 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>            
-            <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
-            <Bundle-Localization>plugin</Bundle-Localization>
-            <Require-Bundle>org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+            <Require-Bundle>org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
+ 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>

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=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.directory.shared.dsmlparser/pom.xml (original)
+++ directory/studio/trunk/org.apache.directory.shared.dsmlparser/pom.xml Thu Aug 12 07:58:59
2010
@@ -68,16 +68,17 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>            
-            <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
-            <Bundle-Localization>plugin</Bundle-Localization>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.version}",
  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.ldap;bundle-version="${org.apache.directory.shared.version}",
  org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
+ org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
  org.dom4j.dom4j;bundle-version="${org.dom4j.version}",
  org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}",
- 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>

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=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.directory.shared.ldap/pom.xml (original)
+++ directory/studio/trunk/org.apache.directory.shared.ldap/pom.xml Thu Aug 12 07:58:59 2010
@@ -68,16 +68,16 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>            
-            <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
-            <Bundle-Localization>plugin</Bundle-Localization>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.version}",
  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.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
  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>
+            <Import-Package>org.slf4j.impl;version="${org.slf4j.version}"</Import-Package>
             <Private-Package>!</Private-Package>
           </instructions>
         </configuration>

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=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.directory.shared.ldapconstants/pom.xml (original)
+++ directory/studio/trunk/org.apache.directory.shared.ldapconstants/pom.xml Thu Aug 12 07:58:59
2010
@@ -68,9 +68,10 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>            
-            <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
-            <Bundle-Localization>plugin</Bundle-Localization>
-            <Require-Bundle>org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+            <Require-Bundle>org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
+ 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>

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=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.httpcomponents.httpclient/pom.xml (original)
+++ directory/studio/trunk/org.apache.httpcomponents.httpclient/pom.xml Thu Aug 12 07:58:59
2010
@@ -68,8 +68,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>            
-            <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
-            <Bundle-Localization>plugin</Bundle-Localization>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Require-Bundle>org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
  org.apache.commons.logging;bundle-version="${org.apache.commons.logging.version}",
  org.apache.httpcomponents.httpcore;bundle-version="${org.apache.httpcomponents.version}"</Require-Bundle>

Modified: directory/studio/trunk/org.apache.httpcomponents.httpcore/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.httpcomponents.httpcore/pom.xml?rev=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.httpcomponents.httpcore/pom.xml (original)
+++ directory/studio/trunk/org.apache.httpcomponents.httpcore/pom.xml Thu Aug 12 07:58:59
2010
@@ -68,8 +68,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>            
-            <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
-            <Bundle-Localization>plugin</Bundle-Localization>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>

Modified: directory/studio/trunk/org.apache.logging.log4j/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.logging.log4j/pom.xml?rev=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.logging.log4j/pom.xml (original)
+++ directory/studio/trunk/org.apache.logging.log4j/pom.xml Thu Aug 12 07:58:59 2010
@@ -68,8 +68,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>            
-            <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
-            <Bundle-Localization>plugin</Bundle-Localization>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>

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=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.mina.core/pom.xml (original)
+++ directory/studio/trunk/org.apache.mina.core/pom.xml Thu Aug 12 07:58:59 2010
@@ -68,8 +68,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>            
-            <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
-            <Bundle-Localization>plugin</Bundle-Localization>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>

Modified: directory/studio/trunk/org.bouncycastle.bcprovjdk15/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.bouncycastle.bcprovjdk15/pom.xml?rev=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/org.bouncycastle.bcprovjdk15/pom.xml (original)
+++ directory/studio/trunk/org.bouncycastle.bcprovjdk15/pom.xml Thu Aug 12 07:58:59 2010
@@ -68,8 +68,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>            
-            <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
-            <Bundle-Localization>plugin</Bundle-Localization>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>

Modified: directory/studio/trunk/org.dom4j.dom4j/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.dom4j.dom4j/pom.xml?rev=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/org.dom4j.dom4j/pom.xml (original)
+++ directory/studio/trunk/org.dom4j.dom4j/pom.xml Thu Aug 12 07:58:59 2010
@@ -68,8 +68,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>            
-            <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
-            <Bundle-Localization>plugin</Bundle-Localization>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>

Modified: directory/studio/trunk/org.slf4j.api/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.slf4j.api/pom.xml?rev=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/org.slf4j.api/pom.xml (original)
+++ directory/studio/trunk/org.slf4j.api/pom.xml Thu Aug 12 07:58:59 2010
@@ -68,8 +68,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>            
-            <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
-            <Bundle-Localization>plugin</Bundle-Localization>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>

Modified: directory/studio/trunk/org.slf4j.log4j12/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.slf4j.log4j12/pom.xml?rev=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/org.slf4j.log4j12/pom.xml (original)
+++ directory/studio/trunk/org.slf4j.log4j12/pom.xml Thu Aug 12 07:58:59 2010
@@ -68,8 +68,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>            
-            <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
-            <Bundle-Localization>plugin</Bundle-Localization>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Require-Bundle>org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
  org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Export-Package>*</Export-Package>

Modified: directory/studio/trunk/org.xpp3.xpp3/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.xpp3.xpp3/pom.xml?rev=984674&r1=984673&r2=984674&view=diff
==============================================================================
--- directory/studio/trunk/org.xpp3.xpp3/pom.xml (original)
+++ directory/studio/trunk/org.xpp3.xpp3/pom.xml Thu Aug 12 07:58:59 2010
@@ -68,8 +68,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>            
-            <Bundle-SymbolicName>${artifactId};singleton:=true</Bundle-SymbolicName>
-            <Bundle-Localization>plugin</Bundle-Localization>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>



Mime
View raw message