directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1036055 - in /directory/studio/trunk: ./ libraries/ libraries/org.apache.directory.server.core.api/ libraries/org.apache.directory.server.xdbm.partition/ libraries/org.apache.directory.shared.ldap.schema/ libraries/org.apache.directory.sha...
Date Wed, 17 Nov 2010 14:25:09 GMT
Author: pamarcelot
Date: Wed Nov 17 14:25:08 2010
New Revision: 1036055

URL: http://svn.apache.org/viewvc?rev=1036055&view=rev
Log:
Renamed the 'org.apache.directory.shared.ldapschema' module to 'org.apache.directory.shared.ldap.schema'
for consistency in modules naming.

Added:
    directory/studio/trunk/libraries/org.apache.directory.shared.ldap.schema/
      - copied from r1035198, directory/studio/trunk/libraries/org.apache.directory.shared.ldapschema/
Removed:
    directory/studio/trunk/libraries/org.apache.directory.shared.ldapschema/
Modified:
    directory/studio/trunk/libraries/org.apache.directory.server.core.api/pom.xml
    directory/studio/trunk/libraries/org.apache.directory.server.xdbm.partition/pom.xml
    directory/studio/trunk/libraries/org.apache.directory.shared.ldap.schema/pom.xml
    directory/studio/trunk/libraries/org.apache.directory.shared.ldapclientapi/pom.xml
    directory/studio/trunk/libraries/pom.xml
    directory/studio/trunk/pom.xml

Modified: directory/studio/trunk/libraries/org.apache.directory.server.core.api/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.core.api/pom.xml?rev=1036055&r1=1036054&r2=1036055&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.core.api/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.core.api/pom.xml Wed Nov
17 14:25:08 2010
@@ -95,7 +95,7 @@
  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.ldapclientapi;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldapschema;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.mina.core;bundle-version="${org.apache.mina.core.version}",
  org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
  org.slf4j.api;bundle-version="${org.slf4j.version}",

Modified: directory/studio/trunk/libraries/org.apache.directory.server.xdbm.partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.xdbm.partition/pom.xml?rev=1036055&r1=1036054&r2=1036055&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.xdbm.partition/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.xdbm.partition/pom.xml Wed
Nov 17 14:25:08 2010
@@ -92,7 +92,7 @@
  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.ldapschema;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>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>

Modified: directory/studio/trunk/libraries/org.apache.directory.shared.ldap.schema/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.shared.ldap.schema/pom.xml?rev=1036055&r1=1035198&r2=1036055&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.shared.ldap.schema/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.shared.ldap.schema/pom.xml Wed Nov
17 14:25:08 2010
@@ -26,7 +26,7 @@
     <version>2.0.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>org.apache.directory.shared.ldapschema</artifactId>
+  <artifactId>org.apache.directory.shared.ldap.schema</artifactId>
   <version>${org.apache.directory.shared.version}</version>
   
   <name>Apache Directory Shared LDAP Schema (for Apache Directory Studio)</name>

Modified: directory/studio/trunk/libraries/org.apache.directory.shared.ldapclientapi/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.shared.ldapclientapi/pom.xml?rev=1036055&r1=1036054&r2=1036055&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.shared.ldapclientapi/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.shared.ldapclientapi/pom.xml Wed
Nov 17 14:25:08 2010
@@ -86,16 +86,11 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <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.commons.lang;bundle-version="${org.apache.commons.lang.version}",
- org.apache.commons.pool;bundle-version="${org.apache.commons.pool.version}",
- org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
+            <Require-Bundle>org.apache.commons.pool;bundle-version="${org.apache.commons.pool.version}",
  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.mina.core;bundle-version="${org.apache.mina.core.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>
+ org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
             <Embed-StripGroup>true</Embed-StripGroup>

Modified: directory/studio/trunk/libraries/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/pom.xml?rev=1036055&r1=1036054&r2=1036055&view=diff
==============================================================================
--- directory/studio/trunk/libraries/pom.xml (original)
+++ directory/studio/trunk/libraries/pom.xml Wed Nov 17 14:25:08 2010
@@ -48,7 +48,7 @@
     <module>org.apache.directory.shared.i18n</module>
     <module>org.apache.directory.shared.ldap</module>
     <module>org.apache.directory.shared.ldapclientapi</module>
-    <module>org.apache.directory.shared.ldapschema</module>
+    <module>org.apache.directory.shared.ldap.schema</module>
     <module>org.apache.httpcomponents.httpclient</module>
     <module>org.apache.httpcomponents.httpcore</module>
     <module>org.apache.logging.log4j</module>

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=1036055&r1=1036054&r2=1036055&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Wed Nov 17 14:25:08 2010
@@ -181,7 +181,12 @@
 
   <dependencyManagement>
     <dependencies>
-      <!-- Apache Directory Studio -->
+      <!-- Apache Directory Studio Libraries -->
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>net.sf.ehcache.core</artifactId>
+        <version>${net.sf.ehcache.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>org.antlr.antlr</artifactId>
@@ -209,13 +214,38 @@
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.apache.commons.logging</artifactId>
+        <version>${org.apache.commons.logging.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
         <artifactId>org.apache.commons.pool</artifactId>
         <version>${org.apache.commons.pool.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>org.apache.commons.logging</artifactId>
-        <version>${org.apache.commons.logging.version}</version>
+        <artifactId>org.apache.directory.server.core.api</artifactId>
+        <version>${org.apache.directory.server.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.apache.directory.server.core.avl</artifactId>
+        <version>${org.apache.directory.server.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.apache.directory.server.core.constants</artifactId>
+        <version>${org.apache.directory.server.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.apache.directory.server.i18n</artifactId>
+        <version>${org.apache.directory.server.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>org.apache.directory.server.xdbm.partition</artifactId>
+        <version>${org.apache.directory.server.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
@@ -234,12 +264,12 @@
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>org.apache.directory.shared.ldapschema</artifactId>
+        <artifactId>org.apache.directory.shared.ldapclientapi</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>org.apache.directory.shared.ldapclientapi</artifactId>
+        <artifactId>org.apache.directory.shared.ldap.schema</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
       <dependency>
@@ -288,7 +318,7 @@
         <version>${org.xpp3.validversion}</version>
       </dependency>
       
-      
+      <!-- Apache Directory Studio Plugins -->
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>aciitemeditor</artifactId>



Mime
View raw message