[jboss-cvs] JBoss Messaging SVN: r3124 - in trunk: src/main/org/jboss/messaging/core/impl/jchannelfactory and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 20 08:23:32 EDT 2007
Author: timfox
Date: 2007-09-20 08:23:32 -0400 (Thu, 20 Sep 2007)
New Revision: 3124
Added:
trunk/src/main/org/jboss/messaging/core/contract/ChannelFactory.java
trunk/src/main/org/jboss/messaging/core/impl/jchannelfactory/MultiplexerChannelFactory.java
trunk/src/main/org/jboss/messaging/core/impl/jchannelfactory/XMLChannelFactory.java
Removed:
trunk/src/main/org/jboss/messaging/core/contract/JChannelFactory.java
trunk/src/main/org/jboss/messaging/core/impl/jchannelfactory/MultiplexerJChannelFactory.java
trunk/src/main/org/jboss/messaging/core/impl/jchannelfactory/XMLJChannelFactory.java
Modified:
trunk/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java
trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
trunk/src/main/org/jboss/messaging/core/jmx/MessagingPostOfficeService.java
trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java
trunk/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPersistenceServiceConfigFileJChannelFactory.java
trunk/tests/src/org/jboss/test/messaging/core/postoffice/SimpleJChannelFactory.java
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-1077
Copied: trunk/src/main/org/jboss/messaging/core/contract/ChannelFactory.java (from rev 3119, trunk/src/main/org/jboss/messaging/core/contract/JChannelFactory.java)
===================================================================
--- trunk/src/main/org/jboss/messaging/core/contract/ChannelFactory.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/contract/ChannelFactory.java 2007-09-20 12:23:32 UTC (rev 3124)
@@ -0,0 +1,40 @@
+/*
+ * 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.messaging.core.contract;
+
+import org.jgroups.Channel;
+
+
+/**
+ * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * @version <tt>$Revision$</tt>
+ *
+ * $Id$
+ */
+public interface ChannelFactory
+{
+ Channel createControlChannel() throws Exception;
+
+ Channel createDataChannel() throws Exception;
+}
Deleted: trunk/src/main/org/jboss/messaging/core/contract/JChannelFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/contract/JChannelFactory.java 2007-09-19 16:16:04 UTC (rev 3123)
+++ trunk/src/main/org/jboss/messaging/core/contract/JChannelFactory.java 2007-09-20 12:23:32 UTC (rev 3124)
@@ -1,16 +0,0 @@
-package org.jboss.messaging.core.contract;
-
-import org.jgroups.JChannel;
-
-/**
- * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
- * @version <tt>$Revision$</tt>
- *
- * $Id$
- */
-public interface JChannelFactory
-{
- JChannel createControlChannel() throws Exception;
-
- JChannel createDataChannel() throws Exception;
-}
Copied: trunk/src/main/org/jboss/messaging/core/impl/jchannelfactory/MultiplexerChannelFactory.java (from rev 3119, trunk/src/main/org/jboss/messaging/core/impl/jchannelfactory/MultiplexerJChannelFactory.java)
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/jchannelfactory/MultiplexerChannelFactory.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/impl/jchannelfactory/MultiplexerChannelFactory.java 2007-09-20 12:23:32 UTC (rev 3124)
@@ -0,0 +1,143 @@
+/*
+ * 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.messaging.core.impl.jchannelfactory;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.jboss.messaging.core.contract.ChannelFactory;
+import org.jgroups.Channel;
+
+/**
+ * A ChannelFactory that will use the MBean ChannelFactory interface
+ *
+ * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
+ * @version <tt>$Revision$</tt>
+ * $Id$
+ */
+public class MultiplexerChannelFactory implements ChannelFactory
+{
+
+ // Constants ------------------------------------------------------------------------------------
+
+ private static final String[] MUX_SIGNATURE = new String[]{"java.lang.String",
+ "java.lang.String", "boolean", "java.lang.String"};
+
+ // Attributes -----------------------------------------------------------------------------------
+ MBeanServer server;
+ ObjectName channelFactory;
+ String dataStack;
+ String controlStack;
+ String uniqueID;
+ private static final String MUX_OPERATION = "createMultiplexerChannel";
+
+ // Static ---------------------------------------------------------------------------------------
+
+ // Constructors ---------------------------------------------------------------------------------
+
+ public MultiplexerChannelFactory(MBeanServer server,
+ ObjectName channelFactory,
+ String uniqueID,
+ String controlStack,
+ String dataStack)
+ {
+ this.server = server;
+ this.channelFactory = channelFactory;
+ this.uniqueID = uniqueID;
+ this.dataStack = dataStack;
+ this.controlStack = controlStack;
+ }
+
+ // Public ---------------------------------------------------------------------------------------
+
+ public MBeanServer getServer()
+ {
+ return server;
+ }
+
+ public void setServer(MBeanServer server)
+ {
+ this.server = server;
+ }
+
+ public ObjectName getChannelFactory()
+ {
+ return channelFactory;
+ }
+
+ public void setChannelFactory(ObjectName channelFactory)
+ {
+ this.channelFactory = channelFactory;
+ }
+
+ public String getDataStack()
+ {
+ return dataStack;
+ }
+
+ public void setDataStack(String dataStack)
+ {
+ this.dataStack = dataStack;
+ }
+
+ public String getControlStack()
+ {
+ return controlStack;
+ }
+
+ public void setControlStack(String controlStack)
+ {
+ this.controlStack = controlStack;
+ }
+
+ public String getUniqueID()
+ {
+ return uniqueID;
+ }
+
+ public void setUniqueID(String uniqueID)
+ {
+ this.uniqueID = uniqueID;
+ }
+
+ public Channel createControlChannel() throws Exception
+ {
+ return (Channel) server.invoke(this.channelFactory, MUX_OPERATION,
+ new Object[]{controlStack, uniqueID + "-CTRL", Boolean.TRUE, uniqueID}, MUX_SIGNATURE);
+ }
+
+ public Channel createDataChannel() throws Exception
+ {
+ return (Channel) server.invoke(this.channelFactory, MUX_OPERATION,
+ new Object[]{dataStack, uniqueID + "-DATA", Boolean.TRUE, uniqueID}, MUX_SIGNATURE);
+ }
+
+ // Package protected ----------------------------------------------------------------------------
+
+ // Protected ------------------------------------------------------------------------------------
+
+ // Private -------------------------------------------------------------------------------------
+
+ // Inner classes -------------------------------------------------------------------------------
+
+}
Deleted: trunk/src/main/org/jboss/messaging/core/impl/jchannelfactory/MultiplexerJChannelFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/jchannelfactory/MultiplexerJChannelFactory.java 2007-09-19 16:16:04 UTC (rev 3123)
+++ trunk/src/main/org/jboss/messaging/core/impl/jchannelfactory/MultiplexerJChannelFactory.java 2007-09-20 12:23:32 UTC (rev 3124)
@@ -1,143 +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.messaging.core.impl.jchannelfactory;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-
-import org.jboss.messaging.core.contract.JChannelFactory;
-import org.jgroups.JChannel;
-
-/**
- * A JChannelFactory that will use the MBean JChannelFactory interface
- *
- * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
- * @version <tt>$Revision$</tt>
- * $Id$
- */
-public class MultiplexerJChannelFactory implements JChannelFactory
-{
-
- // Constants ------------------------------------------------------------------------------------
-
- private static final String[] MUX_SIGNATURE = new String[]{"java.lang.String",
- "java.lang.String", "boolean", "java.lang.String"};
-
- // Attributes -----------------------------------------------------------------------------------
- MBeanServer server;
- ObjectName channelFactory;
- String asyncStack;
- String syncStack;
- String uniqueID;
- private static final String MUX_OPERATION = "createMultiplexerChannel";
-
- // Static ---------------------------------------------------------------------------------------
-
- // Constructors ---------------------------------------------------------------------------------
-
- public MultiplexerJChannelFactory(MBeanServer server,
- ObjectName channelFactory,
- String uniqueID,
- String syncStack,
- String asyncStack)
- {
- this.server = server;
- this.channelFactory = channelFactory;
- this.uniqueID = uniqueID;
- this.asyncStack = asyncStack;
- this.syncStack = syncStack;
- }
-
- // Public ---------------------------------------------------------------------------------------
-
- public MBeanServer getServer()
- {
- return server;
- }
-
- public void setServer(MBeanServer server)
- {
- this.server = server;
- }
-
- public ObjectName getChannelFactory()
- {
- return channelFactory;
- }
-
- public void setChannelFactory(ObjectName channelFactory)
- {
- this.channelFactory = channelFactory;
- }
-
- public String getAsyncStack()
- {
- return asyncStack;
- }
-
- public void setAsyncStack(String asyncStack)
- {
- this.asyncStack = asyncStack;
- }
-
- public String getSyncStack()
- {
- return syncStack;
- }
-
- public void setSyncStack(String syncStack)
- {
- this.syncStack = syncStack;
- }
-
- public String getUniqueID()
- {
- return uniqueID;
- }
-
- public void setUniqueID(String uniqueID)
- {
- this.uniqueID = uniqueID;
- }
-
- public JChannel createControlChannel() throws Exception
- {
- return (JChannel) server.invoke(this.channelFactory, MUX_OPERATION,
- new Object[]{syncStack, uniqueID, Boolean.TRUE, uniqueID}, MUX_SIGNATURE);
- }
-
- public JChannel createDataChannel() throws Exception
- {
- return (JChannel) server.invoke(this.channelFactory, MUX_OPERATION,
- new Object[]{asyncStack, uniqueID, Boolean.TRUE, uniqueID}, MUX_SIGNATURE);
- }
-
- // Package protected ----------------------------------------------------------------------------
-
- // Protected ------------------------------------------------------------------------------------
-
- // Private -------------------------------------------------------------------------------------
-
- // Inner classes -------------------------------------------------------------------------------
-
-}
Copied: trunk/src/main/org/jboss/messaging/core/impl/jchannelfactory/XMLChannelFactory.java (from rev 3119, trunk/src/main/org/jboss/messaging/core/impl/jchannelfactory/XMLJChannelFactory.java)
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/jchannelfactory/XMLChannelFactory.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/impl/jchannelfactory/XMLChannelFactory.java 2007-09-20 12:23:32 UTC (rev 3124)
@@ -0,0 +1,96 @@
+/*
+ * 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.messaging.core.impl.jchannelfactory;
+
+import org.jboss.messaging.core.contract.ChannelFactory;
+import org.jgroups.Channel;
+import org.jgroups.JChannel;
+import org.w3c.dom.Element;
+
+/**
+ * A ChannelFactory that will use Elements to create channels.
+ * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
+ * @version <tt>$Revision:1909 $</tt>
+ * $Id:XMLJChannelFactory.java 1909 2007-01-06 06:08:03Z clebert.suconic at jboss.com $
+ */
+public class XMLChannelFactory implements ChannelFactory
+{
+
+ // Constants ------------------------------------------------------------------------------------
+
+ // Attributes -----------------------------------------------------------------------------------
+ Element controlConfig;
+ Element dataConfig;
+
+ // Static ---------------------------------------------------------------------------------------
+
+ // Constructors ---------------------------------------------------------------------------------
+
+ public XMLChannelFactory(Element controlConfig, Element dataConfig)
+ {
+ this.controlConfig = controlConfig;
+ this.dataConfig = dataConfig;
+ }
+
+ // Public ---------------------------------------------------------------------------------------
+
+ public Element getControlConfig()
+ {
+ return controlConfig;
+ }
+
+ public void setControlConfig(Element controlConfig)
+ {
+ this.controlConfig = controlConfig;
+ }
+
+ public Element getDataConfig()
+ {
+ return dataConfig;
+ }
+
+ public void setDataConfig(Element dataConfig)
+ {
+ this.dataConfig = dataConfig;
+ }
+
+ // implementation of JChannelFactory ------------------------------------------------------------
+ public Channel createControlChannel() throws Exception
+ {
+ return new JChannel(controlConfig);
+ }
+
+ public Channel createDataChannel() throws Exception
+ {
+ return new JChannel(dataConfig);
+ }
+
+ // Package protected ----------------------------------------------------------------------------
+
+ // Protected ------------------------------------------------------------------------------------
+
+ // Private --------------------------------------------------------------------------------------
+
+ // Inner classes --------------------------------------------------------------------------------
+
+}
Deleted: trunk/src/main/org/jboss/messaging/core/impl/jchannelfactory/XMLJChannelFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/jchannelfactory/XMLJChannelFactory.java 2007-09-19 16:16:04 UTC (rev 3123)
+++ trunk/src/main/org/jboss/messaging/core/impl/jchannelfactory/XMLJChannelFactory.java 2007-09-20 12:23:32 UTC (rev 3124)
@@ -1,95 +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.messaging.core.impl.jchannelfactory;
-
-import org.jboss.messaging.core.contract.JChannelFactory;
-import org.jgroups.JChannel;
-import org.w3c.dom.Element;
-
-/**
- * A JChannelFactory that will use Elements to create channels.
- * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
- * @version <tt>$Revision:1909 $</tt>
- * $Id:XMLJChannelFactory.java 1909 2007-01-06 06:08:03Z clebert.suconic at jboss.com $
- */
-public class XMLJChannelFactory implements JChannelFactory
-{
-
- // Constants ------------------------------------------------------------------------------------
-
- // Attributes -----------------------------------------------------------------------------------
- Element syncConfig;
- Element asyncConfig;
-
- // Static ---------------------------------------------------------------------------------------
-
- // Constructors ---------------------------------------------------------------------------------
-
- public XMLJChannelFactory(Element syncConfig, Element asyncConfig)
- {
- this.syncConfig = syncConfig;
- this.asyncConfig = asyncConfig;
- }
-
- // Public ---------------------------------------------------------------------------------------
-
- public Element getSyncConfig()
- {
- return syncConfig;
- }
-
- public void setSyncConfig(Element syncConfig)
- {
- this.syncConfig = syncConfig;
- }
-
- public Element getAsyncConfig()
- {
- return asyncConfig;
- }
-
- public void setAsyncConfig(Element asyncConfig)
- {
- this.asyncConfig = asyncConfig;
- }
-
- // implementation of JChannelFactory ------------------------------------------------------------
- public JChannel createControlChannel() throws Exception
- {
- return new JChannel(syncConfig);
- }
-
- public JChannel createDataChannel() throws Exception
- {
- return new JChannel(asyncConfig);
- }
-
- // Package protected ----------------------------------------------------------------------------
-
- // Protected ------------------------------------------------------------------------------------
-
- // Private --------------------------------------------------------------------------------------
-
- // Inner classes --------------------------------------------------------------------------------
-
-}
Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java 2007-09-19 16:16:04 UTC (rev 3123)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java 2007-09-20 12:23:32 UTC (rev 3124)
@@ -30,7 +30,7 @@
import java.util.List;
import org.jboss.logging.Logger;
-import org.jboss.messaging.core.contract.JChannelFactory;
+import org.jboss.messaging.core.contract.ChannelFactory;
import org.jgroups.Address;
import org.jgroups.Channel;
import org.jgroups.MembershipListener;
@@ -70,7 +70,7 @@
private long castTimeout;
- private JChannelFactory jChannelFactory;
+ private ChannelFactory jChannelFactory;
private Channel controlChannel;
@@ -103,7 +103,7 @@
//We probably don't need this if all nodes are in different VMs
public GroupMember(String groupName, long stateTimeout, long castTimeout,
- JChannelFactory jChannelFactory, RequestTarget requestTarget,
+ ChannelFactory jChannelFactory, RequestTarget requestTarget,
GroupListener groupListener)
{
this.groupName = groupName;
Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java 2007-09-19 16:16:04 UTC (rev 3123)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java 2007-09-20 12:23:32 UTC (rev 3124)
@@ -60,7 +60,7 @@
import org.jboss.messaging.core.contract.Delivery;
import org.jboss.messaging.core.contract.Filter;
import org.jboss.messaging.core.contract.FilterFactory;
-import org.jboss.messaging.core.contract.JChannelFactory;
+import org.jboss.messaging.core.contract.ChannelFactory;
import org.jboss.messaging.core.contract.Message;
import org.jboss.messaging.core.contract.MessageReference;
import org.jboss.messaging.core.contract.MessageStore;
@@ -285,7 +285,7 @@
IDManager channelIDManager,
ClusterNotifier clusterNotifier,
String groupName,
- JChannelFactory jChannelFactory,
+ ChannelFactory jChannelFactory,
long stateTimeout, long castTimeout,
boolean supportsFailover)
throws Exception
Modified: trunk/src/main/org/jboss/messaging/core/jmx/MessagingPostOfficeService.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/jmx/MessagingPostOfficeService.java 2007-09-19 16:16:04 UTC (rev 3123)
+++ trunk/src/main/org/jboss/messaging/core/jmx/MessagingPostOfficeService.java 2007-09-20 12:23:32 UTC (rev 3124)
@@ -36,13 +36,13 @@
import org.jboss.messaging.core.contract.ClusterNotifier;
import org.jboss.messaging.core.contract.ConditionFactory;
import org.jboss.messaging.core.contract.FilterFactory;
-import org.jboss.messaging.core.contract.JChannelFactory;
+import org.jboss.messaging.core.contract.ChannelFactory;
import org.jboss.messaging.core.contract.MessageStore;
import org.jboss.messaging.core.contract.MessagingComponent;
import org.jboss.messaging.core.contract.PersistenceManager;
import org.jboss.messaging.core.impl.IDManager;
-import org.jboss.messaging.core.impl.jchannelfactory.MultiplexerJChannelFactory;
-import org.jboss.messaging.core.impl.jchannelfactory.XMLJChannelFactory;
+import org.jboss.messaging.core.impl.jchannelfactory.MultiplexerChannelFactory;
+import org.jboss.messaging.core.impl.jchannelfactory.XMLChannelFactory;
import org.jboss.messaging.core.impl.postoffice.MessagingPostOffice;
import org.jboss.messaging.core.impl.tx.TransactionRepository;
import org.jboss.messaging.util.ExceptionUtil;
@@ -351,7 +351,7 @@
FilterFactory ff = new SelectorFactory();
- JChannelFactory jChannelFactory = null;
+ ChannelFactory jChannelFactory = null;
if (channelFactoryName != null)
{
@@ -372,19 +372,19 @@
log.debug(this + " uses MultiplexerJChannelFactory");
jChannelFactory =
- new MultiplexerJChannelFactory(server, channelFactoryName, channelPartitionName,
+ new MultiplexerChannelFactory(server, channelFactoryName, channelPartitionName,
controlChannelName, dataChannelName);
}
else
{
log.debug(this + " uses XMLJChannelFactory");
- jChannelFactory = new XMLJChannelFactory(controlChannelConfig, dataChannelConfig);
+ jChannelFactory = new XMLChannelFactory(controlChannelConfig, dataChannelConfig);
}
}
else
{
log.debug(this + " uses XMLJChannelFactory");
- jChannelFactory = new XMLJChannelFactory(controlChannelConfig, dataChannelConfig);
+ jChannelFactory = new XMLChannelFactory(controlChannelConfig, dataChannelConfig);
}
if (clustered)
Modified: trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java 2007-09-19 16:16:04 UTC (rev 3123)
+++ trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java 2007-09-20 12:23:32 UTC (rev 3124)
@@ -28,7 +28,7 @@
import org.jboss.messaging.core.contract.Condition;
import org.jboss.messaging.core.contract.ConditionFactory;
import org.jboss.messaging.core.contract.FilterFactory;
-import org.jboss.messaging.core.contract.JChannelFactory;
+import org.jboss.messaging.core.contract.ChannelFactory;
import org.jboss.messaging.core.contract.Message;
import org.jboss.messaging.core.contract.MessageReference;
import org.jboss.messaging.core.contract.MessageStore;
@@ -86,7 +86,7 @@
// TODO (ovidiu) we're temporarily ignoring the multiplex option, it doesn't work well
boolean ignoreMultiplexer = true;
- JChannelFactory jChannelFactory =
+ ChannelFactory jChannelFactory =
new ClusteredPersistenceServiceConfigFileJChannelFactory(configFilePath,
ignoreMultiplexer,
sc.getMBeanServer());
Modified: trunk/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPersistenceServiceConfigFileJChannelFactory.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPersistenceServiceConfigFileJChannelFactory.java 2007-09-19 16:16:04 UTC (rev 3123)
+++ trunk/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPersistenceServiceConfigFileJChannelFactory.java 2007-09-20 12:23:32 UTC (rev 3124)
@@ -10,11 +10,12 @@
import javax.management.ObjectName;
import org.jboss.logging.Logger;
-import org.jboss.messaging.core.contract.JChannelFactory;
-import org.jboss.messaging.core.impl.jchannelfactory.MultiplexerJChannelFactory;
+import org.jboss.messaging.core.contract.ChannelFactory;
+import org.jboss.messaging.core.impl.jchannelfactory.MultiplexerChannelFactory;
import org.jboss.messaging.util.XMLUtil;
import org.jboss.test.messaging.tools.container.ServiceConfigHelper;
import org.jboss.test.messaging.tools.jboss.MBeanConfigurationElement;
+import org.jgroups.Channel;
import org.jgroups.JChannel;
import org.w3c.dom.Element;
@@ -28,7 +29,7 @@
*
* $Id$
*/
-public class ClusteredPersistenceServiceConfigFileJChannelFactory implements JChannelFactory
+public class ClusteredPersistenceServiceConfigFileJChannelFactory implements ChannelFactory
{
// Constants ------------------------------------------------------------------------------------
@@ -43,7 +44,7 @@
// we're either using a delegate MultiplexerJChannelFactory, if we find one configured in the
// file ...
- private JChannelFactory multiplexorDelegate;
+ private ChannelFactory multiplexorDelegate;
// ... or just plain XML configuration.
private Element controlConfig;
@@ -70,9 +71,9 @@
init(configFilePath, skipMultiplex, mbeanServer);
}
- // JChannelFactory ------------------------------------------------------------------------------
+ // ChannelFactory ------------------------------------------------------------------------------
- public JChannel createControlChannel() throws Exception
+ public Channel createControlChannel() throws Exception
{
if (multiplexorDelegate != null)
{
@@ -84,7 +85,7 @@
}
}
- public JChannel createDataChannel() throws Exception
+ public Channel createDataChannel() throws Exception
{
if (multiplexorDelegate != null)
{
@@ -152,7 +153,7 @@
if(mbeanServer.getMBeanInfo(channelFactoryName) != null)
{
multiplexorDelegate =
- new MultiplexerJChannelFactory(mbeanServer, channelFactoryName,
+ new MultiplexerChannelFactory(mbeanServer, channelFactoryName,
channelPartitionName, controlChannelName,
dataChannelName);
Modified: trunk/tests/src/org/jboss/test/messaging/core/postoffice/SimpleJChannelFactory.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/postoffice/SimpleJChannelFactory.java 2007-09-19 16:16:04 UTC (rev 3123)
+++ trunk/tests/src/org/jboss/test/messaging/core/postoffice/SimpleJChannelFactory.java 2007-09-20 12:23:32 UTC (rev 3124)
@@ -22,7 +22,7 @@
package org.jboss.test.messaging.core.postoffice;
-import org.jboss.messaging.core.contract.JChannelFactory;
+import org.jboss.messaging.core.contract.ChannelFactory;
import org.jgroups.JChannel;
/**
@@ -33,7 +33,7 @@
*
* $Id$
*/
-public class SimpleJChannelFactory implements JChannelFactory
+public class SimpleJChannelFactory implements ChannelFactory
{
// Constants ------------------------------------------------------------------------------------
More information about the jboss-cvs-commits
mailing list