You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/09/06 06:58:55 UTC
[22/29] git commit: Delete old JMS tests.
Delete old JMS tests.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1b66d8d7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1b66d8d7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1b66d8d7
Branch: refs/heads/master
Commit: 1b66d8d7f85566c7133686e106c26b1cd884cf33
Parents: 1d99b19
Author: Matt Sicker <ma...@apache.org>
Authored: Fri Sep 5 23:42:07 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Fri Sep 5 23:42:07 2014 -0500
----------------------------------------------------------------------
.../mom/jms/appender/JmsQueueAppenderTest.java | 85 -----------
.../mom/jms/appender/JmsQueueFailoverTest.java | 122 ---------------
.../log4j/mom/jms/appender/JmsQueueTest.java | 147 -------------------
.../mom/jms/appender/JmsTopicFailoverTest.java | 121 ---------------
.../log4j/mom/jms/appender/JmsTopicTest.java | 147 -------------------
.../test/resources/log4j-jmsqueue-failover.xml | 52 -------
log4j-jms/src/test/resources/log4j-jmsqueue.xml | 30 ----
.../test/resources/log4j-jmstopic-failover.xml | 52 -------
8 files changed, 756 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1b66d8d7/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsQueueAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsQueueAppenderTest.java b/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsQueueAppenderTest.java
deleted file mode 100644
index f05a9fc..0000000
--- a/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsQueueAppenderTest.java
+++ /dev/null
@@ -1,85 +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.logging.log4j.mom.jms.appender;
-
-import java.util.Map;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.core.Appender;
-import org.apache.logging.log4j.core.Logger;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.Configuration;
-import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.apache.logging.log4j.mom.jms.receiver.AbstractJmsReceiver;
-import org.apache.logging.log4j.mom.jms.receiver.JmsQueueReceiver;
-import org.apache.logging.log4j.status.StatusConsoleListener;
-import org.apache.logging.log4j.status.StatusLogger;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.mockejb.jms.MockQueue;
-import org.mockejb.jms.QueueConnectionFactoryImpl;
-import org.mockejb.jndi.MockContextFactory;
-
-import static org.junit.Assert.*;
-
-/**
- *
- */
-public class JmsQueueAppenderTest {
-
- private static final String FACTORY_NAME = "TestQueueConnectionFactory";
- private static final String QUEUE_NAME = "TestQueue";
-
- private static Context context;
- private static AbstractJmsReceiver receiver;
-
- private static final String CONFIG = "log4j-jmsqueue.xml";
-
- LoggerContext ctx = (LoggerContext) LogManager.getContext();
- Logger root = ctx.getLogger("JmsQueueTest");
-
- @BeforeClass
- public static void setupClass() throws Exception {
- // MockContextFactory becomes the primary JNDI provider
- final StatusConsoleListener listener = new StatusConsoleListener(Level.ERROR);
- StatusLogger.getLogger().registerListener(listener);
- MockContextFactory.setAsInitial();
- context = new InitialContext();
- context.rebind(FACTORY_NAME, new QueueConnectionFactoryImpl());
- context.rebind(QUEUE_NAME, new MockQueue(QUEUE_NAME));
- System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
- receiver = new JmsQueueReceiver(FACTORY_NAME, QUEUE_NAME, null, null);
- }
-
- @AfterClass
- public static void cleanupClass() {
- StatusLogger.getLogger().reset();
- }
-
- @Test
- public void testConfiguration() throws Exception {
- final LoggerContext ctx = (LoggerContext) LogManager.getContext();
- final Configuration config = ctx.getConfiguration();
- final Map<String, Appender> appenders = config.getAppenders();
- assertTrue(appenders.containsKey("JMSQueue"));
- }
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1b66d8d7/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsQueueFailoverTest.java
----------------------------------------------------------------------
diff --git a/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsQueueFailoverTest.java b/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsQueueFailoverTest.java
deleted file mode 100644
index 25c3068..0000000
--- a/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsQueueFailoverTest.java
+++ /dev/null
@@ -1,122 +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.logging.log4j.mom.jms.appender;
-
-import java.util.List;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.ThreadContext;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.Configuration;
-import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.apache.logging.log4j.mom.jms.receiver.AbstractJmsReceiver;
-import org.apache.logging.log4j.mom.jms.receiver.JmsQueueReceiver;
-import org.apache.logging.log4j.status.StatusConsoleListener;
-import org.apache.logging.log4j.status.StatusLogger;
-import org.apache.logging.log4j.test.appender.ListAppender;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.mockejb.jms.MockQueue;
-import org.mockejb.jms.QueueConnectionFactoryImpl;
-import org.mockejb.jndi.MockContextFactory;
-
-import static org.junit.Assert.*;
-
-/**
- *
- */
-public class JmsQueueFailoverTest {
-
- private static final String FACTORY_NAME = "QueueConnectionFactory";
- private static final String QUEUE_NAME = "Log4j2Queue";
-
- private static Context context;
- private static AbstractJmsReceiver receiver;
-
- private static final String CONFIG = "log4j-jmsqueue-failover.xml";
-
- private static Configuration config;
- private static ListAppender listAppender;
- private static LoggerContext ctx;
-
- @BeforeClass
- public static void setupClass() throws Exception {
- setupQueue();
- System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
- ctx = (LoggerContext) LogManager.getContext(false);
- }
-
- @AfterClass
- public static void cleanupClass() {
- System.clearProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY);
- ctx.reconfigure();
- StatusLogger.getLogger().reset();
- }
-
- @Before
- public void before() {
- config = ctx.getConfiguration();
- listAppender = (ListAppender) config.getAppender("List");
- assertNotNull("No Appender", listAppender);
- listAppender.clear();
- ThreadContext.clearMap();
- }
-
- private static void setupQueue() throws Exception {
- // MockContextFactory becomes the primary JNDI provider
- final StatusConsoleListener listener = new StatusConsoleListener(Level.ERROR);
- StatusLogger.getLogger().registerListener(listener);
- MockContextFactory.setAsInitial();
- context = new InitialContext();
- context.rebind(FACTORY_NAME, new QueueConnectionFactoryImpl());
- //context.rebind(QUEUE_NAME, new MockQueue(QUEUE_NAME));
- //System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
- //receiver = new JmsQueueReceiver(FACTORY_NAME, QUEUE_NAME, null, null);
- }
-
- @Test
- public void testFailover() throws Exception {
- ThreadContext.put("appender", "Failover");
- final Logger logger = LogManager.getLogger(JmsQueueFailoverTest.class);
- logger.debug("Test Message");
- final List<LogEvent> events = listAppender.getEvents();
- assertNotNull("No events returned", events);
- assertTrue("No events returned", events.size() > 0);
- assertTrue("Incorrect event", "Test Message".equals(events.get(0).getMessage().getFormattedMessage()));
- }
-
- @Test
- public void testReconnect() throws Exception {
- context.rebind(QUEUE_NAME, new MockQueue(QUEUE_NAME));
- receiver = new JmsQueueReceiver(FACTORY_NAME, QUEUE_NAME, null, null);
- ThreadContext.put("appender", "Failover");
- final Logger logger = LogManager.getLogger(JmsQueueFailoverTest.class);
- logger.debug("Test Message");
- final List<LogEvent> events = listAppender.getEvents();
- assertNotNull("No events returned", events);
- assertTrue("No events returned", events.size() > 0);
- assertTrue("Incorrect event", "Test Message".equals(events.get(0).getMessage().getFormattedMessage()));
- }
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1b66d8d7/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsQueueTest.java
----------------------------------------------------------------------
diff --git a/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsQueueTest.java b/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsQueueTest.java
deleted file mode 100644
index a36e148..0000000
--- a/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsQueueTest.java
+++ /dev/null
@@ -1,147 +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.logging.log4j.mom.jms.appender;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.core.Appender;
-import org.apache.logging.log4j.core.Filter;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.Logger;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.appender.ConsoleAppender;
-import org.apache.logging.log4j.core.filter.AbstractFilter;
-import org.apache.logging.log4j.core.filter.CompositeFilter;
-import org.apache.logging.log4j.core.layout.PatternLayout;
-import org.apache.logging.log4j.mom.jms.receiver.AbstractJmsReceiver;
-import org.apache.logging.log4j.mom.jms.receiver.JmsQueueReceiver;
-import org.apache.logging.log4j.mom.jms.receiver.JmsTopicReceiver;
-import org.apache.logging.log4j.status.StatusConsoleListener;
-import org.apache.logging.log4j.status.StatusLogger;
-import org.apache.logging.log4j.test.appender.ListAppender;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.mockejb.jms.MockQueue;
-import org.mockejb.jms.QueueConnectionFactoryImpl;
-import org.mockejb.jndi.MockContextFactory;
-
-import static org.junit.Assert.*;
-
-/**
- *
- */
-public class JmsQueueTest {
-
- private static final String FACTORY_NAME = "TestQueueConnectionFactory";
- private static final String QUEUE_NAME = "TestQueue";
-
- private static Context context;
- private static AbstractJmsReceiver receiver;
-
- LoggerContext ctx = (LoggerContext) LogManager.getContext();
- Logger root = ctx.getLogger("JmsQueueTest");
-
- @BeforeClass
- public static void setupClass() throws Exception {
- // MockContextFactory becomes the primary JNDI provider
- final StatusConsoleListener listener = new StatusConsoleListener(Level.ERROR);
- StatusLogger.getLogger().registerListener(listener);
- MockContextFactory.setAsInitial();
- context = new InitialContext();
- context.rebind(FACTORY_NAME, new QueueConnectionFactoryImpl());
- context.rebind(QUEUE_NAME, new MockQueue(QUEUE_NAME));
- ((LoggerContext) LogManager.getContext()).reconfigure();
- receiver = new JmsQueueReceiver(FACTORY_NAME, QUEUE_NAME, null, null);
- }
-
- @AfterClass
- public static void cleanupClass() {
- StatusLogger.getLogger().reset();
- }
-
- @After
- public void teardown() {
- final Map<String,Appender> map = root.getAppenders();
- for (final Map.Entry<String, Appender> entry : map.entrySet()) {
- final Appender app = entry.getValue();
- root.removeAppender(app);
- app.stop();
- }
- }
-
- @Test
- public void testServer() throws Exception {
- final Filter clientFilter = new MessageFilter(Filter.Result.NEUTRAL, Filter.Result.DENY);
- final Filter serverFilter = new MessageFilter(Filter.Result.DENY, Filter.Result.NEUTRAL);
- final CompositeFilter clientFilters = CompositeFilter.createFilters(new Filter[]{clientFilter});
- final JmsQueueAppender appender = JmsQueueAppender.createAppender("Test", null, null, null, null, null, FACTORY_NAME,
- QUEUE_NAME, null, null, null, clientFilters, "true");
- appender.start();
- final CompositeFilter serverFilters = CompositeFilter.createFilters(new Filter[]{serverFilter});
- final ListAppender listApp = new ListAppender("Events", serverFilters, null, false, false);
- listApp.start();
- final PatternLayout layout = PatternLayout.newBuilder().withPattern("%m %ex%n").build();
- final ConsoleAppender console = ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "false", "true");
- console.start();
- final Logger serverLogger = ctx.getLogger(JmsTopicReceiver.class.getName());
- serverLogger.addAppender(console);
- serverLogger.setAdditive(false);
-
-
- // set appender on root and set level to debug
- root.addAppender(listApp);
- root.addAppender(appender);
- root.setAdditive(false);
- root.setLevel(Level.DEBUG);
- root.debug("This is a test message");
- Thread.sleep(100);
- final List<LogEvent> events = listApp.getEvents();
- assertNotNull("No event retrieved", events);
- assertTrue("No events retrieved", events.size() > 0);
- assertTrue("Incorrect event", events.get(0).getMessage().getFormattedMessage().equals("This is a test message"));
- }
-
- private class MessageFilter extends AbstractFilter {
-
- private static final long serialVersionUID = 1L;
-
- public MessageFilter(final Result onMatch, final Result onMismatch) {
- super(onMatch, onMismatch);
- }
-
- @Override
- public Result filter(final LogEvent event) {
- final StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
- for (final StackTraceElement element : stackTrace) {
- if (element.getMethodName().equals("onMessage")) {
- return onMatch;
- } else if (element.getMethodName().equals("testServer")) {
- return onMismatch;
- }
- }
- return onMismatch;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1b66d8d7/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsTopicFailoverTest.java
----------------------------------------------------------------------
diff --git a/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsTopicFailoverTest.java b/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsTopicFailoverTest.java
deleted file mode 100644
index a8de6de..0000000
--- a/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsTopicFailoverTest.java
+++ /dev/null
@@ -1,121 +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.logging.log4j.mom.jms.appender;
-
-import java.util.List;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.ThreadContext;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.Configuration;
-import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.apache.logging.log4j.mom.jms.receiver.AbstractJmsReceiver;
-import org.apache.logging.log4j.mom.jms.receiver.JmsTopicReceiver;
-import org.apache.logging.log4j.status.StatusConsoleListener;
-import org.apache.logging.log4j.status.StatusLogger;
-import org.apache.logging.log4j.test.appender.ListAppender;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.mockejb.jms.MockTopic;
-import org.mockejb.jms.TopicConnectionFactoryImpl;
-import org.mockejb.jndi.MockContextFactory;
-
-import static org.junit.Assert.*;
-
-/**
- *
- */
-public class JmsTopicFailoverTest {
-
- private static final String FACTORY_NAME = "TopicConnectionFactory";
- private static final String TOPIC_NAME = "Log4j2Topic";
-
- private static Context context;
-
- private static final String CONFIG = "log4j-jmstopic-failover.xml";
-
- private static Configuration config;
- private static ListAppender listAppender;
- private static LoggerContext ctx;
-
- @BeforeClass
- public static void setupClass() throws Exception {
- setupQueue();
- System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
- ctx = (LoggerContext) LogManager.getContext(false);
- }
-
- @AfterClass
- public static void cleanupClass() {
- System.clearProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY);
- ctx.reconfigure();
- StatusLogger.getLogger().reset();
- }
-
- @Before
- public void before() {
- config = ctx.getConfiguration();
- listAppender = (ListAppender) config.getAppender("List");
- assertNotNull("No Appender", listAppender);
- listAppender.clear();
- ThreadContext.clearMap();
- }
-
- private static void setupQueue() throws Exception {
- // MockContextFactory becomes the primary JNDI provider
- final StatusConsoleListener listener = new StatusConsoleListener(Level.ERROR);
- StatusLogger.getLogger().registerListener(listener);
- MockContextFactory.setAsInitial();
- context = new InitialContext();
- context.rebind(FACTORY_NAME, new TopicConnectionFactoryImpl());
- //context.rebind(QUEUE_NAME, new MockQueue(QUEUE_NAME));
- //System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
- //receiver = new JmsQueueReceiver(FACTORY_NAME, QUEUE_NAME, null, null);
- }
-
- @Test
- public void testFailover() throws Exception {
- ThreadContext.put("appender", "Failover");
- final Logger logger = LogManager.getLogger(JmsTopicFailoverTest.class);
- logger.debug("Test Message");
- final List<LogEvent> events = listAppender.getEvents();
- assertNotNull("No events returned", events);
- assertTrue("No events returned", events.size() > 0);
- assertTrue("Incorrect event", "Test Message".equals(events.get(0).getMessage().getFormattedMessage()));
- }
-
- @Test
- public void testReconnect() throws Exception {
- context.rebind(TOPIC_NAME, new MockTopic(TOPIC_NAME));
- final AbstractJmsReceiver receiver = new JmsTopicReceiver(FACTORY_NAME, TOPIC_NAME, null, null);
- ThreadContext.put("appender", "Failover");
- final Logger logger = LogManager.getLogger(JmsTopicFailoverTest.class);
- logger.debug("Test Message");
- final List<LogEvent> events = listAppender.getEvents();
- assertNotNull("No events returned", events);
- assertTrue("No events returned", events.size() > 0);
- assertTrue("Incorrect event", "Test Message".equals(events.get(0).getMessage().getFormattedMessage()));
- }
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1b66d8d7/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsTopicTest.java
----------------------------------------------------------------------
diff --git a/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsTopicTest.java b/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsTopicTest.java
deleted file mode 100644
index 890f929..0000000
--- a/log4j-jms/src/test/java/org/apache/logging/log4j/mom/jms/appender/JmsTopicTest.java
+++ /dev/null
@@ -1,147 +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.logging.log4j.mom.jms.appender;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.core.Appender;
-import org.apache.logging.log4j.core.Filter;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.Logger;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.appender.ConsoleAppender;
-import org.apache.logging.log4j.core.filter.AbstractFilter;
-import org.apache.logging.log4j.core.filter.CompositeFilter;
-import org.apache.logging.log4j.core.layout.PatternLayout;
-import org.apache.logging.log4j.mom.jms.receiver.AbstractJmsReceiver;
-import org.apache.logging.log4j.mom.jms.receiver.JmsTopicReceiver;
-import org.apache.logging.log4j.status.StatusConsoleListener;
-import org.apache.logging.log4j.status.StatusLogger;
-import org.apache.logging.log4j.test.appender.ListAppender;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.mockejb.jms.MockTopic;
-import org.mockejb.jms.TopicConnectionFactoryImpl;
-import org.mockejb.jndi.MockContextFactory;
-
-import static org.junit.Assert.*;
-
-/**
- *
- */
-public class JmsTopicTest {
-
- private static final String FACTORY_NAME = "TestTopicConnectionFactory";
- private static final String TOPIC_NAME = "TestTopic";
-
- private static Context context;
- private static AbstractJmsReceiver receiver;
-
- LoggerContext ctx = (LoggerContext) LogManager.getContext();
- Logger root = ctx.getLogger("JmsTopicTest");
-
- @BeforeClass
- public static void setupClass() throws Exception {
- // MockContextFactory becomes the primary JNDI provider
- final StatusConsoleListener listener = new StatusConsoleListener(Level.ERROR);
- StatusLogger.getLogger().registerListener(listener);
- MockContextFactory.setAsInitial();
- context = new InitialContext();
- context.rebind(FACTORY_NAME, new TopicConnectionFactoryImpl());
- context.rebind(TOPIC_NAME, new MockTopic(TOPIC_NAME));
- ((LoggerContext) LogManager.getContext()).reconfigure();
- receiver = new JmsTopicReceiver(FACTORY_NAME, TOPIC_NAME, null, null);
- }
-
- @AfterClass
- public static void cleanupClass() {
- StatusLogger.getLogger().reset();
- }
-
- @After
- public void teardown() {
- final Map<String,Appender> map = root.getAppenders();
- for (final Map.Entry<String, Appender> entry : map.entrySet()) {
- final Appender app = entry.getValue();
- root.removeAppender(app);
- app.stop();
- }
- }
-
- @Test
- public void testServer() throws Exception {
- final Filter clientFilter = new MessageFilter(Filter.Result.NEUTRAL, Filter.Result.DENY);
- final Filter serverFilter = new MessageFilter(Filter.Result.DENY, Filter.Result.NEUTRAL);
- final CompositeFilter clientFilters = CompositeFilter.createFilters(new Filter[]{clientFilter});
- final JmsTopicAppender appender = JmsTopicAppender.createAppender("Test", null, null, null, null, null, FACTORY_NAME,
- TOPIC_NAME, null, null, null, clientFilters, "true");
- appender.start();
- final CompositeFilter serverFilters = CompositeFilter.createFilters(new Filter[]{serverFilter});
- final ListAppender listApp = new ListAppender("Events", serverFilters, null, false, false);
- listApp.start();
- final PatternLayout layout = PatternLayout.newBuilder().withPattern("%m %ex%n").build();
- final ConsoleAppender console =
- ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "false", "true");
- console.start();
- final Logger serverLogger = ctx.getLogger(JmsTopicReceiver.class.getName());
- serverLogger.addAppender(console);
- serverLogger.setAdditive(false);
-
-
- // set appender on root and set level to debug
- root.addAppender(listApp);
- root.addAppender(appender);
- root.setAdditive(false);
- root.setLevel(Level.DEBUG);
- root.debug("This is a test message");
- Thread.sleep(100);
- final List<LogEvent> events = listApp.getEvents();
- assertNotNull("No event retrieved", events);
- assertTrue("No events retrieved", events.size() > 0);
- assertTrue("Incorrect event", events.get(0).getMessage().getFormattedMessage().equals("This is a test message"));
- }
-
- private class MessageFilter extends AbstractFilter {
-
- private static final long serialVersionUID = 1L;
-
- public MessageFilter(final Result onMatch, final Result onMismatch) {
- super(onMatch, onMismatch);
- }
-
- @Override
- public Result filter(final LogEvent event) {
- final StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
- for (final StackTraceElement element : stackTrace) {
- if (element.getMethodName().equals("onMessage")) {
- return onMatch;
- } else if (element.getMethodName().equals("testServer")) {
- return onMismatch;
- }
- }
- return onMismatch;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1b66d8d7/log4j-jms/src/test/resources/log4j-jmsqueue-failover.xml
----------------------------------------------------------------------
diff --git a/log4j-jms/src/test/resources/log4j-jmsqueue-failover.xml b/log4j-jms/src/test/resources/log4j-jmsqueue-failover.xml
deleted file mode 100644
index 8b86750..0000000
--- a/log4j-jms/src/test/resources/log4j-jmsqueue-failover.xml
+++ /dev/null
@@ -1,52 +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.
-
--->
-<Configuration status="OFF" name="FailoverTest">
- <Appenders>
- <List name="List"/>
- <JMSQueue name="Log4j2Queue" queueBindingName="Log4j2Queue" factoryBindingName="QueueConnectionFactory"
- ignoreExceptions="false"/>
- <Rewrite name="Rewrite" ignoreExceptions="false">
- <PropertiesRewritePolicy>
- <Property name="appender">List</Property>
- </PropertiesRewritePolicy>
- <AppenderRef ref="Log4j2Queue"/>
- </Rewrite>
- <Failover name="Failover" primary="Rewrite" ignoreExceptions="false">
- <Failovers>
- <AppenderRef ref="List"/>
- </Failovers>
- </Failover>
- </Appenders>
-
- <Loggers>
- <Root level="debug">
- <AppenderRef ref="Failover">
- <ThreadContextMapFilter onMatch="ACCEPT" onMismatch="DENY">
- <KeyValuePair key="appender" value="Failover"/>
- </ThreadContextMapFilter>
- </AppenderRef>
- <AppenderRef ref="List">
- <ThreadContextMapFilter onMatch="ACCEPT" onMismatch="DENY">
- <KeyValuePair key="appender" value="List"/>
- </ThreadContextMapFilter>
- </AppenderRef>
- </Root>
- </Loggers>
-
-</Configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1b66d8d7/log4j-jms/src/test/resources/log4j-jmsqueue.xml
----------------------------------------------------------------------
diff --git a/log4j-jms/src/test/resources/log4j-jmsqueue.xml b/log4j-jms/src/test/resources/log4j-jmsqueue.xml
deleted file mode 100644
index 44ea169..0000000
--- a/log4j-jms/src/test/resources/log4j-jmsqueue.xml
+++ /dev/null
@@ -1,30 +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.
-
--->
-<Configuration name="ConfigTest" status="OFF" monitorInterval="5">
- <Appenders>
- <JMSQueue name="JMSQueue" factoryBindingName="TestQueueConnectionFactory" queueBindingName="TestQueue">
- <PatternLayout pattern="%m%n"/>
- </JMSQueue>
- </Appenders>
- <Loggers>
- <Root level="error">
- <AppenderRef ref="JMSQueue"/>
- </Root>
- </Loggers>
-</Configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1b66d8d7/log4j-jms/src/test/resources/log4j-jmstopic-failover.xml
----------------------------------------------------------------------
diff --git a/log4j-jms/src/test/resources/log4j-jmstopic-failover.xml b/log4j-jms/src/test/resources/log4j-jmstopic-failover.xml
deleted file mode 100644
index 8588f69..0000000
--- a/log4j-jms/src/test/resources/log4j-jmstopic-failover.xml
+++ /dev/null
@@ -1,52 +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.
-
--->
-<Configuration status="OFF" name="FailoverTest">
- <Appenders>
- <List name="List"/>
- <JMSTopic name="Log4j2Topic" topicBindingName="Log4j2Topic" factoryBindingName="TopicConnectionFactory"
- ignoreExceptions="false"/>
- <Rewrite name="Rewrite" ignoreExceptions="false">
- <PropertiesRewritePolicy>
- <Property name="appender">List</Property>
- </PropertiesRewritePolicy>
- <AppenderRef ref="Log4j2Topic"/>
- </Rewrite>
- <Failover name="Failover" primary="Rewrite" ignoreExceptions="false">
- <Failovers>
- <AppenderRef ref="List"/>
- </Failovers>
- </Failover>
- </Appenders>
-
- <Loggers>
- <Root level="debug">
- <AppenderRef ref="Failover">
- <ThreadContextMapFilter onMatch="ACCEPT" onMismatch="DENY">
- <KeyValuePair key="appender" value="Failover"/>
- </ThreadContextMapFilter>
- </AppenderRef>
- <AppenderRef ref="List">
- <ThreadContextMapFilter onMatch="ACCEPT" onMismatch="DENY">
- <KeyValuePair key="appender" value="List"/>
- </ThreadContextMapFilter>
- </AppenderRef>
- </Root>
- </Loggers>
-
-</Configuration>
\ No newline at end of file