* Fix for rogue "${appserver.base}" directory creation due to bad Log4jLoggerManager...

* Moved to slf4j for logging instead.

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches@509767 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-MRM-239/archiva-webapp/pom.xml b/archiva-MRM-239/archiva-webapp/pom.xml
index 2d58dbf40f091b33bf340da24790b735fa31a961..d14600afc59f0713549e35fb1a33aacd2f556b91 100644 (file)
--- a/archiva-MRM-239/archiva-webapp/pom.xml
+++ b/archiva-MRM-239/archiva-webapp/pom.xml
@@ -67,10 +67,15 @@
     </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>
       <artifactId>commons-logging</artifactId>

diff --git a/archiva-MRM-239/archiva-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-MRM-239/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
index 1e236d6a870410c3cd8cdeb71f2b2b2faf0b67e6..4dbb2a3983f54a52fb05ae8130a67820a8bfb278 100644 (file)
--- a/archiva-MRM-239/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
+++ b/archiva-MRM-239/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
@@ -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>

diff --git a/archiva-MRM-239/archiva-webapp/src/main/resources/log4j.xml b/archiva-MRM-239/archiva-webapp/src/main/resources/log4j.xml
new file mode 100644 (file)
index 0000000..9875c60
--- /dev/null
+++ b/archiva-MRM-239/archiva-webapp/src/main/resources/log4j.xml
@@ -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>

diff --git a/archiva-MRM-239/archiva-webapp/src/main/resources/xwork.xml b/archiva-MRM-239/archiva-webapp/src/main/resources/xwork.xml
index f89edbe4b9af7fce83f77d8927e7a0b6829c8f54..8b8fe6c0ae209a0af4b0d5aa6b77153f2190e4af 100644 (file)
--- a/archiva-MRM-239/archiva-webapp/src/main/resources/xwork.xml
+++ b/archiva-MRM-239/archiva-webapp/src/main/resources/xwork.xml
@@ -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>

diff --git a/archiva-MRM-239/pom.xml b/archiva-MRM-239/pom.xml
index 4992be115908f20c70c61714b612b035635efef7..6cab15d699ed68f8c8b3cd378a2d0559447c67ba 100644 (file)
--- a/archiva-MRM-239/pom.xml
+++ b/archiva-MRM-239/pom.xml
@@ -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>