directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1067686 [3/3] - in /directory: shared/branches/m1/dsml-engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/ shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ shared/branches/m1/dsml-parser/src/main...
Date Sun, 06 Feb 2011 15:45:57 GMT
Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java?rev=1067686&r1=1067685&r2=1067686&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java
(original)
+++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java
Sun Feb  6 15:45:55 2011
@@ -33,9 +33,9 @@ import java.util.Map;
 import org.apache.directory.junit.tools.Concurrent;
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
+import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.dsmlv2.reponse.SearchResponse;
-import org.apache.directory.shared.ldap.codec.controls.ControlDecorator;
 import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.model.filter.LdapURL;
 import org.apache.directory.shared.ldap.model.message.Control;
@@ -74,7 +74,7 @@ public class SearchResultReferenceTest e
         {
             fail( e.getMessage() );
         }
-
+        
         SearchResultReference searchResultReference = ( ( SearchResponse ) parser.getBatchResponse()
             .getCurrentResponse().getDecorated() ).getCurrentSearchResultReference();
         Map<String, Control> controls = searchResultReference.getControls();
@@ -86,7 +86,7 @@ public class SearchResultReferenceTest e
         assertNotNull( control );
         assertTrue( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
-        assertEquals( "Some text", Strings.utf8ToString((byte[]) ((ControlDecorator<Control>)control).getValue())
);
+        assertEquals( "Some text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?>
) control ).getValue()) );
     }
 
 
@@ -122,7 +122,7 @@ public class SearchResultReferenceTest e
         assertNotNull( control );
         assertTrue( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
-        assertFalse( ((ControlDecorator<Control>)control).hasValue() );
+        assertFalse( ( ( DsmlControl<?> ) control ).hasValue() );
     }
 
 
@@ -157,7 +157,7 @@ public class SearchResultReferenceTest e
 
         assertNotNull( control );
         assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
-        assertEquals( "Some other text", Strings.utf8ToString((byte[]) ((ControlDecorator<Control>)control).getValue())
);
+        assertEquals( "Some other text", Strings.utf8ToString((byte[]) ( ( DsmlControl<?>
) control ).getValue()) );
     }
 
 
@@ -193,7 +193,7 @@ public class SearchResultReferenceTest e
         assertNotNull( control );
         assertTrue( control.isCritical() );
         assertEquals( "1.2.840.113556.1.4.456", control.getOid() );
-        assertFalse( ((ControlDecorator<Control>)control).hasValue() );
+        assertFalse( ( ( DsmlControl<?> ) control ).hasValue() );
     }
 
 

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/MessageDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/MessageDecorator.java?rev=1067686&r1=1067685&r2=1067686&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/MessageDecorator.java
(original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/MessageDecorator.java
Sun Feb  6 15:45:55 2011
@@ -68,14 +68,14 @@ public abstract class MessageDecorator<E
     /** Map of message controls using OID Strings for keys and Control values */
     private final Map<String, Control> controls;
 
+    /** The current control */
+    private CodecControl<? extends Control> currentControl;
+
     /** The encoded Message length */
     protected int messageLength;
 
     /** The length of the controls */
     private int controlsLength;
-
-    /** The current control */
-    private CodecControl<? extends Control> currentControl;
     
     /** The LdapCodecService */
     private final LdapCodecService codec;

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java?rev=1067686&r1=1067685&r2=1067686&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java
(original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java
Sun Feb  6 15:45:55 2011
@@ -231,7 +231,7 @@ public class ModifyRequestDecorator exte
 
 
     //-------------------------------------------------------------------------
-    // The SearchResultReference methods
+    // The ModifyRequest methods
     //-------------------------------------------------------------------------
     
     

Modified: directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java?rev=1067686&r1=1067685&r2=1067686&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java
(original)
+++ directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java
Sun Feb  6 15:45:55 2011
@@ -147,12 +147,6 @@ public class SearchRequestDecorator exte
     }
 
 
-    public Filter getCurrentFilter()
-    {
-        return currentFilter;
-    }
-
-
     /**
      * Set the SearchRequest PDU TLV's Id
      * @param tlvId The TLV id
@@ -163,6 +157,12 @@ public class SearchRequestDecorator exte
     }
 
 
+    public Filter getCurrentFilter()
+    {
+        return currentFilter;
+    }
+
+
     /**
      * Gets the search filter associated with this search request.
      *

Modified: directory/studio/branches/m1/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java?rev=1067686&r1=1067685&r2=1067686&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java
(original)
+++ directory/studio/branches/m1/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java
Sun Feb  6 15:45:55 2011
@@ -48,7 +48,7 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.dsmlv2.reponse.ExtendedResponseDsml;
 import org.apache.directory.shared.dsmlv2.reponse.ModDNResponseDsml;
 import org.apache.directory.shared.dsmlv2.reponse.ModifyResponseDsml;
-import org.apache.directory.shared.dsmlv2.request.BatchRequest;
+import org.apache.directory.shared.dsmlv2.request.BatchRequestDsml;
 import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService;
 import org.apache.directory.shared.ldap.codec.LdapCodecService;
 import org.apache.directory.shared.ldap.model.entry.*;
@@ -197,7 +197,10 @@ public class ImportDsmlRunnable implemen
             parser.parseAllRequests();
 
             // Getting the batch request
-            BatchRequest batchRequest = parser.getBatchRequest();
+            
+            // @TODO - fix next Alex
+            
+            BatchRequestDsml batchRequest = parser.getBatchRequest();
 
             // Creating a DSML batch response (only if needed)
             BatchResponseDsml batchResponseDsml = null;



Mime
View raw message