You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2007/02/20 22:53:33 UTC
svn commit: r509767 - in /maven/archiva/branches/archiva-MRM-239:
archiva-webapp/pom.xml
archiva-webapp/src/main/resources/META-INF/plexus/application.xml
archiva-webapp/src/main/resources/log4j.xml
archiva-webapp/src/main/resources/xwork.xml pom.xml
Author: joakime
Date: Tue Feb 20 13:53:33 2007
New Revision: 509767
URL: http://svn.apache.org/viewvc?view=rev&rev=509767
Log:
* Fix for rogue "${appserver.base}" directory creation due to bad Log4jLoggerManager implementation.
* Moved to slf4j for logging instead.
Added:
maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/log4j.xml (with props)
Modified:
maven/archiva/branches/archiva-MRM-239/archiva-webapp/pom.xml
maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/xwork.xml
maven/archiva/branches/archiva-MRM-239/pom.xml
Modified: maven/archiva/branches/archiva-MRM-239/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-webapp/pom.xml?view=diff&rev=509767&r1=509766&r2=509767
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-webapp/pom.xml (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-webapp/pom.xml Tue Feb 20 13:53:33 2007
@@ -67,9 +67,14 @@
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-log4j-logging</artifactId>
- <version>1.1-alpha-2</version>
+ <artifactId>plexus-slf4j-logging</artifactId>
+ <version>1.1-alpha-1-SNAPSHOT</version>
<scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=509767&r1=509766&r2=509767
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/META-INF/plexus/application.xml Tue Feb 20 13:53:33 2007
@@ -169,12 +169,12 @@
<name>org.jpox.rdbms.dateTimezone</name>
<value>JDK_DEFAULT_TIMEZONE</value>
</property>
-<!--
+ <!-- NEEDED FOR POSTGRES, But causes problems in other JDBC implementations.
<property>
<name>org.jpox.identifier.case</name>
<value>PreserveCase</value>
</property>
--->
+ -->
</otherProperties>
</configuration>
</component>
@@ -184,101 +184,9 @@
-->
<component>
<role>org.codehaus.plexus.logging.LoggerManager</role>
- <implementation>org.codehaus.plexus.logging.log4j.Log4JLoggerManager</implementation>
+ <implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation>
<lifecycle-handler>basic</lifecycle-handler>
-
- <configuration>
- <threshold>WARN</threshold>
- <default-appender>console,rolling</default-appender>
-
- <appenders>
- <appender>
- <id>console</id>
- <threshold>DEBUG</threshold>
- <type>org.apache.log4j.ConsoleAppender</type>
- <conversion-pattern>%d [%t] %-5p %-30c{1} - %m%n</conversion-pattern>
- </appender>
-
- <appender>
- <id>rolling</id>
- <threshold>DEBUG</threshold>
- <type>org.apache.log4j.DailyRollingFileAppender</type>
- <conversion-pattern>%-4r [%t] %-5p %c %x - %m%n</conversion-pattern>
-
- <properties>
- <property>
- <name>file</name>
- <value>${appserver.base}/logs/archiva.log</value>
- </property>
- <property>
- <name>append</name>
- <value>true</value>
- </property>
- <property>
- <name>datePattern</name>
- <value>'.'yyyy-MM-dd</value>
- </property>
- </properties>
- </appender>
- </appenders>
-
- <levels>
- <!-- Help identify bugs during testing -->
- <level>
- <hierarchy>org.apache.maven</hierarchy>
- <level>INFO</level>
- </level>
- <level>
- <hierarchy>org.codehaus.plexus.security</hierarchy>
- <level>INFO</level>
- </level>
- <!-- squelch noisy objects (for now) -->
- <level>
- <hierarchy>org.codehaus.plexus.mailsender.MailSender</hierarchy>
- <level>INFO</level>
- </level>
- <level>
- <hierarchy>org.quartz</hierarchy>
- <level>INFO</level>
- </level>
- <level>
- <hierarchy>org.apache.jasper</hierarchy>
- <level>INFO</level>
- </level>
- <level>
- <hierarchy>com.opensymphony.xwork</hierarchy>
- <level>INFO</level>
- </level>
- <level>
- <hierarchy>com.opensymphony.webwork</hierarchy>
- <level>INFO</level>
- </level>
- <level>
- <hierarchy>org.codehaus.plexus.PlexusContainer</hierarchy>
- <level>INFO</level>
- </level>
- <level>
- <hierarchy>JPOX</hierarchy>
- <level>WARN</level>
- </level>
- <level>
- <hierarchy>JPOX.MetaData</hierarchy>
- <level>ERROR</level>
- </level>
- <!--
- <level>
- <hierarchy>JPOX.RDBMS.SQL</hierarchy>
- <level>DEBUG</level>
- </level>
- -->
- <level>
- <hierarchy>freemarker</hierarchy>
- <level>WARN</level>
- </level>
- </levels>
- </configuration>
</component>
-
</components>
<load-on-start>
Added: maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/log4j.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/log4j.xml?view=auto&rev=509767
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/log4j.xml (added)
+++ maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/log4j.xml Tue Feb 20 13:53:33 2007
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+ <appender name="rolling" class="org.apache.log4j.DailyRollingFileAppender">
+ <param name="file" value="${appserver.base}/logs/archiva.log" />
+ <param name="append" value="true" />
+ <param name="datePattern" value="'.'yyyy-MM-dd" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%-4r [%t] %-5p %c %x - %m%n"/>
+ </layout>
+ </appender>
+
+ <appender name="console" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d [%t] %-5p %-30c{1} - %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- Help identify bugs during testing -->
+ <logger name="org.apache.maven">
+ <level value="info"/>
+ </logger>
+
+ <logger name="org.codehaus.plexus.security">
+ <level value="info"/>
+ </logger>
+
+ <!-- squelch noisy objects (for now) -->
+ <logger name="org.codehaus.plexus.mailsender.MailSender">
+ <level value="info"/>
+ </logger>
+
+ <logger name="org.quartz">
+ <level value="info"/>
+ </logger>
+
+ <logger name="org.apache.jasper">
+ <level value="info"/>
+ </logger>
+
+ <logger name="com.opensymphony.xwork">
+ <level value="info"/>
+ </logger>
+
+ <logger name="com.opensymphony.webwork">
+ <level value="info"/>
+ </logger>
+
+ <logger name="org.codehaus.plexus.PlexusContainer">
+ <level value="info"/>
+ </logger>
+
+ <logger name="JPOX">
+ <level value="warn"/>
+ </logger>
+
+ <logger name="JPOX.MetaData">
+ <level value="error"/>
+ </logger>
+
+<!--
+ <logger name="JPOX.RDBMS.SQL">
+ <level value="debug"/>
+ </logger>
+ -->
+
+ <logger name="freemarker">
+ <level value="warn"/>
+ </logger>
+
+ <root>
+ <priority value ="warn" />
+ <appender-ref ref="console" />
+ <appender-ref ref="rolling" />
+ </root>
+
+</log4j:configuration>
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/log4j.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/log4j.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/log4j.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/xwork.xml?view=diff&rev=509767&r1=509766&r2=509767
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/xwork.xml (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/xwork.xml Tue Feb 20 13:53:33 2007
@@ -92,6 +92,10 @@
<param name="actionName">login</param>
<param name="namespace">/security</param>
</result>
+ <result name="requires-authorization" type="redirect-action">
+ <param name="actionName">login</param>
+ <param name="namespace">/security</param>
+ </result>
<result name="security-register-success" type="redirect-action">
<param name="actionName">login</param>
<param name="namespace">/security</param>
Modified: maven/archiva/branches/archiva-MRM-239/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/pom.xml?view=diff&rev=509767&r1=509766&r2=509767
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/pom.xml (original)
+++ maven/archiva/branches/archiva-MRM-239/pom.xml Tue Feb 20 13:53:33 2007
@@ -526,7 +526,7 @@
</repository>
<!-- TODO: remove once ehcache, p-sec, registry, webdav, xwork, naming released -->
<repository>
- <id>codehaus.org</id>
+ <id>snapshots.codehaus.org</id>
<url>http://snapshots.repository.codehaus.org</url>
<releases>
<enabled>false</enabled>
@@ -539,7 +539,7 @@
<!-- TODO: remove once modello is released -->
<pluginRepositories>
<pluginRepository>
- <id>codehaus.org</id>
+ <id>snapshots.codehaus.org</id>
<url>http://snapshots.repository.codehaus.org</url>
<releases>
<enabled>false</enabled>
@@ -552,6 +552,6 @@
<properties>
<maven.version>2.0.5</maven.version>
<wagon.version>1.0-beta-2</wagon.version>
- <plexus-security.version>1.0-alpha-10-SNAPSHOT</plexus-security.version>
+ <plexus-security.version>1.0-alpha-10.1-SNAPSHOT</plexus-security.version>
</properties>
</project>