From commits-return-14658-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Mon Jul 23 01:02:46 2007 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 13188 invoked from network); 23 Jul 2007 01:02:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Jul 2007 01:02:45 -0000 Received: (qmail 99202 invoked by uid 500); 23 Jul 2007 01:02:46 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 99145 invoked by uid 500); 23 Jul 2007 01:02:46 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 99134 invoked by uid 99); 23 Jul 2007 01:02:46 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jul 2007 18:02:46 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jul 2007 18:02:43 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id DA7F01A981A; Sun, 22 Jul 2007 18:02:22 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r558576 - in /directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l: annotations/attribute/ descriptions/ Date: Mon, 23 Jul 2007 01:02:21 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070723010222.DA7F01A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Sun Jul 22 18:02:18 2007 New Revision: 558576 URL: http://svn.apache.org/viewvc?view=rev&rev=558576 Log: rename of pkg Added: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/ directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/IgnoreBeanProperty.java (with props) directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeAliases.java (with props) directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeCollective.java (with props) directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeDescription.java (with props) directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeEqualityMatch.java (with props) directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeExists.java (with props) directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeNotUserModifiable.java (with props) directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeObsolete.java (with props) directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeOid.java (with props) directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeOrderingMatch.java (with props) directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeRequired.java (with props) directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSchemaExtension.java (with props) directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSchemaExtensions.java (with props) directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSubstringMatch.java (with props) directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSuperType.java (with props) directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSyntax.java (with props) directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeUsage.java (with props) Modified: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/descriptions/AttributeToPropertyMapping.java directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/descriptions/AttributeTypeExtractor.java Added: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/IgnoreBeanProperty.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/IgnoreBeanProperty.java?view=auto&rev=558576 ============================================================================== --- directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/IgnoreBeanProperty.java (added) +++ directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/IgnoreBeanProperty.java Sun Jul 22 18:02:18 2007 @@ -0,0 +1,40 @@ +/* + * 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.j2l.annotations.attribute; + + +import java.lang.annotation.*; + + +/** + * A marker annotation telling the J2L subsystem to ignore a bean property + * all together. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +@Documented +@Inherited +@Retention( RetentionPolicy.RUNTIME ) +@Target( ElementType.METHOD ) +public @interface IgnoreBeanProperty +{ + String value(); +} Propchange: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/IgnoreBeanProperty.java ------------------------------------------------------------------------------ svn:executable = * Added: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeAliases.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeAliases.java?view=auto&rev=558576 ============================================================================== --- directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeAliases.java (added) +++ directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeAliases.java Sun Jul 22 18:02:18 2007 @@ -0,0 +1,37 @@ +/* + * 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.j2l.annotations.attribute; + +import java.lang.annotation.*; + +/** + * Overrides the default mechanism for assigning aliases to generated + * attributeType definition. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +@Inherited +@Retention(RetentionPolicy.RUNTIME) +@Target( ElementType.METHOD ) +public @interface LdapAttributeAliases +{ + String[] value(); +} Propchange: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeAliases.java ------------------------------------------------------------------------------ svn:executable = * Added: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeCollective.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeCollective.java?view=auto&rev=558576 ============================================================================== --- directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeCollective.java (added) +++ directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeCollective.java Sun Jul 22 18:02:18 2007 @@ -0,0 +1,36 @@ +/* + * 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.j2l.annotations.attribute; + +import java.lang.annotation.*; + +/** + * Overrides default by setting an attributeType as collective. By + * default all generated attributeTypes are not collective. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +@Inherited +@Retention( RetentionPolicy.RUNTIME ) +@Target( ElementType.METHOD ) +public @interface LdapAttributeCollective +{ +} Propchange: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeCollective.java ------------------------------------------------------------------------------ svn:executable = * Added: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeDescription.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeDescription.java?view=auto&rev=558576 ============================================================================== --- directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeDescription.java (added) +++ directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeDescription.java Sun Jul 22 18:02:18 2007 @@ -0,0 +1,37 @@ +/* + * 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.j2l.annotations.attribute; + +import java.lang.annotation.*; + +/** + * Used for a custom LDAP description. Would be nice to be able to use the + * JavaDoc for the property but I don't know if this is possible. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +@Inherited +@Retention ( RetentionPolicy.RUNTIME ) +@Target ( ElementType.METHOD ) +public @interface LdapAttributeDescription +{ + String value(); +} Propchange: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeDescription.java ------------------------------------------------------------------------------ svn:executable = * Added: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeEqualityMatch.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeEqualityMatch.java?view=auto&rev=558576 ============================================================================== --- directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeEqualityMatch.java (added) +++ directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeEqualityMatch.java Sun Jul 22 18:02:18 2007 @@ -0,0 +1,39 @@ +/* + * 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.j2l.annotations.attribute; + +import java.lang.annotation.*; + +/** + * An override equality MatchingRule to use for a specific attributeType if it + * is different from the default matchingRule associated with the property's + * data type. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +@Documented +@Inherited +@Retention ( RetentionPolicy.RUNTIME ) +@Target( ElementType.METHOD ) +public @interface LdapAttributeEqualityMatch +{ + String value(); +} Propchange: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeEqualityMatch.java ------------------------------------------------------------------------------ svn:executable = * Added: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeExists.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeExists.java?view=auto&rev=558576 ============================================================================== --- directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeExists.java (added) +++ directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeExists.java Sun Jul 22 18:02:18 2007 @@ -0,0 +1,34 @@ +/* + * 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.j2l.annotations.attribute; + +import java.lang.annotation.*; + +/** + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +@Inherited +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +public @interface LdapAttributeExists +{ +} Propchange: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeExists.java ------------------------------------------------------------------------------ svn:executable = * Added: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeNotUserModifiable.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeNotUserModifiable.java?view=auto&rev=558576 ============================================================================== --- directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeNotUserModifiable.java (added) +++ directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeNotUserModifiable.java Sun Jul 22 18:02:18 2007 @@ -0,0 +1,37 @@ +/* + * 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.j2l.annotations.attribute; + +import java.lang.annotation.*; + +/** + * Overrides default by setting an attributeType as NOT modifiable + * by the user. By default all generated attributeTypes are user + * modifiable. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +@Inherited +@Retention( RetentionPolicy.RUNTIME ) +@Target( ElementType.METHOD ) +public @interface LdapAttributeNotUserModifiable +{ +} Propchange: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeNotUserModifiable.java ------------------------------------------------------------------------------ svn:executable = * Added: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeObsolete.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeObsolete.java?view=auto&rev=558576 ============================================================================== --- directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeObsolete.java (added) +++ directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeObsolete.java Sun Jul 22 18:02:18 2007 @@ -0,0 +1,35 @@ +/* + * 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.j2l.annotations.attribute; + +import java.lang.annotation.*; + +/** + * Overrides default by setting an attributeType as collective. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +@Inherited +@Retention( RetentionPolicy.RUNTIME ) +@Target( ElementType.METHOD ) +public @interface LdapAttributeObsolete +{ +} Propchange: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeObsolete.java ------------------------------------------------------------------------------ svn:executable = * Added: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeOid.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeOid.java?view=auto&rev=558576 ============================================================================== --- directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeOid.java (added) +++ directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeOid.java Sun Jul 22 18:02:18 2007 @@ -0,0 +1,40 @@ +/* + * 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.j2l.annotations.attribute; + +import java.lang.annotation.*; + +/** + * Overrides the default OID assignment mechanism to set the numeric + * OID of the new attributeType explicitly. By default the J2L system + * automatically and sequencially generates OIDs for new attributeTypes + * using a base OID along with a schema specific branch off that OID base. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +@Documented +@Inherited +@Retention( RetentionPolicy.RUNTIME ) +@Target( ElementType.METHOD ) +public @interface LdapAttributeOid +{ + String value(); +} Propchange: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeOid.java ------------------------------------------------------------------------------ svn:executable = * Added: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeOrderingMatch.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeOrderingMatch.java?view=auto&rev=558576 ============================================================================== --- directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeOrderingMatch.java (added) +++ directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeOrderingMatch.java Sun Jul 22 18:02:18 2007 @@ -0,0 +1,39 @@ +/* + * 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.j2l.annotations.attribute; + +import java.lang.annotation.*; + +/** + * An override ordering MatchingRule to use for a specific attributeType if it + * is different from the default matchingRule associated with the property's + * data type. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +@Documented +@Inherited +@Retention( RetentionPolicy.RUNTIME ) +@Target( ElementType.METHOD ) +public @interface LdapAttributeOrderingMatch +{ + String value(); +} Propchange: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeOrderingMatch.java ------------------------------------------------------------------------------ svn:executable = * Added: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeRequired.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeRequired.java?view=auto&rev=558576 ============================================================================== --- directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeRequired.java (added) +++ directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeRequired.java Sun Jul 22 18:02:18 2007 @@ -0,0 +1,38 @@ +/* + * 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.j2l.annotations.attribute; + +import java.lang.annotation.*; + +/** + * Used to indicate that an attributeType corresponding to a java + * property is required and therefore should be in the MUST list + * of the objectClass for the bean class. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +@Documented +@Inherited +@Retention( RetentionPolicy.RUNTIME ) +@Target( ElementType.METHOD ) +public @interface LdapAttributeRequired +{ +} Propchange: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeRequired.java ------------------------------------------------------------------------------ svn:executable = * Added: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSchemaExtension.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSchemaExtension.java?view=auto&rev=558576 ============================================================================== --- directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSchemaExtension.java (added) +++ directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSchemaExtension.java Sun Jul 22 18:02:18 2007 @@ -0,0 +1,37 @@ +/* + * 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.j2l.annotations.attribute; + +import java.lang.annotation.*; + +/** + * Used to specify a schema extension and values for an attributeType. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +@Inherited +@Retention( RetentionPolicy.RUNTIME) +@Target( ElementType.METHOD ) +public @interface LdapAttributeSchemaExtension +{ + String name(); + String[] values(); +} Propchange: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSchemaExtension.java ------------------------------------------------------------------------------ svn:executable = * Added: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSchemaExtensions.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSchemaExtensions.java?view=auto&rev=558576 ============================================================================== --- directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSchemaExtensions.java (added) +++ directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSchemaExtensions.java Sun Jul 22 18:02:18 2007 @@ -0,0 +1,38 @@ +/* + * 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.j2l.annotations.attribute; + +import java.lang.annotation.*; + +/** + * Used to override schema extensions for an attributeType. An array of + * LdapAttributeSchemaExtension objects must be given as the value. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +@Documented +@Inherited +@Retention( RetentionPolicy.RUNTIME) +@Target( ElementType.METHOD ) +public @interface LdapAttributeSchemaExtensions +{ + LdapAttributeSchemaExtension[] value(); +} Propchange: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSchemaExtensions.java ------------------------------------------------------------------------------ svn:executable = * Added: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSubstringMatch.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSubstringMatch.java?view=auto&rev=558576 ============================================================================== --- directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSubstringMatch.java (added) +++ directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSubstringMatch.java Sun Jul 22 18:02:18 2007 @@ -0,0 +1,39 @@ +/* + * 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.j2l.annotations.attribute; + +import java.lang.annotation.*; + +/** + * An override substring MatchingRule to use for a specific attributeType if it + * is different from the default matchingRule associated with the property's + * data type. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +@Documented +@Inherited +@Retention( RetentionPolicy.RUNTIME ) +@Target( ElementType.METHOD ) +public @interface LdapAttributeSubstringMatch +{ + String value(); +} Propchange: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSubstringMatch.java ------------------------------------------------------------------------------ svn:executable = * Added: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSuperType.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSuperType.java?view=auto&rev=558576 ============================================================================== --- directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSuperType.java (added) +++ directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSuperType.java Sun Jul 22 18:02:18 2007 @@ -0,0 +1,37 @@ +/* + * 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.j2l.annotations.attribute; + +import java.lang.annotation.*; + +/** + * Used to specify a superType for an attributeType. By default newly + * created attributeType descriptions do not have a superType associated. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +@Inherited +@Retention( RetentionPolicy.RUNTIME ) +@Target( ElementType.METHOD ) +public @interface LdapAttributeSuperType +{ + String value(); +} Propchange: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSuperType.java ------------------------------------------------------------------------------ svn:executable = * Added: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSyntax.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSyntax.java?view=auto&rev=558576 ============================================================================== --- directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSyntax.java (added) +++ directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSyntax.java Sun Jul 22 18:02:18 2007 @@ -0,0 +1,37 @@ +/* + * 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.j2l.annotations.attribute; + +import java.lang.annotation.*; + +/** + * Used to override the default algorithm used to assign a syntax to + * generated attributeType descriptions. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +@Inherited +@Retention( RetentionPolicy.RUNTIME ) +@Target( ElementType.METHOD ) +public @interface LdapAttributeSyntax +{ + String value(); +} Propchange: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeSyntax.java ------------------------------------------------------------------------------ svn:executable = * Added: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeUsage.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeUsage.java?view=auto&rev=558576 ============================================================================== --- directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeUsage.java (added) +++ directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeUsage.java Sun Jul 22 18:02:18 2007 @@ -0,0 +1,40 @@ +/* + * 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.j2l.annotations.attribute; + +import org.apache.directory.shared.ldap.schema.UsageEnum; + +import java.lang.annotation.*; + +/** + * Overriding usage information about the attributeType which by default is + * considered a USER_APPLICATIONS attributeType. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +@Documented +@Inherited +@Retention( RetentionPolicy.RUNTIME ) +@Target( ElementType.METHOD ) +public @interface LdapAttributeUsage +{ + UsageEnum value(); +} Propchange: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/annotations/attribute/LdapAttributeUsage.java ------------------------------------------------------------------------------ svn:executable = * Modified: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/descriptions/AttributeToPropertyMapping.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/descriptions/AttributeToPropertyMapping.java?view=diff&rev=558576&r1=558575&r2=558576 ============================================================================== --- directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/descriptions/AttributeToPropertyMapping.java (original) +++ directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/descriptions/AttributeToPropertyMapping.java Sun Jul 22 18:02:18 2007 @@ -48,6 +48,7 @@ private DynaClass dynaClass; private DynaProperty dynaProperty; private PrimitiveMapping primitiveMapping; + private List annotations; public AttributeToPropertyMapping( J2LConfiguration configuration ) @@ -58,6 +59,11 @@ public boolean hasAnnotations() { + if ( annotations != null ) + { + return annotations.size() > 0; + } + return ( getter != null && getter.getAnnotations() != null && getter.getAnnotations().length > 0 ) || ( setter != null && setter.getAnnotations() != null && setter.getAnnotations().length > 0 ); } @@ -65,14 +71,17 @@ public List getAllPropertyAnnotations() { - List annotations = new ArrayList(); - if ( getter != null && getter.getAnnotations() != null && getter.getAnnotations().length > 0 ) - { - CollectionUtils.addAll( annotations, getter.getAnnotations() ); - } - if ( setter != null && setter.getAnnotations() != null && setter.getAnnotations().length > 0 ) + if ( annotations == null ) { - CollectionUtils.addAll( annotations, setter.getAnnotations() ); + annotations = new ArrayList(); + if ( getter != null && getter.getAnnotations() != null && getter.getAnnotations().length > 0 ) + { + CollectionUtils.addAll( annotations, getter.getAnnotations() ); + } + if ( setter != null && setter.getAnnotations() != null && setter.getAnnotations().length > 0 ) + { + CollectionUtils.addAll( annotations, setter.getAnnotations() ); + } } return annotations; @@ -111,6 +120,7 @@ public void setSetter( Method setter ) { + this.annotations = null; this.setter = setter; } @@ -123,6 +133,7 @@ public void setGetter( Method getter ) { + this.annotations = null; this.getter = getter; } Modified: directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/descriptions/AttributeTypeExtractor.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/descriptions/AttributeTypeExtractor.java?view=diff&rev=558576&r1=558575&r2=558576 ============================================================================== --- directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/descriptions/AttributeTypeExtractor.java (original) +++ directory/sandbox/akarasulu/j2l/trunk/runtime/src/main/java/org/apache/directory/j2l/descriptions/AttributeTypeExtractor.java Sun Jul 22 18:02:18 2007 @@ -98,6 +98,11 @@ private void applyAnnotationsToAttributeTypeDescription( AttributeToPropertyMapping mapping ) { + List annotations = mapping.getAllPropertyAnnotations(); + for ( Annotation annotation : annotations ) + { + if ( annotation instanceof ) + } }