directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gokt...@apache.org
Subject svn commit: r1188705 [1/3] - in /directory/shared/branches/shared-osgi: ipojo-manager/src/main/java/org/apache/directory/shared/ipojo/helpers/ ipojo-manager/src/main/java/org/apache/directory/shared/ipojo/schema/ ldap/codec/core/ ldap/extras/aci/ ldap/...
Date Tue, 25 Oct 2011 15:19:24 GMT
Author: gokturk
Date: Tue Oct 25 15:19:20 2011
New Revision: 1188705

URL: http://svn.apache.org/viewvc?rev=1188705&view=rev
Log:
Normalizers and SyntaxCheckers are also modified like Comparators to be extendable in OSGI, and work normal in nonOSGI environment.

shared-ldap-schema-data is cleaned of code duplication which is used to make it work on both environments.
Detection mechanism is used, and code duplicates are deleted. Only classLoad... family of functions in SchemaEntityFactory
are changed to detect whether or not they're in OSGI or not, and act according to that test.


Removed:
    directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/OSGISchemaManager.java
Modified:
    directory/shared/branches/shared-osgi/ipojo-manager/src/main/java/org/apache/directory/shared/ipojo/helpers/OSGIHelper.java
    directory/shared/branches/shared-osgi/ipojo-manager/src/main/java/org/apache/directory/shared/ipojo/schema/SchemaElementsManager.java
    directory/shared/branches/shared-osgi/ldap/codec/core/pom.xml
    directory/shared/branches/shared-osgi/ldap/extras/aci/pom.xml
    directory/shared/branches/shared-osgi/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/EntityFactory.java
    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/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/UUIDComparator.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/WordComparator.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/BooleanNormalizer.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDeepTrimNormalizer.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDeepTrimToLowerNormalizer.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDnNormalizer.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimNormalizer.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimToLowerNormalizer.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DefaultStringNormalizer.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DnNormalizer.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/GeneralizedTimeNormalizer.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NameOrNumericIdNormalizer.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NoOpNormalizer.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NumericNormalizer.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/RegexNormalizer.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/TelephoneNumberNormalizer.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/UniqueMemberNormalizer.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AccessPointSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AttributeTypeDescriptionSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AttributeTypeUsageSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AudioSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/BinarySyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/BitStringSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/BooleanSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CertificateListSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CertificatePairSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CertificateSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ComparatorSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CountrySyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CsnSidSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CsnSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DITContentRuleDescriptionSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DITStructureRuleDescriptionSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DLSubmitPermissionSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DNSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DSAQualitySyntaxSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DSETypeSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DataQualitySyntaxSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DeliveryMethodSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DerefAliasSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DirectoryStringSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/EnhancedGuideSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/FacsimileTelephoneNumberSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/FaxSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/GeneralizedTimeSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/GuideSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/Ia5StringSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/IntegerSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JavaByteSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JavaIntegerSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JavaLongSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JavaShortSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JpegSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/LdapSyntaxDescriptionSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MHSORAddressSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MailPreferenceSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MasterAndShadowAccessPointSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MatchingRuleDescriptionSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MatchingRuleUseDescriptionSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NameAndOptionalUIDSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NameFormDescriptionSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NormalizerSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NumberSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NumericOidSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NumericStringSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ObjectClassDescriptionSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ObjectClassTypeSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ObjectNameSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OctetStringSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OidLenSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OidSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OtherMailboxSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PostalAddressSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PresentationAddressSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PrintableStringSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ProtocolInformationSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/RegexSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SearchScopeSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SubstringAssertionSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SubtreeSpecificationSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierAndConsumerSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierInformationSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierOrConsumerSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupportedAlgorithmSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SyntaxCheckerSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelephoneNumberSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TeletexTerminalIdentifierSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelexNumberSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UtcTimeSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UuidSyntaxChecker.java
    directory/shared/branches/shared-osgi/ldap/schema/data/pom.xml
    directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
    directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java

Modified: directory/shared/branches/shared-osgi/ipojo-manager/src/main/java/org/apache/directory/shared/ipojo/helpers/OSGIHelper.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ipojo-manager/src/main/java/org/apache/directory/shared/ipojo/helpers/OSGIHelper.java?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ipojo-manager/src/main/java/org/apache/directory/shared/ipojo/helpers/OSGIHelper.java (original)
+++ directory/shared/branches/shared-osgi/ipojo-manager/src/main/java/org/apache/directory/shared/ipojo/helpers/OSGIHelper.java Tue Oct 25 15:19:20 2011
@@ -34,7 +34,7 @@ public class OSGIHelper
     public static BundleContext bundleCtx;
 
 
-    private static boolean checkOSGIContext()
+    public static boolean isAPIInOSGIContainer()
     {
         if ( bundleCtx == null )
         {
@@ -47,7 +47,7 @@ public class OSGIHelper
 
     public static List<?> getServices( String serviceClassName, String filter )
     {
-        if ( !checkOSGIContext() )
+        if ( !isAPIInOSGIContainer() )
         {
             return null;
         }
@@ -78,7 +78,7 @@ public class OSGIHelper
 
     public static Object getService( String serviceClassName )
     {
-        if ( !checkOSGIContext() )
+        if ( !isAPIInOSGIContainer() )
         {
             return null;
         }

Modified: directory/shared/branches/shared-osgi/ipojo-manager/src/main/java/org/apache/directory/shared/ipojo/schema/SchemaElementsManager.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ipojo-manager/src/main/java/org/apache/directory/shared/ipojo/schema/SchemaElementsManager.java?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ipojo-manager/src/main/java/org/apache/directory/shared/ipojo/schema/SchemaElementsManager.java (original)
+++ directory/shared/branches/shared-osgi/ipojo-manager/src/main/java/org/apache/directory/shared/ipojo/schema/SchemaElementsManager.java Tue Oct 25 15:19:20 2011
@@ -28,27 +28,31 @@ public class SchemaElementsManager
         return comparator;
     }
 
-    /*
-        public Normalizer getNormalizer( String factoryName ) throws Exception
-        {
-            Normalizer comparator = activeNormalizers.get( factoryName );
-            if ( comparator == null )
-            {
-                throw new Exception( "Required Normalizer is not registered" );
-            }
 
-            return comparator;
+    public Normalizer getNormalizer( String factoryName ) throws Exception
+    {
+        Normalizer normalizer = ( Normalizer ) IPojoHelper
+            .createIPojoComponent( factoryName, null, null );
+
+        if ( normalizer == null )
+        {
+            throw new Exception( "Required Normalizer is not registered" );
         }
 
+        return normalizer;
+    }
+
+
+    public SyntaxChecker getSyntaxChecker( String factoryName ) throws Exception
+    {
+        SyntaxChecker syntaxer = ( SyntaxChecker ) IPojoHelper
+            .createIPojoComponent( factoryName, null, null );
 
-        public SyntaxChecker getSyntaxChecker( String factoryName ) throws Exception
+        if ( syntaxer == null )
         {
-            SyntaxChecker comparator = activeSyntaxCheckers.get( factoryName );
-            if ( comparator == null )
-            {
-                throw new Exception( "Required SyntaxChecker is not registered" );
-            }
+            throw new Exception( "Required Syntax Checker is not registered" );
+        }
 
-            return comparator;
-        }*/
+        return syntaxer;
+    }
 }

Modified: directory/shared/branches/shared-osgi/ldap/codec/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/codec/core/pom.xml?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/codec/core/pom.xml (original)
+++ directory/shared/branches/shared-osgi/ldap/codec/core/pom.xml Tue Oct 25 15:19:20 2011
@@ -82,6 +82,12 @@
       <artifactId>org.osgi</artifactId>
       <scope>provided</scope>
     </dependency>
+    
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.ipojo</artifactId>
+      <version>1.8.0</version>
+    </dependency>
   </dependencies>
 
   <build>

Modified: directory/shared/branches/shared-osgi/ldap/extras/aci/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/aci/pom.xml?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/aci/pom.xml (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/aci/pom.xml Tue Oct 25 15:19:20 2011
@@ -90,6 +90,19 @@
           </instructions>
         </configuration>
       </plugin>
+      
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-ipojo-plugin</artifactId>
+        <version>1.8.0</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>ipojo-bundle</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

Modified: directory/shared/branches/shared-osgi/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.java?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.java (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.java Tue Oct 25 15:19:20 2011
@@ -25,6 +25,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
 import org.apache.directory.shared.util.Strings;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,6 +38,8 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class ACIItemSyntaxChecker extends SyntaxChecker
 {
     /** A logger for this class */

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/EntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/EntityFactory.java?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/EntityFactory.java (original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/EntityFactory.java Tue Oct 25 15:19:20 2011
@@ -85,20 +85,6 @@ public interface EntityFactory
 
 
     /**
-     * Retrieve and load a Comparator class through OSGI from the DIT.
-     * 
-     * @param schemaManager The Schema Manager
-     * @param entry The entry containing all the informations to build a LdapComparator
-     * @param targetRegistries The registries containing all the enabled SchemaObjects
-     * @param schemaName The schema this SchemaObject will be part of
-     * @return the loaded Comparator
-     * @throws LdapException if anything fails during loading
-     */
-    LdapComparator<?> getLdapComparatorOSGI( SchemaManager schemaManager, Entry entry,
-        Registries targetRegistries, String schemaName ) throws LdapException;
-
-
-    /**
      * Construct an MatchingRule from an entry get from the Dit
      *
      * @param schemaManager The Schema Manager

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=1188705&r1=1188704&r2=1188705&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 Tue Oct 25 15:19:20 2011
@@ -37,13 +37,6 @@ import org.slf4j.LoggerFactory;
 @Provides
 public class BitStringComparator extends LdapComparator<String>
 {
-    /**
-     * Property to specify factory type.
-     * TODO:This is temporary. Will be vanished after introducing custom annotations
-     */
-    @Property(name = "ads.comp.type", value = "comparator")
-    public String compType;
-
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 

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=1188705&r1=1188704&r2=1188705&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 Tue Oct 25 15:19:20 2011
@@ -37,13 +37,6 @@ import org.slf4j.LoggerFactory;
 @Provides
 public class BooleanComparator extends LdapComparator<String>
 {
-    /**
-     * Property to specify factory type.
-     * TODO:This is temporary. Will be vanished after introducing custom annotations
-     */
-    @Property(name = "ads.comp.type", value = "comparator")
-    public String compType;
-
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 

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=1188705&r1=1188704&r2=1188705&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 Tue Oct 25 15:19:20 2011
@@ -38,13 +38,6 @@ import org.slf4j.LoggerFactory;
 @Provides
 public class ByteArrayComparator extends LdapComparator<byte[]>
 {
-    /**
-     * Property to specify factory type.
-     * TODO:This is temporary. Will be vanished after introducing custom annotations
-     */
-    @Property(name = "ads.comp.type", value = "comparator")
-    public String compType;
-
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 

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=1188705&r1=1188704&r2=1188705&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 Tue Oct 25 15:19:20 2011
@@ -39,13 +39,6 @@ import org.slf4j.LoggerFactory;
 @Provides
 public class ComparableComparator<T> extends LdapComparator<Comparable<T>>
 {
-    /**
-     * Property to specify factory type.
-     * TODO:This is temporary. Will be vanished after introducing custom annotations
-     */
-    @Property(name = "ads.comp.type", value = "comparator")
-    public String compType;
-
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 

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=1188705&r1=1188704&r2=1188705&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 Tue Oct 25 15:19:20 2011
@@ -44,13 +44,6 @@ import org.slf4j.LoggerFactory;
 @Provides
 public class CsnComparator extends LdapComparator<Object>
 {
-    /**
-     * Property to specify factory type.
-     * TODO:This is temporary. Will be vanished after introducing custom annotations
-     */
-    @Property(name = "ads.comp.type", value = "comparator")
-    public String compType;
-
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 

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=1188705&r1=1188704&r2=1188705&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 Tue Oct 25 15:19:20 2011
@@ -39,13 +39,6 @@ import org.slf4j.LoggerFactory;
 @Provides
 public class CsnSidComparator extends LdapComparator<String>
 {
-    /**
-     * Property to specify factory type.
-     * TODO:This is temporary. Will be vanished after introducing custom annotations
-     */
-    @Property(name = "ads.comp.type", value = "comparator")
-    public String compType;
-
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 

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=1188705&r1=1188704&r2=1188705&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 Tue Oct 25 15:19:20 2011
@@ -36,13 +36,6 @@ import org.apache.felix.ipojo.annotation
 @Provides
 public class DeepTrimCachingNormalizingComparator extends NormalizingComparator
 {
-    /**
-     * Property to specify factory type.
-     * TODO:This is temporary. Will be vanished after introducing custom annotations
-     */
-    @Property(name = "ads.comp.type", value = "comparator")
-    public String compType;
-
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 

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=1188705&r1=1188704&r2=1188705&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 Tue Oct 25 15:19:20 2011
@@ -36,13 +36,6 @@ import org.apache.felix.ipojo.annotation
 @Provides
 public class DeepTrimToLowerCachingNormalizingComparator extends NormalizingComparator
 {
-    /**
-     * Property to specify factory type.
-     * TODO:This is temporary. Will be vanished after introducing custom annotations
-     */
-    @Property(name = "ads.comp.type", value = "comparator")
-    public String compType;
-
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 

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=1188705&r1=1188704&r2=1188705&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 Tue Oct 25 15:19:20 2011
@@ -40,13 +40,6 @@ import org.apache.felix.ipojo.annotation
 @Provides
 public class DnComparator extends LdapComparator<Object>
 {
-    /**
-     * Property to specify factory type.
-     * TODO:This is temporary. Will be vanished after introducing custom annotations
-     */
-    @Property(name = "ads.comp.type", value = "comparator")
-    public String compType;
-
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 

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=1188705&r1=1188704&r2=1188705&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 Tue Oct 25 15:19:20 2011
@@ -43,13 +43,6 @@ import org.slf4j.LoggerFactory;
 @Provides
 public class GeneralizedTimeComparator extends LdapComparator<String>
 {
-    /**
-     * Property to specify factory type.
-     * TODO:This is temporary. Will be vanished after introducing custom annotations
-     */
-    @Property(name = "ads.comp.type", value = "comparator")
-    public String compType;
-
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 

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=1188705&r1=1188704&r2=1188705&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 Tue Oct 25 15:19:20 2011
@@ -43,13 +43,6 @@ import org.slf4j.LoggerFactory;
 @Provides
 public class IntegerComparator extends LdapComparator<Object> implements Serializable
 {
-    /**
-     * Property to specify factory type.
-     * TODO:This is temporary. Will be vanished after introducing custom annotations
-     */
-    @Property(name = "ads.comp.type", value = "comparator")
-    public String compType;
-
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 

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=1188705&r1=1188704&r2=1188705&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 Tue Oct 25 15:19:20 2011
@@ -38,13 +38,6 @@ import org.apache.felix.ipojo.annotation
 @Provides
 public class LongComparator extends LdapComparator<Long> implements Serializable
 {
-    /**
-     * Property to specify factory type.
-     * TODO:This is temporary. Will be vanished after introducing custom annotations
-     */
-    @Property(name = "ads.comp.type", value = "comparator")
-    public String compType;
-
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 

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=1188705&r1=1188704&r2=1188705&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 Tue Oct 25 15:19:20 2011
@@ -41,13 +41,6 @@ import org.slf4j.LoggerFactory;
 @Provides
 public class NumericStringComparator extends LdapComparator<String>
 {
-    /**
-     * Property to specify factory type.
-     * TODO:This is temporary. Will be vanished after introducing custom annotations
-     */
-    @Property(name = "ads.comp.type", value = "comparator")
-    public String compType;
-
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 

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=1188705&r1=1188704&r2=1188705&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 Tue Oct 25 15:19:20 2011
@@ -37,13 +37,6 @@ import org.apache.felix.ipojo.annotation
 @Provides
 public class ObjectClassTypeComparator<T> extends LdapComparator<T>
 {
-    /**
-     * Property to specify factory type.
-     * TODO:This is temporary. Will be vanished after introducing custom annotations
-     */
-    @Property(name = "ads.comp.type", value = "comparator")
-    public String compType;
-
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 

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=1188705&r1=1188704&r2=1188705&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 Tue Oct 25 15:19:20 2011
@@ -37,13 +37,6 @@ import org.slf4j.LoggerFactory;
 @Provides
 public class ObjectIdentifierComparator extends LdapComparator<Object>
 {
-    /**
-     * Property to specify factory type.
-     * TODO:This is temporary. Will be vanished after introducing custom annotations
-     */
-    @Property(name = "ads.comp.type", value = "comparator")
-    public String compType;
-
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 

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=1188705&r1=1188704&r2=1188705&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 Tue Oct 25 15:19:20 2011
@@ -40,13 +40,6 @@ import org.slf4j.LoggerFactory;
 @Provides
 public class ObjectIdentifierFirstComponentComparator extends LdapComparator<String>
 {
-    /**
-     * Property to specify factory type.
-     * TODO:This is temporary. Will be vanished after introducing custom annotations
-     */
-    @Property(name = "ads.comp.type", value = "comparator")
-    public String compType;
-
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 

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=1188705&r1=1188704&r2=1188705&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 Tue Oct 25 15:19:20 2011
@@ -39,13 +39,6 @@ import org.slf4j.LoggerFactory;
 @Provides
 public class StringComparator extends LdapComparator<String> implements Serializable
 {
-    /**
-     * Property to specify factory type.
-     * TODO:This is temporary. Will be vanished after introducing custom annotations
-     */
-    @Property(name = "ads.comp.type", value = "comparator")
-    public String compType;
-
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 

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=1188705&r1=1188704&r2=1188705&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 Tue Oct 25 15:19:20 2011
@@ -40,13 +40,6 @@ import org.slf4j.LoggerFactory;
 @Provides
 public class TelephoneNumberComparator extends LdapComparator<String>
 {
-    /**
-     * Property to specify factory type.
-     * TODO:This is temporary. Will be vanished after introducing custom annotations
-     */
-    @Property(name = "ads.comp.type", value = "comparator")
-    public String compType;
-
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 

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=1188705&r1=1188704&r2=1188705&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 Tue Oct 25 15:19:20 2011
@@ -37,13 +37,6 @@ import org.slf4j.LoggerFactory;
 @Provides
 public class UUIDComparator extends LdapComparator<String>
 {
-    /**
-     * Property to specify factory type.
-     * TODO:This is temporary. Will be vanished after introducing custom annotations
-     */
-    @Property(name = "ads.comp.type", value = "comparator")
-    public String compType;
-
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 

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=1188705&r1=1188704&r2=1188705&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 Tue Oct 25 15:19:20 2011
@@ -42,13 +42,6 @@ import org.apache.felix.ipojo.annotation
 @Provides
 public class UniqueMemberComparator extends LdapComparator<String>
 {
-    /**
-     * Property to specify factory type.
-     * TODO:This is temporary. Will be vanished after introducing custom annotations
-     */
-    @Property(name = "ads.comp.type", value = "comparator")
-    public String compType;
-
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 

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=1188705&r1=1188704&r2=1188705&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 Tue Oct 25 15:19:20 2011
@@ -51,13 +51,6 @@ import org.slf4j.LoggerFactory;
 @Provides
 public class WordComparator extends LdapComparator<String>
 {
-    /**
-     * Property to specify factory type.
-     * TODO:This is temporary. Will be vanished after introducing custom annotations
-     */
-    @Property(name = "ads.comp.type", value = "comparator")
-    public String compType;
-
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/BooleanNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/BooleanNormalizer.java?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/BooleanNormalizer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/BooleanNormalizer.java Tue Oct 25 15:19:20 2011
@@ -25,6 +25,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 
 
 /**
@@ -34,6 +36,8 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class BooleanNormalizer extends Normalizer
 {
     /**
@@ -56,11 +60,11 @@ public class BooleanNormalizer extends N
         }
 
         String strValue = value.getString();
-        
+
         return new StringValue( strValue.trim().toUpperCase() );
     }
 
-    
+
     /**
      * {@inheritDoc}
      */

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDeepTrimNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDeepTrimNormalizer.java?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDeepTrimNormalizer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDeepTrimNormalizer.java Tue Oct 25 15:19:20 2011
@@ -20,6 +20,8 @@
 package org.apache.directory.shared.ldap.model.schema.normalizers;
 
 
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 
 
 /**
@@ -32,6 +34,8 @@ package org.apache.directory.shared.ldap
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class CachingDeepTrimNormalizer extends CachingNormalizer
 {
     public CachingDeepTrimNormalizer()

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDeepTrimToLowerNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDeepTrimToLowerNormalizer.java?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDeepTrimToLowerNormalizer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDeepTrimToLowerNormalizer.java Tue Oct 25 15:19:20 2011
@@ -20,6 +20,8 @@
 package org.apache.directory.shared.ldap.model.schema.normalizers;
 
 
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 
 
 /**
@@ -32,6 +34,8 @@ package org.apache.directory.shared.ldap
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class CachingDeepTrimToLowerNormalizer extends CachingNormalizer
 {
     public CachingDeepTrimToLowerNormalizer()

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDnNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDnNormalizer.java?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDnNormalizer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingDnNormalizer.java Tue Oct 25 15:19:20 2011
@@ -21,6 +21,8 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 
 
 /**
@@ -33,6 +35,8 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class CachingDnNormalizer extends CachingNormalizer
 {
     public CachingDnNormalizer()

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimNormalizer.java?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimNormalizer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimNormalizer.java Tue Oct 25 15:19:20 2011
@@ -30,6 +30,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.ldap.model.schema.PrepareString;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 
 
 /**
@@ -40,6 +42,8 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class DeepTrimNormalizer extends Normalizer
 {
     /**
@@ -62,41 +66,42 @@ public class DeepTrimNormalizer extends 
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
+    public Value<?> normalize( Value<?> value ) throws LdapException
+    {
+        try
+        {
+            String normalized = PrepareString.normalize( value.getString(),
+                PrepareString.StringType.DIRECTORY_STRING );
+
+            return new StringValue( normalized );
+        }
+        catch ( IOException ioe )
+        {
+            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err(
+                I18n.ERR_04224, value ), ioe );
+        }
+    }
+
 
-   /**
-    * {@inheritDoc}
-    */
-   public Value<?> normalize( Value<?> value ) throws LdapException
-   {
-       try
-       {
-           String normalized = PrepareString.normalize( value.getString(), 
-               PrepareString.StringType.DIRECTORY_STRING ); 
-           
-           return new StringValue( normalized ); 
-       }
-       catch ( IOException ioe )
-       {
-           throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_04224, value ), ioe );
-       }
-   }
-
-
-   /**
-    * {@inheritDoc}
-    */
-   public String normalize( String value ) throws LdapException
-   {
-       try
-       {
-           String normalized = PrepareString.normalize( value, 
-               PrepareString.StringType.DIRECTORY_STRING ); 
-           
-           return normalized; 
-       }
-       catch ( IOException ioe )
-       {
-           throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_04224, value ), ioe );
-       }
-   }
+    /**
+     * {@inheritDoc}
+     */
+    public String normalize( String value ) throws LdapException
+    {
+        try
+        {
+            String normalized = PrepareString.normalize( value,
+                PrepareString.StringType.DIRECTORY_STRING );
+
+            return normalized;
+        }
+        catch ( IOException ioe )
+        {
+            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err(
+                I18n.ERR_04224, value ), ioe );
+        }
+    }
 }
\ No newline at end of file

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimToLowerNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimToLowerNormalizer.java?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimToLowerNormalizer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimToLowerNormalizer.java Tue Oct 25 15:19:20 2011
@@ -30,6 +30,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.ldap.model.schema.PrepareString;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 
 
 /**
@@ -41,6 +43,8 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class DeepTrimToLowerNormalizer extends Normalizer
 {
     /**
@@ -77,12 +81,13 @@ public class DeepTrimToLowerNormalizer e
         {
             String normalized = PrepareString.normalize( value.getString(),
                 PrepareString.StringType.CASE_IGNORE );
-            
+
             return new StringValue( normalized );
         }
         catch ( IOException ioe )
         {
-            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_04224, value ), ioe );
+            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err(
+                I18n.ERR_04224, value ), ioe );
         }
     }
 
@@ -101,12 +106,13 @@ public class DeepTrimToLowerNormalizer e
         {
             String normalized = PrepareString.normalize( value,
                 PrepareString.StringType.CASE_IGNORE );
-            
+
             return normalized;
         }
         catch ( IOException ioe )
         {
-            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_04224,  value ), ioe );
+            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err(
+                I18n.ERR_04224, value ), ioe );
         }
     }
 }

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DefaultStringNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DefaultStringNormalizer.java?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DefaultStringNormalizer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DefaultStringNormalizer.java Tue Oct 25 15:19:20 2011
@@ -19,12 +19,15 @@
  */
 package org.apache.directory.shared.ldap.model.schema.normalizers;
 
+
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.entry.StringValue;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.util.Strings;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 
 
 /**
@@ -36,11 +39,14 @@ import org.apache.directory.shared.util.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class DefaultStringNormalizer extends Normalizer
 {
     /** A default String normalizer */
     private static final DefaultStringNormalizer NORMALIZER = new DefaultStringNormalizer();
-    
+
+
     protected DefaultStringNormalizer()
     {
         // TODO : This is probably not the correct OID ... 
@@ -54,30 +60,30 @@ public class DefaultStringNormalizer ext
     public Value<?> normalize( Value<?> value ) throws LdapException
     {
         String str = value.getString();
-        
-        if ( Strings.isEmpty(str) )
+
+        if ( Strings.isEmpty( str ) )
         {
             return new StringValue( str );
         }
-        
+
         return new StringValue( str );
     }
 
-    
+
     /**
      * {@inheritDoc}
      */
     public String normalize( String value ) throws LdapException
     {
-        if ( Strings.isEmpty(value) )
+        if ( Strings.isEmpty( value ) )
         {
             return value;
         }
-        
+
         return value;
     }
 
-    
+
     /**
      * Normalize the given String
      *

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DnNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DnNormalizer.java?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DnNormalizer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DnNormalizer.java Tue Oct 25 15:19:20 2011
@@ -27,6 +27,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 
 
 /**
@@ -35,11 +37,14 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class DnNormalizer extends Normalizer
 {
     /** A reference to the schema manager used to normalize the Dn */
     private SchemaManager schemaManager;
-    
+
+
     /**
      * Empty constructor
      */
@@ -55,11 +60,11 @@ public class DnNormalizer extends Normal
     public Value<?> normalize( Value<?> value ) throws LdapException
     {
         Dn dn = null;
-        
+
         String dnStr = value.getString();
-        
+
         dn = new Dn( schemaManager, dnStr );
-        
+
         return new StringValue( dn.getNormName() );
     }
 
@@ -70,9 +75,9 @@ public class DnNormalizer extends Normal
     public String normalize( String value ) throws LdapException
     {
         Dn dn = null;
-        
+
         dn = new Dn( schemaManager, value );
-        
+
         return dn.getNormName();
     }
 
@@ -86,9 +91,9 @@ public class DnNormalizer extends Normal
     public String normalize( Dn value ) throws LdapException
     {
         Dn dn = null;
-        
+
         dn = value.apply( schemaManager );
-        
+
         return dn.getNormName();
     }
 

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/GeneralizedTimeNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/GeneralizedTimeNormalizer.java?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/GeneralizedTimeNormalizer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/GeneralizedTimeNormalizer.java Tue Oct 25 15:19:20 2011
@@ -36,6 +36,8 @@ import org.apache.directory.shared.util.
 import org.apache.directory.shared.util.GeneralizedTime.Format;
 import org.apache.directory.shared.util.GeneralizedTime.FractionDelimiter;
 import org.apache.directory.shared.util.GeneralizedTime.TimeZoneFormat;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 
 
 /**
@@ -51,6 +53,8 @@ import org.apache.directory.shared.util.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class GeneralizedTimeNormalizer extends Normalizer
 {
     /**
@@ -75,7 +79,8 @@ public class GeneralizedTimeNormalizer e
         }
         catch ( IOException ioe )
         {
-            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_04224, value ), ioe );
+            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err(
+                I18n.ERR_04224, value ), ioe );
         }
     }
 
@@ -97,11 +102,13 @@ public class GeneralizedTimeNormalizer e
         }
         catch ( IOException ioe )
         {
-            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_04224, value ), ioe );
+            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err(
+                I18n.ERR_04224, value ), ioe );
         }
         catch ( ParseException pe )
         {
-            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_04224, value ), pe );
+            throw new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err(
+                I18n.ERR_04224, value ), pe );
         }
     }
 }
\ No newline at end of file

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NameOrNumericIdNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NameOrNumericIdNormalizer.java?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NameOrNumericIdNormalizer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NameOrNumericIdNormalizer.java Tue Oct 25 15:19:20 2011
@@ -29,6 +29,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.syntaxCheckers.NumericOidSyntaxChecker;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 
 
 /**
@@ -40,6 +42,8 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class NameOrNumericIdNormalizer extends Normalizer
 {
     private NumericOidSyntaxChecker checker = new NumericOidSyntaxChecker();

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NoOpNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NoOpNormalizer.java?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NoOpNormalizer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NoOpNormalizer.java Tue Oct 25 15:19:20 2011
@@ -22,6 +22,8 @@ package org.apache.directory.shared.ldap
 
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 
 
 /**
@@ -30,6 +32,8 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class NoOpNormalizer extends Normalizer
 {
     /**
@@ -42,7 +46,7 @@ public class NoOpNormalizer extends Norm
         super( oid );
     }
 
-    
+
     /**
      * Default constructor for NoOpNormalizer used when we must set the OID
      * after instantiating the Normalizer.
@@ -51,7 +55,7 @@ public class NoOpNormalizer extends Norm
     {
     }
 
-    
+
     /**
      * Returns the value argument as-is without alterations all the time.
      * 
@@ -63,8 +67,8 @@ public class NoOpNormalizer extends Norm
     {
         return value;
     }
-    
-    
+
+
     /**
      * Returns the value argument as-is without alterations all the time.
      * 

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NumericNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NumericNormalizer.java?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NumericNormalizer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NumericNormalizer.java Tue Oct 25 15:19:20 2011
@@ -30,6 +30,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.ldap.model.schema.PrepareString;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 
 
 /**
@@ -38,6 +40,8 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class NumericNormalizer extends Normalizer
 {
     /**
@@ -48,39 +52,39 @@ public class NumericNormalizer extends N
         super( SchemaConstants.NUMERIC_STRING_MATCH_MR_OID );
     }
 
-   
-   /**
-    * {@inheritDoc}
-    */
-   public Value<?> normalize( Value<?> value ) throws LdapException
-   {
-       try
-       {
-           String normalized = PrepareString.normalize( value.getString(),
-               PrepareString.StringType.NUMERIC_STRING );
-           
-           return new StringValue( normalized );
-       }
-       catch ( IOException ioe )
-       {
-           throw new LdapInvalidDnException( I18n.err( I18n.ERR_04224, value ), ioe );
-       }
-   }
-
-
-   /**
-    * {@inheritDoc}
-    */
-   public String normalize( String value ) throws LdapException
-   {
-       try
-       {
-           return PrepareString.normalize( value,
-               PrepareString.StringType.NUMERIC_STRING );
-       }
-       catch ( IOException ioe )
-       {
-           throw new LdapInvalidDnException( I18n.err( I18n.ERR_04224, value ), ioe );
-       }
-   }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Value<?> normalize( Value<?> value ) throws LdapException
+    {
+        try
+        {
+            String normalized = PrepareString.normalize( value.getString(),
+                PrepareString.StringType.NUMERIC_STRING );
+
+            return new StringValue( normalized );
+        }
+        catch ( IOException ioe )
+        {
+            throw new LdapInvalidDnException( I18n.err( I18n.ERR_04224, value ), ioe );
+        }
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public String normalize( String value ) throws LdapException
+    {
+        try
+        {
+            return PrepareString.normalize( value,
+                PrepareString.StringType.NUMERIC_STRING );
+        }
+        catch ( IOException ioe )
+        {
+            throw new LdapInvalidDnException( I18n.err( I18n.ERR_04224, value ), ioe );
+        }
+    }
 }
\ No newline at end of file

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java Tue Oct 25 15:19:20 2011
@@ -26,6 +26,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.util.Strings;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 
 
 /**
@@ -34,6 +36,8 @@ import org.apache.directory.shared.util.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class ObjectIdentifierNormalizer extends Normalizer
 {
     /**
@@ -71,8 +75,8 @@ public class ObjectIdentifierNormalizer 
             return new StringValue( Strings.toLowerCase( str ) );
         }
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/RegexNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/RegexNormalizer.java?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/RegexNormalizer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/RegexNormalizer.java Tue Oct 25 15:19:20 2011
@@ -26,6 +26,8 @@ import java.util.regex.Pattern;
 import org.apache.directory.shared.ldap.model.entry.StringValue;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 
 
 /**
@@ -34,6 +36,8 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class RegexNormalizer extends Normalizer
 {
     /** the perl 5 regex engine */
@@ -54,7 +58,7 @@ public class RegexNormalizer extends Nor
         super( oid );
         if ( regexes != null )
         {
-            this.regexes = new Pattern[ regexes.length ];
+            this.regexes = new Pattern[regexes.length];
             System.arraycopy( regexes, 0, this.regexes, 0, regexes.length );
 
             matchers = new Matcher[regexes.length];
@@ -63,8 +67,8 @@ public class RegexNormalizer extends Nor
             {
                 matchers[i] = regexes[i].matcher( "" );
             }
-        } 
-        else 
+        }
+        else
         {
             this.regexes = null;
             matchers = new Matcher[0];
@@ -99,8 +103,6 @@ public class RegexNormalizer extends Nor
     }
 
 
-
-
     /**
      * {@inheritDoc}
      */
@@ -112,7 +114,7 @@ public class RegexNormalizer extends Nor
         }
 
         String str = value;
-        
+
         for ( int i = 0; i < matchers.length; i++ )
         {
 
@@ -121,8 +123,8 @@ public class RegexNormalizer extends Nor
 
         return str;
     }
-    
-    
+
+
     /**
      * @see java.lang.Object#toString()
      */

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/TelephoneNumberNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/TelephoneNumberNormalizer.java?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/TelephoneNumberNormalizer.java (original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/TelephoneNumberNormalizer.java Tue Oct 25 15:19:20 2011
@@ -30,6 +30,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.ldap.model.schema.PrepareString;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 
 
 /**
@@ -38,6 +40,8 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class TelephoneNumberNormalizer extends Normalizer
 {
     /**
@@ -49,39 +53,38 @@ public class TelephoneNumberNormalizer e
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
+    public Value<?> normalize( Value<?> value ) throws LdapException
+    {
+        try
+        {
+            String normalized = PrepareString.normalize( value.getString(),
+                PrepareString.StringType.TELEPHONE_NUMBER );
+
+            return new StringValue( normalized );
+        }
+        catch ( IOException ioe )
+        {
+            throw new LdapInvalidDnException( I18n.err( I18n.ERR_04224, value ), ioe );
+        }
+    }
+
 
-   /**
-    * {@inheritDoc}
-    */
-   public Value<?> normalize( Value<?> value ) throws LdapException
-   {
-       try
-       {
-           String normalized = PrepareString.normalize( value.getString(),
-               PrepareString.StringType.TELEPHONE_NUMBER );
-           
-           return new StringValue( normalized );
-       }
-       catch ( IOException ioe )
-       {
-           throw new LdapInvalidDnException( I18n.err( I18n.ERR_04224, value ), ioe );
-       }
-   }
-
-
-   /**
-    * {@inheritDoc}
-    */
-   public String normalize( String value ) throws LdapException
-   {
-       try
-       {
-           return PrepareString.normalize( value,
-               PrepareString.StringType.TELEPHONE_NUMBER );
-       }
-       catch ( IOException ioe )
-       {
-           throw new LdapInvalidDnException( I18n.err( I18n.ERR_04224, value ), ioe );
-       }
-   }
+    /**
+     * {@inheritDoc}
+     */
+    public String normalize( String value ) throws LdapException
+    {
+        try
+        {
+            return PrepareString.normalize( value,
+                PrepareString.StringType.TELEPHONE_NUMBER );
+        }
+        catch ( IOException ioe )
+        {
+            throw new LdapInvalidDnException( I18n.err( I18n.ERR_04224, value ), ioe );
+        }
+    }
 }
\ No newline at end of file



Mime
View raw message