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:42 UTC
[09/29] git commit: Move JMS log4j configuration files to appropriate
module.
Move JMS log4j configuration files to appropriate module.
git-svn-id: https://svn.apache.org/repos/asf/logging/log4j/log4j2/branches/messaging-module@1608332 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cd762042
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cd762042
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cd762042
Branch: refs/heads/master
Commit: cd7620428795814642795bc57713da778b1f5457
Parents: a117d38
Author: mattsicker <ma...@unknown>
Authored: Mon Jul 7 03:39:36 2014 +0000
Committer: mattsicker <ma...@unknown>
Committed: Mon Jul 7 03:39:36 2014 +0000
----------------------------------------------------------------------
.../test/resources/log4j-jmsqueue-failover.xml | 52 --------------------
.../src/test/resources/log4j-jmsqueue.xml | 30 -----------
.../test/resources/log4j-jmstopic-failover.xml | 52 --------------------
.../test/resources/log4j-jmsqueue-failover.xml | 52 ++++++++++++++++++++
log4j-mom/src/test/resources/log4j-jmsqueue.xml | 30 +++++++++++
.../test/resources/log4j-jmstopic-failover.xml | 52 ++++++++++++++++++++
6 files changed, 134 insertions(+), 134 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd762042/log4j-core/src/test/resources/log4j-jmsqueue-failover.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-jmsqueue-failover.xml b/log4j-core/src/test/resources/log4j-jmsqueue-failover.xml
deleted file mode 100644
index 8b86750..0000000
--- a/log4j-core/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/cd762042/log4j-core/src/test/resources/log4j-jmsqueue.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-jmsqueue.xml b/log4j-core/src/test/resources/log4j-jmsqueue.xml
deleted file mode 100644
index 44ea169..0000000
--- a/log4j-core/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/cd762042/log4j-core/src/test/resources/log4j-jmstopic-failover.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-jmstopic-failover.xml b/log4j-core/src/test/resources/log4j-jmstopic-failover.xml
deleted file mode 100644
index 8588f69..0000000
--- a/log4j-core/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/cd762042/log4j-mom/src/test/resources/log4j-jmsqueue-failover.xml
----------------------------------------------------------------------
diff --git a/log4j-mom/src/test/resources/log4j-jmsqueue-failover.xml b/log4j-mom/src/test/resources/log4j-jmsqueue-failover.xml
new file mode 100644
index 0000000..8b86750
--- /dev/null
+++ b/log4j-mom/src/test/resources/log4j-jmsqueue-failover.xml
@@ -0,0 +1,52 @@
+<?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/cd762042/log4j-mom/src/test/resources/log4j-jmsqueue.xml
----------------------------------------------------------------------
diff --git a/log4j-mom/src/test/resources/log4j-jmsqueue.xml b/log4j-mom/src/test/resources/log4j-jmsqueue.xml
new file mode 100644
index 0000000..44ea169
--- /dev/null
+++ b/log4j-mom/src/test/resources/log4j-jmsqueue.xml
@@ -0,0 +1,30 @@
+<?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/cd762042/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
new file mode 100644
index 0000000..8588f69
--- /dev/null
+++ b/log4j-mom/src/test/resources/log4j-jmstopic-failover.xml
@@ -0,0 +1,52 @@
+<?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