directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1065284 [2/2] - in /directory/shared/trunk: ./ dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ ldap/src/main/java/org/apache/directory/shared/ldap/...
Date Sun, 30 Jan 2011 14:16:27 GMT
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java?rev=1065284&r1=1065283&r2=1065284&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java
(original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java
Sun Jan 30 14:16:26 2011
@@ -24,6 +24,7 @@ import java.util.Collection;
 import java.util.Iterator;
 
 import org.apache.directory.shared.dsmlv2.ParserUtils;
+import org.apache.directory.shared.ldap.codec.ILdapCodecService;
 import org.apache.directory.shared.ldap.model.entry.Modification;
 import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.model.entry.Value;
@@ -40,14 +41,14 @@ import org.dom4j.QName;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ModifyRequestDsml extends AbstractRequestDsml
+public class ModifyRequestDsml extends AbstractRequestDsml<ModifyRequest>
 {
     /**
      * Creates a new getDecoratedMessage() of ModifyRequestDsml.
      */
-    public ModifyRequestDsml()
+    public ModifyRequestDsml( ILdapCodecService codec )
     {
-        super( new ModifyRequestImpl() );
+        super( codec, new ModifyRequestImpl() );
     }
 
 
@@ -57,9 +58,9 @@ public class ModifyRequestDsml extends A
      * @param ldapMessage
      *      the message to decorate
      */
-    public ModifyRequestDsml( ModifyRequest ldapMessage )
+    public ModifyRequestDsml( ILdapCodecService codec, ModifyRequest ldapMessage )
     {
-        super( ldapMessage );
+        super( codec, ldapMessage );
     }
 
 
@@ -68,7 +69,7 @@ public class ModifyRequestDsml extends A
      */
     public MessageTypeEnum getType()
     {
-        return getDecoratedMessage().getType();
+        return getDecorated().getType();
     }
 
 
@@ -79,7 +80,7 @@ public class ModifyRequestDsml extends A
     {
         Element element = super.toDsml( root );
 
-        ModifyRequest request = ( ModifyRequest ) getDecoratedMessage();
+        ModifyRequest request = ( ModifyRequest ) getDecorated();
 
         // Dn
         if ( request.getName() != null )

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java?rev=1065284&r1=1065283&r2=1065284&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java
(original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java
Sun Jan 30 14:16:26 2011
@@ -24,6 +24,7 @@ import java.util.List;
 
 import org.apache.directory.shared.dsmlv2.ParserUtils;
 import org.apache.directory.shared.ldap.codec.AttributeValueAssertion;
+import org.apache.directory.shared.ldap.codec.ILdapCodecService;
 import org.apache.directory.shared.ldap.codec.LdapConstants;
 import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter;
 import org.apache.directory.shared.ldap.codec.search.ExtensibleMatchFilter;
@@ -49,14 +50,14 @@ import org.dom4j.QName;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SearchRequestDsml extends AbstractRequestDsml
+public class SearchRequestDsml extends AbstractRequestDsml<SearchRequest>
 {
     /**
      * Creates a new getDecoratedMessage() of SearchRequestDsml.
      */
-    public SearchRequestDsml()
+    public SearchRequestDsml( ILdapCodecService codec )
     {
-        super( new SearchRequestImpl() );
+        super( codec, new SearchRequestImpl() );
     }
 
 
@@ -66,9 +67,9 @@ public class SearchRequestDsml extends A
      * @param ldapMessage
      *      the message to decorate
      */
-    public SearchRequestDsml( SearchRequest ldapMessage )
+    public SearchRequestDsml( ILdapCodecService codec, SearchRequest ldapMessage )
     {
-        super( ldapMessage );
+        super( codec, ldapMessage );
     }
 
 
@@ -77,7 +78,7 @@ public class SearchRequestDsml extends A
      */
     public MessageTypeEnum getType()
     {
-        return getDecoratedMessage().getType();
+        return getDecorated().getType();
     }
 
 
@@ -88,7 +89,7 @@ public class SearchRequestDsml extends A
     {
         Element element = super.toDsml( root );
 
-        SearchRequest request = ( SearchRequest ) getDecoratedMessage();
+        SearchRequest request = ( SearchRequest ) getDecorated();
 
         // Dn
         if ( request.getBase() != null )

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java?rev=1065284&r1=1065283&r2=1065284&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java
Sun Jan 30 14:16:26 2011
@@ -25,7 +25,13 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import org.apache.directory.shared.asn1.DecoderException;
+import org.apache.directory.shared.asn1.EncoderException;
+import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesDecorator;
+import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesFactory;
 import org.apache.directory.shared.ldap.model.message.Control;
+import org.apache.directory.shared.ldap.model.message.controls.Subentries;
+import org.apache.directory.shared.ldap.model.message.controls.SubentriesImpl;
 import org.apache.mina.filter.codec.ProtocolCodecFactory;
 
 
@@ -41,6 +47,25 @@ public class DefaultLdapCodecService imp
     Map<String,IExtendedOpFactory<?,?>> extReqFactories = new HashMap<String,
IExtendedOpFactory<?,?>>();
     Map<String,IExtendedOpFactory<?,?>> extResFactories = new HashMap<String,
IExtendedOpFactory<?,?>>();
     
+    
+    public DefaultLdapCodecService()
+    {
+        loadStockControls();
+    }
+    
+    
+    /**
+     * Loads the Controls implement out of the box in the codec.
+     */
+    private void loadStockControls()
+    {
+        SubentriesFactory subentriesFactory = new SubentriesFactory();
+        controlFactories.put( Subentries.OID, subentriesFactory );
+
+        
+        
+    }
+    
 
     //-------------------------------------------------------------------------
     // ILdapCodecService implementation methods
@@ -182,7 +207,7 @@ public class DefaultLdapCodecService imp
     {
         try
         {
-            IControlFactory<?,?> factory = controlFactories.get( control.getOid() );
+            IControlFactory factory = controlFactories.get( control.getOid() );
             return factory.decorate( control );
         }
         catch ( SecurityException e )
@@ -192,4 +217,16 @@ public class DefaultLdapCodecService imp
         
         return null;
     }
+
+
+    public javax.naming.ldap.Control toJndiControl( Control control ) throws EncoderException
+    {
+        return null;
+    }
+
+
+    public Control fromJndiControl( javax.naming.ldap.Control control ) throws DecoderException
+    {
+        return null;
+    }
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/IControlFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/IControlFactory.java?rev=1065284&r1=1065283&r2=1065284&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/IControlFactory.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/IControlFactory.java
Sun Jan 30 14:16:26 2011
@@ -20,6 +20,8 @@
 package org.apache.directory.shared.ldap.codec;
 
 
+import org.apache.directory.shared.asn1.DecoderException;
+import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.ldap.model.message.Control;
 
 
@@ -35,7 +37,11 @@ public interface IControlFactory<C exten
     
     D newCodecControl();
     
-    D decorate( Control control );
+    D decorate( C control );
     
     C newControl();
+    
+    javax.naming.ldap.Control toJndiControl( C control ) throws EncoderException;
+    
+    C fromJndiControl( javax.naming.ldap.Control control ) throws DecoderException;
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/IDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/IDecorator.java?rev=1065284&r1=1065283&r2=1065284&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/IDecorator.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/IDecorator.java
Sun Jan 30 14:16:26 2011
@@ -32,6 +32,11 @@ import org.apache.directory.shared.asn1.
  */
 public interface IDecorator<E>
 {
+    /**
+     * Gets the object being decorated by this IDecorator.
+     *
+     * @return The decorated object
+     */
     E getDecorated();
     
     

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ILdapCodecService.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ILdapCodecService.java?rev=1065284&r1=1065283&r2=1065284&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ILdapCodecService.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ILdapCodecService.java
Sun Jan 30 14:16:26 2011
@@ -22,6 +22,8 @@ package org.apache.directory.shared.ldap
 
 import java.util.Iterator;
 
+import org.apache.directory.shared.asn1.DecoderException;
+import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.mina.filter.codec.ProtocolCodecFactory;
 
@@ -69,4 +71,9 @@ public interface ILdapCodecService
      * @return the client or server specific {@link ProtocolCodecFactory}
      */
     ProtocolCodecFactory newProtocolCodecFactory( boolean client );
+    
+    
+    javax.naming.ldap.Control toJndiControl( Control control ) throws EncoderException;
+    
+    Control fromJndiControl( javax.naming.ldap.Control control ) throws DecoderException;
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecorator.java?rev=1065284&r1=1065283&r2=1065284&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecorator.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecorator.java
Sun Jan 30 14:16:26 2011
@@ -44,7 +44,8 @@ import org.apache.directory.shared.util.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @param <E>
  */
-public abstract class ControlDecorator<E extends Control> extends AbstractAsn1Object
implements Control, ICodecControl<E>
+public abstract class ControlDecorator<E extends Control> extends AbstractAsn1Object

+    implements Control, ICodecControl<E>
 {
     /** The decorated Control */
     private E decorated;
@@ -99,11 +100,23 @@ public abstract class ControlDecorator<E
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public E getDecorated()
     {
         return decorated;
     }
 
+    
+    /**
+     * {@inheritDoc}
+     */
+    public void setDecorated( E decorated )
+    {
+        this.decorated = decorated;
+    }
+    
 
     // ------------------------------------------------------------------------
     // Control Methods

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java?rev=1065284&r1=1065283&r2=1065284&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java
Sun Jan 30 14:16:26 2011
@@ -305,7 +305,9 @@ public class LdapResultDecorator impleme
     }
 
 
-    
+    /**
+     * {@inheritDoc}
+     */
     public LdapResult getDecorated()
     {
         return decoratedLdapResult;

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/MessageDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/MessageDecorator.java?rev=1065284&r1=1065283&r2=1065284&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/MessageDecorator.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/MessageDecorator.java
Sun Jan 30 14:16:26 2011
@@ -388,11 +388,14 @@ public abstract class MessageDecorator<E
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
     public E getDecorated()
     {
         return decoratedMessage;
     }
-
+    
 
     public int computeLength()
     {

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResponseDecorator.java?rev=1065284&r1=1065283&r2=1065284&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResponseDecorator.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResponseDecorator.java
Sun Jan 30 14:16:26 2011
@@ -45,7 +45,7 @@ public abstract class ResponseDecorator<
     {
         super( codec, decoratedMessage );
         
-        ldapResultDecorator = new LdapResultDecorator( ((ResultResponse)decoratedMessage).getLdapResult()
);
+        ldapResultDecorator = new LdapResultDecorator( ( ( ResultResponse ) decoratedMessage
).getLdapResult() );
     }
 
 

Added: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesFactory.java?rev=1065284&view=auto
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesFactory.java
(added)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesFactory.java
Sun Jan 30 14:16:26 2011
@@ -0,0 +1,77 @@
+/*
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you under the Apache License, Version 2.0 (the
+ *   "License"); you may not use this file except in compliance
+ *   with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.apache.directory.shared.ldap.codec.search.controls.subentries;
+
+
+import javax.naming.ldap.Control;
+
+import org.apache.directory.shared.asn1.DecoderException;
+import org.apache.directory.shared.asn1.EncoderException;
+import org.apache.directory.shared.ldap.codec.IControlFactory;
+import org.apache.directory.shared.ldap.model.message.controls.Subentries;
+import org.apache.directory.shared.ldap.model.message.controls.SubentriesImpl;
+
+
+/**
+ * A factory for creating {@link Subentries} Controls and their 
+ * {@link SubentriesDecorator} objects.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class SubentriesFactory implements IControlFactory<Subentries, SubentriesDecorator>
+{
+    public String getOid()
+    {
+        return Subentries.OID;
+    }
+
+    public SubentriesDecorator newCodecControl()
+    {
+        return new SubentriesDecorator();
+    }
+
+
+    public Subentries newControl()
+    {
+        return new SubentriesImpl();
+    }
+
+    
+    public SubentriesDecorator decorate( Subentries control )
+    {
+        if ( control.getOid().equals( Subentries.OID ) )
+        {
+            throw new IllegalArgumentException( "Bad control provided: " + control );
+        }
+        
+        return new SubentriesDecorator( control );
+    }
+
+    public Control toJndiControl( Subentries control ) throws EncoderException
+    {
+        return null;
+    }
+
+    public Subentries fromJndiControl( Control control ) throws DecoderException
+    {
+        return null;
+    }
+}

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java?rev=1065284&r1=1065283&r2=1065284&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java
Sun Jan 30 14:16:26 2011
@@ -20,7 +20,6 @@
 package org.apache.directory.shared.ldap.util;
 
 
-import java.nio.ByteBuffer;
 import java.util.Hashtable;
 import java.util.Map;
 
@@ -46,7 +45,6 @@ import javax.naming.directory.InvalidAtt
 import javax.naming.directory.InvalidSearchFilterException;
 import javax.naming.directory.NoSuchAttributeException;
 import javax.naming.directory.SchemaViolationException;
-import javax.naming.ldap.BasicControl;
 import javax.naming.ldap.ExtendedRequest;
 import javax.naming.ldap.ExtendedResponse;
 import javax.naming.ldap.LdapName;
@@ -56,7 +54,6 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.ldap.model.exception.*;
 import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.codec.ICodecControl;
 import org.apache.directory.shared.ldap.codec.ILdapCodecService;
 import org.apache.directory.shared.ldap.model.exception.LdapAffectMultipleDsaException;
 import org.apache.directory.shared.ldap.model.exception.LdapAliasDereferencingException;
@@ -103,20 +100,15 @@ public final class JndiUtils
     }
 
 
+    // @TODO not really needed and can be moved out
     public static javax.naming.ldap.Control toJndiControl( ILdapCodecService codec, Control
control ) 
         throws EncoderException
     {
-        ICodecControl<? extends Control> codecControl = codec.decorate( control );
-        int length = codecControl.computeLength();
-        ByteBuffer buffer = ByteBuffer.allocate( length );
-        codecControl.encode( buffer );
-        buffer.flip();
-        javax.naming.ldap.Control jndiControl = new BasicControl( control.getOid(), 
-            control.isCritical(), buffer.array() );
-        return jndiControl;
+        return codec.toJndiControl( control );
     }
 
 
+    // @TODO not really needed and can be moved out
     public static javax.naming.ldap.Control[] toJndiControls( ILdapCodecService codec, Control...
controls ) 
          throws EncoderException
     {
@@ -139,15 +131,15 @@ public final class JndiUtils
     }
 
 
+    // @TODO not really needed and can be moved out
     public static Control fromJndiControl( ILdapCodecService codec, javax.naming.ldap.Control
jndiControl ) 
         throws DecoderException
     {
-        ICodecControl<Control> control = codec.newControl( jndiControl.getID() );
-        control.decode( jndiControl.getEncodedValue() );
-        return control.getDecorated();
+        return codec.fromJndiControl( jndiControl );
     }
 
 
+    // @TODO not really needed and can be moved out
     public static Control[] fromJndiControls( ILdapCodecService codec, javax.naming.ldap.Control...
jndiControls )
         throws DecoderException
     {

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/TestControlFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/TestControlFactory.java?rev=1065284&r1=1065283&r2=1065284&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/TestControlFactory.java
(original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/TestControlFactory.java
Sun Jan 30 14:16:26 2011
@@ -20,6 +20,8 @@
 package org.apache.directory.shared.ldap.codec;
 
 
+import org.apache.directory.shared.asn1.DecoderException;
+import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.ldap.model.message.Control;
 
 
@@ -44,4 +46,19 @@ public class TestControlFactory implemen
     {
         return null;
     }
+
+    public ITestCodecControl decorate( ITestControl control )
+    {
+        return null;
+    }
+
+    public javax.naming.ldap.Control toJndiControl( ITestControl control ) throws EncoderException
+    {
+        return null;
+    }
+
+    public ITestControl fromJndiControl( javax.naming.ldap.Control control ) throws DecoderException
+    {
+        return null;
+    }
 }
\ No newline at end of file

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/TestLdapCodecService.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/TestLdapCodecService.java?rev=1065284&r1=1065283&r2=1065284&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/TestLdapCodecService.java
(original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/TestLdapCodecService.java
Sun Jan 30 14:16:26 2011
@@ -25,6 +25,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import org.apache.directory.shared.asn1.DecoderException;
+import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.mina.filter.codec.ProtocolCodecFactory;
 
@@ -130,4 +132,16 @@ public class TestLdapCodecService implem
     {
         return null;
     }
+
+
+    public javax.naming.ldap.Control toJndiControl( Control control ) throws EncoderException
+    {
+        return null;
+    }
+
+
+    public Control fromJndiControl( javax.naming.ldap.Control control ) throws DecoderException
+    {
+        return null;
+    }
 }
\ No newline at end of file

Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?rev=1065284&r1=1065283&r2=1065284&view=diff
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Sun Jan 30 14:16:26 2011
@@ -82,10 +82,8 @@
     <module>ldap-schema</module>
     <module>ldap-schema-converter</module>
     <module>ldap-client-api</module>
-    <!--
     <module>dsml-parser</module>
     <module>dsml-engine</module>
-    -->
   </modules>
 
   <build>



Mime
View raw message