directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1067576 - in /directory: shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ studio/branches/m1/plugins/ldapbrows...
Date Sun, 06 Feb 2011 02:32:37 GMT
Author: akarasulu
Date: Sun Feb  6 02:32:37 2011
New Revision: 1067576

URL: http://svn.apache.org/viewvc?rev=1067576&view=rev
Log:
preparing to switch to using dsml decorators and removing more dependencies to codec

Modified:
    directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/BatchResponseDsml.java
    directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
    directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponseDsml.java
    directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
    directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultReferenceDsml.java
    directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
    directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/BatchRequestDsml.java
    directory/studio/branches/m1/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java

Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/BatchResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/BatchResponseDsml.java?rev=1067576&r1=1067575&r2=1067576&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/BatchResponseDsml.java
(original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/BatchResponseDsml.java
Sun Feb  6 02:32:37 2011
@@ -25,6 +25,7 @@ import java.util.List;
 
 import org.apache.directory.shared.dsmlv2.DsmlDecorator;
 import org.apache.directory.shared.dsmlv2.ParserUtils;
+import org.apache.directory.shared.ldap.model.message.Response;
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
@@ -38,7 +39,7 @@ import org.dom4j.Element;
 public class BatchResponseDsml
 {
     /** The Responses list */
-    private List<DsmlDecorator> responses;
+    private List<DsmlDecorator<? extends Response>> responses;
 
     /** The ID of the response */
     private int requestID;
@@ -49,7 +50,7 @@ public class BatchResponseDsml
      */
     public BatchResponseDsml()
     {
-        responses = new ArrayList<DsmlDecorator>();
+        responses = new ArrayList<DsmlDecorator<? extends Response>>();
     }
 
 
@@ -61,7 +62,7 @@ public class BatchResponseDsml
      * @return
      *      true (as per the general contract of the Collection.add method).
      */
-    public boolean addResponse( DsmlDecorator response )
+    public boolean addResponse( DsmlDecorator<? extends Response> response )
     {
         return responses.add( response );
     }
@@ -75,7 +76,7 @@ public class BatchResponseDsml
      * @return
      *      true if this list contained the specified element.
      */
-    public boolean removeResponse( DsmlDecorator response )
+    public boolean removeResponse( DsmlDecorator<Response> response )
     {
         return responses.remove( response );
     }
@@ -120,7 +121,7 @@ public class BatchResponseDsml
             element.addAttribute( "requestID", "" + requestID );
         }
 
-        for ( DsmlDecorator response : responses )
+        for ( DsmlDecorator<? extends Response> response : responses )
         {
             response.toDsml( element );
         }

Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java?rev=1067576&r1=1067575&r2=1067576&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
(original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
Sun Feb  6 02:32:37 2011
@@ -74,7 +74,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.SearchResultEntryImpl;
 import org.apache.directory.shared.ldap.model.message.SearchResultReference;
 import org.apache.directory.shared.ldap.model.message.SearchResultReferenceImpl;
-import org.apache.directory.shared.ldap.model.message.controls.AbstractControl;
 import org.apache.directory.shared.ldap.model.message.controls.OpaqueControl;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.util.Base64;

Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponseDsml.java?rev=1067576&r1=1067575&r2=1067576&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponseDsml.java
(original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponseDsml.java
Sun Feb  6 02:32:37 2011
@@ -26,6 +26,7 @@ import java.util.List;
 import org.apache.directory.shared.dsmlv2.DsmlDecorator;
 import org.apache.directory.shared.ldap.codec.LdapCodecService;
 import org.apache.directory.shared.ldap.model.message.Message;
+import org.apache.directory.shared.ldap.model.message.Response;
 import org.apache.directory.shared.ldap.model.message.ResultResponse;
 import org.dom4j.Element;
 
@@ -40,7 +41,8 @@ import org.dom4j.Element;
 public class SearchResponseDsml extends AbstractResultResponseDsml<ResultResponse>
 {
     /** The responses */
-    private List<DsmlDecorator> responses = new ArrayList<DsmlDecorator>();
+    private List<DsmlDecorator<? extends Response>> responses = 
+        new ArrayList<DsmlDecorator<? extends Response>>();
 
 
     /**
@@ -71,7 +73,7 @@ public class SearchResponseDsml extends 
      * @return
      *      true (as per the general contract of the Collection.add method).
      */
-    public boolean addResponse( DsmlDecorator response )
+    public boolean addResponse( DsmlDecorator<? extends Response> response )
     {
         return responses.add( response );
     }
@@ -85,7 +87,7 @@ public class SearchResponseDsml extends 
      * @return
      *      true if this list contained the specified element.
      */
-    public boolean removeResponse( DsmlDecorator response )
+    public boolean removeResponse( DsmlDecorator<Response> response )
     {
         return responses.remove( response );
     }
@@ -108,7 +110,7 @@ public class SearchResponseDsml extends 
             }
         }
 
-        for ( DsmlDecorator response : responses )
+        for ( DsmlDecorator<? extends Response> response : responses )
         {
             response.toDsml( element );
         }

Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java?rev=1067576&r1=1067575&r2=1067576&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
(original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
Sun Feb  6 02:32:37 2011
@@ -42,7 +42,8 @@ import org.dom4j.QName;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SearchResultEntryDsml extends AbstractResponseDsml<SearchResultEntry>
+public class SearchResultEntryDsml 
+    extends AbstractResponseDsml<SearchResultEntry>
     implements SearchResultEntry
 {
     /**

Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultReferenceDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultReferenceDsml.java?rev=1067576&r1=1067575&r2=1067576&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultReferenceDsml.java
(original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultReferenceDsml.java
Sun Feb  6 02:32:37 2011
@@ -36,7 +36,8 @@ import org.dom4j.Element;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SearchResultReferenceDsml extends AbstractResponseDsml<SearchResultReference>
+public class SearchResultReferenceDsml 
+    extends AbstractResponseDsml<SearchResultReference>
     implements SearchResultReference
 {
     /**

Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java?rev=1067576&r1=1067575&r2=1067576&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
(original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
Sun Feb  6 02:32:37 2011
@@ -41,7 +41,8 @@ import org.dom4j.QName;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class AddRequestDsml extends AbstractResultResponseRequestDsml<AddRequest> 
+public class AddRequestDsml 
+    extends AbstractResultResponseRequestDsml<AddRequest> 
     implements AddRequest
 {
     /**

Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/BatchRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/BatchRequestDsml.java?rev=1067576&r1=1067575&r2=1067576&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/BatchRequestDsml.java
(original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/BatchRequestDsml.java
Sun Feb  6 02:32:37 2011
@@ -28,6 +28,7 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.dsmlv2.request.BatchRequest.OnError;
 import org.apache.directory.shared.dsmlv2.request.BatchRequest.Processing;
 import org.apache.directory.shared.dsmlv2.request.BatchRequest.ResponseOrder;
+import org.apache.directory.shared.ldap.model.message.Request;
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
@@ -41,7 +42,7 @@ import org.dom4j.Element;
 public class BatchRequestDsml
 {
     /** The Requests list */
-    private List<DsmlDecorator> requests;
+    private List<DsmlDecorator<? extends Request>> requests;
 
     /** The ID of the request */
     private int requestID;
@@ -61,7 +62,7 @@ public class BatchRequestDsml
      */
     public BatchRequestDsml()
     {
-        requests = new ArrayList<DsmlDecorator>();
+        requests = new ArrayList<DsmlDecorator<? extends Request>>();
         responseOrder = ResponseOrder.SEQUENTIAL;
         processing = Processing.SEQUENTIAL;
         onError = OnError.EXIT;
@@ -76,7 +77,7 @@ public class BatchRequestDsml
      * @return
      *      true (as per the general contract of the Collection.add method).
      */
-    public boolean addRequest( DsmlDecorator request )
+    public boolean addRequest( DsmlDecorator<? extends Request> request )
     {
         return requests.add( request );
     }
@@ -90,7 +91,7 @@ public class BatchRequestDsml
      * @return
      *      true if this list contained the specified element.
      */
-    public boolean removeRequest( DsmlDecorator request )
+    public boolean removeRequest( DsmlDecorator<? extends Request> request )
     {
         return requests.remove( request );
     }
@@ -227,7 +228,7 @@ public class BatchRequestDsml
         }
 
         // Requests
-        for ( DsmlDecorator request : requests )
+        for ( DsmlDecorator<? extends Request> request : requests )
         {
             request.toDsml( element );
         }

Modified: directory/studio/branches/m1/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java?rev=1067576&r1=1067575&r2=1067576&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java
(original)
+++ directory/studio/branches/m1/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java
Sun Feb  6 02:32:37 2011
@@ -343,7 +343,7 @@ public class ExportDsmlRunnable implemen
      *      the associated search result entry DSML
      * @throws org.apache.directory.shared.ldap.model.exception.LdapException
      */
-    private static DsmlDecorator convertSearchResultToDsml( SearchResult searchResult, SearchParameter
searchParameter )
+    private static DsmlDecorator<? extends Response> convertSearchResultToDsml( SearchResult
searchResult, SearchParameter searchParameter )
         throws LdapException, LdapURLEncodingException
     {
         Entry entry = AttributeUtils.toClientEntry(searchResult.getAttributes(),



Mime
View raw message