directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1083463 - in /directory/apacheds/branches/akarasulu: core-api/src/main/java/org/apache/directory/server/core/schema/ core-integ/src/test/java/org/apache/directory/server/core/schema/ core-integ/src/test/resources/org/apache/directory/serve...
Date Sun, 20 Mar 2011 15:09:42 GMT
Author: akarasulu
Date: Sun Mar 20 15:09:42 2011
New Revision: 1083463

URL: http://svn.apache.org/viewvc?rev=1083463&view=rev
Log:
fixed compilation errors and bytecode for schema tests and all pass

Modified:
    directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
    directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
    directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
    directory/apacheds/branches/akarasulu/core-integ/src/test/resources/org/apache/directory/server/core/schema/DummyComparator.bytecode
    directory/apacheds/branches/akarasulu/core-integ/src/test/resources/org/apache/directory/server/core/schema/DummyNormalizer.bytecode
    directory/apacheds/branches/akarasulu/core-integ/src/test/resources/org/apache/directory/server/core/schema/DummySyntaxChecker.bytecode
    directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
    directory/apacheds/branches/akarasulu/server-integ/src/test/resources/org/apache/directory/server/core/schema/DummyComparator.bytecode
    directory/apacheds/branches/akarasulu/server-integ/src/test/resources/org/apache/directory/server/core/schema/DummyNormalizer.bytecode
    directory/apacheds/branches/akarasulu/server-integ/src/test/resources/org/apache/directory/server/core/schema/DummySyntaxChecker.bytecode

Modified: directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java?rev=1083463&r1=1083462&r2=1083463&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
(original)
+++ directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
Sun Mar 20 15:09:42 2011
@@ -35,7 +35,9 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.DITContentRule;
 import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
+import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntax;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRule;
 import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
 import org.apache.directory.shared.ldap.model.schema.NameForm;
@@ -422,20 +424,20 @@ public class DescriptionParsers
      * @return the set of Syntax objects for the descriptions 
      * @throws org.apache.directory.shared.ldap.model.exception.LdapException if there are
problems parsing the descriptions
      */
-    public MutableLdapSyntaxImpl[] parseLdapSyntaxes( EntryAttribute attr ) throws LdapException
+    public MutableLdapSyntax[] parseLdapSyntaxes( EntryAttribute attr ) throws LdapException
     {
         if ( attr == null || attr.size() == 0 )
         {
             return EMPTY_SYNTAXES;
         }
 
-        MutableLdapSyntaxImpl[] syntaxes = new MutableLdapSyntaxImpl[attr.size()];
+        MutableLdapSyntax[] syntaxes = new MutableLdapSyntaxImpl[attr.size()];
 
         int pos = 0;
 
         for ( Value<?> value : attr )
         {
-            MutableLdapSyntaxImpl ldapSyntax = null;
+            MutableLdapSyntax ldapSyntax = null;
 
             try
             {
@@ -471,20 +473,20 @@ public class DescriptionParsers
      * @return the set of matchingRule objects for the descriptions 
      * @throws LdapException if there are problems parsing the descriptions
      */
-    public MutableMatchingRuleImpl[] parseMatchingRules( EntryAttribute attr ) throws LdapException
+    public MutableMatchingRule[] parseMatchingRules( EntryAttribute attr ) throws LdapException
     {
         if ( attr == null || attr.size() == 0 )
         {
             return EMPTY_MATCHING_RULES;
         }
 
-        MutableMatchingRuleImpl[] matchingRules = new MutableMatchingRuleImpl[attr.size()];
+        MutableMatchingRule[] matchingRules = new MutableMatchingRuleImpl[attr.size()];
 
         int pos = 0;
 
         for ( Value<?> value : attr )
         {
-            MutableMatchingRuleImpl matchingRule = null;
+            MutableMatchingRule matchingRule = null;
 
             try
             {
@@ -648,7 +650,7 @@ public class DescriptionParsers
      * @param desc the ldapSyntax 
      * @return true if the syntax is human readable, false otherwise
      */
-    private boolean isHumanReadable( MutableLdapSyntaxImpl ldapSyntax )
+    private boolean isHumanReadable( MutableLdapSyntax ldapSyntax )
     {
         List<String> values = ldapSyntax.getExtensions().get( MetaSchemaConstants.X_IS_HUMAN_READABLE
);
 

Modified: directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java?rev=1083463&r1=1083462&r2=1083463&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
(original)
+++ directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
Sun Mar 20 15:09:42 2011
@@ -75,6 +75,8 @@ public class MetaComparatorHandlerIT ext
 
     class DummyMR extends MutableMatchingRuleImpl
     {
+        private static final long serialVersionUID = 663235361551754739L;
+
         public DummyMR()
         {
             super( OID );

Modified: directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=1083463&r1=1083462&r2=1083463&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
(original)
+++ directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
Sun Mar 20 15:09:42 2011
@@ -70,8 +70,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
+import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntax;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRule;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
@@ -737,7 +737,7 @@ public class SubschemaSubentryIT extends
 
         Attributes attrs = getSubschemaSubentryAttributes();
         Attribute attrTypes = attrs.get( "ldapSyntaxes" );
-        MutableLdapSyntaxImpl ldapSyntax = null;
+        MutableLdapSyntax ldapSyntax = null;
 
         for ( int ii = 0; ii < attrTypes.size(); ii++ )
         {
@@ -906,7 +906,7 @@ public class SubschemaSubentryIT extends
 
         Attributes attrs = getSubschemaSubentryAttributes();
         Attribute attrTypes = attrs.get( "matchingRules" );
-        MutableMatchingRuleImpl matchingRule = null;
+        MutableMatchingRule matchingRule = null;
 
         for ( int ii = 0; ii < attrTypes.size(); ii++ )
         {

Modified: directory/apacheds/branches/akarasulu/core-integ/src/test/resources/org/apache/directory/server/core/schema/DummyComparator.bytecode
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-integ/src/test/resources/org/apache/directory/server/core/schema/DummyComparator.bytecode?rev=1083463&r1=1083462&r2=1083463&view=diff
==============================================================================
Binary files - no diff available.

Modified: directory/apacheds/branches/akarasulu/core-integ/src/test/resources/org/apache/directory/server/core/schema/DummyNormalizer.bytecode
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-integ/src/test/resources/org/apache/directory/server/core/schema/DummyNormalizer.bytecode?rev=1083463&r1=1083462&r2=1083463&view=diff
==============================================================================
Binary files - no diff available.

Modified: directory/apacheds/branches/akarasulu/core-integ/src/test/resources/org/apache/directory/server/core/schema/DummySyntaxChecker.bytecode
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-integ/src/test/resources/org/apache/directory/server/core/schema/DummySyntaxChecker.bytecode?rev=1083463&r1=1083462&r2=1083463&view=diff
==============================================================================
Binary files - no diff available.

Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java?rev=1083463&r1=1083462&r2=1083463&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
(original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
Sun Mar 20 15:09:42 2011
@@ -37,8 +37,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.DITContentRule;
 import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
-import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
+import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntax;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRule;
 import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
 import org.apache.directory.shared.ldap.model.schema.NameForm;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -236,9 +236,9 @@ public class SchemaSubentryManager
                 break;
                 
             case( SYNTAX_INDEX ):
-                MutableLdapSyntaxImpl[] syntaxes = parsers.parseLdapSyntaxes( mods );
+                MutableLdapSyntax[] syntaxes = parsers.parseLdapSyntaxes( mods );
                 
-                for ( MutableLdapSyntaxImpl syntax : syntaxes )
+                for ( MutableLdapSyntax syntax : syntaxes )
                 {
                     subentryModifier.deleteSchemaObject( modifyContext, syntax );
                 }
@@ -246,9 +246,9 @@ public class SchemaSubentryManager
                 break;
                 
             case( MATCHING_RULE_INDEX ):
-                MutableMatchingRuleImpl[] mrs = parsers.parseMatchingRules( mods );
+                MutableMatchingRule[] mrs = parsers.parseMatchingRules( mods );
                 
-                for ( MutableMatchingRuleImpl mr : mrs )
+                for ( MutableMatchingRule mr : mrs )
                 {
                     subentryModifier.deleteSchemaObject( modifyContext, mr );
                 }
@@ -374,9 +374,9 @@ public class SchemaSubentryManager
                 break;
                 
             case( SYNTAX_INDEX ):
-                MutableLdapSyntaxImpl[] syntaxes = parsers.parseLdapSyntaxes( mods );
+                MutableLdapSyntax[] syntaxes = parsers.parseLdapSyntaxes( mods );
                 
-                for ( MutableLdapSyntaxImpl syntax : syntaxes )
+                for ( MutableLdapSyntax syntax : syntaxes )
                 {
                     subentryModifier.addSchemaObject( modifyContext, syntax );
                 }
@@ -384,9 +384,9 @@ public class SchemaSubentryManager
                 break;
                 
             case( MATCHING_RULE_INDEX ):
-                MutableMatchingRuleImpl[] mrs = parsers.parseMatchingRules( mods );
+                MutableMatchingRule[] mrs = parsers.parseMatchingRules( mods );
                 
-                for ( MutableMatchingRuleImpl mr : mrs )
+                for ( MutableMatchingRule mr : mrs )
                 {
                     subentryModifier.addSchemaObject( modifyContext, mr );
                 }

Modified: directory/apacheds/branches/akarasulu/server-integ/src/test/resources/org/apache/directory/server/core/schema/DummyComparator.bytecode
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/server-integ/src/test/resources/org/apache/directory/server/core/schema/DummyComparator.bytecode?rev=1083463&r1=1083462&r2=1083463&view=diff
==============================================================================
Binary files - no diff available.

Modified: directory/apacheds/branches/akarasulu/server-integ/src/test/resources/org/apache/directory/server/core/schema/DummyNormalizer.bytecode
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/server-integ/src/test/resources/org/apache/directory/server/core/schema/DummyNormalizer.bytecode?rev=1083463&r1=1083462&r2=1083463&view=diff
==============================================================================
Binary files - no diff available.

Modified: directory/apacheds/branches/akarasulu/server-integ/src/test/resources/org/apache/directory/server/core/schema/DummySyntaxChecker.bytecode
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/server-integ/src/test/resources/org/apache/directory/server/core/schema/DummySyntaxChecker.bytecode?rev=1083463&r1=1083462&r2=1083463&view=diff
==============================================================================
Binary files - no diff available.



Mime
View raw message