directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r433164 - in /directory/branches/apacheds/1.0: core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceITest.java core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
Date Mon, 21 Aug 2006 06:12:17 GMT
Author: akarasulu
Date: Sun Aug 20 23:12:16 2006
New Revision: 433164

URL: http://svn.apache.org/viewvc?rev=433164&view=rev
Log:
rolling back fix for DIRSERVER-708

Modified:
    directory/branches/apacheds/1.0/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceITest.java
    directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java

Modified: directory/branches/apacheds/1.0/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceITest.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceITest.java?rev=433164&r1=433163&r2=433164&view=diff
==============================================================================
--- directory/branches/apacheds/1.0/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceITest.java
(original)
+++ directory/branches/apacheds/1.0/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceITest.java
Sun Aug 20 23:12:16 2006
@@ -60,6 +60,10 @@
         Attribute objectClass = new LockableAttributeImpl( "objectClass" );
         objectClass.add( "top" );
         objectClass.add( "subentry" );
+//        objectClass.add( SubentryService.AUTONOUMOUS_AREA_SUBENTRY_OC );
+//        objectClass.add( SubentryService.COLLECTIVE_SUBENTRY_OC );
+//        objectClass.add( SubentryService.SCHEMA_SUBENTRY_OC );
+        objectClass.add( SubentryService.AC_SUBENTRY_OC );
         subentry.put( objectClass );
         subentry.put( "subtreeSpecification", "{ base \"ou=configuration\" }" );
         subentry.put( "cn", "testsubentry" );
@@ -73,6 +77,10 @@
         Attribute objectClass = new LockableAttributeImpl( "objectClass" );
         objectClass.add( "top" );
         objectClass.add( "subentry" );
+//        objectClass.add( SubentryService.AUTONOUMOUS_AREA_SUBENTRY_OC );
+//        objectClass.add( SubentryService.COLLECTIVE_SUBENTRY_OC );
+//        objectClass.add( SubentryService.SCHEMA_SUBENTRY_OC );
+        objectClass.add( SubentryService.AC_SUBENTRY_OC );
         subentry.put( objectClass );
         String spec = "{ base \"ou=configuration\", specificExclusions { chopBefore:\"cn=unmarked\"
} }";
         subentry.put( "subtreeSpecification", spec );

Modified: directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java?rev=433164&r1=433163&r2=433164&view=diff
==============================================================================
--- directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
(original)
+++ directory/branches/apacheds/1.0/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
Sun Aug 20 23:12:16 2006
@@ -77,16 +77,16 @@
 
     public static final String AUTONOUMOUS_AREA = "autonomousArea";
     public static final String AUTONOUMOUS_AREA_SUBENTRY = "autonomousAreaSubentry";
-    private static final Object AUTONOUMOUS_AREA_SUBENTRY_OC = "autonomousAreaSubentry";
+    public static final Object AUTONOUMOUS_AREA_SUBENTRY_OC = "autonomousAreaSubentry";
 
     public static final String AC_AREA = "accessControlSpecificArea";
     public static final String AC_INNERAREA = "accessControlInnerArea";
     public static final String AC_SUBENTRY = "accessControlSubentries";
-    private static final String AC_SUBENTRY_OC = "accessControlSubentry";
+    public static final String AC_SUBENTRY_OC = "accessControlSubentry";
 
     public static final String SCHEMA_AREA = "subschemaAdminSpecificArea";
     public static final String SCHEMA_AREA_SUBENTRY = "subschemaSubentry";
-    private static final String SCHEMA_SUBENTRY_OC = "subschema";
+    public static final String SCHEMA_SUBENTRY_OC = "subschema";
 
     public static final String COLLECTIVE_AREA = "collectiveAttributeSpecificArea";
     public static final String COLLECTIVE_ATTRIBUTE_SUBENTRIES = "collectiveAttributeSubentries";



Mime
View raw message