[jboss-cvs] JBoss Messaging SVN: r3604 - in trunk: src/main/org/jboss/jms/server and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 21 13:56:59 EST 2008
Author: timfox
Date: 2008-01-21 13:56:59 -0500 (Mon, 21 Jan 2008)
New Revision: 3604
Added:
trunk/src/main/org/jboss/jms/server/endpoint/BrowserEndpoint.java
trunk/src/main/org/jboss/jms/server/endpoint/ConnectionEndpoint.java
trunk/src/main/org/jboss/jms/server/endpoint/ConnectionFactoryEndpoint.java
trunk/src/main/org/jboss/jms/server/endpoint/ConsumerEndpoint.java
trunk/src/main/org/jboss/jms/server/endpoint/SessionEndpoint.java
Removed:
trunk/src/main/org/jboss/jms/delegate/BrowserEndpoint.java
trunk/src/main/org/jboss/jms/delegate/ConnectionEndpoint.java
trunk/src/main/org/jboss/jms/delegate/ConnectionFactoryEndpoint.java
trunk/src/main/org/jboss/jms/delegate/ConsumerEndpoint.java
trunk/src/main/org/jboss/jms/delegate/SessionEndpoint.java
Modified:
trunk/src/main/org/jboss/jms/server/ConnectionManager.java
trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java
trunk/src/main/org/jboss/jms/server/endpoint/ConnectionFactoryInternalEndpoint.java
trunk/src/main/org/jboss/jms/server/endpoint/ServerBrowserEndpoint.java
trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
trunk/src/main/org/jboss/jms/server/endpoint/SessionInternalEndpoint.java
trunk/tests/src/org/jboss/test/messaging/jms/server/connectionmanager/SimpleConnectionManagerTest.java
Log:
Client side cleanup part III
Deleted: trunk/src/main/org/jboss/jms/delegate/BrowserEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/delegate/BrowserEndpoint.java 2008-01-21 18:49:20 UTC (rev 3603)
+++ trunk/src/main/org/jboss/jms/delegate/BrowserEndpoint.java 2008-01-21 18:56:59 UTC (rev 3604)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jms.delegate;
-
-import javax.jms.JMSException;
-
-import org.jboss.jms.client.Closeable;
-import org.jboss.messaging.core.Message;
-
-/**
- * Represents the set of methods from the BrowserDelegate that are handled on the server. The rest
- * of the methods are handled in the advice stack.
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @version <tt>$Revision$</tt>
- *
- * $Id$
- */
-public interface BrowserEndpoint extends Closeable
-{
- /**
- * Reset the internal state of the browser endpoint so the following
- * nextMessage()/hasNextMessage()/nextMessageBlock() invocations would reflect the state of the
- * queue at the moment of the reset.
- */
- void reset() throws JMSException;
-
- Message nextMessage() throws JMSException;
-
- boolean hasNextMessage() throws JMSException;
-
- Message[] nextMessageBlock(int maxMessages) throws JMSException;
-}
Deleted: trunk/src/main/org/jboss/jms/delegate/ConnectionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/delegate/ConnectionEndpoint.java 2008-01-21 18:49:20 UTC (rev 3603)
+++ trunk/src/main/org/jboss/jms/delegate/ConnectionEndpoint.java 2008-01-21 18:56:59 UTC (rev 3604)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jms.delegate;
-
-import javax.jms.JMSException;
-
-import org.jboss.jms.client.Closeable;
-import org.jboss.jms.client.api.ClientSession;
-import org.jboss.jms.tx.TransactionRequest;
-import org.jboss.messaging.core.tx.MessagingXid;
-
-
-/**
- * Represents the set of methods from the ConnectionDelegate that are handled on the server. The
- * rest of the methods are handled in the advice stack.
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @version <tt>$Revision$</tt>
- *
- * $Id$
- */
-public interface ConnectionEndpoint extends Closeable
-{
- ClientSession createSessionDelegate(boolean transacted,
- int acknowledgmentMode,
- boolean isXA) throws JMSException;
-
- String getClientID() throws JMSException;
-
- void setClientID(String id) throws JMSException;
-
- void start() throws JMSException;
-
- void stop() throws JMSException;
-
- void sendTransaction(TransactionRequest request) throws JMSException;
-
- MessagingXid[] getPreparedTransactions() throws JMSException; ;
-}
-
Deleted: trunk/src/main/org/jboss/jms/delegate/ConnectionFactoryEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/delegate/ConnectionFactoryEndpoint.java 2008-01-21 18:49:20 UTC (rev 3603)
+++ trunk/src/main/org/jboss/jms/delegate/ConnectionFactoryEndpoint.java 2008-01-21 18:56:59 UTC (rev 3604)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jms.delegate;
-
-import javax.jms.JMSException;
-
-/**
- * Represents the set of methods from the ConnectionFactoryDelegate that are handled on the server.
- * The rest of the methods are handled in the advice stack.
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @version <tt>$Revision$</tt>
- *
- * $Id$
- */
-public interface ConnectionFactoryEndpoint
-{
- /**
- * @param failedNodeID - zero or positive values mean the connection creation attempt is result
- * of failover. Negative values are ignored (mean regular connection creation attempt).
- */
- CreateConnectionResult createConnectionDelegate(String username,
- String password,
- int failedNodeID)
- throws JMSException;
-}
-
Deleted: trunk/src/main/org/jboss/jms/delegate/ConsumerEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/delegate/ConsumerEndpoint.java 2008-01-21 18:49:20 UTC (rev 3603)
+++ trunk/src/main/org/jboss/jms/delegate/ConsumerEndpoint.java 2008-01-21 18:56:59 UTC (rev 3604)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jms.delegate;
-
-import javax.jms.JMSException;
-
-import org.jboss.jms.client.Closeable;
-
-/**
- * Represents the set of methods from the ConsumerDelegate that are handled on the server.
- * The rest of the methods are handled in the advice stack.
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- *
- * @version <tt>$Revision$</tt>
- *
- * $Id$
- */
-public interface ConsumerEndpoint extends Closeable
-{
- /**
- * Sent to the server to specify a new maximum rate at which to send messages at
- */
- void changeRate(float newRate) throws JMSException;
-}
Deleted: trunk/src/main/org/jboss/jms/delegate/SessionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/delegate/SessionEndpoint.java 2008-01-21 18:49:20 UTC (rev 3603)
+++ trunk/src/main/org/jboss/jms/delegate/SessionEndpoint.java 2008-01-21 18:56:59 UTC (rev 3604)
@@ -1,122 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jms.delegate;
-
-
-import java.util.List;
-
-import javax.jms.JMSException;
-
-import org.jboss.jms.client.Closeable;
-import org.jboss.jms.client.api.ClientBrowser;
-import org.jboss.jms.client.api.Consumer;
-import org.jboss.jms.destination.JBossQueue;
-import org.jboss.jms.destination.JBossTopic;
-import org.jboss.messaging.core.Destination;
-import org.jboss.messaging.core.Message;
-
-/**
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
- *
- * @version <tt>$Revision$</tt>
- *
- * $Id$
- */
-public interface SessionEndpoint extends Closeable
-{
- Consumer createConsumerDelegate(Destination destination, String selector,
- boolean noLocal, String subscriptionName,
- boolean connectionConsumer) throws JMSException;
-
- ClientBrowser createBrowserDelegate(Destination queue, String messageSelector) throws JMSException;
-
- /**
- * Creates a queue identity given a Queue name. Does NOT create the physical queue. The physical
- * creation of queues is an administrative task and is not to be initiated by the JMS API, with
- * the exception of temporary queues.
- */
- JBossQueue createQueue(String queueName) throws JMSException;
-
- /**
- * Creates a topic identity given a Queue name. Does NOT create the physical topic. The physical
- * creation of topics is an administrative task and is not to be initiated by the JMS API, with
- * the exception of temporary topics.
- */
- JBossTopic createTopic(String topicName) throws JMSException;
-
- /**
- * Acknowledge a list of deliveries
- * @throws JMSException
- */
- void acknowledgeDeliveries(List<Ack> acks) throws JMSException;
-
- /**
- * Acknowledge a delivery
- * @throws JMSException
- */
- boolean acknowledgeDelivery(Ack ack) throws JMSException;
-
- /**
- * Cancel a list of deliveries.
- */
- void cancelDeliveries(List<Cancel> cancels) throws JMSException;
-
- /**
- * Cancel a delivery
- * @param cancel
- * @throws JMSException
- */
- void cancelDelivery(Cancel cancel) throws JMSException;
-
- /**
- * Add a temporary destination.
- */
- void addTemporaryDestination(Destination destination) throws JMSException;
-
- /**
- * Delete a temporary destination
- */
- void deleteTemporaryDestination(Destination destination) throws JMSException;
-
- /**
- * Unsubscribe the client from the durable subscription
- * specified by subscriptionName
- *
- * @param subscriptionName the Name of the durable subscription to unsubscribe from
- * @throws JMSException if the unsubscribe fails
- */
- void unsubscribe(String subscriptionName) throws JMSException;
-
- /**
- * Send a message
- * @param message The message to send
- * @throws JMSException
- */
- void send(Message message) throws JMSException;
-
- int getDupsOKBatchSize();
-
- public boolean isStrictTck();
-}
-
Modified: trunk/src/main/org/jboss/jms/server/ConnectionManager.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/ConnectionManager.java 2008-01-21 18:49:20 UTC (rev 3603)
+++ trunk/src/main/org/jboss/jms/server/ConnectionManager.java 2008-01-21 18:56:59 UTC (rev 3604)
@@ -23,7 +23,7 @@
import java.util.List;
-import org.jboss.jms.delegate.ConnectionEndpoint;
+import org.jboss.jms.server.endpoint.ConnectionEndpoint;
import org.jboss.messaging.core.MessagingComponent;
import org.jboss.messaging.core.remoting.PacketSender;
Modified: trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java 2008-01-21 18:49:20 UTC (rev 3603)
+++ trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java 2008-01-21 18:56:59 UTC (rev 3604)
@@ -33,8 +33,8 @@
import javax.jms.JMSException;
-import org.jboss.jms.delegate.ConnectionEndpoint;
import org.jboss.jms.server.ConnectionManager;
+import org.jboss.jms.server.endpoint.ConnectionEndpoint;
import org.jboss.messaging.util.Logger;
import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.util.ConcurrentHashSet;
Copied: trunk/src/main/org/jboss/jms/server/endpoint/BrowserEndpoint.java (from rev 3602, trunk/src/main/org/jboss/jms/delegate/BrowserEndpoint.java)
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/BrowserEndpoint.java (rev 0)
+++ trunk/src/main/org/jboss/jms/server/endpoint/BrowserEndpoint.java 2008-01-21 18:56:59 UTC (rev 3604)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jms.server.endpoint;
+
+import javax.jms.JMSException;
+
+import org.jboss.jms.client.Closeable;
+import org.jboss.messaging.core.Message;
+
+/**
+ * Represents the set of methods from the BrowserDelegate that are handled on the server. The rest
+ * of the methods are handled in the advice stack.
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
+ * @version <tt>$Revision$</tt>
+ *
+ * $Id$
+ */
+public interface BrowserEndpoint extends Closeable
+{
+ /**
+ * Reset the internal state of the browser endpoint so the following
+ * nextMessage()/hasNextMessage()/nextMessageBlock() invocations would reflect the state of the
+ * queue at the moment of the reset.
+ */
+ void reset() throws JMSException;
+
+ Message nextMessage() throws JMSException;
+
+ boolean hasNextMessage() throws JMSException;
+
+ Message[] nextMessageBlock(int maxMessages) throws JMSException;
+}
Copied: trunk/src/main/org/jboss/jms/server/endpoint/ConnectionEndpoint.java (from rev 3602, trunk/src/main/org/jboss/jms/delegate/ConnectionEndpoint.java)
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ConnectionEndpoint.java (rev 0)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ConnectionEndpoint.java 2008-01-21 18:56:59 UTC (rev 3604)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jms.server.endpoint;
+
+import javax.jms.JMSException;
+
+import org.jboss.jms.client.Closeable;
+import org.jboss.jms.client.api.ClientSession;
+import org.jboss.jms.tx.TransactionRequest;
+import org.jboss.messaging.core.tx.MessagingXid;
+
+
+/**
+ * Represents the set of methods from the ConnectionDelegate that are handled on the server. The
+ * rest of the methods are handled in the advice stack.
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * @version <tt>$Revision$</tt>
+ *
+ * $Id$
+ */
+public interface ConnectionEndpoint extends Closeable
+{
+ ClientSession createSessionDelegate(boolean transacted,
+ int acknowledgmentMode,
+ boolean isXA) throws JMSException;
+
+ String getClientID() throws JMSException;
+
+ void setClientID(String id) throws JMSException;
+
+ void start() throws JMSException;
+
+ void stop() throws JMSException;
+
+ void sendTransaction(TransactionRequest request) throws JMSException;
+
+ MessagingXid[] getPreparedTransactions() throws JMSException; ;
+}
+
Copied: trunk/src/main/org/jboss/jms/server/endpoint/ConnectionFactoryEndpoint.java (from rev 3602, trunk/src/main/org/jboss/jms/delegate/ConnectionFactoryEndpoint.java)
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ConnectionFactoryEndpoint.java (rev 0)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ConnectionFactoryEndpoint.java 2008-01-21 18:56:59 UTC (rev 3604)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jms.server.endpoint;
+
+import javax.jms.JMSException;
+
+import org.jboss.jms.delegate.CreateConnectionResult;
+
+/**
+ * Represents the set of methods from the ConnectionFactoryDelegate that are handled on the server.
+ * The rest of the methods are handled in the advice stack.
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
+ * @version <tt>$Revision$</tt>
+ *
+ * $Id$
+ */
+public interface ConnectionFactoryEndpoint
+{
+ /**
+ * @param failedNodeID - zero or positive values mean the connection creation attempt is result
+ * of failover. Negative values are ignored (mean regular connection creation attempt).
+ */
+ CreateConnectionResult createConnectionDelegate(String username,
+ String password,
+ int failedNodeID)
+ throws JMSException;
+}
+
Modified: trunk/src/main/org/jboss/jms/server/endpoint/ConnectionFactoryInternalEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ConnectionFactoryInternalEndpoint.java 2008-01-21 18:49:20 UTC (rev 3603)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ConnectionFactoryInternalEndpoint.java 2008-01-21 18:56:59 UTC (rev 3604)
@@ -23,7 +23,6 @@
import javax.jms.JMSException;
-import org.jboss.jms.delegate.ConnectionFactoryEndpoint;
import org.jboss.jms.delegate.CreateConnectionResult;
/**
Copied: trunk/src/main/org/jboss/jms/server/endpoint/ConsumerEndpoint.java (from rev 3602, trunk/src/main/org/jboss/jms/delegate/ConsumerEndpoint.java)
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ConsumerEndpoint.java (rev 0)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ConsumerEndpoint.java 2008-01-21 18:56:59 UTC (rev 3604)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jms.server.endpoint;
+
+import javax.jms.JMSException;
+
+import org.jboss.jms.client.Closeable;
+
+/**
+ * Represents the set of methods from the ConsumerDelegate that are handled on the server.
+ * The rest of the methods are handled in the advice stack.
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
+ *
+ * @version <tt>$Revision$</tt>
+ *
+ * $Id$
+ */
+public interface ConsumerEndpoint extends Closeable
+{
+ /**
+ * Sent to the server to specify a new maximum rate at which to send messages at
+ */
+ void changeRate(float newRate) throws JMSException;
+}
Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerBrowserEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerBrowserEndpoint.java 2008-01-21 18:49:20 UTC (rev 3603)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerBrowserEndpoint.java 2008-01-21 18:56:59 UTC (rev 3604)
@@ -35,7 +35,6 @@
import javax.jms.InvalidSelectorException;
import javax.jms.JMSException;
-import org.jboss.jms.delegate.BrowserEndpoint;
import org.jboss.jms.exception.MessagingJMSException;
import org.jboss.messaging.util.Logger;
import org.jboss.messaging.core.Filter;
Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java 2008-01-21 18:49:20 UTC (rev 3603)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java 2008-01-21 18:56:59 UTC (rev 3604)
@@ -48,7 +48,6 @@
import org.jboss.jms.client.api.ClientSession;
import org.jboss.jms.client.delegate.ClientSessionDelegate;
-import org.jboss.jms.delegate.ConnectionEndpoint;
import org.jboss.jms.exception.MessagingJMSException;
import org.jboss.jms.server.ConnectionManager;
import org.jboss.jms.server.SecurityStore;
Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2008-01-21 18:49:20 UTC (rev 3603)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2008-01-21 18:56:59 UTC (rev 3604)
@@ -31,7 +31,6 @@
import org.jboss.jms.client.delegate.ClientConnectionDelegate;
import org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate;
-import org.jboss.jms.delegate.ConnectionFactoryEndpoint;
import org.jboss.jms.delegate.CreateConnectionResult;
import org.jboss.jms.exception.MessagingJMSException;
import org.jboss.messaging.core.MessagingServer;
Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java 2008-01-21 18:49:20 UTC (rev 3603)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java 2008-01-21 18:56:59 UTC (rev 3604)
@@ -27,7 +27,6 @@
import javax.jms.JMSException;
-import org.jboss.jms.delegate.ConsumerEndpoint;
import org.jboss.jms.exception.MessagingJMSException;
import org.jboss.messaging.core.Condition;
import org.jboss.messaging.core.Consumer;
Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java 2008-01-21 18:49:20 UTC (rev 3603)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java 2008-01-21 18:56:59 UTC (rev 3604)
@@ -58,7 +58,6 @@
import org.jboss.jms.delegate.Cancel;
import org.jboss.jms.delegate.DefaultAck;
import org.jboss.jms.delegate.DeliveryInfo;
-import org.jboss.jms.delegate.SessionEndpoint;
import org.jboss.jms.destination.JBossDestination;
import org.jboss.jms.destination.JBossQueue;
import org.jboss.jms.destination.JBossTopic;
Copied: trunk/src/main/org/jboss/jms/server/endpoint/SessionEndpoint.java (from rev 3602, trunk/src/main/org/jboss/jms/delegate/SessionEndpoint.java)
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/SessionEndpoint.java (rev 0)
+++ trunk/src/main/org/jboss/jms/server/endpoint/SessionEndpoint.java 2008-01-21 18:56:59 UTC (rev 3604)
@@ -0,0 +1,124 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jms.server.endpoint;
+
+
+import java.util.List;
+
+import javax.jms.JMSException;
+
+import org.jboss.jms.client.Closeable;
+import org.jboss.jms.client.api.ClientBrowser;
+import org.jboss.jms.client.api.Consumer;
+import org.jboss.jms.delegate.Ack;
+import org.jboss.jms.delegate.Cancel;
+import org.jboss.jms.destination.JBossQueue;
+import org.jboss.jms.destination.JBossTopic;
+import org.jboss.messaging.core.Destination;
+import org.jboss.messaging.core.Message;
+
+/**
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
+ * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
+ *
+ * @version <tt>$Revision$</tt>
+ *
+ * $Id$
+ */
+public interface SessionEndpoint extends Closeable
+{
+ Consumer createConsumerDelegate(Destination destination, String selector,
+ boolean noLocal, String subscriptionName,
+ boolean connectionConsumer) throws JMSException;
+
+ ClientBrowser createBrowserDelegate(Destination queue, String messageSelector) throws JMSException;
+
+ /**
+ * Creates a queue identity given a Queue name. Does NOT create the physical queue. The physical
+ * creation of queues is an administrative task and is not to be initiated by the JMS API, with
+ * the exception of temporary queues.
+ */
+ JBossQueue createQueue(String queueName) throws JMSException;
+
+ /**
+ * Creates a topic identity given a Queue name. Does NOT create the physical topic. The physical
+ * creation of topics is an administrative task and is not to be initiated by the JMS API, with
+ * the exception of temporary topics.
+ */
+ JBossTopic createTopic(String topicName) throws JMSException;
+
+ /**
+ * Acknowledge a list of deliveries
+ * @throws JMSException
+ */
+ void acknowledgeDeliveries(List<Ack> acks) throws JMSException;
+
+ /**
+ * Acknowledge a delivery
+ * @throws JMSException
+ */
+ boolean acknowledgeDelivery(Ack ack) throws JMSException;
+
+ /**
+ * Cancel a list of deliveries.
+ */
+ void cancelDeliveries(List<Cancel> cancels) throws JMSException;
+
+ /**
+ * Cancel a delivery
+ * @param cancel
+ * @throws JMSException
+ */
+ void cancelDelivery(Cancel cancel) throws JMSException;
+
+ /**
+ * Add a temporary destination.
+ */
+ void addTemporaryDestination(Destination destination) throws JMSException;
+
+ /**
+ * Delete a temporary destination
+ */
+ void deleteTemporaryDestination(Destination destination) throws JMSException;
+
+ /**
+ * Unsubscribe the client from the durable subscription
+ * specified by subscriptionName
+ *
+ * @param subscriptionName the Name of the durable subscription to unsubscribe from
+ * @throws JMSException if the unsubscribe fails
+ */
+ void unsubscribe(String subscriptionName) throws JMSException;
+
+ /**
+ * Send a message
+ * @param message The message to send
+ * @throws JMSException
+ */
+ void send(Message message) throws JMSException;
+
+ int getDupsOKBatchSize();
+
+ public boolean isStrictTck();
+}
+
Modified: trunk/src/main/org/jboss/jms/server/endpoint/SessionInternalEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/SessionInternalEndpoint.java 2008-01-21 18:49:20 UTC (rev 3603)
+++ trunk/src/main/org/jboss/jms/server/endpoint/SessionInternalEndpoint.java 2008-01-21 18:56:59 UTC (rev 3604)
@@ -23,7 +23,6 @@
import javax.jms.JMSException;
-import org.jboss.jms.delegate.SessionEndpoint;
import org.jboss.messaging.core.Message;
/**
Modified: trunk/tests/src/org/jboss/test/messaging/jms/server/connectionmanager/SimpleConnectionManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/server/connectionmanager/SimpleConnectionManagerTest.java 2008-01-21 18:49:20 UTC (rev 3603)
+++ trunk/tests/src/org/jboss/test/messaging/jms/server/connectionmanager/SimpleConnectionManagerTest.java 2008-01-21 18:56:59 UTC (rev 3604)
@@ -31,9 +31,9 @@
import org.jboss.jms.client.JBossConnection;
import org.jboss.jms.client.JBossConnectionFactory;
import org.jboss.jms.client.api.ClientSession;
-import org.jboss.jms.delegate.ConnectionEndpoint;
import org.jboss.jms.server.ConnectionManager;
import org.jboss.jms.server.connectionmanager.SimpleConnectionManager;
+import org.jboss.jms.server.endpoint.ConnectionEndpoint;
import org.jboss.jms.tx.TransactionRequest;
import org.jboss.messaging.core.impl.server.MessagingServerImpl;
import org.jboss.messaging.core.tx.MessagingXid;
More information about the jboss-cvs-commits
mailing list