From kalumet-commits-return-193-apmail-incubator-kalumet-commits-archive=incubator.apache.org@incubator.apache.org  Mon Jul  9 19:48:33 2012
Return-Path: <kalumet-commits-return-193-apmail-incubator-kalumet-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-kalumet-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-kalumet-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id C04C7D1A6
	for <apmail-incubator-kalumet-commits-archive@minotaur.apache.org>; Mon,  9 Jul 2012 19:48:33 +0000 (UTC)
Received: (qmail 74323 invoked by uid 500); 9 Jul 2012 19:48:33 -0000
Delivered-To: apmail-incubator-kalumet-commits-archive@incubator.apache.org
Received: (qmail 74303 invoked by uid 500); 9 Jul 2012 19:48:33 -0000
Mailing-List: contact kalumet-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:kalumet-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:kalumet-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:kalumet-commits@incubator.apache.org>
List-Id: <kalumet-commits.incubator.apache.org>
Reply-To: kalumet-dev@incubator.apache.org
Delivered-To: mailing list kalumet-commits@incubator.apache.org
Received: (qmail 74296 invoked by uid 99); 9 Jul 2012 19:48:33 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jul 2012 19:48:33 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jul 2012 19:48:30 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 5C6512388980;
	Mon,  9 Jul 2012 19:48:10 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1359366 - in /incubator/kalumet/trunk:
 kalumet-modules/console/pom.xml kalumet-modules/console/src/test/
 kalumet-modules/console/src/test/tomcat/
 kalumet-modules/console/src/test/tomcat/log4j.xml pom.xml
Date: Mon, 09 Jul 2012 19:48:10 -0000
To: kalumet-commits@incubator.apache.org
From: olamy@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120709194810.5C6512388980@eris.apache.org>

Author: olamy
Date: Mon Jul  9 19:48:09 2012
New Revision: 1359366

URL: http://svn.apache.org/viewvc?rev=1359366&view=rev
Log:
possible to run the web console with mvn tomcat7:run -Pdev
-Pdev will use a different log4j.xml to use a ConsoleAppender.

Added:
    incubator/kalumet/trunk/kalumet-modules/console/src/test/
    incubator/kalumet/trunk/kalumet-modules/console/src/test/tomcat/
    incubator/kalumet/trunk/kalumet-modules/console/src/test/tomcat/log4j.xml   (with props)
Modified:
    incubator/kalumet/trunk/kalumet-modules/console/pom.xml
    incubator/kalumet/trunk/pom.xml

Modified: incubator/kalumet/trunk/kalumet-modules/console/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/console/pom.xml?rev=1359366&r1=1359365&r2=1359366&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/console/pom.xml (original)
+++ incubator/kalumet/trunk/kalumet-modules/console/pom.xml Mon Jul  9 19:48:09 2012
@@ -67,6 +67,14 @@
       <artifactId>webcontainer</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
+    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.4</version>
@@ -117,14 +125,49 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>tomcat-maven-plugin</artifactId>
+        <groupId>org.apache.tomcat.maven</groupId>
+        <artifactId>tomcat7-maven-plugin</artifactId>
         <configuration>
           <port>8181</port>
           <path>/apache-kalumet-console</path>
+          <systemProperties>
+            <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
+          </systemProperties>
         </configuration>
+        <dependencies>
+
+        </dependencies>
       </plugin>
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <!-- profile for dev an log output in the console -->
+      <id>dev</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>override-log4j-with-console-output</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <tasks>
+                    <copy overwrite="true" file="${basedir}/src/test/tomcat/log4j.xml"
+                          todir="${project.build.outputDirectory}"/>
+                  </tasks>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>

Added: incubator/kalumet/trunk/kalumet-modules/console/src/test/tomcat/log4j.xml
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/console/src/test/tomcat/log4j.xml?rev=1359366&view=auto
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/console/src/test/tomcat/log4j.xml (added)
+++ incubator/kalumet/trunk/kalumet-modules/console/src/test/tomcat/log4j.xml Mon Jul  9 19:48:09 2012
@@ -0,0 +1,87 @@
+<?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/" debug="false">
+
+  <appender name="FILE" class="org.apache.log4j.ConsoleAppender">
+    <param name="threshold" value="DEBUG"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d{ABSOLUTE} | %-5p | %-10t | %-24.24c{1} | %-30.30C %4L | %m%n"/>
+    </layout>
+  </appender>
+
+  <logger name="org.apache">
+    <level value="WARN"/>
+  </logger>
+
+  <logger name="org.quartz">
+    <level value="WARN"/>
+  </logger>
+
+  <logger name="org.apache.kalumet">
+    <!-- To enable debug logging, replace the INFO by DEBUG -->
+    <level value="INFO"/>
+  </logger>
+
+  <root>
+    <level value="INFO"/>
+    <appender-ref ref="FILE"/>
+  </root>
+
+
+</log4j:configuration>
+
+    <!--
+
+    Log4J Configuration Quick Reference:
+    ====================================
+
+    Priority order is DEBUG < INFO < WARN < ERROR < FATAL
+
+    PatternLayout conversion characters:
+
+    %c   Category of the logging event
+    %C   Fully qualified class name of the caller
+    %d   Date of the logging event  (example: %d{HH:mm:ss,SSS} )
+    %F   File name where the logging request was issued (caution: extremely slow)
+    %l   Location information of the caller (caution: extremely slow)
+    %L   Line number from where the logging request was issued (caution: extremely slow)
+    %m   Application-supplied message
+    %M   Method name from where the logging request was issued (caution: extremely slow)
+    %n   Line separator
+    %p   Priority of the logging event
+    %r   Number of milliseconds since the start of the application
+    %t   Name of the thread that generated the logging event
+    %x   Nested diagnotic context associated with the thread
+    %%   A single percent sign
+
+    Format modifiers examples:
+
+    %20c     Left pad with spaces if category is less than 20 characters long
+    %-20c    Right pad with spaces if category is less than 20 characters long
+    %.30c    Truncate from the beginning if category is more than 30 chars long
+    %20.30c  Left pad 20 chars + truncate from beginning if more than 30 chars
+    %-20.30c Right pad 20 chars + truncate from beginning if more than 30 chars
+
+    Examples:  "%r [%t] %-5p %c %x - %m\n"
+    "%-6r [%15.15t] %-5p %30.30c %x - %m\n"
+
+    -->

Propchange: incubator/kalumet/trunk/kalumet-modules/console/src/test/tomcat/log4j.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/kalumet/trunk/kalumet-modules/console/src/test/tomcat/log4j.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: incubator/kalumet/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/pom.xml?rev=1359366&r1=1359365&r2=1359366&view=diff
==============================================================================
--- incubator/kalumet/trunk/pom.xml (original)
+++ incubator/kalumet/trunk/pom.xml Mon Jul  9 19:48:09 2012
@@ -501,9 +501,9 @@
           <version>2.1.1</version>
         </plugin>
         <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>tomcat-maven-plugin</artifactId>
-          <version>1.1</version>
+          <groupId>org.apache.tomcat.maven</groupId>
+          <artifactId>tomcat7-maven-plugin</artifactId>
+          <version>2.0-beta-1</version>
         </plugin>
       </plugins>
     </pluginManagement>