Merged revisions 598371-598586 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1

........
  r598371 | ritchiem | 2007-11-26 18:17:12 +0000 (Mon, 26 Nov 2007) | 1 line
  
  Qpid-559 : OSGi Patch Provided by Aidan Skinner 
........
  r598572 | ritchiem | 2007-11-27 09:44:28 +0000 (Tue, 27 Nov 2007) | 1 line
  
  Add Target to ignores list.
........
  r598586 | rupertlssmith | 2007-11-27 10:51:29 +0000 (Tue, 27 Nov 2007) | 1 line
  
  Now outputs test results in xml format to the surefire reports directory.
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@599036 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 439 insertions, 0 deletions

diff --git a/java/plugins/src/main/java/org/apache/qpid/extras/Activator.java b/java/plugins/src/main/java/org/apache/qpid/extras/Activator.java
new file mode 100644
index 0000000000..a9292de7cd
--- /dev/null
+++ b/java/plugins/src/main/java/org/apache/qpid/extras/Activator.java
@@ -0,0 +1,28 @@
+package org.apache.qpid.extras;
+
+import org.apache.qpid.extras.exchanges.diagnostic.DiagnosticExchangeType;
+import org.apache.qpid.extras.exchanges.example.TestExchangeType;
+import org.apache.qpid.server.exchange.ExchangeType;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+/**
+ * 
+ * @author aidan
+ * 
+ * Dummy class, used by PluginTest
+ */
+
+public class Activator implements BundleActivator
+{
+
+    public void start(BundleContext ctx) throws Exception
+    {
+        ctx.registerService(ExchangeType.class.getName(), new TestExchangeType(), null);
+        ctx.registerService(ExchangeType.class.getName(), new DiagnosticExchangeType(), null);
+    }
+
+    public void stop(BundleContext ctx) throws Exception
+    {
+    }
+}
diff --git a/java/plugins/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java b/java/plugins/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java
new file mode 100644
index 0000000000..e7d899983e
--- /dev/null
+++ b/java/plugins/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java
@@ -0,0 +1,221 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.extras.exchanges.diagnostic;
+
+import java.lang.instrument.Instrumentation;
+import java.util.List;
+import java.util.Map;
+
+import javax.management.JMException;
+import javax.management.openmbean.OpenDataException;
+import javax.management.openmbean.TabularData;
+
+import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.framing.BasicContentHeaderProperties;
+import org.apache.qpid.framing.FieldTable;
+import org.apache.qpid.server.exchange.AbstractExchange;
+import org.apache.qpid.server.management.MBeanConstructor;
+import org.apache.qpid.server.management.MBeanDescription;
+import org.apache.qpid.server.queue.AMQMessage;
+import org.apache.qpid.server.queue.AMQQueue;
+
+import uk.co.thebadgerset.junit.extensions.util.SizeOf;
+
+/**
+ * 
+ * This is a special diagnostic exchange type which doesn't actually do anything
+ * with messages. When it receives a message, it writes information about the
+ * current memory usage to the "memory" property of the message and places it on the
+ * diagnosticqueue for retrieval 
+ * 
+ * @author Aidan Skinner
+ * 
+ */
+
+public class DiagnosticExchange extends AbstractExchange
+{
+   
+    public static final AMQShortString DIAGNOSTIC_EXCHANGE_CLASS = new AMQShortString("x-diagnostic");
+    public static final AMQShortString DIAGNOSTIC_EXCHANGE_NAME = new AMQShortString("diagnostic");
+
+    /**
+     * the logger.
+     */
+   //private static final Logger _logger = Logger.getLogger(DiagnosticExchange.class);
+
+    /**
+     * MBean class implementing the management interfaces.
+     */
+    @MBeanDescription("Management Bean for Diagnostic Exchange")
+    private final class DiagnosticExchangeMBean extends ExchangeMBean
+    {
+
+        /**
+         * Usual constructor.
+         * 
+         * @throws JMException
+         */
+        @MBeanConstructor("Creates an MBean for AMQ Diagnostic exchange")
+        public DiagnosticExchangeMBean() throws JMException
+        {
+            super();
+            _exchangeType = "diagnostic";
+            init();
+        }
+
+        /**
+         * Returns nothing, there can be no tabular data for this...
+         * 
+         * @throws OpenDataException
+         * @returns null
+         * @todo ... or can there? Could this actually return all the
+         *       information in one easy to read table?
+         */
+        public TabularData bindings() throws OpenDataException
+        {
+            return null;
+        }
+
+        /**
+         * This exchange type doesn't support queues, so this method does
+         * nothing.
+         * 
+         * @param queueName
+         *            the queue you'll fail to create
+         * @param binding
+         *            the binding you'll fail to create
+         * @throws JMException
+         *             an exception that will never be thrown
+         */
+        public void createNewBinding(String queueName, String binding) throws JMException
+        {
+            // No Op
+        }
+
+    } // End of MBean class
+
+    /**
+     * Creates a new MBean instance
+     * 
+     * @return the newly created MBean
+     * @throws AMQException
+     *             if something goes wrong
+     */
+    protected ExchangeMBean createMBean() throws AMQException
+    {
+        try
+        {
+            return new DiagnosticExchange.DiagnosticExchangeMBean();
+        }
+        catch (JMException ex)
+        {
+         //   _logger.error("Exception occured in creating the direct exchange mbean", ex);
+            throw new AMQException(null, "Exception occured in creating the direct exchange mbean", ex);
+        }
+    }
+
+    public AMQShortString getType()
+    {
+        return DIAGNOSTIC_EXCHANGE_CLASS;
+    }
+
+    /**
+     * Does nothing.
+     * 
+     * @param routingKey
+     *            pointless
+     * @param queue
+     *            pointless
+     * @param args
+     *            pointless
+     * @throws AMQException
+     *             never
+     */
+    public void registerQueue(AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQException
+    {
+        // No op
+    }
+
+    /**
+     * Does nothing.
+     * 
+     * @param routingKey
+     *            pointless
+     * @param queue
+     *            pointless
+     * @param args
+     *            pointless
+     * @throws AMQException
+     *             never
+     */
+    public void deregisterQueue(AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQException
+    {
+        // No op
+    }
+
+    public boolean isBound(AMQShortString routingKey, AMQQueue queue)
+    {
+        return false;
+    }
+
+    public boolean isBound(AMQShortString routingKey)
+    {
+        return false;
+    }
+
+    public boolean isBound(AMQQueue queue)
+    {
+        return false;
+    }
+
+    public boolean hasBindings()
+    {
+        return false;
+    }
+
+    public void route(AMQMessage payload) throws AMQException
+    {
+        
+        Long value = new Long(SizeOf.getUsedMemory());
+        AMQShortString key = new AMQShortString("memory");
+        
+        FieldTable headers = ((BasicContentHeaderProperties)payload.getContentHeaderBody().properties).getHeaders();
+        headers.put(key, value);
+        ((BasicContentHeaderProperties)payload.getContentHeaderBody().properties).setHeaders(headers);
+        AMQQueue q = getQueueRegistry().getQueue(new AMQShortString("diagnosticqueue"));
+        
+        payload.enqueue(q);
+        
+    }
+
+	@Override
+	public Map<AMQShortString, List<AMQQueue>> getBindings() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public boolean isBound(AMQShortString routingKey, FieldTable arguments,
+			AMQQueue queue) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+}
diff --git a/java/plugins/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchangeType.java b/java/plugins/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchangeType.java
new file mode 100644
index 0000000000..d96b4dc99e
--- /dev/null
+++ b/java/plugins/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchangeType.java
@@ -0,0 +1,57 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.extras.exchanges.diagnostic;
+
+import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.server.exchange.ExchangeType;
+import org.apache.qpid.server.virtualhost.VirtualHost;
+
+/**
+ * Exchange type class for getting hold of the exchange.
+ */
+public final class DiagnosticExchangeType implements ExchangeType<DiagnosticExchange>
+{
+    
+    public AMQShortString getName()
+    {
+        return DiagnosticExchange.DIAGNOSTIC_EXCHANGE_CLASS;
+    }
+
+    public Class<DiagnosticExchange> getExchangeClass()
+    {
+        return DiagnosticExchange.class;
+    }
+
+    public DiagnosticExchange newInstance(VirtualHost host, AMQShortString name, boolean durable, int ticket, boolean autoDelete)
+            throws AMQException
+    {
+        DiagnosticExchange exch = new DiagnosticExchange();
+        exch.initialise(host, name, durable, ticket, autoDelete);
+        return exch;
+    }
+
+    public AMQShortString getDefaultExchangeName()
+    {
+        return DiagnosticExchange.DIAGNOSTIC_EXCHANGE_NAME;
+    }
+}
diff --git a/java/plugins/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java b/java/plugins/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java
new file mode 100644
index 0000000000..f9904a76b9
--- /dev/null
+++ b/java/plugins/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java
@@ -0,0 +1,97 @@
+package org.apache.qpid.extras.exchanges.example;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.framing.FieldTable;
+import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.queue.AMQMessage;
+import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.virtualhost.VirtualHost;
+
+public class TestExchange implements Exchange
+{
+
+    public void close() throws AMQException
+    {
+    }
+
+    public void deregisterQueue(AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQException
+    {
+    }
+
+    public Map<AMQShortString, List<AMQQueue>> getBindings()
+    {
+        return null;
+    }
+
+    public AMQShortString getName()
+    {
+        return null;
+    }
+
+    public AMQShortString getType()
+    {
+        return null;
+    }
+
+    public boolean hasBindings()
+    {
+        return false;
+    }
+
+    public void initialise(VirtualHost host, AMQShortString name, boolean durable, boolean autoDelete)
+            throws AMQException
+    {
+    }
+
+    public boolean isAutoDelete()
+    {
+        return false;
+    }
+
+    public boolean isBound(AMQShortString routingKey, FieldTable arguments, AMQQueue queue)
+    {
+        return false;
+    }
+
+    public boolean isBound(AMQShortString routingKey, AMQQueue queue)
+    {
+        return false;
+    }
+
+    public boolean isBound(AMQShortString routingKey)
+    {
+        return false;
+    }
+
+    public boolean isBound(AMQQueue queue)
+    {
+        return false;
+    }
+
+    public boolean isDurable()
+    {
+        return false;
+    }
+
+    public void registerQueue(AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQException
+    {
+    }
+
+    public void route(AMQMessage message) throws AMQException
+    {
+    }
+
+    public int getTicket()
+    {
+        return 0;
+    }
+
+    public void initialise(VirtualHost arg0, AMQShortString arg1, boolean arg2, int arg3, boolean arg4)
+            throws AMQException
+    {
+    }
+}
diff --git a/java/plugins/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchangeType.java b/java/plugins/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchangeType.java
new file mode 100644
index 0000000000..96ef8b3470
--- /dev/null
+++ b/java/plugins/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchangeType.java
@@ -0,0 +1,36 @@
+package org.apache.qpid.extras.exchanges.example;
+
+import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeType;
+import org.apache.qpid.server.virtualhost.VirtualHost;
+
+public class TestExchangeType implements ExchangeType
+{
+
+    public Class getExchangeClass()
+    {
+        return TestExchange.class;
+    }
+
+    public AMQShortString getName()
+    {
+        return null;
+    }
+
+    public Exchange newInstance(VirtualHost host, AMQShortString name, boolean durable, 
+                                int token, boolean autoDelete)
+            throws AMQException
+    {
+        TestExchange ex = new TestExchange();
+        ex.initialise(host, name, durable, token, autoDelete);
+        return ex;
+    }
+
+    public AMQShortString getDefaultExchangeName()
+    {
+        return new AMQShortString("test.exchange");
+    }
+
+}