From 681f95e4598f21d08462755564f950085fe6e2bb Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 1 Mar 2012 23:02:33 +0000
Subject: [PATCH] add missing resources in webapp-js module

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1295972 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/resources/archiva-mime-types.txt |   0
 .../src/main/resources/ehcache.xml            |  92 +++++++++
 .../src/main/resources/log4j.xml              | 178 ++++++++++++++++++
 3 files changed, 270 insertions(+)
 rename archiva-modules/archiva-web/{archiva-webapp => archiva-web-common}/src/main/resources/archiva-mime-types.txt (100%)
 create mode 100644 archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/ehcache.xml
 create mode 100644 archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/log4j.xml

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/archiva-mime-types.txt b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/archiva-mime-types.txt
similarity index 100%
rename from archiva-modules/archiva-web/archiva-webapp/src/main/resources/archiva-mime-types.txt
rename to archiva-modules/archiva-web/archiva-web-common/src/main/resources/archiva-mime-types.txt
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/ehcache.xml b/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/ehcache.xml
new file mode 100644
index 000000000..15a436ec1
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/ehcache.xml
@@ -0,0 +1,92 @@
+<!--
+  ~ 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.
+  -->
+<ehcache>
+  <diskStore path="java.io.tmpdir" />
+
+  <!-- make default cache very short lived -->
+
+  <defaultCache
+    maxElementsInMemory="100"
+    maxElementsOnDisk="0"
+    eternal="false"
+    overflowToDisk="false"
+    timeToIdleSeconds="300"
+    timeToLiveSeconds="600"
+    memoryStoreEvictionPolicy="LFU" />
+
+  <!--
+    cache Redback classes longer to avoid a lot of SQL queries
+    See REDBACK-227
+  -->
+  <cache name="defaultJpox"
+      maxElementsInMemory="10000"
+      maxElementsOnDisk="0"
+      eternal="false"
+      overflowToDisk="false"
+      timeToIdleSeconds="1800"
+      timeToLiveSeconds="14400"
+      memoryStoreEvictionPolicy="LFU" />
+
+  <cache name="org.codehaus.plexus.redback.rbac.jdo.JdoOperation"
+    maxElementsInMemory="10000"
+    maxElementsOnDisk="0"
+    eternal="false"
+    overflowToDisk="false"
+    timeToIdleSeconds="1800"
+    timeToLiveSeconds="14400"
+    memoryStoreEvictionPolicy="LFU" />
+
+  <cache name="org.codehaus.plexus.redback.rbac.jdo.JdoPermission"
+    maxElementsInMemory="10000"
+    maxElementsOnDisk="0"
+    eternal="false"
+    overflowToDisk="false"
+    timeToIdleSeconds="1800"
+    timeToLiveSeconds="14400"
+    memoryStoreEvictionPolicy="LFU" />
+
+  <cache name="org.codehaus.plexus.redback.rbac.jdo.JdoResource"
+    maxElementsInMemory="10000"
+    maxElementsOnDisk="0"
+    eternal="false"
+    overflowToDisk="false"
+    timeToIdleSeconds="1800"
+    timeToLiveSeconds="14400"
+    memoryStoreEvictionPolicy="LFU" />
+
+  <cache name="org.codehaus.plexus.redback.rbac.jdo.JdoRole"
+    maxElementsInMemory="10000"
+    maxElementsOnDisk="0"
+    eternal="false"
+    overflowToDisk="false"
+    timeToIdleSeconds="1800"
+    timeToLiveSeconds="14400"
+    memoryStoreEvictionPolicy="LFU" />
+
+  <cache name="org.codehaus.plexus.redback.rbac.jdo.JdoUserAssignment"
+    maxElementsInMemory="10000"
+    maxElementsOnDisk="0"
+    eternal="false"
+    overflowToDisk="false"
+    timeToIdleSeconds="300"
+    timeToLiveSeconds="600"
+    memoryStoreEvictionPolicy="LFU" />
+
+</ehcache>
+
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/log4j.xml b/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/log4j.xml
new file mode 100644
index 000000000..09f80bb75
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/log4j.xml
@@ -0,0 +1,178 @@
+<?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="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="%d [%t] %-5p %c %x - %m%n"/>
+    </layout>
+  </appender>
+  
+  <appender name="auditlog" class="org.apache.log4j.DailyRollingFileAppender">
+    <param name="file" value="${appserver.base}/logs/archiva-audit.log" />
+    <param name="append" value="true" />
+    <param name="datePattern" value="'.'yyyy-MM-dd" />
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %m%n"/>
+    </layout>
+  </appender>
+
+  <appender name="redbackAuditLog" class="org.apache.log4j.DailyRollingFileAppender">
+    <param name="file" value="${appserver.base}/logs/archiva-security-audit.log" />
+    <param name="append" value="true" />
+    <param name="datePattern" value="'.'yyyy-MM-dd" />
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} - %X{redback.currentUser} - %m%n"/>
+    </layout>
+  </appender>
+
+  <logger name="org.codehaus.plexus.redback.struts2.action.AuditEvent" additivity="false">
+    <level value="info" />
+    <appender-ref ref="redbackAuditLog" />
+  </logger>
+
+  <logger name="org.apache.archiva.AuditLog" additivity="false">
+    <level value="info" />
+    <appender-ref ref="auditlog" />
+  </logger>
+  
+<!-- INFO level loggers can use the default
+ <logger name="org.apache.archiva.consumers">
+    <level value="info"/>
+  </logger>
+  
+  <logger name="org.apache.archiva">
+    <level value="info"/>
+  </logger>
+  
+  <logger name="org.codehaus.redback">
+    <level value="info"/>
+  </logger>
+
+  <logger name="org.codehaus.plexus.redback">
+    <level value="info"/>
+  </logger>
+
+  <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.xwork2">
+    <level value="info"/>
+  </logger>
+
+  <logger name="org.apache.struts2">
+    <level value="info"/>
+  </logger>
+
+  <logger name="org.codehaus.plexus.PlexusContainer">
+    <level value="info"/>
+  </logger>
+-->
+
+  <!-- WebDav objects -->
+  <logger name="org.apache.archiva.webdav.ArchivaDavResource">
+    <level value="info"/>
+  </logger>
+  
+  <logger name="org.apache.archiva.webdav.ArchivaDavResourceFactory">
+    <level value="info"/>
+  </logger>
+
+  <!-- squelch noisy objects (for now) -->
+  <logger name="org.apache.commons">
+    <level value="warn"/>
+  </logger>
+
+  <logger name="net.sf.ehcache">
+    <level value="warn"/>
+  </logger>
+
+  <logger name="org.codehaus.plexus.velocity">
+    <level value="error"/>
+  </logger>
+
+  <!-- retained for Redback -->
+  <logger name="JPOX">
+    <level value="warn"/>
+  </logger>
+
+  <logger name="JPOX.MetaData">
+    <level value="error"/>
+  </logger>
+
+  <logger name="JPOX.RDBMS.SQL">
+    <level value="error"/>
+  </logger>
+
+  <logger name="SQL">
+    <level value="error"/>
+  </logger>
+
+  <logger name="freemarker">
+    <level value="warn"/>
+  </logger>
+
+  <logger name="org.codehaus.plexus.component.manager.ClassicSingletonComponentManager">
+    <level value="error"/>
+  </logger>
+
+  <logger name="com.opensymphony.xwork2.ognl.OgnlValueStack">
+    <level value="error"/>
+  </logger>
+
+  <!-- debug wagon transfer -->
+  <!--
+  <logger name="org.apache.archiva.proxy.common">
+    <level value="debug"/>
+  </logger>
+  -->
+  <!-- apache httpclient debug content transfer verbose -->
+  <!--
+  <logger name="org.apache.http.wire">
+    <level value="debug"/>
+  </logger>
+  -->
+  <!-- apache httpclient log headers -->
+  <!--
+  <logger name="org.apache.http.headers">
+    <level value="debug"/>
+  </logger>
+  -->
+
+  <root>
+    <priority value ="info" />
+    <appender-ref ref="rolling" />
+  </root>
+
+</log4j:configuration>