directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ersi...@apache.org
Subject svn commit: r440071 - in /directory/trunks/apacheds/core/src/main: java/org/apache/directory/server/core/sp/LdapClassLoader.java schema/apache.schema
Date Mon, 04 Sep 2006 13:34:08 GMT
Author: ersiner
Date: Mon Sep  4 06:34:07 2006
New Revision: 440071

URL: http://svn.apache.org/viewvc?view=rev&rev=440071
Log:
Fixed schema naming conflict for JavaClassName.

Modified:
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
    directory/trunks/apacheds/core/src/main/schema/apache.schema

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java?view=diff&rev=440071&r1=440070&r2=440071
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
(original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
Mon Sep  4 06:34:07 2006
@@ -71,7 +71,7 @@
         byte[] classBytes = null;
         
         BranchNode filter = new BranchNode( BranchNode.AND );
-        filter.addNode( new SimpleNode( "javaClassName", name, LeafNode.EQUALITY ) );
+        filter.addNode( new SimpleNode( "fullyQualifiedJavaClassName", name, LeafNode.EQUALITY
) );
         filter.addNode( new SimpleNode( "objectClass", "javaClass", LeafNode.EQUALITY ) );
         
         SearchControls controls = new SearchControls();

Modified: directory/trunks/apacheds/core/src/main/schema/apache.schema
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/schema/apache.schema?view=diff&rev=440071&r1=440070&r2=440071
==============================================================================
--- directory/trunks/apacheds/core/src/main/schema/apache.schema (original)
+++ directory/trunks/apacheds/core/src/main/schema/apache.schema Mon Sep  4 06:34:07 2006
@@ -195,25 +195,8 @@
     STRUCTURAL
     MUST ( unixFilePath ) )
 
-#attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.21
-#    NAME 'fqcn'
-#    DESC 'The fully qualified class name of a java class'
-#	 EQUALITY caseExactIA5Match
-#	 SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
-#
-#attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.22
-#    NAME 'byteCode'
-#	 DESC 'The actual byte code for a java class'
-#	 SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 SINGLE-VALUE )
-#
-#objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.8
-#    NAME 'javaClass'
-#    SUP top
-#    STRUCTURAL
-#    MUST ( fqcn $ byteCode ) )
-
 attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.21
-    NAME 'javaClassName'
+    NAME 'fullyQualifiedJavaClassName'
     DESC 'The fully qualified name for a (Java) class'
 	 EQUALITY caseExactIA5Match
 	 SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
@@ -227,7 +210,7 @@
     NAME 'javaClass'
     SUP top
     STRUCTURAL
-    MUST ( javaClassName $ byjavaClassByteCodeteCode ) )
+    MUST ( fullyQualifiedJavaClassName $ javaClassByteCode ) )
 
 attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.23
     NAME 'classLoaderDefaultSearchContext'



Mime
View raw message