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:49 UTC

[16/29] Rename log4j-mom to log4j-jms.

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/89304e88/log4j-mom/src/test/resources/log4j-jmstopic-failover.xml
----------------------------------------------------------------------
diff --git a/log4j-mom/src/test/resources/log4j-jmstopic-failover.xml b/log4j-mom/src/test/resources/log4j-jmstopic-failover.xml
deleted file mode 100644
index 8588f69..0000000
--- a/log4j-mom/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

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/89304e88/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2d0b1e5..591aeb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -499,11 +499,6 @@
         <version>${activemq.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.qpid</groupId>
-        <artifactId>proton-j</artifactId>
-        <version>0.7</version>
-      </dependency>
-      <dependency>
         <groupId>org.mockejb</groupId>
         <artifactId>mockejb</artifactId>
         <version>0.6-beta2</version>
@@ -1011,7 +1006,7 @@
     <module>log4j-nosql</module>
     <module>log4j-web</module>
     <module>log4j-perf</module>
-    <module>log4j-mom</module>
+    <module>log4j-jms</module>
     <module>log4j-streams</module>
   </modules>
   <profiles>