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 2007/11/18 15:15:51 UTC
svn commit: r596086 - in /directory:
apacheds/branches/bigbang/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/
apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/schema/
apacheds/branche...
Author: elecharny
Date: Sun Nov 18 06:15:50 2007
New Revision: 596086
URL: http://svn.apache.org/viewvc?rev=596086&view=rev
Log:
Removed around 50 warnings by removing useless imports and using some generics
Modified:
directory/apacheds/branches/bigbang/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryITest.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
directory/apacheds/branches/bigbang/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/KerberosUtilsTest.java
directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerContextHandler.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java
directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/ModifyRdnTest.java
directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/ssl/LdapsITest.java
directory/apacheds/branches/bigbang/server-xml/src/test/java/org/apache/directory/server/SpringServerTest.java
directory/daemon/branches/bigbang/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java
directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/ASN1InputStream.java
directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/BERConstructedOctetString.java
directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/BERSequence.java
directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/BERSet.java
directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/BERTaggedObject.java
directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/DERSet.java
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURL.java
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/spi/BinaryAttributeDetector.java
Modified: directory/apacheds/branches/bigbang/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?rev=596086&r1=596085&r2=596086&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java (original)
+++ directory/apacheds/branches/bigbang/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java Sun Nov 18 06:15:50 2007
@@ -46,7 +46,6 @@
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
-import javax.naming.directory.ModificationItem;
import java.io.File;
import java.io.FileWriter;
Modified: directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryITest.java?rev=596086&r1=596085&r2=596086&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryITest.java (original)
+++ directory/apacheds/branches/bigbang/core-unit/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryITest.java Sun Nov 18 06:15:50 2007
@@ -21,7 +21,6 @@
import jdbm.helper.IntegerComparator;
-import org.apache.directory.server.core.DefaultDirectoryService;
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.unit.AbstractAdminTestCase;
import org.apache.directory.shared.ldap.exception.LdapNameAlreadyBoundException;
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java?rev=596086&r1=596085&r2=596086&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java Sun Nov 18 06:15:50 2007
@@ -21,20 +21,8 @@
import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.configuration.*;
-import org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext;
-import org.apache.directory.server.core.interceptor.context.RemoveContextPartitionOperationContext;
-import org.apache.directory.server.core.partition.PartitionNexusProxy;
-import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.util.StringTools;
-
-import javax.naming.ConfigurationException;
-import javax.naming.Context;
import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.naming.ldap.LdapContext;
import javax.naming.spi.InitialContextFactory;
-import java.util.Hashtable;
/**
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=596086&r1=596085&r2=596086&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Sun Nov 18 06:15:50 2007
@@ -151,7 +151,6 @@
{
modItems = new ArrayList<ModificationItemImpl>( attrs.size() );
NamingEnumeration<Attribute> e = (NamingEnumeration<Attribute>)attrs.getAll();
- int i = 0;
while ( e.hasMore() )
{
Modified: directory/apacheds/branches/bigbang/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/KerberosUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/KerberosUtilsTest.java?rev=596086&r1=596085&r2=596086&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/KerberosUtilsTest.java (original)
+++ directory/apacheds/branches/bigbang/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/KerberosUtilsTest.java Sun Nov 18 06:15:50 2007
@@ -19,7 +19,6 @@
*/
package org.apache.directory.server.kerberos.shared;
-import java.text.ParseException;
import java.util.List;
import javax.security.auth.kerberos.KerberosPrincipal;
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerContextHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerContextHandler.java?rev=596086&r1=596085&r2=596086&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerContextHandler.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerContextHandler.java Sun Nov 18 06:15:50 2007
@@ -20,7 +20,6 @@
package org.apache.directory.mitosis.service.protocol.handler;
-import com.sun.org.apache.bcel.internal.classfile.Unknown;
import org.apache.directory.mitosis.common.CSNVector;
import org.apache.directory.mitosis.common.Replica;
import org.apache.directory.mitosis.operation.Operation;
Modified: directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java?rev=596086&r1=596085&r2=596086&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java (original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java Sun Nov 18 06:15:50 2007
@@ -22,10 +22,7 @@
import java.io.IOException;
import java.net.InetSocketAddress;
-import java.util.ArrayList;
import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
import java.util.Set;
import javax.security.auth.kerberos.KerberosPrincipal;
Modified: directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/ModifyRdnTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/ModifyRdnTest.java?rev=596086&r1=596085&r2=596086&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/ModifyRdnTest.java (original)
+++ directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/ModifyRdnTest.java Sun Nov 18 06:15:50 2007
@@ -23,13 +23,10 @@
import java.util.Hashtable;
import javax.naming.NameNotFoundException;
-import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
import javax.naming.ldap.InitialLdapContext;
import javax.naming.ldap.LdapContext;
Modified: directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/ssl/LdapsITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/ssl/LdapsITest.java?rev=596086&r1=596085&r2=596086&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/ssl/LdapsITest.java (original)
+++ directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/ssl/LdapsITest.java Sun Nov 18 06:15:50 2007
@@ -20,12 +20,10 @@
package org.apache.directory.server.ssl;
-import org.apache.directory.server.ldap.LdapServer;
import org.apache.directory.server.ssl.support.SSLSocketFactory;
import org.apache.directory.server.unit.AbstractServerTest;
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.message.AttributesImpl;
-import org.apache.mina.util.AvailablePortFinder;
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
Modified: directory/apacheds/branches/bigbang/server-xml/src/test/java/org/apache/directory/server/SpringServerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-xml/src/test/java/org/apache/directory/server/SpringServerTest.java?rev=596086&r1=596085&r2=596086&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-xml/src/test/java/org/apache/directory/server/SpringServerTest.java (original)
+++ directory/apacheds/branches/bigbang/server-xml/src/test/java/org/apache/directory/server/SpringServerTest.java Sun Nov 18 06:15:50 2007
@@ -23,11 +23,8 @@
import org.junit.Test;
import org.springframework.context.ApplicationContext;
-import javax.naming.Context;
-import javax.naming.directory.InitialDirContext;
import java.io.File;
import java.net.URL;
-import java.util.Hashtable;
/**
Modified: directory/daemon/branches/bigbang/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java
URL: http://svn.apache.org/viewvc/directory/daemon/branches/bigbang/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java?rev=596086&r1=596085&r2=596086&view=diff
==============================================================================
--- directory/daemon/branches/bigbang/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java (original)
+++ directory/daemon/branches/bigbang/bootstrappers/src/main/java/org/apache/directory/daemon/InstallationLayout.java Sun Nov 18 06:15:50 2007
@@ -343,7 +343,7 @@
{
try
{
- dependentJars[ii] = deps[ii].toURL();
+ dependentJars[ii] = deps[ii].toURI().toURL();
}
catch ( MalformedURLException e )
{
@@ -368,7 +368,7 @@
{
try
{
- extensionJars[ii] = extensions[ii].toURL();
+ extensionJars[ii] = extensions[ii].toURI().toURL();
}
catch ( MalformedURLException e )
{
Modified: directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/ASN1InputStream.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/ASN1InputStream.java?rev=596086&r1=596085&r2=596086&view=diff
==============================================================================
--- directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/ASN1InputStream.java (original)
+++ directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/ASN1InputStream.java Sun Nov 18 06:15:50 2007
@@ -366,7 +366,7 @@
private BERConstructedOctetString buildConstructedOctetString() throws IOException
{
- Vector octets = new Vector();
+ Vector<DEREncodable> octets = new Vector<DEREncodable>();
for ( ;; )
{
Modified: directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/BERConstructedOctetString.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/BERConstructedOctetString.java?rev=596086&r1=596085&r2=596086&view=diff
==============================================================================
--- directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/BERConstructedOctetString.java (original)
+++ directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/BERConstructedOctetString.java Sun Nov 18 06:15:50 2007
@@ -31,7 +31,7 @@
public class BERConstructedOctetString extends DEROctetString
{
- private Vector octets;
+ private Vector<DEREncodable> octets;
/**
@@ -44,7 +44,7 @@
}
- public BERConstructedOctetString(Vector octets)
+ public BERConstructedOctetString(Vector<DEREncodable> octets)
{
super( toBytes( octets ) );
@@ -55,7 +55,7 @@
/**
* Convert a vector of octet strings into a single byte string.
*/
- static private byte[] toBytes( Vector octs )
+ static private byte[] toBytes( Vector<DEREncodable> octs )
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -85,7 +85,7 @@
/**
* @return Enumeration the DER octets that make up this string.
*/
- public Enumeration getObjects()
+ public Enumeration<DEREncodable> getObjects()
{
if ( octets == null )
{
@@ -96,11 +96,11 @@
}
- private Vector generateOcts()
+ private Vector<DEREncodable> generateOcts()
{
int start = 0;
int end = 0;
- Vector vector = new Vector();
+ Vector<DEREncodable> vector = new Vector<DEREncodable>();
while ( ( end + 1 ) < value.length )
{
Modified: directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/BERSequence.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/BERSequence.java?rev=596086&r1=596085&r2=596086&view=diff
==============================================================================
--- directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/BERSequence.java (original)
+++ directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/BERSequence.java Sun Nov 18 06:15:50 2007
@@ -34,7 +34,8 @@
out.write( DERObject.SEQUENCE | DERObject.CONSTRUCTED );
out.write( DERObject.TAGGED );
- Enumeration e = getObjects();
+ Enumeration<DEREncodable> e = getObjects();
+
while ( e.hasMoreElements() )
{
out.writeObject( e.nextElement() );
Modified: directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/BERSet.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/BERSet.java?rev=596086&r1=596085&r2=596086&view=diff
==============================================================================
--- directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/BERSet.java (original)
+++ directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/BERSet.java Sun Nov 18 06:15:50 2007
@@ -34,7 +34,8 @@
out.write( DERObject.SET | DERObject.CONSTRUCTED );
out.write( DERObject.TAGGED );
- Enumeration e = getObjects();
+ Enumeration<DEREncodable> e = getObjects();
+
while ( e.hasMoreElements() )
{
out.writeObject( e.nextElement() );
Modified: directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/BERTaggedObject.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/BERTaggedObject.java?rev=596086&r1=596085&r2=596086&view=diff
==============================================================================
--- directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/BERTaggedObject.java (original)
+++ directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/BERTaggedObject.java Sun Nov 18 06:15:50 2007
@@ -69,7 +69,7 @@
{
if ( obj instanceof DEROctetString )
{
- Enumeration e;
+ Enumeration<DEREncodable> e;
if ( obj instanceof BERConstructedOctetString )
{
@@ -90,7 +90,7 @@
}
else if ( obj instanceof DERSequence )
{
- Enumeration e = ( ( DERSequence ) obj ).getObjects();
+ Enumeration<DEREncodable> e = ( ( DERSequence ) obj ).getObjects();
while ( e.hasMoreElements() )
{
Modified: directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/DERSet.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/DERSet.java?rev=596086&r1=596085&r2=596086&view=diff
==============================================================================
--- directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/DERSet.java (original)
+++ directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/DERSet.java Sun Nov 18 06:15:50 2007
@@ -34,10 +34,10 @@
*/
public class DERSet implements DEREncodable
{
- protected Vector set = new Vector();
+ protected Vector<DEREncodable> set = new Vector<DEREncodable>();
- public Enumeration getObjects()
+ public Enumeration<DEREncodable> getObjects()
{
return set.elements();
}
@@ -66,7 +66,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ASN1OutputStream aos = new ASN1OutputStream( baos );
- Enumeration e = getObjects();
+ Enumeration<DEREncodable> e = getObjects();
while ( e.hasMoreElements() )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURL.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURL.java?rev=596086&r1=596085&r2=596086&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURL.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURL.java Sun Nov 18 06:15:50 2007
@@ -31,7 +31,6 @@
import java.text.ParseException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/spi/BinaryAttributeDetector.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/spi/BinaryAttributeDetector.java?rev=596086&r1=596085&r2=596086&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/spi/BinaryAttributeDetector.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/spi/BinaryAttributeDetector.java Sun Nov 18 06:15:50 2007
@@ -19,7 +19,6 @@
*/
package org.apache.directory.shared.ldap.message.spi;
-import javax.naming.NamingException;
/**