qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rob...@apache.org
Subject svn commit: r918943 - in /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid: qmf/ server/ server/binding/ server/configuration/ server/exchange/ server/federation/ server/protocol/ server/queue/ server/subscription/ server/transport/
Date Thu, 04 Mar 2010 11:19:29 GMT
Author: robbie
Date: Thu Mar  4 11:19:28 2010
New Revision: 918943

URL: http://svn.apache.org/viewvc?rev=918943&view=rev
Log:
QPID-2379: move getCreateTime() up to the ConfiguredObject supertype, add implementation to
remaining *Config implementors and their associated QMFService delegates

Modified:
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfig.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfig.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfig.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfiguredObject.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfig.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfig.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfig.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfig.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java?rev=918943&r1=918942&r2=918943&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java
Thu Mar  4 11:19:28 2010
@@ -80,7 +80,7 @@
 
     private final CopyOnWriteArrayList<BindingListener> _listeners = new CopyOnWriteArrayList<Exchange.BindingListener>();
 
-    // TODO
+    //TODO : persist creation time
     private long _createTime = System.currentTimeMillis();
 
 

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java?rev=918943&r1=918942&r2=918943&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java Thu Mar
 4 11:19:28 2010
@@ -1227,8 +1227,7 @@
 
         public long getCreateTime()
         {
-            // TODO
-            return 0;
+            return _obj.getCreateTime();
         }
 
         @Override
@@ -1351,8 +1350,7 @@
 
         public long getCreateTime()
         {
-            // TODO
-            return 0;  //To change body of implemented methods use File | Settings | File
Templates.
+            return _obj.getCreateTime();
         }
     }
 
@@ -1419,8 +1417,7 @@
 
         public long getCreateTime()
         {
-            // TODO
-            return 0;  //To change body of implemented methods use File | Settings | File
Templates.
+            return _obj.getCreateTime();
         }
     }
 

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java?rev=918943&r1=918942&r2=918943&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java Thu Mar
 4 11:19:28 2010
@@ -157,6 +157,7 @@
     private static final
     AMQShortString IMMEDIATE_DELIVERY_REPLY_TEXT = new AMQShortString("Immediate delivery
is not possible.");
     private final UUID _id;
+    private long _createTime = System.currentTimeMillis();
 
     public AMQChannel(AMQProtocolSession session, int channelId, MessageStore messageStore)
             throws AMQException
@@ -1367,4 +1368,9 @@
     {
         return getConnectionConfig().getAddress() + "/" + getChannelId();
     }
+
+    public long getCreateTime()
+    {
+        return _createTime;
+    }
 }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java?rev=918943&r1=918942&r2=918943&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java
Thu Mar  4 11:19:28 2010
@@ -78,7 +78,7 @@
     private final class BindingImpl extends Binding implements AMQQueue.Task, Exchange.Task,
BindingConfig
     {
         private final BindingLogSubject _logSubject;
-        //TODO
+        //TODO : persist creation time
         private long _createTime = System.currentTimeMillis();
 
         private BindingImpl(String bindingKey, final AMQQueue queue, final Exchange exchange,
final Map<String, Object> arguments)

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfig.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfig.java?rev=918943&r1=918942&r2=918943&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfig.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfig.java
Thu Mar  4 11:19:28 2010
@@ -37,7 +37,5 @@
 
     String getOrigin();
 
-    long getCreateTime();
-
     long getMatches();
 }
\ No newline at end of file

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfig.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfig.java?rev=918943&r1=918942&r2=918943&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfig.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfig.java
Thu Mar  4 11:19:28 2010
@@ -45,6 +45,4 @@
     Integer getChannelId();
 
     int getAckBatching();
-
-    long getCreateTime();
 }
\ No newline at end of file

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfig.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfig.java?rev=918943&r1=918942&r2=918943&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfig.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfig.java
Thu Mar  4 11:19:28 2010
@@ -46,8 +46,6 @@
 
     void addVirtualHost(VirtualHostConfig virtualHost);
 
-    long getCreateTime();
-
     void createBrokerConnection(String transport,
                                 String host,
                                 int port,

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfiguredObject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfiguredObject.java?rev=918943&r1=918942&r2=918943&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfiguredObject.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfiguredObject.java
Thu Mar  4 11:19:28 2010
@@ -33,4 +33,5 @@
 
     public boolean isDurable();
 
+    long getCreateTime();
 }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfig.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfig.java?rev=918943&r1=918942&r2=918943&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfig.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfig.java
Thu Mar  4 11:19:28 2010
@@ -52,6 +52,4 @@
     long getByteReceives();
 
     long getByteRoutes();
-
-    long getCreateTime();
 }
\ No newline at end of file

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfig.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfig.java?rev=918943&r1=918942&r2=918943&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfig.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfig.java
Thu Mar  4 11:19:28 2010
@@ -47,8 +47,6 @@
 
     void close();
 
-    long getCreateTime();
-
     void createBridge(boolean durable,
                       boolean dynamic,
                       boolean srcIsQueue,

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfig.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfig.java?rev=918943&r1=918942&r2=918943&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfig.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfig.java
Thu Mar  4 11:19:28 2010
@@ -77,6 +77,4 @@
     long getPersistentMsgDequeues();
 
     void purge(long request);
-
-    long getCreateTime();
 }
\ No newline at end of file

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java?rev=918943&r1=918942&r2=918943&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java
Thu Mar  4 11:19:28 2010
@@ -39,6 +39,4 @@
     void addBroker(BrokerConfig broker);
 
     void removeBroker(BrokerConfig broker);
-
-    long getCreateTime();
 }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfig.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfig.java?rev=918943&r1=918942&r2=918943&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfig.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfig.java
Thu Mar  4 11:19:28 2010
@@ -31,6 +31,4 @@
 
     void setBroker(BrokerConfig brokerConfig);
 
-    long getCreateTime();
-
 }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java?rev=918943&r1=918942&r2=918943&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
Thu Mar  4 11:19:28 2010
@@ -100,7 +100,7 @@
 >>>>>>> .r902547
 */
 
-    // TODO
+    //TODO : persist creation time
     private long _createTime = System.currentTimeMillis();
 
     public AbstractExchange(final ExchangeType<? extends Exchange> type)

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java?rev=918943&r1=918942&r2=918943&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java
Thu Mar  4 11:19:28 2010
@@ -106,7 +106,7 @@
 
     private class ConnectionConfigAdapter implements ConnectionConfig
     {
-
+        private long _adapterCreateTime = System.currentTimeMillis();
         private UUID _id = BrokerLink.this.getConfigStore().createId();
 
         public VirtualHost getVirtualHost()
@@ -178,6 +178,11 @@
         {
             return false;
         }
+        
+        public long getCreateTime()
+        {
+            return _adapterCreateTime;
+        }
     }
 
     private class SessionFactory implements Connection.SessionFactory

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java?rev=918943&r1=918942&r2=918943&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
Thu Mar  4 11:19:28 2010
@@ -152,6 +152,7 @@
     private final AtomicBoolean _closing = new AtomicBoolean(false);
     private final UUID _id;
     private final ConfigStore _configStore;
+    private long _createTime = System.currentTimeMillis();
 
     public ManagedObject getManagedObject()
     {
@@ -1133,4 +1134,9 @@
         return String.valueOf(getRemoteAddress());
     }
 
+    public long getCreateTime()
+    {
+        return _createTime;
+    }
+
 }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java?rev=918943&r1=918942&r2=918943&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
Thu Mar  4 11:19:28 2010
@@ -43,6 +43,7 @@
     private ServerConnection _connection;
     private final UUID _id;
     private final IApplicationRegistry _appRegistry;
+    private long _createTime = System.currentTimeMillis();
 
     public ProtocolEngine_0_10(ServerConnection conn,
                                NetworkDriver networkDriver,
@@ -177,4 +178,9 @@
         super.closed();
         getConfigStore().removeConfiguredObject(this);
     }
+
+    public long getCreateTime()
+    {
+        return _createTime;
+    }
 }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java?rev=918943&r1=918942&r2=918943&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
Thu Mar  4 11:19:28 2010
@@ -180,7 +180,7 @@
     private UUID _id;
     private final Map<String, Object> _arguments;
 
-    //TODO
+    //TODO : persist creation time
     private long _createTime = System.currentTimeMillis();
 
 

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java?rev=918943&r1=918942&r2=918943&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
Thu Mar  4 11:19:28 2010
@@ -94,6 +94,7 @@
     private LogSubject _logSubject;
     private LogActor _logActor;
     private UUID _id;
+    private long _createTime = System.currentTimeMillis();
 
 
     static final class BrowserSubscription extends SubscriptionImpl
@@ -770,4 +771,9 @@
     {
         return _channel.isTransactional();
     }
+    
+    public long getCreateTime()
+    {
+        return _createTime;
+    }
 }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java?rev=918943&r1=918942&r2=918943&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
Thu Mar  4 11:19:28 2010
@@ -100,6 +100,7 @@
     private UUID _id;
     private String _traceExclude;
     private String _trace;
+    private long _createTime = System.currentTimeMillis();
 
 
     public Subscription_0_10(ServerSession session, String destination, MessageAcceptMode
acceptMode,
@@ -853,4 +854,9 @@
     {
         return _session.isTransactional();
     }
+
+    public long getCreateTime()
+    {
+        return _createTime;
+    }
 }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java?rev=918943&r1=918942&r2=918943&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
(original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
Thu Mar  4 11:19:28 2010
@@ -69,6 +69,7 @@
 
     private final UUID _id;
     private ConnectionConfig _connectionConfig;
+    private long _createTime = System.currentTimeMillis();
 
     public static interface MessageDispositionChangeListener
     {
@@ -534,4 +535,9 @@
     {
         return getName().toString();
     }
+
+    public long getCreateTime()
+    {
+        return _createTime;
+    }
 }



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message