From directory-cvs-return-3932-apmail-incubator-directory-cvs-archive=incubator.apache.org@incubator.apache.org Wed Mar 16 05:58:58 2005
Return-Path: <directory-cvs-return-3932-apmail-incubator-directory-cvs-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-directory-cvs-archive@www.apache.org
Received: (qmail 83765 invoked from network); 16 Mar 2005 05:58:57 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 16 Mar 2005 05:58:57 -0000
Received: (qmail 86889 invoked by uid 500); 16 Mar 2005 05:58:56 -0000
Delivered-To: apmail-incubator-directory-cvs-archive@incubator.apache.org
Received: (qmail 86850 invoked by uid 500); 16 Mar 2005 05:58:56 -0000
Mailing-List: contact directory-cvs-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:directory-cvs-help@incubator.apache.org>
List-Unsubscribe: <mailto:directory-cvs-unsubscribe@incubator.apache.org>
List-Post: <mailto:directory-cvs@incubator.apache.org>
List-Id: <directory-cvs.incubator.apache.org>
Reply-To: directory-dev@incubator.apache.org
Delivered-To: mailing list directory-cvs@incubator.apache.org
Received: (qmail 86835 invoked by uid 99); 16 Mar 2005 05:58:56 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Tue, 15 Mar 2005 21:58:55 -0800
Received: (qmail 83723 invoked by uid 65534); 16 Mar 2005 05:58:54 -0000
Message-ID: <20050316055854.83721.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Wed, 16 Mar 2005 05:58:54 -0000
Subject: svn commit: r157696 - in directory/shared/ldap/trunk:
 apache-provider/src/java/org/apache/ldap/common/berlib/asn1/LdapTag.java
 common/src/java/org/apache/ldap/common/util/ValuedEnum.java
 common/src/test/org/apache/ldap/common/message/ArrayNamingEnumerationTest.java
 project.properties project.xml
To: directory-cvs@incubator.apache.org
From: akarasulu@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: akarasulu
Date: Tue Mar 15 21:58:53 2005
New Revision: 157696

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D157696
Log:
changes ...

 o fixed a few things to get 1.5 to compile
 o massaged properties in pom for paths and lists for incubator exist
 o using new directory-shared group id now


Modified:
    directory/shared/ldap/trunk/apache-provider/src/java/org/apache/ldap/co=
mmon/berlib/asn1/LdapTag.java
    directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/util=
/ValuedEnum.java
    directory/shared/ldap/trunk/common/src/test/org/apache/ldap/common/mess=
age/ArrayNamingEnumerationTest.java
    directory/shared/ldap/trunk/project.properties
    directory/shared/ldap/trunk/project.xml

Modified: directory/shared/ldap/trunk/apache-provider/src/java/org/apache/l=
dap/common/berlib/asn1/LdapTag.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provi=
der/src/java/org/apache/ldap/common/berlib/asn1/LdapTag.java?view=3Ddiff&r1=
=3D157695&r2=3D157696
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- directory/shared/ldap/trunk/apache-provider/src/java/org/apache/ldap/co=
mmon/berlib/asn1/LdapTag.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/java/org/apache/ldap/co=
mmon/berlib/asn1/LdapTag.java Tue Mar 15 21:58:53 2005
@@ -19,7 +19,6 @@
=20
 import org.apache.asn1.ber.TagEnum;
 import org.apache.asn1.ber.primitives.ContextSpecificTag;
-import org.apache.commons.lang.enum.EnumUtils;
=20
 import java.util.List;
 import java.util.Map;
@@ -294,28 +293,6 @@
     private LdapTag( final String name, final int value, final int id )
     {
         super( name, value, id ) ;
-    }
-
-
-    /**
-     * Gets a List of the enumerations for ASN.1 UNIVERSAL type tags.
-     *
-     * @return the List of enumerations possible for ASN.1 UNIVERSAL type =
tags
-     */
-    public static List list()
-    {
-        return EnumUtils.getEnumList( LdapTag.class ) ;
-    }
-
-
-    /**
-     * Gets the Map of LdapTag objects by name using the LdapTag class.
-     *
-     * @return the Map by name of LdapTag
-     */
-    public static Map map()
-    {
-        return EnumUtils.getEnumMap( LdapTag.class ) ;
     }
=20
=20

Modified: directory/shared/ldap/trunk/common/src/java/org/apache/ldap/commo=
n/util/ValuedEnum.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/common/src/j=
ava/org/apache/ldap/common/util/ValuedEnum.java?view=3Ddiff&r1=3D157695&r2=
=3D157696
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/util=
/ValuedEnum.java (original)
+++ directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/util=
/ValuedEnum.java Tue Mar 15 21:58:53 2005
@@ -134,9 +134,9 @@
         }
         List list =3D Enum.getEnumList(enumClass);
         for (Iterator it =3D list.iterator(); it.hasNext();) {
-            ValuedEnum enum =3D (ValuedEnum) it.next();
-            if (enum.getValue() =3D=3D value) {
-                return enum;
+            ValuedEnum valuedEnum =3D (ValuedEnum) it.next();
+            if (valuedEnum.getValue() =3D=3D value) {
+                return valuedEnum;
             }
         }
         return null;

Modified: directory/shared/ldap/trunk/common/src/test/org/apache/ldap/commo=
n/message/ArrayNamingEnumerationTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/common/src/t=
est/org/apache/ldap/common/message/ArrayNamingEnumerationTest.java?view=3Dd=
iff&r1=3D157695&r2=3D157696
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- directory/shared/ldap/trunk/common/src/test/org/apache/ldap/common/mess=
age/ArrayNamingEnumerationTest.java (original)
+++ directory/shared/ldap/trunk/common/src/test/org/apache/ldap/common/mess=
age/ArrayNamingEnumerationTest.java Tue Mar 15 21:58:53 2005
@@ -36,12 +36,12 @@
      */
     public void testUsingNullArray()
     {
-        ArrayNamingEnumeration enum =3D new ArrayNamingEnumeration( null );
-        assertFalse( enum.hasMore() );
+        ArrayNamingEnumeration list =3D new ArrayNamingEnumeration( null );
+        assertFalse( list.hasMore() );
=20
         try
         {
-            enum.next();
+            list.next();
             fail( "should blow exception before getting here" );
         }
         catch( NoSuchElementException e )
@@ -56,12 +56,12 @@
      */
     public void testUsingEmptyArray()
     {
-        ArrayNamingEnumeration enum =3D new ArrayNamingEnumeration( ArrayU=
tils.EMPTY_STRING_ARRAY );
-        assertFalse( enum.hasMore() );
+        ArrayNamingEnumeration list =3D new ArrayNamingEnumeration( ArrayU=
tils.EMPTY_STRING_ARRAY );
+        assertFalse( list.hasMore() );
=20
         try
         {
-            enum.next();
+            list.next();
             fail( "should blow exception before getting here" );
         }
         catch( NoSuchElementException e )
@@ -76,14 +76,14 @@
      */
     public void testUsingSingleElementArray()
     {
-        ArrayNamingEnumeration enum ;
-        enum =3D new ArrayNamingEnumeration( new String[] { "foo" });
-        assertTrue( enum.hasMore() );
-        assertEquals( "foo", enum.next() );
+        ArrayNamingEnumeration list;
+        list =3D new ArrayNamingEnumeration( new String[] { "foo" });
+        assertTrue( list.hasMore() );
+        assertEquals( "foo", list.next() );
=20
         try
         {
-            enum.next();
+            list.next();
             fail( "should blow exception before getting here" );
         }
         catch( NoSuchElementException e )
@@ -100,16 +100,16 @@
      */
     public void testUsingTwoElementArray()
     {
-        ArrayNamingEnumeration enum ;
-        enum =3D new ArrayNamingEnumeration( new String[] { "foo", "bar" }=
);
-        assertTrue( enum.hasMore() );
-        assertEquals( "foo", enum.next() );
-        assertTrue( enum.hasMore() );
-        assertEquals( "bar", enum.next() );
+        ArrayNamingEnumeration list;
+        list =3D new ArrayNamingEnumeration( new String[] { "foo", "bar" }=
);
+        assertTrue( list.hasMore() );
+        assertEquals( "foo", list.next() );
+        assertTrue( list.hasMore() );
+        assertEquals( "bar", list.next() );
=20
         try
         {
-            enum.next();
+            list.next();
             fail( "should blow exception before getting here" );
         }
         catch( NoSuchElementException e )

Modified: directory/shared/ldap/trunk/project.properties
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/project.prop=
erties?view=3Ddiff&r1=3D157695&r2=3D157696
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- directory/shared/ldap/trunk/project.properties (original)
+++ directory/shared/ldap/trunk/project.properties Tue Mar 15 21:58:53 2005
@@ -1,7 +1,5 @@
 maven.xdoc.date=3Dleft
 maven.changelog.factory=3Dorg.apache.maven.svnlib.SvnChangeLogFactory
-maven.license.licenseFile=3D${basedir}/../../LICENSE.txt
-maven.incubator.disclaimerFile=3D${basedir}/../../INCUBATOR-DISCLAIMER.txt
 maven.xdoc.poweredby.image=3D
 maven.xdoc.includeProjectDocumentation=3Dno
=20
@@ -17,7 +15,7 @@
 maven.repo.apachecvs.directory=3D/www/cvs.apache.org/repository
 maven.repo.apachecvs.group=3Dapcvs
=20
-maven.site.stage.directory=3D/home/akarasulu/public_html/rsynced-sites/dir=
ectory/subprojects/ldap
+maven.site.stage.directory=3D/home/akarasulu/public_html/rsynced-sites/dir=
ectory/subprojects/shared/ldap
=20
=20
 # User must specify:

Modified: directory/shared/ldap/trunk/project.xml
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/project.xml?=
view=3Ddiff&r1=3D157695&r2=3D157696
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- directory/shared/ldap/trunk/project.xml (original)
+++ directory/shared/ldap/trunk/project.xml Tue Mar 15 21:58:53 2005
@@ -1,77 +1,7 @@
 <?xml version=3D"1.0" encoding=3D"ISO-8859-1"?>
 <project>
-  <pomVersion>3</pomVersion>
-  <groupId>directory-ldap</groupId>
-  <artifactId>directory-ldap-parent</artifactId>
-  <name>The Apache Directory Project</name>
+  <extend>../../project.xml</extend>
   <currentVersion>0.9-SNAPSHOT</currentVersion>
- =20
-  <organization>
-      <name>The Apache Incubator</name>
-      <url>http://directory.apache.org</url>
-      <logo>/images/apache-directory-logo.png</logo>
-      <logo>http://directory.apache.org/images/apache-directory-logo.png</=
logo>
-  </organization>
- =20
-  <inceptionYear>2003</inceptionYear>
-  <package>org.apache.directory.sitedocs</package>
-  <logo>http://directory.apache.org/images/apache-directory-logo.png</logo=
>
-  <url>http://directory.apache.org/subprojects/directory-ldap/${module.pat=
h}</url>
-
-  <issueTrackingUrl>
-    http://issues.apache.org/jira/browse/DIRLDAP
-  </issueTrackingUrl>
-
-  <siteAddress>minotaur.apache.org</siteAddress>
-  <siteDirectory>
-    /www/directory.apache.org/subprojects/ldap
-  </siteDirectory>
-  <distributionDirectory>
-    /www/cvs.apache.org/dist/directory
-  </distributionDirectory>
- =20
-  <repository>
-    <connection>
-      scm:svn:http://svn.apache.org/repos/asf/directory/ldap/trunk/${modul=
e=2Epath}
-    </connection>
-
-    <url>
-      http://svn.apache.org/viewcvs.cgi/directory/ldap/trunk/${module.path=
}/?root=3DApache-SVN
-    </url>
-   =20
-    <developerConnection>
-      https://svn.apache.org/repos/asf/directory/ldap/trunk/${module.path}
-    </developerConnection>
-  </repository>
- =20
-  <shortDescription>Apache Directory Project</shortDescription>
- =20
-  <description>
-    Apache Directory Project.
-  </description>
- =20
-  <mailingLists>
-    <mailingList>
-      <name>Directory Developer List</name>
-      <subscribe>
-            dev@directory.apache.org
-      </subscribe>
-      <unsubscribe>
-            dev-unsubscribe@directory.apache.org
-      </unsubscribe>
-      <archive>
-            http://nagoya.apache.org/eyebrowse/SummarizeList?listId=3D181
-      </archive>
-    </mailingList>
-  </mailingLists>
- =20
-  <licenses>
-    <license>
-      <name>Apache 2.0 License</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
=20
   <build>
     <nagEmailAddress>dev@directory.apache.org</nagEmailAddress>