You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2005/03/16 06:58:54 UTC
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
Author: akarasulu
Date: Tue Mar 15 21:58:53 2005
New Revision: 157696
URL: http://svn.apache.org/viewcvs?view=rev&rev=157696
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/common/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/message/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/ldap/common/berlib/asn1/LdapTag.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/LdapTag.java?view=diff&r1=157695&r2=157696
==============================================================================
--- directory/shared/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/LdapTag.java (original)
+++ directory/shared/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/LdapTag.java Tue Mar 15 21:58:53 2005
@@ -19,7 +19,6 @@
import org.apache.asn1.ber.TagEnum;
import org.apache.asn1.ber.primitives.ContextSpecificTag;
-import org.apache.commons.lang.enum.EnumUtils;
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 ) ;
}
Modified: directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/util/ValuedEnum.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/util/ValuedEnum.java?view=diff&r1=157695&r2=157696
==============================================================================
--- 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 = Enum.getEnumList(enumClass);
for (Iterator it = list.iterator(); it.hasNext();) {
- ValuedEnum enum = (ValuedEnum) it.next();
- if (enum.getValue() == value) {
- return enum;
+ ValuedEnum valuedEnum = (ValuedEnum) it.next();
+ if (valuedEnum.getValue() == value) {
+ return valuedEnum;
}
}
return null;
Modified: directory/shared/ldap/trunk/common/src/test/org/apache/ldap/common/message/ArrayNamingEnumerationTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/common/src/test/org/apache/ldap/common/message/ArrayNamingEnumerationTest.java?view=diff&r1=157695&r2=157696
==============================================================================
--- directory/shared/ldap/trunk/common/src/test/org/apache/ldap/common/message/ArrayNamingEnumerationTest.java (original)
+++ directory/shared/ldap/trunk/common/src/test/org/apache/ldap/common/message/ArrayNamingEnumerationTest.java Tue Mar 15 21:58:53 2005
@@ -36,12 +36,12 @@
*/
public void testUsingNullArray()
{
- ArrayNamingEnumeration enum = new ArrayNamingEnumeration( null );
- assertFalse( enum.hasMore() );
+ ArrayNamingEnumeration list = new ArrayNamingEnumeration( null );
+ assertFalse( list.hasMore() );
try
{
- enum.next();
+ list.next();
fail( "should blow exception before getting here" );
}
catch( NoSuchElementException e )
@@ -56,12 +56,12 @@
*/
public void testUsingEmptyArray()
{
- ArrayNamingEnumeration enum = new ArrayNamingEnumeration( ArrayUtils.EMPTY_STRING_ARRAY );
- assertFalse( enum.hasMore() );
+ ArrayNamingEnumeration list = new ArrayNamingEnumeration( ArrayUtils.EMPTY_STRING_ARRAY );
+ assertFalse( list.hasMore() );
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 = new ArrayNamingEnumeration( new String[] { "foo" });
- assertTrue( enum.hasMore() );
- assertEquals( "foo", enum.next() );
+ ArrayNamingEnumeration list;
+ list = new ArrayNamingEnumeration( new String[] { "foo" });
+ assertTrue( list.hasMore() );
+ assertEquals( "foo", list.next() );
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 = new ArrayNamingEnumeration( new String[] { "foo", "bar" });
- assertTrue( enum.hasMore() );
- assertEquals( "foo", enum.next() );
- assertTrue( enum.hasMore() );
- assertEquals( "bar", enum.next() );
+ ArrayNamingEnumeration list;
+ list = new ArrayNamingEnumeration( new String[] { "foo", "bar" });
+ assertTrue( list.hasMore() );
+ assertEquals( "foo", list.next() );
+ assertTrue( list.hasMore() );
+ assertEquals( "bar", list.next() );
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.properties?view=diff&r1=157695&r2=157696
==============================================================================
--- 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=left
maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
-maven.license.licenseFile=${basedir}/../../LICENSE.txt
-maven.incubator.disclaimerFile=${basedir}/../../INCUBATOR-DISCLAIMER.txt
maven.xdoc.poweredby.image=
maven.xdoc.includeProjectDocumentation=no
@@ -17,7 +15,7 @@
maven.repo.apachecvs.directory=/www/cvs.apache.org/repository
maven.repo.apachecvs.group=apcvs
-maven.site.stage.directory=/home/akarasulu/public_html/rsynced-sites/directory/subprojects/ldap
+maven.site.stage.directory=/home/akarasulu/public_html/rsynced-sites/directory/subprojects/shared/ldap
# User must specify:
Modified: directory/shared/ldap/trunk/project.xml
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/project.xml?view=diff&r1=157695&r2=157696
==============================================================================
--- 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="1.0" encoding="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>
-
- <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>
-
- <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.path}</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>
-
- <repository>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/directory/ldap/trunk/${module.path}
- </connection>
-
- <url>
- http://svn.apache.org/viewcvs.cgi/directory/ldap/trunk/${module.path}/?root=Apache-SVN
- </url>
-
- <developerConnection>
- https://svn.apache.org/repos/asf/directory/ldap/trunk/${module.path}
- </developerConnection>
- </repository>
-
- <shortDescription>Apache Directory Project</shortDescription>
-
- <description>
- Apache Directory Project.
- </description>
-
- <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=181
- </archive>
- </mailingList>
- </mailingLists>
-
- <licenses>
- <license>
- <name>Apache 2.0 License</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
<build>
<nagEmailAddress>dev@directory.apache.org</nagEmailAddress>