[jboss-cvs] JBoss Messaging SVN: r3335 - in branches/Branch_MC_Integration_New: src/etc and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 16 04:03:58 EST 2007
Author: ataylor
Date: 2007-11-16 04:03:58 -0500 (Fri, 16 Nov 2007)
New Revision: 3335
Added:
branches/Branch_MC_Integration_New/src/etc/server/standalone/config/multiplexer.xml
branches/Branch_MC_Integration_New/src/etc/server/standalone/run.sh
Removed:
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/Bootstrap.java
branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/jmx/JDBCMBeanSupport.java
branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/jmx/JDBCServiceSupport.java
Modified:
branches/Branch_MC_Integration_New/build-messaging.xml
branches/Branch_MC_Integration_New/build-thirdparty.xml
branches/Branch_MC_Integration_New/src/etc/embedded.mf
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/JmsServerStatistics.java
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/bridge/BridgeService.java
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/microcontainer/AuthenticationManager.java
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/microcontainer/JBMBootstrapServer.java
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/microcontainer/ServiceLocator.java
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/recovery/MessagingXAResourceWrapper.java
branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/ChannelSupport.java
Log:
initial microcontainer integration, added new integration libraries
Modified: branches/Branch_MC_Integration_New/build-messaging.xml
===================================================================
--- branches/Branch_MC_Integration_New/build-messaging.xml 2007-11-15 09:39:19 UTC (rev 3334)
+++ branches/Branch_MC_Integration_New/build-messaging.xml 2007-11-16 09:03:58 UTC (rev 3335)
@@ -161,10 +161,15 @@
<path refid="jboss.aop.classpath"/>
<path refid="jboss.remoting.classpath"/>
<path refid="jboss.jbossts14.classpath"/>
- <path refid="jbossas.core.libs.classpath"/>
+ <!--<path refid="jbossas.core.libs.classpath"/>-->
<!-- some components at JBoss use JBossSerialization (JCA for instance) -->
<path refid="jboss.serialization.classpath"/>
<path refid="jboss.microcontainer.classpath"/>
+ <path refid="jboss.jboss.security.spi.classpath"/>
+ <path refid="jboss.jboss.jaspi.api.classpath"/>
+ <path refid="jboss.integration.classpath"/>
+ <path refid="jboss.jbosssx.client.classpath"/>
+ <path refid="jboss.jboss.javaee.classpath"/>
</path>
<!--
@@ -398,14 +403,32 @@
<include name="jboss-kernel.jar"/>
<include name="jboss-dependency.jar"/>
</fileset>
- <fileset dir="${jbossas.core.libs.lib}">
+ <fileset dir="${jboss.jboss.javaee.lib}">
+ <include name="jboss-javaee.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jboss.common.logging.spi.lib}">
+ <include name="jboss-common-logging-spi.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jbossxb.lib}">
+ <include name="jboss-xml-binding.jar"/>
+ </fileset>
+ <fileset dir="${jboss.integration.lib}">
+ <include name="jboss-transaction-spi.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jboss.security.spi.lib}">
+ <include name="jboss-security-spi.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jboss.jaspi.api.lib}">
+ <include name="jboss-jaspi-api.jar"/>
+ </fileset>
+ <!--<fileset dir="${jbossas.core.libs.lib}">
<include name="jboss-j2ee.jar"/>
<include name="jboss-common.jar"/>
<include name="jboss-xml-binding.jar"/>
<include name="jbosssx-client.jar"/>
<include name="jboss-system.jar"/>
<include name="jboss-jmx.jar"/>
- </fileset>
+ </fileset>-->
<fileset dir="${jboss.common.core.lib}">
<include name="jboss-common-core.jar"/>
</fileset>
Modified: branches/Branch_MC_Integration_New/build-thirdparty.xml
===================================================================
--- branches/Branch_MC_Integration_New/build-thirdparty.xml 2007-11-15 09:39:19 UTC (rev 3334)
+++ branches/Branch_MC_Integration_New/build-thirdparty.xml 2007-11-16 09:03:58 UTC (rev 3335)
@@ -92,8 +92,14 @@
<componentref name="jboss/aop" version="2.0.0.beta2"/>
<componentref name="jboss/remoting" version="2.2.2.SP1-brew"/>
<componentref name="jboss/jbossts14" version="4.2.3.SP3"/>
- <componentref name="jbossas/core-libs" version="4.2.1.GA"/>
- <componentref name="jboss/microcontainer" version="2.0.0.Beta5"/>
+ <!--<componentref name="jbossas/core-libs" version="4.2.1.GA"/>-->
+ <componentref name="jboss/microcontainer" version="2.0.0.Beta5"/>
+ <componentref name="jboss/jboss-security-spi" version="2.0.1.GA"/>
+ <componentref name="jboss/jboss-jaspi-api" version="1.0-BETA1"/>
+ <componentref name="jboss/integration" version="5.0.0.Beta4"/>
+ <componentref name="jboss/jbosssx-client" version="2.0.1.GA"/>
+ <componentref name="jboss/jboss-javaee" version="5.0.0.Beta3"/>
+ <componentref name="jboss/jboss-common-logging-spi" version="2.0.4.GA"/>
<!--
Modified: branches/Branch_MC_Integration_New/src/etc/embedded.mf
===================================================================
--- branches/Branch_MC_Integration_New/src/etc/embedded.mf 2007-11-15 09:39:19 UTC (rev 3334)
+++ branches/Branch_MC_Integration_New/src/etc/embedded.mf 2007-11-16 09:03:58 UTC (rev 3335)
@@ -9,4 +9,4 @@
Implementation-Vendor: @MODULE_VENDOR@
Implementation-Vendor-Id: @MODULE_URL@
Main-Class: org.jboss.jms.server.microcontainer.JBMBootstrapServer
-Class-Path: jboss-kernel.jar jboss-j2ee.jar jboss-common.jar jboss-xml-binding.jar jboss-common-core.jar jboss-container.jar jboss-dependency.jar concurrent.jar jnp-client.jar jnpserver.jar xercesImpl.jar jgroups.jar jboss-remoting.jar commons-logging.jar hsqldb.jar jbossjta.jar jbossjta-integration.jar jbossts-common.jar jbosssx-client.jar jboss-system.jar jboss-jmx.jar jboss-aop-jdk50.jar trove.jar javassist.jar log4j.jar
\ No newline at end of file
+Class-Path: jboss-kernel.jar jboss-javaee.jar jboss-common.jar jboss-xml-binding.jar jboss-common-core.jar jboss-container.jar jboss-dependency.jar concurrent.jar jnp-client.jar jnpserver.jar xercesImpl.jar jgroups.jar jboss-remoting.jar commons-logging.jar hsqldb.jar jbossjta.jar jbossjta-integration.jar jbossts-common.jar jbosssx-client.jar jboss-system.jar jboss-jmx.jar jboss-aop-jdk50.jar trove.jar javassist.jar log4j.jar jboss-common-logging-spi.jar jboss-xml-binding.jar jboss-transaction-spi.jar jboss-security-spi.jar jboss-jaspi-api.jar
\ No newline at end of file
Added: branches/Branch_MC_Integration_New/src/etc/server/standalone/config/multiplexer.xml
===================================================================
--- branches/Branch_MC_Integration_New/src/etc/server/standalone/config/multiplexer.xml (rev 0)
+++ branches/Branch_MC_Integration_New/src/etc/server/standalone/config/multiplexer.xml 2007-11-16 09:03:58 UTC (rev 3335)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <bean class="org.jgroups.jmx.JChannelFactory" name="jgroups.mux:name=Multiplexer">
+ <!--mbean code="org.jgroups.JChannelFactory" name="jgroups.mux:name=Multiplexer" xmbean-dd="resource:META-INF/multiplexer-xmbean.xml" -->
+ <property name="Domain">jgroups.mux</property>
+ <property name="MultiplexerConfig">multiplexer-stacks.xml</property>
+ <property name="ExposeChannels">true</property>
+ <property name="ExposeProtocols">true</property>
+
+ <!-- The address used to determine the node name -->
+ <!-- <attribute name="NodeAddress">${jboss.bind.address}</attribute> -->
+
+ </bean>
+</deployment>
\ No newline at end of file
Added: branches/Branch_MC_Integration_New/src/etc/server/standalone/run.sh
===================================================================
--- branches/Branch_MC_Integration_New/src/etc/server/standalone/run.sh (rev 0)
+++ branches/Branch_MC_Integration_New/src/etc/server/standalone/run.sh 2007-11-16 09:03:58 UTC (rev 3335)
@@ -0,0 +1,3 @@
+CONFIG=$1
+echo running Server with config ${CONFIG}
+java -classpath config/:config/${CONFIG}:lib/jboss-messaging.jar org.jboss.jms.server.microcontainer.JBMBootstrapServer ${CONFIG}.xml jbm-beans.xml
\ No newline at end of file
Property changes on: branches/Branch_MC_Integration_New/src/etc/server/standalone/run.sh
___________________________________________________________________
Name: svn:executable
+ *
Deleted: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/Bootstrap.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/Bootstrap.java 2007-11-15 09:39:19 UTC (rev 3334)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/Bootstrap.java 2007-11-16 09:03:58 UTC (rev 3335)
@@ -1,58 +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.server;
-
-import org.jboss.system.ServiceMBeanSupport;
-
-/**
- * A bootstrap for a scoped deployment.
- *
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @version <tt>$Revision$</tt>
- *
- * $Id$
- */
-public class Bootstrap extends ServiceMBeanSupport
-{
- // Constants -----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- public Bootstrap() throws Exception
- {
- }
-
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
-}
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/JmsServerStatistics.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/JmsServerStatistics.java 2007-11-15 09:39:19 UTC (rev 3334)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/JmsServerStatistics.java 2007-11-16 09:03:58 UTC (rev 3335)
@@ -11,78 +11,297 @@
*/
public interface JmsServerStatistics
{
+ /**
+ * returns how many messages have been recieved for a given queue. This is dependant on the
+ * Message Counter being enabled
+ * @param queue the queue
+ * @return number of messages
+ * @throws Exception if a problem occurs
+ */
int getMessageCountForQueue(String queue) throws Exception;
+ /**
+ * returns how many messagesd have been delivered from a specific queue
+ * @param queue the queue
+ * @return number of messages
+ * @throws Exception if a problem occurs
+ */
int getDeliveringCountForQueue(String queue) throws Exception;
+ /**
+ * returns how many messages are scheduled for a specific queue
+ * @param queue the queue
+ * @return number of messages
+ * @throws Exception if a problem occurs
+ */
int getScheduledMessageCountForQueue(String queue) throws Exception;
+ /**
+ * returns the message counter for a queue
+ * @param queue the queue
+ * @return number of messages
+ * @throws Exception if a problem occurs
+ */
MessageCounter getMessageCounterForQueue(String queue) throws Exception;
+ /**
+ * returns the message statistics for a queue
+ * @param queue the queue
+ * @return the message statistics
+ * @throws Exception if a problem occurs
+ */
MessageStatistics getMessageStatisticsForQueue(String queue) throws Exception;
+ /**
+ * returns how many consumers a specific queue has
+ * @param queue the queue
+ * @return number of consumers
+ * @throws Exception if a problem occurs
+ */
int getConsumerCountForQueue(String queue) throws Exception;
+ /**
+ * restes the message counter for a specific queue
+ * @param queue the queue
+ * @throws Exception if a problem occurs
+ */
void resetMessageCounterForQueue(String queue) throws Exception;
+ /**
+ * resets the counter history for a specific queue
+ * @param queue the queue
+ * @throws Exception if a problem occurs
+ */
void resetMessageCounterHistoryForQueue(String queue) throws Exception;
+ /**
+ * lists all messages for a specific queue. This will contain the message references only
+ * @param queue the queue
+ * @return the messages
+ * @throws Exception if a problem occurs
+ */
List listAllMessagesForQueue(String queue) throws Exception;
+ /**
+ * lists all messages that match the given selector.
+ * @param queue the queue
+ * @param selector
+ * @return the messages
+ * @throws Exception if a problem occurs
+ */
List listAllMessagesForQueue(String queue,String selector) throws Exception;
+ /**
+ * list all the durable messages for a specific queue
+ * @param queue the queue
+ * @return the messages
+ * @throws Exception if a problem occurs
+ */
List listDurableMessagesForQueue(String queue) throws Exception;
+ /**
+ * list all the durable messages for a queue that match a given selector
+ * @param queue the queue
+ * @param selector
+ * @return the messages
+ * @throws Exception if a problem occurs
+ */
List listDurableMessagesForQueue(String queue,String selector) throws Exception;
+ /**
+ * lists all the non durable messages for a specific queue.
+ * @param queue the queue
+ * @return the messages
+ * @throws Exception if a problem occurs
+ */
List listNonDurableMessagesForQueue(String queue) throws Exception;
+ /**
+ * lists all noon durable messages for a queue.
+ * @param queue
+ * @param selector
+ * @return
+ * @throws Exception
+ */
List listNonDurableMessagesForQueue(String queue,String selector) throws Exception;
+ /**
+ * lists all durable messages for a specific queue that match a specific selector
+ * @param queue
+ * @return
+ * @throws Exception
+ */
String listMessageCounterAsHTMLForQueue(String queue) throws Exception;
+ /**
+ * list the message count history for a specific queue in HTML format
+ * @param queue
+ * @return
+ * @throws Exception
+ */
String listMessageCounterHistoryAsHTMLForQueue(String queue) throws Exception;
//topic
+ /**
+ * counts messages received for a topic
+ * @param topicName
+ * @return
+ * @throws Exception
+ */
int getAllMessageCountForTopic(String topicName) throws Exception;
+ /**
+ * counts durable messages recieved for a topic
+ * @param topicName
+ * @return
+ * @throws Exception
+ */
int getDurableMessageCountForTopic(String topicName) throws Exception;
+ /**
+ * counts non durable messages recieved for a topic
+ * @param topicName
+ * @return
+ * @throws Exception
+ */
int getNonDurableMessageCountForTopic(String topicName) throws Exception;
+ /**
+ * counts all subscriptions for a topic
+ * @param topicName
+ * @return
+ * @throws Exception
+ */
int getAllSubscriptionsCountForTopic(String topicName) throws Exception;
+ /**
+ * counts all durable subscriptions for a topic
+ * @param topicName
+ * @return
+ * @throws Exception
+ */
int getDurableSubscriptionsCountForTopic(String topicName) throws Exception;
+ /**
+ * counts all non durable subscriptions for a topic
+ * @param topicName
+ * @return
+ * @throws Exception
+ */
int getNonDurableSubscriptionsCountForTopic(String topicName) throws Exception;
- // JMX operations
-
+ /**
+ * removes all the messages for a specific topic
+ * @param topic
+ * @throws Exception
+ * @throws Throwable
+ */
void removeAllMessagesForTopic(String topic) throws Exception, Throwable;
+ /**
+ * lists all subscriptions for a topic
+ * @param topic
+ * @return
+ * @throws Exception
+ */
List listAllSubscriptionsForTopic(String topic) throws Exception;
+ /**
+ * lists all durable subscriptions for a topic
+ * @param topic
+ * @return
+ * @throws Exception
+ */
List listDurableSubscriptionsForTopic(String topic) throws Exception;
+ /**
+ * lists all non durable subscriptions for a topic
+ * @param topic
+ * @return
+ * @throws Exception
+ */
List listNonDurableSubscriptionsForTopic(String topic) throws Exception;
+ /**
+ * lists all subscriptions for a topic as html
+ * @param topic
+ * @return
+ * @throws Exception
+ */
String listAllSubscriptionsAsHTMLForTopic(String topic) throws Exception;
+ /**
+ * lists all durable subscriptions for a topic as html
+ * @param topic
+ * @return
+ * @throws Exception
+ */
String listDurableSubscriptionsAsHTMLForTopic(String topic) throws Exception;
+ /**
+ * lists all non durable subscriptions for a topic as html
+ * @param topic
+ * @return
+ * @throws Exception
+ */
String listNonDurableSubscriptionsAsHTMLForTopic(String topic) throws Exception;
+ /**
+ * lists all the messages for a topic for a given subscription
+ * @param topic
+ * @param subscriptionId
+ * @return
+ * @throws Exception
+ */
List listAllMessagesForTopic(String topic,String subscriptionId) throws Exception;
+ /**
+ * lists all the messages for a topic for a given subscription and message selector
+ * @param topic
+ * @param subscriptionId
+ * @param selector
+ * @return
+ * @throws Exception
+ */
List listAllMessagesForTopic(String topic,String subscriptionId, String selector) throws Exception;
+ /**
+ * lists durable messages for a topic for a given subscription
+ * @param topic
+ * @param subscriptionId
+ * @return
+ * @throws Exception
+ */
List listDurableMessagesForTopic(String topic,String subscriptionId) throws Exception;
+ /**
+ * lists durable messages for a topic for a given subscription and message selector
+ * @param topic
+ * @param subscriptionId
+ * @param selector
+ * @return
+ * @throws Exception
+ */
List listDurableMessagesForTopic(String topic,String subscriptionId, String selector) throws Exception;
+ /**
+ * lists non durable messages for a topic for a given subscription
+ * @param topic
+ * @param subscriptionId
+ * @return
+ * @throws Exception
+ */
List listNonDurableMessagesForTopic(String topic,String subscriptionId) throws Exception;
+ /**
+ * lists durable messages for a topic for a given subscription and message selector
+ * @param topic
+ * @param subscriptionId
+ * @param selector
+ * @return
+ * @throws Exception
+ */
List listNonDurableMessagesForTopic(String topic,String subscriptionId, String selector) throws Exception;
List getMessageCountersForTopic(String topic) throws Exception;
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/bridge/BridgeService.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/bridge/BridgeService.java 2007-11-15 09:39:19 UTC (rev 3334)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/bridge/BridgeService.java 2007-11-16 09:03:58 UTC (rev 3335)
@@ -21,13 +21,11 @@
*/
package org.jboss.jms.server.bridge;
-import java.util.Properties;
+import org.jboss.logging.Logger;
+import org.jboss.messaging.core.contract.MessagingComponent;
import javax.management.ObjectName;
-import org.jboss.messaging.core.contract.MessagingComponent;
-import org.jboss.system.ServiceMBeanSupport;
-
/**
* A BridgeService
*
@@ -37,8 +35,9 @@
* $Id$
*
*/
-public class BridgeService extends ServiceMBeanSupport implements BridgeMBean
+public class BridgeService implements BridgeMBean
{
+ private static final Logger log = Logger.getLogger(BridgeService.class);
private Bridge bridge;
private String sourceDestinationLookup;
@@ -285,7 +284,7 @@
{
if (log.isTraceEnabled()) { log.trace("Starting bridge"); }
- super.startService();
+ //super.startService();
if (this.sourceProviderLoader == null)
{
@@ -309,18 +308,18 @@
boolean sameSourceAndTarget = sourceProviderLoader.equals(targetProviderLoader);
- Properties sourceProps = (Properties)server.getAttribute(sourceProviderLoader, "Properties");
+ // Properties sourceProps = (Properties)server.getAttribute(sourceProviderLoader, "Properties");
- Properties targetProps = (Properties)server.getAttribute(targetProviderLoader, "Properties");
+ // Properties targetProps = (Properties)server.getAttribute(targetProviderLoader, "Properties");
- String sourceCFRef = (String)server.getAttribute(sourceProviderLoader, "FactoryRef");
+ //String sourceCFRef = (String)server.getAttribute(sourceProviderLoader, "FactoryRef");
- String targetCFRef = (String)server.getAttribute(targetProviderLoader, "FactoryRef");
+ //String targetCFRef = (String)server.getAttribute(targetProviderLoader, "FactoryRef");
- ConnectionFactoryFactory sourceCff =
- new JNDIConnectionFactoryFactory(sourceProps, sourceCFRef);
+ //ConnectionFactoryFactory sourceCff =
+ // new JNDIConnectionFactoryFactory(sourceProps, sourceCFRef);
- ConnectionFactoryFactory destCff;
+ /* ConnectionFactoryFactory destCff;
if (sameSourceAndTarget)
{
@@ -345,7 +344,7 @@
bridge.start();
- log.info("Started bridge " + this.getName() + ". Source: " + sourceDestinationLookup + " Target: " + targetDestinationLookup);
+ log.info("Started bridge " + this.getName() + ". Source: " + sourceDestinationLookup + " Target: " + targetDestinationLookup);*/
}
@@ -355,7 +354,7 @@
bridge.stop();
- log.info("Stopped bridge " + this.getName());
+ //log.info("Stopped bridge " + this.getName());
}
// Private ---------------------------------------------------------------------------------
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/microcontainer/AuthenticationManager.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/microcontainer/AuthenticationManager.java 2007-11-15 09:39:19 UTC (rev 3334)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/microcontainer/AuthenticationManager.java 2007-11-16 09:03:58 UTC (rev 3335)
@@ -25,6 +25,7 @@
import javax.security.auth.Subject;
import java.security.Principal;
+import java.util.Map;
import java.util.Set;
/**
@@ -68,4 +69,15 @@
{
return null;
}
+
+
+ public boolean isValid(javax.security.auth.message.MessageInfo messageInfo, Subject subject, String string)
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Principal getTargetPrincipal(Principal principal, Map<String, Object> map)
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
}
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/microcontainer/JBMBootstrapServer.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/microcontainer/JBMBootstrapServer.java 2007-11-15 09:39:19 UTC (rev 3334)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/microcontainer/JBMBootstrapServer.java 2007-11-16 09:03:58 UTC (rev 3335)
@@ -25,12 +25,12 @@
import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer;
import org.jboss.kernel.spi.config.KernelConfig;
import org.jboss.kernel.spi.deployment.KernelDeployment;
-import org.jboss.util.CollectionsFactory;
import javax.jms.*;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import java.net.URL;
+import java.util.ArrayList;
import java.util.List;
import java.util.ListIterator;
import java.util.Properties;
@@ -47,7 +47,7 @@
/**
* The deployments
*/
- protected List deployments = CollectionsFactory.createCopyOnWriteList();
+ protected List deployments = new ArrayList();
/**
* The arguments
*/
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/microcontainer/ServiceLocator.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/microcontainer/ServiceLocator.java 2007-11-15 09:39:19 UTC (rev 3334)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/microcontainer/ServiceLocator.java 2007-11-16 09:03:58 UTC (rev 3335)
@@ -21,9 +21,9 @@
*/
package org.jboss.jms.server.microcontainer;
-import com.arjuna.ats.jbossatx.jta.TransactionManagerService;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
+import org.jboss.tm.TransactionManagerLocator;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
@@ -56,14 +56,7 @@
if(tm == null)
{
Object o = kernelControllerContext.getController().getInstalledContext("jboss:service=TransactionManager").getTarget();
- if(o instanceof TransactionManagerService)
- {
- tm = ((TransactionManagerService) o).getTransactionManager();
- }
- else
- {
- tm = (TransactionManager) o;
- }
+ tm = TransactionManagerLocator.locateTransactionManager();
}
return tm;
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/recovery/MessagingXAResourceWrapper.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/recovery/MessagingXAResourceWrapper.java 2007-11-15 09:39:19 UTC (rev 3334)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/recovery/MessagingXAResourceWrapper.java 2007-11-16 09:03:58 UTC (rev 3335)
@@ -21,21 +21,13 @@
*/
package org.jboss.jms.server.recovery;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.XAConnection;
-import javax.jms.XAConnectionFactory;
-import javax.jms.XASession;
-import javax.naming.Context;
-import javax.naming.InitialContext;
+import org.jboss.logging.Logger;
+
+import javax.jms.*;
import javax.transaction.xa.XAException;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
-import org.jboss.jms.jndi.JMSProviderAdapter;
-import org.jboss.logging.Logger;
-import org.jboss.util.naming.Util;
-
/**
* XAResourceWrapper.
*
@@ -336,7 +328,7 @@
protected XAConnectionFactory getConnectionFactory() throws Exception
{
// Get the JMS Provider Adapter
- if (providerName == null)
+ /*if (providerName == null)
throw new IllegalArgumentException("Null provider name");
Context ctx = new InitialContext();
@@ -356,7 +348,7 @@
finally
{
ctx.close();
- }
+ }*/ return null;
}
/**
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/ChannelSupport.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/ChannelSupport.java 2007-11-15 09:39:19 UTC (rev 3334)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/ChannelSupport.java 2007-11-16 09:03:58 UTC (rev 3335)
@@ -21,23 +21,10 @@
*/
package org.jboss.messaging.core.impl;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Set;
-
+import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
import org.jboss.jms.server.MessagingTimeoutFactory;
import org.jboss.logging.Logger;
-import org.jboss.messaging.core.contract.Channel;
-import org.jboss.messaging.core.contract.Delivery;
-import org.jboss.messaging.core.contract.DeliveryObserver;
-import org.jboss.messaging.core.contract.Distributor;
-import org.jboss.messaging.core.contract.Filter;
-import org.jboss.messaging.core.contract.MessageReference;
-import org.jboss.messaging.core.contract.MessageStore;
-import org.jboss.messaging.core.contract.PersistenceManager;
+import org.jboss.messaging.core.contract.*;
import org.jboss.messaging.core.impl.tx.Transaction;
import org.jboss.messaging.core.impl.tx.TransactionException;
import org.jboss.messaging.core.impl.tx.TxCallback;
@@ -46,7 +33,8 @@
import org.jboss.util.timeout.Timeout;
import org.jboss.util.timeout.TimeoutTarget;
-import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
+import javax.swing.*;
+import java.util.*;
/**
*
@@ -240,11 +228,16 @@
}
clearAllScheduledDeliveries();
- }
+ JOptionPane.showInputDialog(null, "ffghf", JOptionPane.QUESTION_MESSAGE);
+ do
+ {
+
+ } while(false);
+ }
}
/*
- * This method clears the channel.
+ * This method clears the channel. t
* Basically it consumes the rest of the messages in the channel.
* We can't just delete the corresponding references directly from the database since
* a) We might be paging
Deleted: branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/jmx/JDBCMBeanSupport.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/jmx/JDBCMBeanSupport.java 2007-11-15 09:39:19 UTC (rev 3334)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/jmx/JDBCMBeanSupport.java 2007-11-16 09:03:58 UTC (rev 3335)
@@ -1,177 +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.jmx;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Properties;
-
-import javax.management.MBeanServerInvocationHandler;
-import javax.management.ObjectName;
-import javax.naming.InitialContext;
-import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
-
-import org.jboss.messaging.util.ExceptionUtil;
-import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.tm.TransactionManagerLocator;
-
-/**
- * A JDBCMBeanSupport
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @version <tt>$Revision$</tt>
- *
- * $Id$
- *
- */
-public class JDBCMBeanSupport extends ServiceMBeanSupport
-{
- protected DataSource ds;
-
- protected Properties sqlProperties;
-
- protected TransactionManager tm;
-
- private String dataSourceJNDIName;
-
- private boolean createTablesOnStartup = true;
-
- private ObjectName tmObjectName;
-
- public JDBCMBeanSupport()
- {
- sqlProperties = new Properties();
- }
-
- // ServiceMBeanSupport overrides ---------------------------------
-
- protected void startService() throws Exception
- {
- try
- {
- if (ds == null)
- {
- InitialContext ic = new InitialContext();
- ds = (DataSource)ic.lookup(dataSourceJNDIName);
- ic.close();
- }
-
- if (ds == null)
- {
- throw new IllegalStateException("No DataSource found. This service dependencies must " +
- "have not been enforced correctly!");
- }
-
- log.debug(this + " started");
-
- tm = getTransactionManagerReference();
- }
- catch (Throwable t)
- {
- throw ExceptionUtil.handleJMXInvocation(t, this + " startService");
- }
- }
-
- protected void stopService() throws Exception
- {
- log.debug(this + " stopped");
- }
-
- // MBean attributes --------------------------------------------------------
-
- public String getSqlProperties()
- {
- try
- {
- ByteArrayOutputStream boa = new ByteArrayOutputStream();
- sqlProperties.store(boa, "");
- return new String(boa.toByteArray());
- }
- catch (IOException shouldnothappen)
- {
- return "";
- }
- }
-
- public void setSqlProperties(String value)
- {
- try
- {
- ByteArrayInputStream is = new ByteArrayInputStream(value.getBytes());
- sqlProperties = new Properties();
- sqlProperties.load(is);
- }
- catch (IOException shouldnothappen)
- {
- log.error("Caught IOException", shouldnothappen);
- }
- }
-
- public void setDataSource(String dataSourceJNDIName) throws Exception
- {
- this.dataSourceJNDIName = dataSourceJNDIName;
- }
-
- public String getDataSource()
- {
- return dataSourceJNDIName;
- }
-
- public void setTransactionManager(ObjectName tmObjectName) throws Exception
- {
- this.tmObjectName = tmObjectName;
- }
-
- public ObjectName getTransactionManager()
- {
- return tmObjectName;
- }
-
- public boolean isCreateTablesOnStartup() throws Exception
- {
- return createTablesOnStartup;
- }
-
- public void setCreateTablesOnStartup(boolean b) throws Exception
- {
- createTablesOnStartup = b;
- }
-
- // Protected ----------------------------------------------------------
-
- // Private ----------------------------------------------------------------
-
- private TransactionManager getTransactionManagerReference()
- {
- // lazy initialization
- if (tm == null)
- {
- tm = TransactionManagerLocator.getInstance().locate();
- }
-
- return tm;
- }
-
- // Innner classes ---------------------------------------------------------
-}
Deleted: branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/jmx/JDBCServiceSupport.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/jmx/JDBCServiceSupport.java 2007-11-15 09:39:19 UTC (rev 3334)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/jmx/JDBCServiceSupport.java 2007-11-16 09:03:58 UTC (rev 3335)
@@ -1,182 +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.jmx;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Properties;
-
-import javax.management.MBeanServerInvocationHandler;
-import javax.management.ObjectName;
-import javax.naming.InitialContext;
-import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
-
-import org.jboss.messaging.util.ExceptionUtil;
-import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.tm.TransactionManagerLocator;
-
-/**
- * MBean wrapper for any service that needs database attributes
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @version <tt>$Revision: 2684 $</tt>
- *
- * $Id: JDBCServiceSupport.java 2684 2007-05-15 07:31:30Z timfox $
- *
- */
-public abstract class JDBCServiceSupport extends ServiceMBeanSupport
-{
- // Constants ------------------------------------------------------------------------------------
-
- // Static ---------------------------------------------------------------------------------------
-
- // Attributes -----------------------------------------------------------------------------------
-
- protected DataSource ds;
- protected Properties sqlProperties;
- protected boolean createTablesOnStartup = true;
-
- private String dataSourceJNDIName;
- private ObjectName tmObjectName;
- private TransactionManager tm;
-
- // Constructors ---------------------------------------------------------------------------------
-
- // ServiceMBeanSupport overrides ----------------------------------------------------------------
-
- protected void startService() throws Exception
- {
- InitialContext ic = null;
- try
- {
- ic = new InitialContext();
- ds = (DataSource)ic.lookup(dataSourceJNDIName);
- if (ds == null)
- {
- throw new IllegalStateException("No DataSource found. This service dependencies must " +
- "have not been enforced correctly!");
- }
-
- }
- catch (Throwable t)
- {
- throw ExceptionUtil.handleJMXInvocation(t, this + " startService");
- }
- finally
- {
- if (ic != null)
- {
- ic.close();
- }
- }
- }
-
- protected void stopService() throws Exception
- {
- log.debug(this + " stopped");
- }
-
- // MBean attributes -----------------------------------------------------------------------------
-
- public String getSqlProperties()
- {
- try
- {
- ByteArrayOutputStream boa = new ByteArrayOutputStream();
- sqlProperties.store(boa, "");
- return new String(boa.toByteArray());
- }
- catch (IOException shouldnothappen)
- {
- return "";
- }
- }
-
- public void setSqlProperties(String value)
- {
- try
- {
- ByteArrayInputStream is = new ByteArrayInputStream(value.getBytes());
- sqlProperties = new Properties();
- sqlProperties.load(is);
- }
- catch (IOException shouldnothappen)
- {
- log.error("Caught IOException", shouldnothappen);
- }
- }
-
- public void setDataSource(String dataSourceJNDIName) throws Exception
- {
- this.dataSourceJNDIName = dataSourceJNDIName;
- }
-
- public String getDataSource()
- {
- return dataSourceJNDIName;
- }
-
- public void setTransactionManager(ObjectName tmObjectName) throws Exception
- {
- this.tmObjectName = tmObjectName;
- }
-
- public ObjectName getTransactionManager()
- {
- return tmObjectName;
- }
-
- public boolean isCreateTablesOnStartup() throws Exception
- {
- return createTablesOnStartup;
- }
-
- public void setCreateTablesOnStartup(boolean b) throws Exception
- {
- createTablesOnStartup = b;
- }
-
- // Public ---------------------------------------------------------------------------------------
-
- // Package protected ----------------------------------------------------------------------------
-
- // Protected ------------------------------------------------------------------------------------
-
- protected TransactionManager getTransactionManagerReference()
- {
- // lazy initialization
- if (tm == null)
- {
- tm = TransactionManagerLocator.getInstance().locate();
- }
-
- return tm;
- }
-
- // Private --------------------------------------------------------------------------------------
-
- // Inner classes --------------------------------------------------------------------------------
-
-}
-
More information about the jboss-cvs-commits
mailing list