directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r808360 - in /directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema: ./ syntaxes/
Date Thu, 27 Aug 2009 10:42:00 GMT
Author: elecharny
Date: Thu Aug 27 10:41:59 2009
New Revision: 808360

URL: http://svn.apache.org/viewvc?rev=808360&view=rev
Log:
Fixed compilation errors, removed useless classes

Added:
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NameOrNumericIdSyntax.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NumberSyntax.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/ObjectClassTypeSyntax.java
Removed:
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/AbstractAttributeType.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/AbstractMatchingRule.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/AbstractSchemaObject.java
Modified:
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DescriptionUtils.java

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DescriptionUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DescriptionUtils.java?rev=808360&r1=808359&r2=808360&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DescriptionUtils.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DescriptionUtils.java
Thu Aug 27 10:41:59 2009
@@ -538,9 +538,9 @@
             buf.append( '\n' );
         }
 
-        ObjectClass[] sups = objectClass.getSuperClasses();
+        List<ObjectClass> sups = objectClass.getSuperiors();
 
-        if ( sups != null && sups.length > 0 )
+        if ( ( sups != null ) && ( sups.size() > 0 ) )
         {
             buf.append( "SUP\n" );
             
@@ -558,8 +558,9 @@
             buf.append( '\n' );
         }
 
-        AttributeType[] must = objectClass.getMustList();
-        if ( must != null && must.length > 0 )
+        List<AttributeType> must = objectClass.getMustAttributeTypes();
+        
+        if ( ( must != null ) && ( must.size() > 0 ) )
         {
             buf.append( "MUST\n" );
             
@@ -571,9 +572,9 @@
             }
         }
 
-        AttributeType[] may = objectClass.getMayList();
+        List<AttributeType> may = objectClass.getMayAttributeTypes();
         
-        if ( may != null && may.length > 0 )
+        if ( ( may != null ) && ( may.size() > 0 ) )
         {
             buf.append( "MAY\n" );
 

Added: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NameOrNumericIdSyntax.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NameOrNumericIdSyntax.java?rev=808360&view=auto
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NameOrNumericIdSyntax.java
(added)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NameOrNumericIdSyntax.java
Thu Aug 27 10:41:59 2009
@@ -0,0 +1,51 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+package org.apache.directory.shared.ldap.schema.syntaxes;
+
+
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.schema.syntaxChecker.NumericOidSyntaxChecker;
+
+/**
+ * A Syntax for Name or Numeric OID
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class NameOrNumericIdSyntax extends LdapSyntax
+{
+    /** The serialVersionUID */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Creates a Syntax object for Name or Numeric OID. This is a ApacheMeta 
+     * Syntax.
+     */
+    public NameOrNumericIdSyntax()
+    {
+        super( SchemaConstants.NAME_OR_NUMERIC_ID_SYNTAX );
+        
+        setDescription( "The syntax for either numeric ids or names." );
+        setSyntaxChecker( new NumericOidSyntaxChecker() );
+        addName( "nameOrOid" );
+        setSchemaName( "apacheMeta" );
+    }
+}

Added: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NumberSyntax.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NumberSyntax.java?rev=808360&view=auto
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NumberSyntax.java
(added)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/NumberSyntax.java
Thu Aug 27 10:41:59 2009
@@ -0,0 +1,51 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+package org.apache.directory.shared.ldap.schema.syntaxes;
+
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.schema.syntaxChecker.NumericStringSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntaxChecker.ObjectClassTypeSyntaxChecker;
+
+/**
+ * A Syntax for Numbers
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class NumberSyntax extends LdapSyntax
+{
+    /** The serialVersionUID */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Creates a Syntax object for Numbers. This is a ApacheMeta 
+     * Syntax.
+     */
+    public NumberSyntax()
+    {
+        super( SchemaConstants.NUMBER_SYNTAX );
+        
+        setDescription( "The syntax for number strings." );
+        setSyntaxChecker( new NumericStringSyntaxChecker() );
+        addName( "number" );
+        setSchemaName( "apacheMeta" );
+    }
+}

Added: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/ObjectClassTypeSyntax.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/ObjectClassTypeSyntax.java?rev=808360&view=auto
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/ObjectClassTypeSyntax.java
(added)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntaxes/ObjectClassTypeSyntax.java
Thu Aug 27 10:41:59 2009
@@ -0,0 +1,50 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+package org.apache.directory.shared.ldap.schema.syntaxes;
+
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.schema.syntaxChecker.ObjectClassTypeSyntaxChecker;
+
+/**
+ * A Syntax for ObjectclassType
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class ObjectClassTypeSyntax extends LdapSyntax
+{
+    /** The serialVersionUID */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Creates a Syntax object for ObjectClass type. This is a ApacheMeta 
+     * Syntax.
+     */
+    public ObjectClassTypeSyntax()
+    {
+        super( SchemaConstants.OBJECT_CLASS_TYPE_SYNTAX );
+        
+        setDescription( "The syntax for ObjectClassType" );
+        setSyntaxChecker( new ObjectClassTypeSyntaxChecker() );
+        addName( "objectClassType" );
+        setSchemaName( "apacheMeta" );
+    }
+}



Mime
View raw message