directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gokt...@apache.org
Subject svn commit: r1188705 [3/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
Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PresentationAddressSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PresentationAddressSyntaxChecker.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/syntaxCheckers/PresentationAddressSyntaxChecker.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PresentationAddressSyntaxChecker.java
Tue Oct 25 15:19:20 2011
@@ -20,6 +20,8 @@
 package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
 
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,6 +34,8 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class PresentationAddressSyntaxChecker extends BinarySyntaxChecker
 {
     /** A logger for this class */

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PrintableStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PrintableStringSyntaxChecker.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/syntaxCheckers/PrintableStringSyntaxChecker.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PrintableStringSyntaxChecker.java
Tue Oct 25 15:19:20 2011
@@ -23,6 +23,8 @@ package org.apache.directory.shared.ldap
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 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;
 
@@ -58,6 +60,8 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class PrintableStringSyntaxChecker 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/syntaxCheckers/ProtocolInformationSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ProtocolInformationSyntaxChecker.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/syntaxCheckers/ProtocolInformationSyntaxChecker.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ProtocolInformationSyntaxChecker.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.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,6 +34,8 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class ProtocolInformationSyntaxChecker 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/syntaxCheckers/RegexSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/RegexSyntaxChecker.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/syntaxCheckers/RegexSyntaxChecker.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/RegexSyntaxChecker.java
Tue Oct 25 15:19:20 2011
@@ -23,6 +23,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,6 +36,8 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class RegexSyntaxChecker 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/syntaxCheckers/SearchScopeSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SearchScopeSyntaxChecker.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/syntaxCheckers/SearchScopeSyntaxChecker.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SearchScopeSyntaxChecker.java
Tue Oct 25 15:19:20 2011
@@ -23,6 +23,8 @@ package org.apache.directory.shared.ldap
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 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;
 
@@ -40,6 +42,8 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class SearchScopeSyntaxChecker 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/syntaxCheckers/SubstringAssertionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SubstringAssertionSyntaxChecker.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/syntaxCheckers/SubstringAssertionSyntaxChecker.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SubstringAssertionSyntaxChecker.java
Tue Oct 25 15:19:20 2011
@@ -20,6 +20,8 @@
 package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
 
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,6 +35,8 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class SubstringAssertionSyntaxChecker extends BinarySyntaxChecker
 {
     /** A logger for this class */

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SubtreeSpecificationSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SubtreeSpecificationSyntaxChecker.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/syntaxCheckers/SubtreeSpecificationSyntaxChecker.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SubtreeSpecificationSyntaxChecker.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.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.model.subtree.SubtreeSpecificationChecker;
 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;
 
@@ -38,6 +40,8 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class SubtreeSpecificationSyntaxChecker 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/syntaxCheckers/SupplierAndConsumerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierAndConsumerSyntaxChecker.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/syntaxCheckers/SupplierAndConsumerSyntaxChecker.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierAndConsumerSyntaxChecker.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.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,6 +33,8 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class SupplierAndConsumerSyntaxChecker 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/syntaxCheckers/SupplierInformationSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierInformationSyntaxChecker.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/syntaxCheckers/SupplierInformationSyntaxChecker.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierInformationSyntaxChecker.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.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,6 +33,8 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class SupplierInformationSyntaxChecker 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/syntaxCheckers/SupplierOrConsumerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierOrConsumerSyntaxChecker.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/syntaxCheckers/SupplierOrConsumerSyntaxChecker.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierOrConsumerSyntaxChecker.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.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,6 +33,8 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class SupplierOrConsumerSyntaxChecker 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/syntaxCheckers/SupportedAlgorithmSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupportedAlgorithmSyntaxChecker.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/syntaxCheckers/SupportedAlgorithmSyntaxChecker.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupportedAlgorithmSyntaxChecker.java
Tue Oct 25 15:19:20 2011
@@ -20,6 +20,8 @@
 package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
 
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,6 +34,8 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class SupportedAlgorithmSyntaxChecker extends BinarySyntaxChecker
 {
     /** A logger for this class */

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SyntaxCheckerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SyntaxCheckerSyntaxChecker.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/syntaxCheckers/SyntaxCheckerSyntaxChecker.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SyntaxCheckerSyntaxChecker.java
Tue Oct 25 15:19:20 2011
@@ -20,6 +20,8 @@
 package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
 
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
+import org.apache.felix.ipojo.annotations.Component;
+import org.apache.felix.ipojo.annotations.Provides;
 
 /**
  * A SyntaxChecker for the SyntaxChecker schema element
@@ -27,6 +29,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 SyntaxCheckerSyntaxChecker extends Ia5StringSyntaxChecker
 {
     /**

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelephoneNumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelephoneNumberSyntaxChecker.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/syntaxCheckers/TelephoneNumberSyntaxChecker.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelephoneNumberSyntaxChecker.java
Tue Oct 25 15:19:20 2011
@@ -28,6 +28,8 @@ import java.util.regex.PatternSyntaxExce
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 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;
 
@@ -46,6 +48,8 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class TelephoneNumberSyntaxChecker 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/syntaxCheckers/TeletexTerminalIdentifierSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TeletexTerminalIdentifierSyntaxChecker.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/syntaxCheckers/TeletexTerminalIdentifierSyntaxChecker.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TeletexTerminalIdentifierSyntaxChecker.java
Tue Oct 25 15:19:20 2011
@@ -23,6 +23,8 @@ package org.apache.directory.shared.ldap
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 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;
 
@@ -42,6 +44,8 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class TeletexTerminalIdentifierSyntaxChecker 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/syntaxCheckers/TelexNumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelexNumberSyntaxChecker.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/syntaxCheckers/TelexNumberSyntaxChecker.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelexNumberSyntaxChecker.java
Tue Oct 25 15:19:20 2011
@@ -23,6 +23,8 @@ package org.apache.directory.shared.ldap
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 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;
 
@@ -39,6 +41,8 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class TelexNumberSyntaxChecker 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/syntaxCheckers/UtcTimeSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UtcTimeSyntaxChecker.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/syntaxCheckers/UtcTimeSyntaxChecker.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UtcTimeSyntaxChecker.java
Tue Oct 25 15:19:20 2011
@@ -25,6 +25,8 @@ import java.util.regex.Pattern;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 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;
 
@@ -62,6 +64,8 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class UtcTimeSyntaxChecker 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/syntaxCheckers/UuidSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UuidSyntaxChecker.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/syntaxCheckers/UuidSyntaxChecker.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UuidSyntaxChecker.java
Tue Oct 25 15:19:20 2011
@@ -23,6 +23,8 @@ package org.apache.directory.shared.ldap
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 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;
 
@@ -35,6 +37,8 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
+@Component
+@Provides
 public class UuidSyntaxChecker extends SyntaxChecker
 {
     /** A logger for this class */

Modified: directory/shared/branches/shared-osgi/ldap/schema/data/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/schema/data/pom.xml?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/schema/data/pom.xml (original)
+++ directory/shared/branches/shared-osgi/ldap/schema/data/pom.xml Tue Oct 25 15:19:20 2011
@@ -155,15 +155,6 @@
                 org.apache.directory.shared.ldap.schemaextractor.impl;version="${project.version}";-noimport:=true,
                 org.apache.directory.shared.ldap.schemamanager.impl;version="${project.version}";-noimport:=true
             </Export-Package>
-            <Import-Package>
-              *,
-              org.apache.directory.shared.ldap.aci,
-              org.apache.directory.shared.ldap.model.schema.comparators,
-              org.apache.directory.shared.ldap.model.schema.normalizers,
-              org.apache.directory.shared.ldap.model.schema.parsers,
-              org.apache.directory.shared.ldap.model.schema.registries,
-              org.apache.directory.shared.ldap.model.schema.syntaxCheckers
-            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
Tue Oct 25 15:19:20 2011
@@ -28,6 +28,7 @@ import java.util.Set;
 
 import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.i18n.I18n;
+import org.apache.directory.shared.ipojo.helpers.OSGIHelper;
 import org.apache.directory.shared.ipojo.schema.SchemaElementsManager;
 import org.apache.directory.shared.ldap.model.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
@@ -270,19 +271,29 @@ public class SchemaEntityFactory impleme
         SyntaxChecker syntaxChecker = null;
         String byteCodeStr = StringConstants.EMPTY;
 
-        if ( byteCode == null )
+        // Check if we're in OSGI context and byteCode is null 
+        if ( OSGIHelper.isAPIInOSGIContainer() && byteCode == null )
         {
-            clazz = Class.forName( className );
+            // That is the only case we have to OSGI load the class,
+            // The other cases are the monolithic load cases.
+            syntaxChecker = schemaElements.getSyntaxChecker( className );
         }
         else
         {
-            classLoader.setAttribute( byteCode );
-            clazz = classLoader.loadClass( className );
-            byteCodeStr = new String( Base64.encode( byteCode.getBytes() ) );
-        }
+            if ( byteCode == null )
+            {
+                clazz = Class.forName( className );
+            }
+            else
+            {
+                classLoader.setAttribute( byteCode );
+                clazz = classLoader.loadClass( className );
+                byteCodeStr = new String( Base64.encode( byteCode.getBytes() ) );
+            }
 
-        // Create the syntaxChecker instance
-        syntaxChecker = ( SyntaxChecker ) clazz.newInstance();
+            // Create the syntaxChecker instance
+            syntaxChecker = ( SyntaxChecker ) clazz.newInstance();
+        }
 
         // Update the common fields
         syntaxChecker.setBytecode( byteCodeStr );
@@ -402,72 +413,50 @@ public class SchemaEntityFactory impleme
         Class<?> clazz = null;
         String byteCodeStr = StringConstants.EMPTY;
 
-        if ( byteCode == null )
+        // Check if we're in OSGI context and byteCode is null 
+        if ( OSGIHelper.isAPIInOSGIContainer() && byteCode == null )
         {
-            clazz = Class.forName( className );
+            // That is the only case we have to OSGI load the class,
+            // The other cases are the monolithic load cases.
+            // Comparators are also oid bound classes, so we send it too.
+            comparator = schemaElements.getLdapComparator( className, oid );
         }
         else
         {
-            classLoader.setAttribute( byteCode );
-            clazz = classLoader.loadClass( className );
-            byteCodeStr = new String( Base64.encode( byteCode.getBytes() ) );
-        }
-
-        // Create the comparator instance. Either we have a no argument constructor,
-        // or we have one which takes an OID. Lets try the one with an OID argument first
-        try
-        {
-            Constructor<?> constructor = clazz.getConstructor( new Class[]
-                { String.class } );
-            comparator = ( LdapComparator<?> ) constructor.newInstance( new Object[]
-                { oid } );
-        }
-        catch ( NoSuchMethodException nsme )
-        {
-            // Ok, let's try with the constructor without argument.
-            // In this case, we will have to check that the OID is the same than
-            // the one we got in the Comparator entry
-            clazz.getConstructor();
-            comparator = ( LdapComparator<?> ) clazz.newInstance();
-
-            if ( !comparator.getOid().equals( oid ) )
+            if ( byteCode == null )
             {
-                String msg = I18n.err( I18n.ERR_10015, oid, comparator.getOid() );
-                throw new LdapInvalidAttributeValueException( ResultCodeEnum.UNWILLING_TO_PERFORM,
msg, nsme );
+                clazz = Class.forName( className );
+            }
+            else
+            {
+                classLoader.setAttribute( byteCode );
+                clazz = classLoader.loadClass( className );
+                byteCodeStr = new String( Base64.encode( byteCode.getBytes() ) );
             }
-        }
-
-        // Update the loadable fields
-        comparator.setBytecode( byteCodeStr );
-        comparator.setFqcn( className );
-
-        // Inject the SchemaManager for the comparator who needs it
-        comparator.setSchemaManager( schemaManager );
-
-        return comparator;
-    }
-
-
-    /**
-     * Load Comparator instances by marshaling IPojo
-     */
-    private LdapComparator<?> OSGILoadComparator( SchemaManager schemaManager, String
oid, String className,
-        Attribute byteCode ) throws Exception
-    {
-        // Try to class load the comparator
-        LdapComparator<?> comparator = null;
-        Class<?> clazz = null;
-        String byteCodeStr = StringConstants.EMPTY;
 
-        if ( byteCode == null )
-        {
-            comparator = schemaElements.getLdapComparator( className, oid );
-        }
-        else
-        {
-            classLoader.setAttribute( byteCode );
-            clazz = classLoader.loadClass( className );
-            byteCodeStr = new String( Base64.encode( byteCode.getBytes() ) );
+            // Create the comparator instance. Either we have a no argument constructor,
+            // or we have one which takes an OID. Lets try the one with an OID argument first
+            try
+            {
+                Constructor<?> constructor = clazz.getConstructor( new Class[]
+                    { String.class } );
+                comparator = ( LdapComparator<?> ) constructor.newInstance( new Object[]
+                    { oid } );
+            }
+            catch ( NoSuchMethodException nsme )
+            {
+                // Ok, let's try with the constructor without argument.
+                // In this case, we will have to check that the OID is the same than
+                // the one we got in the Comparator entry
+                clazz.getConstructor();
+                comparator = ( LdapComparator<?> ) clazz.newInstance();
+
+                if ( !comparator.getOid().equals( oid ) )
+                {
+                    String msg = I18n.err( I18n.ERR_10015, oid, comparator.getOid() );
+                    throw new LdapInvalidAttributeValueException( ResultCodeEnum.UNWILLING_TO_PERFORM,
msg, nsme );
+                }
+            }
         }
 
         // Update the loadable fields
@@ -575,61 +564,6 @@ public class SchemaEntityFactory impleme
 
 
     /**
-     * {@inheritDoc}
-     */
-    public LdapComparator<?> getLdapComparatorOSGI( SchemaManager schemaManager, Entry
entry,
-        Registries targetRegistries,
-        String schemaName ) throws LdapException
-    {
-        checkEntry( entry, SchemaConstants.COMPARATOR );
-
-        // The Comparator OID
-        String oid = getOid( entry, SchemaConstants.COMPARATOR );
-
-        // Get the schema
-        if ( !schemaManager.isSchemaLoaded( schemaName ) )
-        {
-            // The schema is not loaded. We can't create the requested Comparator
-            String msg = I18n.err( I18n.ERR_10016, entry.getDn().getName(), schemaName );
-            LOG.warn( msg );
-            throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM,
msg );
-        }
-
-        Schema schema = getSchema( schemaName, targetRegistries );
-
-        if ( schema == null )
-        {
-            // The schema is disabled. We still have to update the backend
-            String msg = I18n.err( I18n.ERR_10017, entry.getDn().getName(), schemaName );
-            LOG.info( msg );
-            schema = schemaManager.getLoadedSchema( schemaName );
-        }
-
-        // The FQCN
-        String fqcn = getFqcn( entry, SchemaConstants.COMPARATOR );
-
-        // The ByteCode
-        Attribute byteCode = entry.get( MetaSchemaConstants.M_BYTECODE_AT );
-
-        try
-        {
-            // Class load the comparator
-            LdapComparator<?> comparator = OSGILoadComparator( schemaManager, oid,
fqcn, byteCode );
-
-            // Update the common fields
-            setSchemaObjectProperties( comparator, entry, schema );
-
-            // return the resulting comparator
-            return comparator;
-        }
-        catch ( Exception e )
-        {
-            throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM,
e.getMessage(), e );
-        }
-    }
-
-
-    /**
      * Class load a normalizer instances
      */
     private Normalizer classLoadNormalizer( SchemaManager schemaManager, String oid, String
className,
@@ -640,19 +574,29 @@ public class SchemaEntityFactory impleme
         Normalizer normalizer = null;
         String byteCodeStr = StringConstants.EMPTY;
 
-        if ( byteCode == null )
+        // Check if we're in OSGI context and byteCode is null 
+        if ( OSGIHelper.isAPIInOSGIContainer() && byteCode == null )
         {
-            clazz = Class.forName( className );
+            // That is the only case we have to OSGI load the class,
+            // The other cases are the monolithic load cases.
+            normalizer = schemaElements.getNormalizer( className );
         }
         else
         {
-            classLoader.setAttribute( byteCode );
-            clazz = classLoader.loadClass( className );
-            byteCodeStr = new String( Base64.encode( byteCode.getBytes() ) );
-        }
+            if ( byteCode == null )
+            {
+                clazz = Class.forName( className );
+            }
+            else
+            {
+                classLoader.setAttribute( byteCode );
+                clazz = classLoader.loadClass( className );
+                byteCodeStr = new String( Base64.encode( byteCode.getBytes() ) );
+            }
 
-        // Create the normalizer instance
-        normalizer = ( Normalizer ) clazz.newInstance();
+            // Create the normalizer instance
+            normalizer = ( Normalizer ) clazz.newInstance();
+        }
 
         // Update the common fields
         normalizer.setBytecode( byteCodeStr );

Modified: directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java?rev=1188705&r1=1188704&r2=1188705&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
Tue Oct 25 15:19:20 2011
@@ -1593,7 +1593,7 @@ public class DefaultSchemaManager implem
         return new ImmutableSyntaxCheckerRegistry( registries.getSyntaxCheckerRegistry()
);
     }
 
-    
+
     /**
      * Get rid of AT's options (everything after the ';'
      * @param oid
@@ -1602,7 +1602,7 @@ public class DefaultSchemaManager implem
     private String stripOptions( String oid )
     {
         int semiColonPos = oid.indexOf( ';' );
-        
+
         if ( semiColonPos != -1 )
         {
             return oid.substring( 0, semiColonPos );
@@ -1613,6 +1613,7 @@ public class DefaultSchemaManager implem
         }
     }
 
+
     /**
      * {@inheritDoc}
      */



Mime
View raw message