Removes MdbContainerFAilTest
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/40538bb7 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/40538bb7 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/40538bb7 Branch: refs/heads/tomee-1.7.x Commit: 40538bb7b7ce9f88c986737f6e559d1352623e33 Parents: 12d3b95 Author: Otavio Santana <[email protected]> Authored: Thu Jul 6 15:00:41 2017 -0300 Committer: Otavio Santana <[email protected]> Committed: Thu Jul 6 15:00:41 2017 -0300 ---------------------------------------------------------------------- .../openejb/core/mdb/MdbContainerFailTest.java | 148 ------------------- .../service-jar.xml | 82 ---------- 2 files changed, 230 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/40538bb7/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbContainerFailTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbContainerFailTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbContainerFailTest.java deleted file mode 100644 index a29d325..0000000 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbContainerFailTest.java +++ /dev/null @@ -1,148 +0,0 @@ -/* - * 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.openejb.core.mdb; - -import org.apache.activemq.ActiveMQXAConnectionFactory; -import org.apache.openejb.OpenEJBException; -import org.apache.openejb.activemq.AMQXASupportTest; -import org.apache.openejb.jee.MessageDrivenBean; -import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.testing.Configuration; -import org.apache.openejb.testing.Module; -import org.apache.openejb.testng.PropertiesBuilder; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - -import javax.annotation.Resource; -import javax.ejb.ActivationConfigProperty; -import javax.ejb.MessageDriven; -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.Session; -import javax.jms.TextMessage; -import javax.jms.XAConnectionFactory; -import java.util.Properties; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - - -@RunWith(ApplicationComposer.class) -public class MdbContainerFailTest { - - private static final String TEXT = "foo"; - - - @Configuration - public Properties config() { - return new PropertiesBuilder() - - .p("amq", "new://Resource?type=ActiveMQResourceAdapter") - .p("amq.DataSource", "") - .p("amq.BrokerXmlConfig", "broker:(vm://localhost)") - - .p("target", "new://Resource?type=Queue") - - .p("mdbs", "new://Container?type=MESSAGE") - .p("mdbs.ResourceAdapter", "amq") - - .p("cf", "new://Resource?type=" + ConnectionFactory.class.getName()) - .p("cf.ResourceAdapter", "amq") - - .p("xaCf", "new://Resource?class-name=" + ActiveMQXAConnectionFactory.class.getName()) - .p("xaCf.BrokerURL", "vm://localhost") - .p("mdb.activation.ignore", "testString") - .p("openejb.provider.default", "org.apache.openejb.actproptrue") // service-jar.xml with FailOnUnknowActivationSpec = true - .build(); - } - - @Module - public MessageDrivenBean jar() { - return new MessageDrivenBean(AMQXASupportTest.Listener.class); - } - - @Resource(name = "target") - private Queue destination; - - @Resource(name = "xaCf") - private XAConnectionFactory xacf; - - @Resource(name = "cf") - private ConnectionFactory cf; - - @Before - public void resetLatch() { - AMQXASupportTest.Listener.reset(); - } - - @Test(expected = OpenEJBException.class) - public void shouldReturnsError() throws Exception { - assertNotNull(cf); - - - final Connection connection = cf.createConnection(); - try { - final Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - final MessageProducer producer = session.createProducer(destination); - producer.send(session.createTextMessage(TEXT)); - assertTrue(AMQXASupportTest.Listener.sync()); - } finally { - connection.close(); - } - } - - @MessageDriven(activationConfig = { - @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"), - @ActivationConfigProperty(propertyName = "destination", propertyValue = "target") - }) - public static class Listener implements MessageListener { - public static CountDownLatch latch; - public static boolean ok = false; - - @Override - public void onMessage(final Message message) { - try { - try { - ok = TextMessage.class.isInstance(message) && TEXT.equals(TextMessage.class.cast(message).getText()); - } catch (final JMSException e) { - // no-op - } - } finally { - latch.countDown(); - } - } - - public static void reset() { - latch = new CountDownLatch(1); - ok = false; - } - - public static boolean sync() throws InterruptedException { - latch.await(1, TimeUnit.MINUTES); - return ok; - } - } - -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/40538bb7/container/openejb-core/src/test/resources/META-INF/org.apache.openejb.actproptrue/service-jar.xml ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/resources/META-INF/org.apache.openejb.actproptrue/service-jar.xml b/container/openejb-core/src/test/resources/META-INF/org.apache.openejb.actproptrue/service-jar.xml deleted file mode 100644 index ab1dceb..0000000 --- a/container/openejb-core/src/test/resources/META-INF/org.apache.openejb.actproptrue/service-jar.xml +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> - -<!-- $Rev$ $Date$ --> - -<ServiceJar> - - <ServiceProvider id="Default CMP Container" parent="org.apache.openejb:Default CMP Container"/> - <ServiceProvider id="Default BMP Container" parent="org.apache.openejb:Default BMP Container"/> - <ServiceProvider id="Default Stateless Container" parent="org.apache.openejb:Default Stateless Container"/> - <ServiceProvider id="Default Singleton Container" parent="org.apache.openejb:Default Singleton Container"/> - <ServiceProvider id="Default Stateful Container" parent="org.apache.openejb:Default Stateful Container"/> - <ServiceProvider id="Default Managed Container" parent="org.apache.openejb:Default Managed Container"/> - <ServiceProvider id="Default JDK 1.3 ProxyFactory" parent="org.apache.openejb:Default JDK 1.3 ProxyFactory"/> - <ServiceProvider id="Default Security Service" parent="org.apache.openejb:Default Security Service"/> - <ServiceProvider id="PseudoSecurityService" parent="org.apache.openejb:PseudoSecurityService"/> - <ServiceProvider id="Default Transaction Manager" parent="org.apache.openejb:Default Transaction Manager"/> - <ServiceProvider id="Default JDBC Database" parent="org.apache.openejb:Default JDBC Database"/> - <ServiceProvider id="Default Unmanaged JDBC Database" parent="org.apache.openejb:Default Unmanaged JDBC Database"/> - <ServiceProvider id="Default JMS Resource Adapter" parent="org.apache.openejb:Default JMS Resource Adapter"> - BrokerXmlConfig=broker:()/localhost?persistent=false - DataSource - </ServiceProvider> - <ServiceProvider id="Default JMS Connection Factory" parent="org.apache.openejb:Default JMS Connection Factory"/> - <ServiceProvider id="Default Queue" parent="org.apache.openejb:Default Queue"/> - <ServiceProvider id="Default Topic" parent="org.apache.openejb:Default Topic"/> - <ServiceProvider id="Default ORB" parent="org.apache.openejb:Default ORB"/> - <ServiceProvider id="Default Mail Session" parent="org.apache.openejb:Default Mail Session"/> - <ServiceProvider id="Default Remote Jndi Provider" parent="org.apache.openejb:Default Remote Jndi Provider"/> - <ServiceProvider id="RoutedDataSource" parent="org.apache.openejb:RoutedDataSource"/> - <ServiceProvider id="Default Executor Service" parent="org.apache.openejb:Default Executor Service"/> - <ServiceProvider id="Default Scheduled Executor Service" - parent="org.apache.openejb:Default Scheduled Executor Service"/> - <ServiceProvider id="Default Managed Thread Factory" parent="org.apache.openejb:Default Managed Thread Factory"/> - <ServiceProvider id="Default Context Service" parent="org.apache.openejb:Default Context Service"/> - - - <ServiceProvider - id="Default MDB Container" - service="Container" - types="MESSAGE" - constructor="id, securityService, ResourceAdapter, MessageListenerInterface, ActivationSpecClass, InstanceLimit, FailOnUnknowActivationSpec" - class-name="org.apache.openejb.core.mdb.MdbContainer"> - - # The resource adapter delivers messages to the container - - ResourceAdapter Default JMS Resource Adapter - - # Specifies the message listener interface handled by this container - - MessageListenerInterface javax.jms.MessageListener - - # Specifies the activation spec class - - ActivationSpecClass org.apache.activemq.ra.ActiveMQActivationSpec - - # Specifies the maximum number of bean instances that are - # allowed to exist for each MDB deployment. - - InstanceLimit 10 - - # log a warning if true or throw an exception if false is an activation spec can't be respected - - FailOnUnknowActivationSpec = true - - </ServiceProvider> -</ServiceJar>
