directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r501193 - in /directory/apacheds/trunk: bootstrap-partition/src/main/java/org/apache/directory/server/schema/bootstrap/partition/ core-unit/src/main/java/org/apache/directory/server/core/unit/ core-unit/src/test/java/org/apache/directory/se...
Date Mon, 29 Jan 2007 21:52:42 GMT
Author: akarasulu
Date: Mon Jan 29 13:52:41 2007
New Revision: 501193

URL: http://svn.apache.org/viewvc?view=rev&rev=501193
Log:
fixing issues with some casting: I need to reread how to use generics because this was a nightmare

Modified:
    directory/apacheds/trunk/bootstrap-partition/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java
    directory/apacheds/trunk/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java
    directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/SearchOpsITest.java
    directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/MutablePartitionConfiguration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/MiscTest.java

Modified: directory/apacheds/trunk/bootstrap-partition/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-partition/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java?view=diff&rev=501193&r1=501192&r2=501193
==============================================================================
--- directory/apacheds/trunk/bootstrap-partition/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java
(original)
+++ directory/apacheds/trunk/bootstrap-partition/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java
Mon Jan 29 13:52:41 2007
@@ -108,9 +108,9 @@
      * 
      * @return set of user index names
      */
-    public Set<String> getIndexedAttributes()
+    public Set<Object> getIndexedAttributes()
     {
-        Set<String> attributes = new HashSet<String>();
+        Set<Object> attributes = new HashSet<Object>();
         Iterator<String> ii = iterator();
         
         while( ii.hasNext() )

Modified: directory/apacheds/trunk/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java?view=diff&rev=501193&r1=501192&r2=501193
==============================================================================
--- directory/apacheds/trunk/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java
(original)
+++ directory/apacheds/trunk/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java
Mon Jan 29 13:52:41 2007
@@ -138,7 +138,7 @@
         if ( ! isExternal )
         {
             // Add indices for ou, uid, and objectClass
-            HashSet<String> indexedAttributes = new HashSet<String>();
+            HashSet<Object> indexedAttributes = new HashSet<Object>();
             indexedAttributes.add( "ou" );
             indexedAttributes.add( "uid" );
             indexedAttributes.add( "objectClass" );

Modified: directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/SearchOpsITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/SearchOpsITest.java?view=diff&rev=501193&r1=501192&r2=501193
==============================================================================
--- directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/SearchOpsITest.java
(original)
+++ directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/SearchOpsITest.java
Mon Jan 29 13:52:41 2007
@@ -74,7 +74,7 @@
             sysConf.setContextEntry( attrs );
             sysConf.setSuffix( "ou=system" );
             
-            Set<String> indices = new HashSet<String>();
+            Set<Object> indices = new HashSet<Object>();
             indices.addAll( sysConf.getIndexedAttributes() );
             
             MutableIndexConfiguration idxConfig = new MutableIndexConfiguration();

Modified: directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java?view=diff&rev=501193&r1=501192&r2=501193
==============================================================================
--- directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
(original)
+++ directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
Mon Jan 29 13:52:41 2007
@@ -58,7 +58,7 @@
         partition.setName( "apache" );
         partition.setSuffix( suffix );
 
-        Set<String> indexedAttributes = new HashSet<String>();
+        Set<Object> indexedAttributes = new HashSet<Object>();
         indexedAttributes.add( "objectClass" );
         indexedAttributes.add( "ou" );
         indexedAttributes.add( "uid" );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/MutablePartitionConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/MutablePartitionConfiguration.java?view=diff&rev=501193&r1=501192&r2=501193
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/MutablePartitionConfiguration.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/MutablePartitionConfiguration.java
Mon Jan 29 13:52:41 2007
@@ -51,7 +51,7 @@
     }
 
 
-    public void setIndexedAttributes( Set<String> indexedAttributes )
+    public void setIndexedAttributes( Set<Object> indexedAttributes )
     {
         super.setIndexedAttributes( indexedAttributes );
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java?view=diff&rev=501193&r1=501192&r2=501193
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java
Mon Jan 29 13:52:41 2007
@@ -61,7 +61,7 @@
      */
     protected PartitionConfiguration()
     {
-        setIndexedAttributes( new HashSet<String>() );
+        setIndexedAttributes( new HashSet<Object>() );
     }
 
 
@@ -90,7 +90,7 @@
      * Returns the set of attribute type strings to create an index on.
      */
     @SuppressWarnings("unchecked")
-    public Set<String> getIndexedAttributes()
+    public Set<Object> getIndexedAttributes()
     {
         return ConfigurationUtil.getClonedSet( indexedAttributes );
     }
@@ -99,7 +99,7 @@
     /**
      * Sets the set of attribute type strings to create an index on.
      */
-    protected void setIndexedAttributes( Set<String> indexedAttributes )
+    protected void setIndexedAttributes( Set<Object> indexedAttributes )
     {
         this.indexedAttributes = indexedAttributes;
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?view=diff&rev=501193&r1=501192&r2=501193
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
Mon Jan 29 13:52:41 2007
@@ -278,13 +278,13 @@
             }
             
             // add all attribute oids of index configs to a hashset
-            Set<String> indices = systemCfg.getIndexedAttributes();
+            Set<Object> indices = systemCfg.getIndexedAttributes();
             Set<String> indexOids = new HashSet<String>();
             OidRegistry registry = factoryCfg.getRegistries().getOidRegistry();
             
-            for ( String index : indices )
+            for ( Object index : indices )
             {
-                indexOids.add( registry.getOid( index ) );
+                indexOids.add( registry.getOid( index.toString() ) );
             }
             
             if ( ! indexOids.contains( Oid.ALIAS ) )
@@ -732,7 +732,7 @@
     /**
      * @see Partition#search(org.apache.directory.shared.ldap.name.LdapDN,java.util.Map,org.apache.directory.shared.ldap.filter.ExprNode,javax.naming.directory.SearchControls)
      */
-    public NamingEnumeration search( LdapDN base, Map env, ExprNode filter, SearchControls
searchCtls )
+    public NamingEnumeration<SearchResult> search( LdapDN base, Map env, ExprNode filter,
SearchControls searchCtls )
         throws NamingException
     {
 

Modified: directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/MiscTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/MiscTest.java?view=diff&rev=501193&r1=501192&r2=501193
==============================================================================
--- directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/MiscTest.java
(original)
+++ directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/MiscTest.java
Mon Jan 29 13:52:41 2007
@@ -86,7 +86,7 @@
         }
         else if ( this.getName().equals( "testUserAuthOnMixedCaseSuffix" ) )
         {
-            Set<PartitionConfiguration> partitions = new HashSet();
+            Set<PartitionConfiguration> partitions = new HashSet<PartitionConfiguration>();
             partitions.addAll( configuration.getPartitionConfigurations() );
             MutablePartitionConfiguration partition = new MutablePartitionConfiguration();
             partition.setSuffix( "dc=aPache,dc=org" );
@@ -97,7 +97,7 @@
             oc.add( "domain" );
             partition.setName( "apache" );
             partition.setContextEntry( entry );
-            partition.setIndexedAttributes( Collections.singleton( "dc" ) );
+            partition.setIndexedAttributes( Collections.singleton( ( Object ) "dc" ) );
             partitions.add( partition );
             configuration.setPartitionConfigurations( partitions );
         }
@@ -118,7 +118,7 @@
             oc.add( "domain" );
             partition.setName( "apache" );
             partition.setContextEntry( entry );
-            partition.setIndexedAttributes( Collections.singleton( "dc" ) );
+            partition.setIndexedAttributes( Collections.singleton( ( Object ) "dc" ) );
             partitions.add( partition );
             configuration.setPartitionConfigurations( partitions );
         }



Mime
View raw message