Author: pamarcelot
Date: Tue Nov  2 17:07:03 2010
New Revision: 1030125

URL: http://svn.apache.org/viewvc?rev=1030125&view=rev
Log:
Merged the 'connection-refactoring' branch.

Added:
    directory/studio/trunk/libraries/org.apache.commons.pool/   (props changed)
      - copied from r1030058, directory/studio/branches/studio-connection-refactoring/libraries/org.apache.commons.pool/
    directory/studio/trunk/libraries/org.apache.commons.pool/pom.xml
      - copied unchanged from r1030058, directory/studio/branches/studio-connection-refactoring/libraries/org.apache.commons.pool/pom.xml
    directory/studio/trunk/libraries/org.apache.directory.shared.ldapclientapi/   (props changed)
      - copied from r1030058, directory/studio/branches/studio-connection-refactoring/libraries/org.apache.directory.shared.ldapclientapi/
    directory/studio/trunk/libraries/org.apache.directory.shared.ldapclientapi/pom.xml
      - copied unchanged from r1030058, directory/studio/branches/studio-connection-refactoring/libraries/org.apache.directory.shared.ldapclientapi/pom.xml
    directory/studio/trunk/libraries/org.apache.directory.shared.ldapschema/   (props changed)
      - copied from r1030058, directory/studio/branches/studio-connection-refactoring/libraries/org.apache.directory.shared.ldapschema/
    directory/studio/trunk/libraries/org.apache.directory.shared.ldapschema/pom.xml
      - copied unchanged from r1030058, directory/studio/branches/studio-connection-refactoring/libraries/org.apache.directory.shared.ldapschema/pom.xml
Modified:
    directory/studio/trunk/libraries/org.apache.directory.shared.ldap/pom.xml
    directory/studio/trunk/libraries/pom.xml

Propchange: directory/studio/trunk/libraries/org.apache.commons.pool/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Nov  2 17:07:03 2010
@@ -0,0 +1,6 @@
+.settings
+lib
+META-INF
+target
+.classpath
+.project

Modified: directory/studio/trunk/libraries/org.apache.directory.shared.ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.shared.ldap/pom.xml?rev=1030125&r1=1030124&r2=1030125&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.shared.ldap/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.shared.ldap/pom.xml Tue Nov  2 17:07:03 2010
@@ -90,6 +90,7 @@
  org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
  org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
  org.apache.directory.shared.i18n;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>
@@ -146,6 +147,10 @@
           <artifactId>shared-ldap-constants</artifactId>
         </exclusion>
         <exclusion>
+          <groupId>org.apache.mina</groupId>
+          <artifactId>mina-core</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-api</artifactId>
         </exclusion>

Propchange: directory/studio/trunk/libraries/org.apache.directory.shared.ldapclientapi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Nov  2 17:07:03 2010
@@ -0,0 +1,6 @@
+.settings
+lib
+META-INF
+target
+.classpath
+.project

Propchange: directory/studio/trunk/libraries/org.apache.directory.shared.ldapschema/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Nov  2 17:07:03 2010
@@ -0,0 +1,6 @@
+.settings
+lib
+META-INF
+target
+.classpath
+.project

Modified: directory/studio/trunk/libraries/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/pom.xml?rev=1030125&r1=1030124&r2=1030125&view=diff
==============================================================================
--- directory/studio/trunk/libraries/pom.xml (original)
+++ directory/studio/trunk/libraries/pom.xml Tue Nov  2 17:07:03 2010
@@ -37,9 +37,12 @@
     <module>org.apache.commons.io</module>
     <module>org.apache.commons.lang</module>
     <module>org.apache.commons.logging</module>
+    <module>org.apache.commons.pool</module>
     <module>org.apache.directory.shared.dsmlparser</module>
     <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.httpcomponents.httpclient</module>
     <module>org.apache.httpcomponents.httpcore</module>
     <module>org.apache.logging.log4j</module>