You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/09/18 12:04:56 UTC
svn commit: r998433 - in /directory: apacheds/trunk/
apacheds/trunk/core-api/ apacheds/trunk/core-avl/
apacheds/trunk/core-integ/ apacheds/trunk/core-jndi/ apacheds/trunk/core/
apacheds/trunk/ldap-client-test/ apacheds/trunk/protocol-ldap/
apacheds/tru...
Author: elecharny
Date: Sat Sep 18 10:04:56 2010
New Revision: 998433
URL: http://svn.apache.org/viewvc?rev=998433&view=rev
Log:
merged shared-cursor into shared-ldap
Added:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/cursor/
- copied from r998381, directory/shared/trunk/cursor/src/main/java/org/apache/directory/shared/ldap/cursor/
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/cursor/
- copied from r998381, directory/shared/trunk/cursor/src/test/java/org/apache/directory/shared/ldap/cursor/
Removed:
directory/shared/trunk/cursor/
Modified:
directory/apacheds/trunk/core-api/pom.xml
directory/apacheds/trunk/core-avl/pom.xml
directory/apacheds/trunk/core-integ/pom.xml
directory/apacheds/trunk/core-jndi/pom.xml
directory/apacheds/trunk/core/pom.xml
directory/apacheds/trunk/ldap-client-test/pom.xml
directory/apacheds/trunk/pom.xml
directory/apacheds/trunk/protocol-ldap/pom.xml
directory/apacheds/trunk/server-integ/pom.xml
directory/apacheds/trunk/server-tools/pom.xml
directory/apacheds/trunk/xdbm-partition/pom.xml
directory/apacheds/trunk/xdbm-tools/pom.xml
directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype
directory/installers/trunk/pom.xml
directory/shared/trunk/all/pom.xml
directory/shared/trunk/dsml-parser/pom.xml
directory/shared/trunk/ldap-client-api/pom.xml
directory/shared/trunk/pom.xml
Modified: directory/apacheds/trunk/core-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/pom.xml?rev=998433&r1=998432&r2=998433&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/pom.xml (original)
+++ directory/apacheds/trunk/core-api/pom.xml Sat Sep 18 10:04:56 2010
@@ -83,11 +83,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-cursor</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-i18n</artifactId>
</dependency>
Modified: directory/apacheds/trunk/core-avl/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/pom.xml?rev=998433&r1=998432&r2=998433&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/pom.xml (original)
+++ directory/apacheds/trunk/core-avl/pom.xml Sat Sep 18 10:04:56 2010
@@ -47,11 +47,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-cursor</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap</artifactId>
</dependency>
</dependencies>
Modified: directory/apacheds/trunk/core-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/pom.xml?rev=998433&r1=998432&r2=998433&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/pom.xml (original)
+++ directory/apacheds/trunk/core-integ/pom.xml Sat Sep 18 10:04:56 2010
@@ -75,11 +75,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-cursor</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap</artifactId>
</dependency>
Modified: directory/apacheds/trunk/core-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/pom.xml?rev=998433&r1=998432&r2=998433&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/pom.xml (original)
+++ directory/apacheds/trunk/core-jndi/pom.xml Sat Sep 18 10:04:56 2010
@@ -65,11 +65,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-cursor</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap</artifactId>
</dependency>
Modified: directory/apacheds/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/pom.xml?rev=998433&r1=998432&r2=998433&view=diff
==============================================================================
--- directory/apacheds/trunk/core/pom.xml (original)
+++ directory/apacheds/trunk/core/pom.xml Sat Sep 18 10:04:56 2010
@@ -83,11 +83,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-cursor</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-i18n</artifactId>
</dependency>
Modified: directory/apacheds/trunk/ldap-client-test/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/pom.xml?rev=998433&r1=998432&r2=998433&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/pom.xml (original)
+++ directory/apacheds/trunk/ldap-client-test/pom.xml Sat Sep 18 10:04:56 2010
@@ -71,11 +71,6 @@
<artifactId>shared-ldap</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-cursor</artifactId>
- </dependency>
-
<!-- Other dependencies -->
<dependency>
<groupId>org.apache.directory.shared</groupId>
Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?rev=998433&r1=998432&r2=998433&view=diff
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Sat Sep 18 10:04:56 2010
@@ -418,12 +418,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-cursor</artifactId>
- <version>${org.apache.directory.shared.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-dsml-parser</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
Modified: directory/apacheds/trunk/protocol-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/pom.xml?rev=998433&r1=998432&r2=998433&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/pom.xml (original)
+++ directory/apacheds/trunk/protocol-ldap/pom.xml Sat Sep 18 10:04:56 2010
@@ -86,11 +86,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-cursor</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-i18n</artifactId>
</dependency>
Modified: directory/apacheds/trunk/server-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/pom.xml?rev=998433&r1=998432&r2=998433&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/pom.xml (original)
+++ directory/apacheds/trunk/server-integ/pom.xml Sat Sep 18 10:04:56 2010
@@ -98,11 +98,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-cursor</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap</artifactId>
</dependency>
Modified: directory/apacheds/trunk/server-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/pom.xml?rev=998433&r1=998432&r2=998433&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/pom.xml (original)
+++ directory/apacheds/trunk/server-tools/pom.xml Sat Sep 18 10:04:56 2010
@@ -98,11 +98,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-cursor</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap</artifactId>
</dependency>
Modified: directory/apacheds/trunk/xdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/pom.xml?rev=998433&r1=998432&r2=998433&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/pom.xml (original)
+++ directory/apacheds/trunk/xdbm-partition/pom.xml Sat Sep 18 10:04:56 2010
@@ -63,11 +63,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-cursor</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-i18n</artifactId>
</dependency>
Modified: directory/apacheds/trunk/xdbm-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/pom.xml?rev=998433&r1=998432&r2=998433&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/pom.xml (original)
+++ directory/apacheds/trunk/xdbm-tools/pom.xml Sat Sep 18 10:04:56 2010
@@ -58,11 +58,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-cursor</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap</artifactId>
</dependency>
</dependencies>
Modified: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype?rev=998433&r1=998432&r2=998433&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype (original)
+++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype Sat Sep 18 10:04:56 2010
@@ -62,7 +62,6 @@ f none /opt/apacheds/lib/mina-core-2.0.0
f none /opt/apacheds/lib/servlet-api-2.5-6.1.14.jar 0644 apacheds apacheds
f none /opt/apacheds/lib/shared-asn1-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
f none /opt/apacheds/lib/shared-asn1-codec-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
-f none /opt/apacheds/lib/shared-cursor-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
f none /opt/apacheds/lib/shared-dsml-parser-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
f none /opt/apacheds/lib/shared-i18n-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
f none /opt/apacheds/lib/shared-ldap-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
Modified: directory/installers/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/installers/trunk/pom.xml?rev=998433&r1=998432&r2=998433&view=diff
==============================================================================
--- directory/installers/trunk/pom.xml (original)
+++ directory/installers/trunk/pom.xml Sat Sep 18 10:04:56 2010
@@ -157,12 +157,6 @@
</dependency>
<dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-cursor</artifactId>
- <version>${shared.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-http-integration</artifactId>
<version>${server.version}</version>
Modified: directory/shared/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/all/pom.xml?rev=998433&r1=998432&r2=998433&view=diff
==============================================================================
--- directory/shared/trunk/all/pom.xml (original)
+++ directory/shared/trunk/all/pom.xml Sat Sep 18 10:04:56 2010
@@ -41,11 +41,6 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shared-cursor</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>shared-i18n</artifactId>
</dependency>
Modified: directory/shared/trunk/dsml-parser/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/pom.xml?rev=998433&r1=998432&r2=998433&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/pom.xml (original)
+++ directory/shared/trunk/dsml-parser/pom.xml Sat Sep 18 10:04:56 2010
@@ -56,11 +56,6 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shared-cursor</artifactId>
- </dependency>
-
- <dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
</dependency>
Modified: directory/shared/trunk/ldap-client-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/pom.xml?rev=998433&r1=998432&r2=998433&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/pom.xml (original)
+++ directory/shared/trunk/ldap-client-api/pom.xml Sat Sep 18 10:04:56 2010
@@ -54,11 +54,6 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shared-cursor</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>shared-asn1</artifactId>
</dependency>
Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?rev=998433&r1=998432&r2=998433&view=diff
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Sat Sep 18 10:04:56 2010
@@ -77,7 +77,6 @@
<module>ldap-jndi</module>
<module>ldap-schema</module>
<module>asn1-codec</module>
- <module>cursor</module>
<module>ldap-client-api</module>
<module>dsml-parser</module>
</modules>
@@ -115,12 +114,6 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shared-cursor</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>shared-dsml-parser</artifactId>
<version>${project.version}</version>
</dependency>