directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1104425 - in /directory/shared/branches/shared-osgi: dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/ integ/src/test/java/org/apache/directory/shared/ldap/c...
Date Tue, 17 May 2011 17:34:40 GMT
Author: elecharny
Date: Tue May 17 17:34:39 2011
New Revision: 1104425

URL: http://svn.apache.org/viewvc?rev=1104425&view=rev
Log:
o Renamed the LdapCodecServiceFactory
o Called it instead of creating a new instance of the StandaloneLdapApiService

Added:
    directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapApiServiceFactory.java
      - copied, changed from r1104318, directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapCodecServiceFactory.java
Removed:
    directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapCodecServiceFactory.java
Modified:
    directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
    directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java
    directory/shared/branches/shared-osgi/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java
    directory/shared/branches/shared-osgi/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
    directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/extendedRequest/StoreExtendedRequestName.java
    directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultActivator.java
    directory/shared/branches/shared-osgi/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java
    directory/shared/branches/shared-osgi/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java
    directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationGrammar.java
    directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureGrammar.java
    directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationRequestTest.java
    directory/shared/branches/shared-osgi/ldap/extras/sp/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java
    directory/shared/branches/shared-osgi/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolCodecActivator.java
    directory/shared/branches/shared-osgi/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolEncoder.java

Modified: directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java?rev=1104425&r1=1104424&r2=1104425&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
(original)
+++ directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
Tue May 17 17:34:39 2011
@@ -42,7 +42,7 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.CodecControl;
 import org.apache.directory.shared.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
 import org.apache.directory.shared.ldap.model.entry.BinaryValue;
 import org.apache.directory.shared.ldap.model.entry.StringValue;
@@ -80,7 +80,7 @@ import org.xmlpull.v1.XmlPullParserExcep
  */
 public final class Dsmlv2Grammar extends AbstractGrammar implements Grammar
 {
-    private LdapApiService codec = LdapCodecServiceFactory.getSingleton();
+    private LdapApiService codec = LdapApiServiceFactory.getSingleton();
     
 
     /**

Modified: directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java?rev=1104425&r1=1104424&r2=1104425&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java
(original)
+++ directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java
Tue May 17 17:34:39 2011
@@ -26,7 +26,7 @@ import static org.junit.Assert.fail;
 
 import org.apache.directory.shared.dsmlv2.request.Dsmlv2Grammar;
 import org.apache.directory.shared.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
 import org.xmlpull.v1.XmlPullParserException;
 
 /**
@@ -37,7 +37,7 @@ import org.xmlpull.v1.XmlPullParserExcep
 public abstract class AbstractTest
 {
     /** The LDAP encoder decoder service */
-    private LdapApiService codec = LdapCodecServiceFactory.getSingleton();
+    private LdapApiService codec = LdapApiServiceFactory.getSingleton();
     
     private Dsmlv2Grammar grammar = new Dsmlv2Grammar();
     

Modified: directory/shared/branches/shared-osgi/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java?rev=1104425&r1=1104424&r2=1104425&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java
(original)
+++ directory/shared/branches/shared-osgi/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java
Tue May 17 17:34:39 2011
@@ -78,7 +78,7 @@ public class StandaloneLdapCodecServiceT
     @Test
     public void testLoadingExtras() throws Exception
     {
-        StandaloneLdapApiService codec = new StandaloneLdapApiService();
+        LdapApiService codec = LdapApiServiceFactory.getSingleton();
         
         assertTrue( codec.isControlRegistered( PasswordPolicy.OID ) );
 
@@ -94,7 +94,7 @@ public class StandaloneLdapCodecServiceT
     @Test
     public void testLoadingExtendedOperation() throws Exception
     {
-        StandaloneLdapApiService codec = new StandaloneLdapApiService();
+        LdapApiService codec = LdapApiServiceFactory.getSingleton();
         StoredProcedureRequest req = new StoredProcedureRequestImpl();
         req.setLanguage( "Java" );
         req.setProcedure( Strings.getBytesUtf8( "bogusProc" ) );

Modified: directory/shared/branches/shared-osgi/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1104425&r1=1104424&r2=1104425&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
Tue May 17 17:34:39 2011
@@ -63,7 +63,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.ldap.codec.api.BinaryAttributeDetector;
 import org.apache.directory.shared.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
 import org.apache.directory.shared.ldap.codec.api.MessageEncoderException;
@@ -221,7 +221,7 @@ public class LdapNetworkConnection exten
     private SchemaManager schemaManager;
 
     /** the ldap codec service */
-    LdapApiService codec = LdapCodecServiceFactory.getSingleton();
+    LdapApiService codec = LdapApiServiceFactory.getSingleton();
 
     /** The Ldap codec protocol filter */
     private IoFilter ldapProtocolFilter = new ProtocolCodecFilter( codec.getProtocolCodecFactory()
);
@@ -3089,7 +3089,7 @@ public class LdapNetworkConnection exten
     public ExtendedResponse extended( Oid oid, byte[] value ) throws LdapException
     {
         ExtendedRequest<?> extendedRequest =
-            LdapCodecServiceFactory.getSingleton().newExtendedRequest( oid.toString(), value
);
+            LdapApiServiceFactory.getSingleton().newExtendedRequest( oid.toString(), value
);
         return extended( extendedRequest );
     }
 

Modified: directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/extendedRequest/StoreExtendedRequestName.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/extendedRequest/StoreExtendedRequestName.java?rev=1104425&r1=1104424&r2=1104425&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/extendedRequest/StoreExtendedRequestName.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/extendedRequest/StoreExtendedRequestName.java
Tue May 17 17:34:39 2011
@@ -26,7 +26,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.util.Oid;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.ExtendedRequestDecorator;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
 import org.apache.directory.shared.util.Strings;
@@ -99,9 +99,9 @@ public class StoreExtendedRequestName ex
                     throw new DecoderException( msg );
                 }
 
-                req = LdapCodecServiceFactory.getSingleton().newExtendedRequest( requestName,
null );
+                req = LdapApiServiceFactory.getSingleton().newExtendedRequest( requestName,
null );
                 req.setMessageId( container.getMessageId() );
-                container.setMessage( LdapCodecServiceFactory.getSingleton().decorate( req
) );
+                container.setMessage( LdapApiServiceFactory.getSingleton().decorate( req
) );
             }
             catch ( DecoderException de )
             {

Copied: directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapApiServiceFactory.java
(from r1104318, directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapCodecServiceFactory.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapApiServiceFactory.java?p2=directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapApiServiceFactory.java&p1=directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapCodecServiceFactory.java&r1=1104318&r2=1104425&rev=1104425&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapCodecServiceFactory.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapApiServiceFactory.java
Tue May 17 17:34:39 2011
@@ -35,10 +35,10 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class LdapCodecServiceFactory
+public class LdapApiServiceFactory
 {
     /** Logger for this class */
-    private static final Logger LOG = LoggerFactory.getLogger( LdapCodecServiceFactory.class
);
+    private static final Logger LOG = LoggerFactory.getLogger( LdapApiServiceFactory.class
);
     
     /** The LdapCodecService singleton bound to this factory */
     private static LdapApiService ldapCodecService;
@@ -105,10 +105,10 @@ public class LdapCodecServiceFactory
          * If the class member is already set we have problems.
          */
         
-        if ( LdapCodecServiceFactory.ldapCodecService != null )
+        if ( LdapApiServiceFactory.ldapCodecService != null )
         {
             StringBuilder sb = new StringBuilder( "The LdapCodecService is already set to
an instance of " );
-            sb.append( LdapCodecServiceFactory.class.getName() );
+            sb.append( LdapApiServiceFactory.class.getName() );
             LOG.error( sb.toString() );
             throw new IllegalStateException( sb.toString() );
         }
@@ -124,8 +124,8 @@ public class LdapCodecServiceFactory
             {
                 @SuppressWarnings("unchecked")
                 Class<? extends LdapApiService> serviceClass = ( Class<? extends
LdapApiService> ) 
-                    Class.forName( "org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapCodecService"
);
-                LdapCodecServiceFactory.ldapCodecService = serviceClass.newInstance();
+                    Class.forName( "org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapApiService"
);
+                LdapApiServiceFactory.ldapCodecService = serviceClass.newInstance();
                 usingStandaloneImplementation = true;
             }
             catch ( Exception e )
@@ -136,7 +136,7 @@ public class LdapCodecServiceFactory
         else
         {
             usingStandaloneImplementation = false;
-            LdapCodecServiceFactory.ldapCodecService = ldapCodecService;
+            LdapApiServiceFactory.ldapCodecService = ldapCodecService;
         }
     }
 }

Modified: directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultActivator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultActivator.java?rev=1104425&r1=1104424&r2=1104425&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultActivator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultActivator.java
Tue May 17 17:34:39 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.ldap.codec.api.LdapApiService;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
@@ -54,7 +54,7 @@ public class DefaultActivator implements
     public void start( BundleContext bundleContext ) throws Exception
     {
         registration = bundleContext.registerService( LdapApiService.class.getName(), codec,
null );
-        LdapCodecServiceFactory.initialize( codec );
+        LdapApiServiceFactory.initialize( codec );
     }
 
 

Modified: directory/shared/branches/shared-osgi/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java?rev=1104425&r1=1104424&r2=1104425&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java
Tue May 17 17:34:39 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.codec.osgi;
 
 
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
 import org.apache.directory.shared.ldap.codec.api.LdapEncoder;
 import org.apache.directory.shared.ldap.codec.osgi.DefaultLdapCodecService;
 import org.apache.mina.core.session.IoSession;
@@ -66,9 +66,9 @@ public abstract class AbstractCodecServi
         });
         
         
-        if ( LdapCodecServiceFactory.isInitialized() == false )
+        if ( LdapApiServiceFactory.isInitialized() == false )
         {
-            LdapCodecServiceFactory.initialize( codec );
+            LdapApiServiceFactory.initialize( codec );
         }
         encoder = new LdapEncoder( codec );
     }

Modified: directory/shared/branches/shared-osgi/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java?rev=1104425&r1=1104424&r2=1104425&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java
Tue May 17 17:34:39 2011
@@ -20,6 +20,8 @@
 package org.apache.directory.shared.ldap.codec.osgi;
 
 
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
 import org.apache.directory.shared.ldap.codec.api.LdapEncoder;
 import org.apache.directory.shared.ldap.codec.standalone.StandaloneLdapApiService;
 import org.junit.AfterClass;
@@ -34,7 +36,7 @@ import org.junit.BeforeClass;
 public abstract class AbstractCodecServiceTest
 {
     /** The codec service */
-    protected static StandaloneLdapApiService codec;
+    protected static LdapApiService codec;
 
     /** The encoder instance */
     protected static LdapEncoder encoder;
@@ -74,7 +76,7 @@ public abstract class AbstractCodecServi
         
         System.setProperty( StandaloneLdapApiService.EXTRA_EXTENDED_OPERATION_LIST, "" );

 
-        codec = new StandaloneLdapApiService();
+        codec = LdapApiServiceFactory.getSingleton();
         encoder = new LdapEncoder( codec );
     }
 

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationGrammar.java?rev=1104425&r1=1104424&r2=1104425&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationGrammar.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/certGeneration/CertGenerationGrammar.java
Tue May 17 17:34:39 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
 import org.apache.directory.shared.ldap.extras.extended.CertGenerationRequestImpl;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.util.Strings;
@@ -91,7 +91,7 @@ public class CertGenerationGrammar exten
                 public void action( CertGenerationContainer container )
                 {
                     CertGenerationRequestDecorator certGenerationObject = new CertGenerationRequestDecorator(

-                        LdapCodecServiceFactory.getSingleton(), new CertGenerationRequestImpl()
);
+                        LdapApiServiceFactory.getSingleton(), new CertGenerationRequestImpl()
);
                     container.setCertGenerationObject( certGenerationObject );
                 }
             } );

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureGrammar.java?rev=1104425&r1=1104424&r2=1104425&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureGrammar.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/storedProcedure/StoredProcedureGrammar.java
Tue May 17 17:34:39 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
 import org.apache.directory.shared.ldap.extras.extended.StoredProcedureParameter;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
@@ -94,7 +94,7 @@ public final class StoredProcedureGramma
                     StoredProcedureRequestDecorator storedProcedure = container.getStoredProcedure();
                     if ( storedProcedure == null )
                     {
-                        storedProcedure = new StoredProcedureRequestDecorator( LdapCodecServiceFactory.getSingleton()
);
+                        storedProcedure = new StoredProcedureRequestDecorator( LdapApiServiceFactory.getSingleton()
);
                         container.setStoredProcedure( storedProcedure );
                     }
 

Modified: directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationRequestTest.java?rev=1104425&r1=1104424&r2=1104425&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationRequestTest.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/CertGenerationRequestTest.java
Tue May 17 17:34:39 2011
@@ -29,7 +29,7 @@ import java.nio.ByteBuffer;
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.EncoderException;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
 import org.apache.directory.shared.ldap.extras.extended.CertGenerationRequestImpl;
 import org.apache.directory.shared.ldap.extras.extended.ads_impl.certGeneration.CertGenerationContainer;
 import org.apache.directory.shared.ldap.extras.extended.ads_impl.certGeneration.CertGenerationRequestDecorator;
@@ -108,7 +108,7 @@ public class CertGenerationRequestTest
         }
 
         CertGenerationRequestDecorator req = new CertGenerationRequestDecorator( 
-            LdapCodecServiceFactory.getSingleton(), new CertGenerationRequestImpl() );
+            LdapApiServiceFactory.getSingleton(), new CertGenerationRequestImpl() );
         req = container.getCertGenerationObject();
         assertEquals( dn, req.getTargetDN() );
         assertEquals( dn, req.getIssuerDN() );

Modified: directory/shared/branches/shared-osgi/ldap/extras/sp/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/sp/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java?rev=1104425&r1=1104424&r2=1104425&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/sp/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/extras/sp/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java
Tue May 17 17:34:39 2011
@@ -36,7 +36,7 @@ import javax.naming.ldap.LdapContext;
 
 import org.apache.commons.lang.SerializationUtils;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
 import org.apache.directory.shared.ldap.extras.extended.StoredProcedureRequestImpl;
 
 
@@ -150,7 +150,7 @@ public final class JavaStoredProcUtils
              * Call the stored procedure via the extended operation
              * and get back its return value.
              */
-            ExtendedRequest jndiReq = LdapCodecServiceFactory.getSingleton().toJndi( req
);
+            ExtendedRequest jndiReq = LdapApiServiceFactory.getSingleton().toJndi( req );
             ExtendedResponse resp = ctx.extendedOperation( jndiReq );
 
             /**

Modified: directory/shared/branches/shared-osgi/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolCodecActivator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolCodecActivator.java?rev=1104425&r1=1104424&r2=1104425&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolCodecActivator.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolCodecActivator.java
Tue May 17 17:34:39 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.codec.protocol.mina;
 
 
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
@@ -63,7 +63,7 @@ public class LdapProtocolCodecActivator 
     public void start( BundleContext bundleContext ) throws Exception
     {
         registration = bundleContext.registerService( LdapProtocolCodecFactory.class.getName(),
factory, null );
-        LdapCodecServiceFactory.getSingleton().registerProtocolCodecFactory( factory );
+        LdapApiServiceFactory.getSingleton().registerProtocolCodecFactory( factory );
     }
 
 

Modified: directory/shared/branches/shared-osgi/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolEncoder.java?rev=1104425&r1=1104424&r2=1104425&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolEncoder.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolEncoder.java
Tue May 17 17:34:39 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
 
 import java.nio.ByteBuffer;
 
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
 import org.apache.directory.shared.ldap.codec.api.LdapEncoder;
 import org.apache.directory.shared.ldap.model.message.Message;
 import org.apache.mina.core.buffer.IoBuffer;
@@ -49,7 +49,7 @@ public class LdapProtocolEncoder impleme
      */
     public LdapProtocolEncoder()
     {
-        this.encoder = new LdapEncoder( LdapCodecServiceFactory.getSingleton() );
+        this.encoder = new LdapEncoder( LdapApiServiceFactory.getSingleton() );
     }
 
 



Mime
View raw message