You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ol...@apache.org on 2012/01/11 14:40:25 UTC
svn commit: r1230029 - in
/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources:
META-INF/maven/
archetype-resources/test-api-impl/src/main/resources/META-INF/
archetype-resources/test-webapp/src/main/resources/
Author: olamy
Date: Wed Jan 11 13:40:24 2012
New Revision: 1230029
URL: http://svn.apache.org/viewvc?rev=1230029&view=rev
Log:
add a simple log4j.xml
Added:
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml (with props)
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/resources/META-INF/spring-context.xml
Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1230029&r1=1230028&r2=1230029&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml Wed Jan 11 13:40:24 2012
@@ -80,6 +80,12 @@
</module>
<module id="test-webapp" dir="test-webapp" name="test-webapp">
<fileSets>
+ <fileSet filtered="false" encoding="UTF-8">
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/main/webapp</directory>
<includes>
Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/resources/META-INF/spring-context.xml?rev=1230029&r1=1230028&r2=1230029&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/resources/META-INF/spring-context.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/src/main/resources/META-INF/spring-context.xml Wed Jan 11 13:40:24 2012
@@ -39,8 +39,7 @@
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
<context:annotation-config />
- <context:component-scan
- base-package="${package}"/>
+ <context:component-scan base-package="${package}"/>
<jaxrs:server id="testServices" address="/testServices">
Added: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml?rev=1230029&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml (added)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml Wed Jan 11 13:40:24 2012
@@ -0,0 +1,41 @@
+<?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.
+ -->
+
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+ <appender name="console" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d [%t] %-5p %c %x - %m%n"/>
+ </layout>
+ </appender>
+
+ <logger name="org.springframework">
+ <level value="info"/>
+ </logger>
+
+
+ <root>
+ <priority value ="info" />
+ <appender-ref ref="console" />
+ </root>
+
+</log4j:configuration>
Propchange: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org