directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1070534 - in /directory/studio/branches/m1: ./ libraries/org.apache.directory.server.config/ libraries/org.apache.directory.server.core.api/ libraries/org.apache.directory.server.core.avl/ libraries/org.apache.directory.server.core/ librar...
Date Mon, 14 Feb 2011 15:55:44 GMT
Author: pamarcelot
Date: Mon Feb 14 15:55:44 2011
New Revision: 1070534

URL: http://svn.apache.org/viewvc?rev=1070534&view=rev
Log:
Fixed MANIFEST.MF files generation for 3rd parties library plugins

Modified:
    directory/studio/branches/m1/libraries/org.apache.directory.server.config/pom.xml
    directory/studio/branches/m1/libraries/org.apache.directory.server.core.api/pom.xml
    directory/studio/branches/m1/libraries/org.apache.directory.server.core.avl/pom.xml
    directory/studio/branches/m1/libraries/org.apache.directory.server.core/pom.xml
    directory/studio/branches/m1/libraries/org.apache.directory.server.ldif.partition/pom.xml
    directory/studio/branches/m1/libraries/org.apache.directory.server.xdbm.partition/pom.xml
    directory/studio/branches/m1/pom.xml

Modified: directory/studio/branches/m1/libraries/org.apache.directory.server.config/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/libraries/org.apache.directory.server.config/pom.xml?rev=1070534&r1=1070533&r2=1070534&view=diff
==============================================================================
--- directory/studio/branches/m1/libraries/org.apache.directory.server.config/pom.xml (original)
+++ directory/studio/branches/m1/libraries/org.apache.directory.server.config/pom.xml Mon
Feb 14 15:55:44 2011
@@ -86,11 +86,13 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Require-Bundle>org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.validversion}",
+            <Require-Bundle>org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
+ org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.validversion}",
  org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
  org.apache.directory.server.ldif.partition;bundle-version="${org.apache.directory.server.validversion}",
  org.apache.directory.server.xdbm.partition;bundle-version="${org.apache.directory.server.validversion}",
  org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
  org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
@@ -147,9 +149,17 @@
         </exclusion>
         <exclusion>
           <groupId>org.apache.directory.shared</groupId>
+          <artifactId>shared-ldap-schema</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.directory.shared</groupId>
           <artifactId>shared-util</artifactId>
         </exclusion>
         <exclusion>
+          <groupId>commons-io</groupId>
+          <artifactId>commons-io</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-api</artifactId>
         </exclusion>
@@ -162,6 +172,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-schema</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-util</artifactId>
       <scope>provided</scope>
     </dependency>
@@ -181,6 +196,11 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>org.slf4j.api</artifactId>
       <scope>provided</scope>

Modified: directory/studio/branches/m1/libraries/org.apache.directory.server.core.api/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/libraries/org.apache.directory.server.core.api/pom.xml?rev=1070534&r1=1070533&r2=1070534&view=diff
==============================================================================
--- directory/studio/branches/m1/libraries/org.apache.directory.server.core.api/pom.xml (original)
+++ directory/studio/branches/m1/libraries/org.apache.directory.server.core.api/pom.xml Mon
Feb 14 15:55:44 2011
@@ -93,9 +93,9 @@
  org.apache.directory.server.core.constants;bundle-version="${org.apache.directory.server.validversion}",
  org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
  org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.ldap.client.api;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.ldap.codec;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.extras.util;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
  org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
@@ -165,7 +165,11 @@
         </exclusion>
         <exclusion>
           <groupId>org.apache.directory.shared</groupId>
-          <artifactId>shared-ldap-codec</artifactId>
+          <artifactId>shared-ldap-codec-standalone</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.directory.shared</groupId>
+          <artifactId>shared-ldap-extras-util</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.apache.directory.shared</groupId>
@@ -236,7 +240,12 @@
     </dependency>
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-codec</artifactId>
+      <artifactId>shared-ldap-codec-standalone</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-extras-util</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: directory/studio/branches/m1/libraries/org.apache.directory.server.core.avl/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/libraries/org.apache.directory.server.core.avl/pom.xml?rev=1070534&r1=1070533&r2=1070534&view=diff
==============================================================================
--- directory/studio/branches/m1/libraries/org.apache.directory.server.core.avl/pom.xml (original)
+++ directory/studio/branches/m1/libraries/org.apache.directory.server.core.avl/pom.xml Mon
Feb 14 15:55:44 2011
@@ -88,7 +88,6 @@
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Require-Bundle>org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
  org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
  org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>

Modified: directory/studio/branches/m1/libraries/org.apache.directory.server.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/libraries/org.apache.directory.server.core/pom.xml?rev=1070534&r1=1070533&r2=1070534&view=diff
==============================================================================
--- directory/studio/branches/m1/libraries/org.apache.directory.server.core/pom.xml (original)
+++ directory/studio/branches/m1/libraries/org.apache.directory.server.core/pom.xml Mon Feb
14 15:55:44 2011
@@ -92,9 +92,11 @@
  org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.validversion}",
  org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
  org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.ldap.client.api;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.ldap.codec;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.extras.aci;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.extras.trigger;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.extras.util;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
@@ -170,6 +172,18 @@
         </exclusion>
         <exclusion>
           <groupId>org.apache.directory.shared</groupId>
+          <artifactId>shared-ldap-extras-aci</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.directory.shared</groupId>
+          <artifactId>shared-ldap-extras-trigger</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.directory.shared</groupId>
+          <artifactId>shared-ldap-extras-util</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.directory.shared</groupId>
           <artifactId>shared-ldap-model</artifactId>
         </exclusion>
         <exclusion>
@@ -223,6 +237,21 @@
     </dependency>
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-extras-aci</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-extras-trigger</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-extras-util</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-model</artifactId>
       <scope>provided</scope>
     </dependency>

Modified: directory/studio/branches/m1/libraries/org.apache.directory.server.ldif.partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/libraries/org.apache.directory.server.ldif.partition/pom.xml?rev=1070534&r1=1070533&r2=1070534&view=diff
==============================================================================
--- directory/studio/branches/m1/libraries/org.apache.directory.server.ldif.partition/pom.xml
(original)
+++ directory/studio/branches/m1/libraries/org.apache.directory.server.ldif.partition/pom.xml
Mon Feb 14 15:55:44 2011
@@ -93,8 +93,6 @@
  org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
  org.apache.directory.server.xdbm.partition;bundle-version="${org.apache.directory.server.validversion}",
  org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",

Modified: directory/studio/branches/m1/libraries/org.apache.directory.server.xdbm.partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/libraries/org.apache.directory.server.xdbm.partition/pom.xml?rev=1070534&r1=1070533&r2=1070534&view=diff
==============================================================================
--- directory/studio/branches/m1/libraries/org.apache.directory.server.xdbm.partition/pom.xml
(original)
+++ directory/studio/branches/m1/libraries/org.apache.directory.server.xdbm.partition/pom.xml
Mon Feb 14 15:55:44 2011
@@ -92,8 +92,6 @@
  org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
  org.apache.directory.shared.asn1.api;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
  org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>

Modified: directory/studio/branches/m1/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/pom.xml?rev=1070534&r1=1070533&r2=1070534&view=diff
==============================================================================
--- directory/studio/branches/m1/pom.xml (original)
+++ directory/studio/branches/m1/pom.xml Mon Feb 14 15:55:44 2011
@@ -1386,7 +1386,12 @@
       </dependency>
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-model</artifactId>
+        <artifactId>shared-ldap-codec</artifactId>
+        <version>${org.apache.directory.shared.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.shared</groupId>
+        <artifactId>shared-ldap-codec-standalone</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
       <dependency>
@@ -1396,7 +1401,17 @@
       </dependency>
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-codec</artifactId>
+        <artifactId>shared-ldap-extras-trigger</artifactId>
+        <version>${org.apache.directory.shared.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.shared</groupId>
+        <artifactId>shared-ldap-extras-util</artifactId>
+        <version>${org.apache.directory.shared.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.shared</groupId>
+        <artifactId>shared-ldap-model</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
       <dependency>



Mime
View raw message