directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r761466 - in /directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap: ./ gui/ handlers/
Date Thu, 02 Apr 2009 23:10:32 GMT
Author: elecharny
Date: Thu Apr  2 23:10:31 2009
New Revision: 761466

URL: http://svn.apache.org/viewvc?rev=761466&view=rev
Log:
o Renamed some more XXXRequest to InternalXXXRequest
o BindRequest now inherit from AbandonableRequest

Modified:
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java

Modified: directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java?rev=761466&r1=761465&r2=761466&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java
(original)
+++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java
Thu Apr  2 23:10:31 2009
@@ -30,7 +30,7 @@
 import org.apache.directory.server.core.authn.LdapPrincipal;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.ldap.handlers.controls.PagedSearchContext;
-import org.apache.directory.shared.ldap.message.AbandonableRequest;
+import org.apache.directory.shared.ldap.message.InternalAbandonableRequest;
 import org.apache.directory.shared.ldap.message.BindStatus;
 import org.apache.mina.core.session.IoSession;
 import org.slf4j.Logger;
@@ -53,7 +53,7 @@
     private static final boolean IS_DEBUG = LOG.isDebugEnabled();
 
     /** The list of requests we can abandon */
-    private static final AbandonableRequest[] EMPTY_ABANDONABLES = new AbandonableRequest[0];

+    private static final InternalAbandonableRequest[] EMPTY_ABANDONABLES = new InternalAbandonableRequest[0];

     
     /** A lock to protect the abandonableRequests against concurrent access */
     private final String outstandingLock;
@@ -71,7 +71,7 @@
     private LdapService ldapService;
     
     /** A map of all the running requests */
-    private Map<Integer, AbandonableRequest> outstandingRequests;
+    private Map<Integer, InternalAbandonableRequest> outstandingRequests;
     
     /** The current Bind status */
     private BindStatus bindStatus;
@@ -98,7 +98,7 @@
     {
         this.ioSession = ioSession;
         outstandingLock = "OutstandingRequestLock: " + ioSession.toString();
-        outstandingRequests = new ConcurrentHashMap<Integer, AbandonableRequest>();
+        outstandingRequests = new ConcurrentHashMap<Integer, InternalAbandonableRequest>();
         bindStatus = BindStatus.ANONYMOUS;
         saslProperties = new HashMap<String, Object>();
         pagedSearchContexts = new HashMap<Integer, PagedSearchContext>();
@@ -185,9 +185,9 @@
     {
         synchronized ( outstandingLock )
         {
-            AbandonableRequest[] abandonables = outstandingRequests.values().toArray( EMPTY_ABANDONABLES
);
+            InternalAbandonableRequest[] abandonables = outstandingRequests.values().toArray(
EMPTY_ABANDONABLES );
             
-            for ( AbandonableRequest abandonable : abandonables )
+            for ( InternalAbandonableRequest abandonable : abandonables )
             {
                 abandonOutstandingRequest( abandonable.getMessageId() );
             }
@@ -200,9 +200,9 @@
      * 
      * @param messageId The request ID to abandon
      */
-    public AbandonableRequest abandonOutstandingRequest( int messageId )
+    public InternalAbandonableRequest abandonOutstandingRequest( int messageId )
     {
-        AbandonableRequest request = null;
+        InternalAbandonableRequest request = null;
         
         synchronized ( outstandingLock )
         {
@@ -237,7 +237,7 @@
      *
      * @param request an outstanding request that can be abandoned
      */
-    public void registerOutstandingRequest( AbandonableRequest request )
+    public void registerOutstandingRequest( InternalAbandonableRequest request )
     {
         synchronized( outstandingLock )
         {
@@ -251,7 +251,7 @@
      *
      * @param request the request to unregister
      */
-    public void unregisterOutstandingRequest( AbandonableRequest request )
+    public void unregisterOutstandingRequest( InternalAbandonableRequest request )
     {
         synchronized( outstandingLock )
         {
@@ -263,7 +263,7 @@
     /**
      * @return A list of all the abandonable requests for this session. 
      */
-    public Map<Integer, AbandonableRequest> getOutstandingRequests()
+    public Map<Integer, InternalAbandonableRequest> getOutstandingRequests()
     {
         synchronized( outstandingLock )
         {

Modified: directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java?rev=761466&r1=761465&r2=761466&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java
(original)
+++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java
Thu Apr  2 23:10:31 2009
@@ -33,7 +33,7 @@
 
 import org.apache.directory.server.ldap.LdapService;
 import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.AbandonableRequest;
+import org.apache.directory.shared.ldap.message.InternalAbandonableRequest;
 import javax.swing.JTextArea;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -42,7 +42,7 @@
 public class OutstandingRequestsDialog extends JDialog
 {
     private static final long serialVersionUID = -3777123348215825711L;
-    private static final AbandonableRequest[] EMPTY_REQUEST_ARRAY = new AbandonableRequest[0];
+    private static final InternalAbandonableRequest[] EMPTY_REQUEST_ARRAY = new InternalAbandonableRequest[0];
     private JPanel jContentPane;
     private JPanel jPanel;
     private JScrollPane jScrollPane;
@@ -164,7 +164,7 @@
                 if ( row > -1 )
                 {
                     jButton2.setEnabled( true );
-                    AbandonableRequest req = ( ( OutstandingRequestsModel ) jTable.getModel()
)
+                    InternalAbandonableRequest req = ( ( OutstandingRequestsModel ) jTable.getModel()
)
                         .getAbandonableRequest( row );
                     jTextArea.setText( req.toString() );
                     jTextArea.setEnabled( true );
@@ -183,14 +183,14 @@
 
     private void setRequestsModel()
     {
-        AbandonableRequest[] requests;
-        Map<Integer, AbandonableRequest> reqsMap = session.getOutstandingRequests();
+        InternalAbandonableRequest[] requests;
+        Map<Integer, InternalAbandonableRequest> reqsMap = session.getOutstandingRequests();
         
         if ( reqsMap != null )
         {
-            requests = new AbandonableRequest[reqsMap.size()];
+            requests = new InternalAbandonableRequest[reqsMap.size()];
             //noinspection unchecked
-            requests = ( AbandonableRequest[] ) reqsMap.values().toArray( requests );
+            requests = ( InternalAbandonableRequest[] ) reqsMap.values().toArray( requests
);
         }
         else
         {
@@ -324,7 +324,7 @@
                 public void actionPerformed( java.awt.event.ActionEvent e )
                 {
                     int row = jTable.getSelectedRow();
-                    AbandonableRequest req = ( ( OutstandingRequestsModel ) jTable.getModel()
)
+                    InternalAbandonableRequest req = ( ( OutstandingRequestsModel ) jTable.getModel()
)
                         .getAbandonableRequest( row );
                     req.abandon();
                     session.abandonOutstandingRequest( req.getMessageId() );

Modified: directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java?rev=761466&r1=761465&r2=761466&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java
(original)
+++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java
Thu Apr  2 23:10:31 2009
@@ -23,7 +23,7 @@
 import javax.swing.event.TableModelListener;
 import javax.swing.table.TableModel;
 
-import org.apache.directory.shared.ldap.message.AbandonableRequest;
+import org.apache.directory.shared.ldap.message.InternalAbandonableRequest;
 
 
 public class OutstandingRequestsModel implements TableModel
@@ -32,16 +32,16 @@
         { "messageId", "type" };
     final Class<?>[] columnClasses = new Class[]
         { Integer.class, String.class };
-    final AbandonableRequest[] requests;
+    final InternalAbandonableRequest[] requests;
 
 
-    OutstandingRequestsModel(AbandonableRequest[] requests)
+    OutstandingRequestsModel(InternalAbandonableRequest[] requests)
     {
         this.requests = requests;
     }
 
 
-    AbandonableRequest getAbandonableRequest( int row )
+    InternalAbandonableRequest getAbandonableRequest( int row )
     {
         return requests[row];
     }
@@ -79,7 +79,7 @@
 
     public Object getValueAt( int rowIndex, int columnIndex )
     {
-        AbandonableRequest req = requests[rowIndex];
+        InternalAbandonableRequest req = requests[rowIndex];
 
         switch ( columnIndex )
         {

Modified: directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java?rev=761466&r1=761465&r2=761466&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
(original)
+++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
Thu Apr  2 23:10:31 2009
@@ -33,7 +33,7 @@
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.codec.search.controls.ChangeType;
 import org.apache.directory.shared.ldap.message.AbandonListener;
-import org.apache.directory.shared.ldap.message.AbandonableRequest;
+import org.apache.directory.shared.ldap.message.InternalAbandonableRequest;
 import org.apache.directory.shared.ldap.message.InternalSearchRequest;
 import org.apache.directory.shared.ldap.message.InternalSearchResponseEntry;
 import org.apache.directory.shared.ldap.message.SearchResponseEntryImpl;
@@ -94,7 +94,7 @@
     }
 
     
-    public void requestAbandoned( AbandonableRequest req )
+    public void requestAbandoned( InternalAbandonableRequest req )
     {
         try
         {

Modified: directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java?rev=761466&r1=761465&r2=761466&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java
(original)
+++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java
Thu Apr  2 23:10:31 2009
@@ -25,7 +25,7 @@
 import org.apache.directory.server.ldap.LdapService;
 import org.apache.directory.shared.ldap.exception.OperationAbandonedException;
 import org.apache.directory.shared.ldap.message.AbandonListener;
-import org.apache.directory.shared.ldap.message.AbandonableRequest;
+import org.apache.directory.shared.ldap.message.InternalAbandonableRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -70,7 +70,7 @@
     }
     
     
-    public void requestAbandoned( AbandonableRequest req )
+    public void requestAbandoned( InternalAbandonableRequest req )
     {
         if ( listener != null )
         {



Mime
View raw message