directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gokt...@apache.org
Subject svn commit: r1336637 - /directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/
Date Thu, 10 May 2012 12:25:02 GMT
Author: gokturk
Date: Thu May 10 12:25:01 2012
New Revision: 1336637

URL: http://svn.apache.org/viewvc?rev=1336637&view=rev
Log:
Comparators are updated to generate IPojo component definitions

Modified:
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectClassTypeComparator.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierComparator.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/TelephoneNumberComparator.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UuidComparator.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java?rev=1336637&r1=1336636&r2=1336637&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java
Thu May 10 12:25:01 2012
@@ -21,6 +21,8 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Property;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,6 +32,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@Component
 public class BitStringComparator extends LdapComparator<String>
 {
     /** The serial version UID */
@@ -43,7 +46,7 @@ public class BitStringComparator extends
      * The BitStringComparator constructor. Its OID is the IntegerOrderingMatch matching
      * rule OID.
      */
-    public BitStringComparator( String oid )
+    public BitStringComparator( @Property(name = "ads.comp.comparator.oid") String oid )
     {
         super( oid );
     }

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java?rev=1336637&r1=1336636&r2=1336637&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java
Thu May 10 12:25:01 2012
@@ -21,6 +21,8 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Property;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,6 +32,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@Component
 public class BooleanComparator extends LdapComparator<String>
 {
     /** The serial version UID */
@@ -43,7 +46,7 @@ public class BooleanComparator extends L
      * The BooleanComparator constructor. Its OID is the BooleanMatch matching
      * rule OID.
      */
-    public BooleanComparator( String oid )
+    public BooleanComparator( @Property(name = "ads.comp.comparator.oid") String oid )
     {
         super( oid );
     }

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java?rev=1336637&r1=1336636&r2=1336637&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java
Thu May 10 12:25:01 2012
@@ -22,6 +22,8 @@ package org.apache.directory.shared.ldap
 
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
 import org.apache.directory.shared.util.Strings;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Property;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,6 +33,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@Component
 public class ByteArrayComparator extends LdapComparator<byte[]>
 {
     /** The serial version UID */
@@ -44,7 +47,7 @@ public class ByteArrayComparator extends
      * The ByteArrayComparator constructor. Its OID is the OctetStringMatch matching
      * rule OID.
      */
-    public ByteArrayComparator( String oid )
+    public ByteArrayComparator( @Property(name = "ads.comp.comparator.oid") String oid )
     {
         super( oid );
     }

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java?rev=1336637&r1=1336636&r2=1336637&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java
Thu May 10 12:25:01 2012
@@ -22,6 +22,8 @@ package org.apache.directory.shared.ldap
 
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Property;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,6 +34,7 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @param <T> the type, must extend {@link Comparable}
  */
+@Component
 public class ComparableComparator<T> extends LdapComparator<Comparable<T>>
 {
     /** The serial version UID */
@@ -46,7 +49,7 @@ public class ComparableComparator<T> ext
      *
      * @param oid the comparator OID
      */
-    public ComparableComparator( String oid )
+    public ComparableComparator( @Property(name = "ads.comp.comparator.oid") String oid )
     {
         super( oid );
     }

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java?rev=1336637&r1=1336636&r2=1336637&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java
Thu May 10 12:25:01 2012
@@ -22,6 +22,8 @@ package org.apache.directory.shared.ldap
 
 import org.apache.directory.shared.ldap.model.entry.StringValue;
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Property;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,6 +39,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@Component
 public class CsnComparator extends LdapComparator<Object>
 {
     /** The serial version UID */
@@ -50,7 +53,7 @@ public class CsnComparator extends LdapC
      * The CsnComparator constructor. Its OID is the CsnMatch matching
      * rule OID.
      */
-    public CsnComparator( String oid )
+    public CsnComparator( @Property(name = "ads.comp.comparator.oid") String oid )
     {
         super( oid );
     }

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java?rev=1336637&r1=1336636&r2=1336637&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java
Thu May 10 12:25:01 2012
@@ -21,6 +21,8 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Property;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,6 +34,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@Component
 public class CsnSidComparator extends LdapComparator<String>
 {
     /** The serial version UID */
@@ -45,7 +48,7 @@ public class CsnSidComparator extends Ld
      * The CsnSidComparator constructor. Its OID is the CsnSidMatch matching
      * rule OID.
      */
-    public CsnSidComparator( String oid )
+    public CsnSidComparator( @Property(name = "ads.comp.comparator.oid") String oid )
     {
         super( oid );
     }

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java?rev=1336637&r1=1336636&r2=1336637&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java
Thu May 10 12:25:01 2012
@@ -22,6 +22,8 @@ package org.apache.directory.shared.ldap
 
 import org.apache.directory.shared.ldap.model.schema.normalizers.CachingNormalizer;
 import org.apache.directory.shared.ldap.model.schema.normalizers.DeepTrimNormalizer;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Property;
 
 
 /**
@@ -29,6 +31,7 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@Component
 public class DeepTrimCachingNormalizingComparator extends NormalizingComparator
 {
     /** The serial version UID */
@@ -37,7 +40,7 @@ public class DeepTrimCachingNormalizingC
 
     @SuppressWarnings(
         { "rawtypes", "unchecked" })
-    public DeepTrimCachingNormalizingComparator( String oid )
+    public DeepTrimCachingNormalizingComparator( @Property(name = "ads.comp.comparator.oid")
String oid )
     {
         super( oid, new CachingNormalizer( new DeepTrimNormalizer( oid ), 10 ),
             new ComparableComparator( oid ) );

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java?rev=1336637&r1=1336636&r2=1336637&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java
Thu May 10 12:25:01 2012
@@ -22,6 +22,8 @@ package org.apache.directory.shared.ldap
 
 import org.apache.directory.shared.ldap.model.schema.normalizers.CachingNormalizer;
 import org.apache.directory.shared.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Property;
 
 
 /**
@@ -29,6 +31,7 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@Component
 public class DeepTrimToLowerCachingNormalizingComparator extends NormalizingComparator
 {
     /** The serial version UID */
@@ -37,7 +40,7 @@ public class DeepTrimToLowerCachingNorma
 
     @SuppressWarnings(
         { "rawtypes", "unchecked" })
-    public DeepTrimToLowerCachingNormalizingComparator( String oid )
+    public DeepTrimToLowerCachingNormalizingComparator( @Property(name = "ads.comp.comparator.oid")
String oid )
     {
         super( oid, new CachingNormalizer( new DeepTrimToLowerNormalizer( oid ), 10 ),
             new ComparableComparator( oid ) );

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java?rev=1336637&r1=1336636&r2=1336637&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java
Thu May 10 12:25:01 2012
@@ -26,6 +26,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Property;
 
 
 /**
@@ -33,6 +35,7 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@Component
 public class DnComparator extends LdapComparator<Object>
 {
     /** The serial version UID */
@@ -42,7 +45,7 @@ public class DnComparator extends LdapCo
     private SchemaManager schemaManager;
 
 
-    public DnComparator( String oid )
+    public DnComparator( @Property(name = "ads.comp.comparator.oid") String oid )
     {
         super( oid );
     }

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java?rev=1336637&r1=1336636&r2=1336637&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java
Thu May 10 12:25:01 2012
@@ -27,6 +27,8 @@ import org.apache.directory.shared.i18n.
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
 import org.apache.directory.shared.ldap.model.schema.PrepareString;
 import org.apache.directory.shared.util.GeneralizedTime;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Property;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,6 +38,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@Component
 public class GeneralizedTimeComparator extends LdapComparator<String>
 {
     /** The serial version UID */
@@ -49,7 +52,7 @@ public class GeneralizedTimeComparator e
      * The GeneralizedTimeComparator constructor. Its OID is the
      * generalizedTimeOrderingMatch matching rule OID.
      */
-    public GeneralizedTimeComparator( String oid )
+    public GeneralizedTimeComparator( @Property(name = "ads.comp.comparator.oid") String
oid )
     {
         super( oid );
     }

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java?rev=1336637&r1=1336636&r2=1336637&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java
Thu May 10 12:25:01 2012
@@ -27,6 +27,8 @@ import java.math.BigInteger;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
 import org.apache.directory.shared.ldap.model.schema.PrepareString;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Property;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,6 +38,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@Component
 public class IntegerComparator extends LdapComparator<Object> implements Serializable
 {
     /** The serial version UID */
@@ -49,7 +52,7 @@ public class IntegerComparator extends L
      * The IntegerComparator constructor. Its OID is the IntegerOrderingMatch matching
      * rule OID.
      */
-    public IntegerComparator( String oid )
+    public IntegerComparator( @Property(name = "ads.comp.comparator.oid") String oid )
     {
         super( oid );
     }

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java?rev=1336637&r1=1336636&r2=1336637&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java
Thu May 10 12:25:01 2012
@@ -24,6 +24,8 @@ import java.io.Serializable;
 
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Property;
 
 
 /**
@@ -31,6 +33,7 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@Component
 public class LongComparator extends LdapComparator<Long> implements Serializable
 {
     /** The serial version UID */
@@ -41,7 +44,7 @@ public class LongComparator extends Ldap
      * The LongComparator constructor. Its OID is the IntegerOrderingMatch matching
      * rule OID.
      */
-    public LongComparator( String oid )
+    public LongComparator( @Property(name = "ads.comp.comparator.oid") String oid )
     {
         super( oid );
     }

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java?rev=1336637&r1=1336636&r2=1336637&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java
Thu May 10 12:25:01 2012
@@ -25,6 +25,8 @@ import java.io.IOException;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
 import org.apache.directory.shared.ldap.model.schema.PrepareString;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Property;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,6 +36,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@Component
 public class NumericStringComparator extends LdapComparator<String>
 {
     /** The serial version UID */
@@ -47,7 +50,7 @@ public class NumericStringComparator ext
      * The IntegerComparator constructor. Its OID is the numericStringOrderingMatch matching
      * rule OID.
      */
-    public NumericStringComparator( String oid )
+    public NumericStringComparator( @Property(name = "ads.comp.comparator.oid") String oid
)
     {
         super( oid );
     }

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectClassTypeComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectClassTypeComparator.java?rev=1336637&r1=1336636&r2=1336637&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectClassTypeComparator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectClassTypeComparator.java
Thu May 10 12:25:01 2012
@@ -22,6 +22,8 @@ package org.apache.directory.shared.ldap
 
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
 import org.apache.directory.shared.util.Strings;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Property;
 
 
 /**
@@ -30,13 +32,14 @@ import org.apache.directory.shared.util.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@Component
 public class ObjectClassTypeComparator<T> extends LdapComparator<T>
 {
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 
 
-    public ObjectClassTypeComparator( String oid )
+    public ObjectClassTypeComparator( @Property(name = "ads.comp.comparator.oid") String
oid )
     {
         super( oid );
     }

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierComparator.java?rev=1336637&r1=1336636&r2=1336637&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierComparator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierComparator.java
Thu May 10 12:25:01 2012
@@ -21,6 +21,8 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Property;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,6 +32,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@Component
 public class ObjectIdentifierComparator extends LdapComparator<Object>
 {
     /** The serial version UID */
@@ -43,7 +46,7 @@ public class ObjectIdentifierComparator 
      * The ObjectIdentifierComparator constructor. Its OID is the ObjectIdentifierMatch matching
      * rule OID.
      */
-    public ObjectIdentifierComparator( String oid )
+    public ObjectIdentifierComparator( @Property(name = "ads.comp.comparator.oid") String
oid )
     {
         super( oid );
     }

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java?rev=1336637&r1=1336636&r2=1336637&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java
Thu May 10 12:25:01 2012
@@ -24,6 +24,8 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
 import org.apache.directory.shared.util.Chars;
 import org.apache.directory.shared.util.Strings;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Property;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,6 +35,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@Component
 public class ObjectIdentifierFirstComponentComparator extends LdapComparator<String>
 {
     /** The serial version UID */
@@ -46,7 +49,7 @@ public class ObjectIdentifierFirstCompon
      * The ObjectIdentifierFirstComponentComparator constructor. Its OID is the 
      * ObjectIdentifierFirstComponentMatch matching rule OID.
      */
-    public ObjectIdentifierFirstComponentComparator( String oid )
+    public ObjectIdentifierFirstComponentComparator( @Property(name = "ads.comp.comparator.oid")
String oid )
     {
         super( oid );
     }

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java?rev=1336637&r1=1336636&r2=1336637&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java
Thu May 10 12:25:01 2012
@@ -27,6 +27,8 @@ import org.apache.directory.shared.i18n.
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Property;
 
 
 /**
@@ -36,6 +38,7 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@Component
 public class SerializableComparator<E> extends LdapComparator<E> implements Serializable
 {
     /** The serial version UID */
@@ -54,7 +57,7 @@ public class SerializableComparator<E> e
     // ------------------------------------------------------------------------
     // C O N T R U C T O R S
     // ------------------------------------------------------------------------
-    public SerializableComparator( String matchingRuleOid )
+    public SerializableComparator( @Property(name = "ads.comp.comparator.oid") String matchingRuleOid
)
     {
         super( matchingRuleOid );
         this.matchingRuleOid = matchingRuleOid;

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java?rev=1336637&r1=1336636&r2=1336637&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java
Thu May 10 12:25:01 2012
@@ -23,6 +23,8 @@ package org.apache.directory.shared.ldap
 import java.io.Serializable;
 
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Property;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,6 +34,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@Component
 public class StringComparator extends LdapComparator<String> implements Serializable
 {
     /** The serial version UID */
@@ -45,7 +48,7 @@ public class StringComparator extends Ld
      * The StringComparator constructor. Its OID is the StringMatch matching
      * rule OID.
      */
-    public StringComparator( String oid )
+    public StringComparator( @Property(name = "ads.comp.comparator.oid") String oid )
     {
         super( oid );
     }

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/TelephoneNumberComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/TelephoneNumberComparator.java?rev=1336637&r1=1336636&r2=1336637&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/TelephoneNumberComparator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/TelephoneNumberComparator.java
Thu May 10 12:25:01 2012
@@ -21,6 +21,8 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Property;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,6 +35,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@Component
 public class TelephoneNumberComparator extends LdapComparator<String>
 {
     /** The serial version UID */
@@ -46,7 +49,7 @@ public class TelephoneNumberComparator e
      * The TelephoneNumberComparator constructor. Its OID is the TelephoneNumberMatch matching
      * rule OID.
      */
-    public TelephoneNumberComparator( String oid )
+    public TelephoneNumberComparator( @Property(name = "ads.comp.comparator.oid") String
oid )
     {
         super( oid );
     }

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java?rev=1336637&r1=1336636&r2=1336637&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java
Thu May 10 12:25:01 2012
@@ -26,6 +26,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Property;
 
 
 /**
@@ -35,6 +37,7 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@Component
 public class UniqueMemberComparator extends LdapComparator<String>
 {
     /** The serial version UID */
@@ -48,7 +51,7 @@ public class UniqueMemberComparator exte
      * The IntegerComparator constructor. Its OID is the IntegerOrderingMatch matching
      * rule OID.
      */
-    public UniqueMemberComparator( String oid )
+    public UniqueMemberComparator( @Property(name = "ads.comp.comparator.oid") String oid
)
     {
         super( oid );
     }

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UuidComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UuidComparator.java?rev=1336637&r1=1336636&r2=1336637&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UuidComparator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UuidComparator.java
Thu May 10 12:25:01 2012
@@ -21,6 +21,8 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Property;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,6 +32,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@Component
 public class UuidComparator extends LdapComparator<String>
 {
     /** The serial version UID */
@@ -43,7 +46,7 @@ public class UuidComparator extends Ldap
      * The UUIDComparator constructor. Its OID is the UUIDMatch matching
      * rule OID.
      */
-    public UuidComparator( String oid )
+    public UuidComparator( @Property(name = "ads.comp.comparator.oid") String oid )
     {
         super( oid );
     }

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java?rev=1336637&r1=1336636&r2=1336637&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java
Thu May 10 12:25:01 2012
@@ -22,6 +22,8 @@ package org.apache.directory.shared.ldap
 
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
 import org.apache.directory.shared.util.Strings;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Property;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -44,6 +46,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
+@Component
 public class WordComparator extends LdapComparator<String>
 {
     /** The serial version UID */
@@ -57,7 +60,7 @@ public class WordComparator extends Ldap
      * The StringComparator constructor. Its OID is the StringMatch matching
      * rule OID.
      */
-    public WordComparator( String oid )
+    public WordComparator( @Property(name = "ads.comp.comparator.oid") String oid )
     {
         super( oid );
     }



Mime
View raw message