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 18:32:28 UTC
svn commit: r998490 - in /directory: apacheds/trunk/
apacheds/trunk/core-api/ apacheds/trunk/kerberos-shared/
apacheds/trunk/protocol-changepw/ apacheds/trunk/protocol-ldap/
apacheds/trunk/server-integ/ apacheds/trunk/server-tools/
apacheds/trunk/xdbm-...
Author: elecharny
Date: Sat Sep 18 16:32:27 2010
New Revision: 998490
URL: http://svn.apache.org/viewvc?rev=998490&view=rev
Log:
merged asn1 module into shared-ldap
Added:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/AbstractAsn1Object.java
- copied unchanged from r998381, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/AbstractAsn1Object.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/Asn1Object.java
- copied unchanged from r998381, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/Asn1Object.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/ber/
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/ber/AbstractContainer.java
- copied unchanged from r998381, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/AbstractContainer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Container.java
- copied unchanged from r998381, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Container.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java
- copied unchanged from r998381, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/ber/grammar/
- copied from r998381, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/ber/tlv/
- copied from r998381, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/codec/
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/codec/BinaryDecoder.java
- copied unchanged from r998381, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/BinaryDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/codec/BinaryEncoder.java
- copied unchanged from r998381, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/BinaryEncoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/codec/Decoder.java
- copied unchanged from r998381, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/Decoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/codec/DecoderException.java
- copied unchanged from r998381, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/DecoderException.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/codec/Encoder.java
- copied unchanged from r998381, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/Encoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/codec/EncoderException.java
- copied unchanged from r998381, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/EncoderException.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/codec/binary/
- copied from r998381, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/binary/
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/codec/stateful/
- copied from r998381, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/der/
- copied from r998381, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/der/
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/primitives/
- copied from r998381, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/primitives/
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/asn1/util/
- copied from r998381, directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/ber/
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/ber/tlv/
- copied from r998381, directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/ber/tlv/
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/asn1/primitives/
- copied from r998381, directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/
Removed:
directory/shared/trunk/asn1/
Modified:
directory/apacheds/trunk/core-api/pom.xml
directory/apacheds/trunk/kerberos-shared/pom.xml
directory/apacheds/trunk/pom.xml
directory/apacheds/trunk/protocol-changepw/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/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype
directory/shared/trunk/all/pom.xml
directory/shared/trunk/dsml-parser/pom.xml
directory/shared/trunk/ldap-client-api/pom.xml
directory/shared/trunk/ldap/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=998490&r1=998489&r2=998490&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/pom.xml (original)
+++ directory/apacheds/trunk/core-api/pom.xml Sat Sep 18 16:32:27 2010
@@ -88,11 +88,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>ldap-client-api</artifactId>
</dependency>
Modified: directory/apacheds/trunk/kerberos-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/pom.xml?rev=998490&r1=998489&r2=998490&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/pom.xml (original)
+++ directory/apacheds/trunk/kerberos-shared/pom.xml Sat Sep 18 16:32:27 2010
@@ -59,11 +59,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap</artifactId>
</dependency>
</dependencies>
Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?rev=998490&r1=998489&r2=998490&view=diff
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Sat Sep 18 16:32:27 2010
@@ -406,12 +406,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1</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-changepw/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-changepw/pom.xml?rev=998490&r1=998489&r2=998490&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-changepw/pom.xml (original)
+++ directory/apacheds/trunk/protocol-changepw/pom.xml Sat Sep 18 16:32:27 2010
@@ -59,11 +59,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap</artifactId>
</dependency>
Modified: directory/apacheds/trunk/protocol-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/pom.xml?rev=998490&r1=998489&r2=998490&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/pom.xml (original)
+++ directory/apacheds/trunk/protocol-ldap/pom.xml Sat Sep 18 16:32:27 2010
@@ -76,11 +76,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1</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=998490&r1=998489&r2=998490&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/pom.xml (original)
+++ directory/apacheds/trunk/server-integ/pom.xml Sat Sep 18 16:32:27 2010
@@ -93,11 +93,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1</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=998490&r1=998489&r2=998490&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/pom.xml (original)
+++ directory/apacheds/trunk/server-tools/pom.xml Sat Sep 18 16:32:27 2010
@@ -93,11 +93,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1</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=998490&r1=998489&r2=998490&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/pom.xml (original)
+++ directory/apacheds/trunk/xdbm-partition/pom.xml Sat Sep 18 16:32:27 2010
@@ -58,11 +58,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-i18n</artifactId>
</dependency>
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=998490&r1=998489&r2=998490&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 16:32:27 2010
@@ -60,8 +60,6 @@ f none /opt/apacheds/lib/libwrapper.so 0
f none /opt/apacheds/lib/log4j-1.2.16.jar 0644 apacheds apacheds
f none /opt/apacheds/lib/mina-core-2.0.0-RC1.jar 0644 apacheds apacheds
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-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/shared/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/all/pom.xml?rev=998490&r1=998489&r2=998490&view=diff
==============================================================================
--- directory/shared/trunk/all/pom.xml (original)
+++ directory/shared/trunk/all/pom.xml Sat Sep 18 16:32:27 2010
@@ -31,11 +31,6 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shared-asn1</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=998490&r1=998489&r2=998490&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/pom.xml (original)
+++ directory/shared/trunk/dsml-parser/pom.xml Sat Sep 18 16:32:27 2010
@@ -37,11 +37,6 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shared-asn1</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>shared-i18n</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=998490&r1=998489&r2=998490&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/pom.xml (original)
+++ directory/shared/trunk/ldap-client-api/pom.xml Sat Sep 18 16:32:27 2010
@@ -54,11 +54,6 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shared-asn1</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>shared-ldap-schema</artifactId>
</dependency>
Modified: directory/shared/trunk/ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/pom.xml?rev=998490&r1=998489&r2=998490&view=diff
==============================================================================
--- directory/shared/trunk/ldap/pom.xml (original)
+++ directory/shared/trunk/ldap/pom.xml Sat Sep 18 16:32:27 2010
@@ -39,11 +39,6 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shared-asn1</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>shared-i18n</artifactId>
</dependency>
Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?rev=998490&r1=998489&r2=998490&view=diff
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Sat Sep 18 16:32:27 2010
@@ -72,7 +72,6 @@
<modules>
<module>i18n</module>
<module>all</module>
- <module>asn1</module>
<module>ldap</module>
<module>ldap-jndi</module>
<module>ldap-schema</module>
@@ -101,12 +100,6 @@
<!-- Project sub-modules dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shared-asn1</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>shared-dsml-parser</artifactId>
<version>${project.version}</version>
</dependency>
@@ -432,7 +425,7 @@
<!-- Generated ldif files -->
<exclude>ldap-schema/src/main/resources/schema/**</exclude>
<!-- Files having a Bouncy Castle license -->
- <exclude>asn1/src/main/java/org/apache/directory/shared/asn1/der/*.java</exclude>
+ <exclude>ldap/src/main/java/org/apache/directory/shared/asn1/der/*.java</exclude>
</excludes>
</configuration>
</plugin>