aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-web/archiva-webapp/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'archiva-modules/archiva-web/archiva-webapp/src/main')
-rwxr-xr-xarchiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml3
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml6
2 files changed, 2 insertions, 7 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
index b0b3840b6..a66c9253b 100755
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
@@ -37,6 +37,7 @@
<util:properties id="archivaRuntimeProperties" location="classpath:application.properties" />
+ <!--
<bean id="jcr-repository" class="org.apache.jackrabbit.core.RepositoryImpl" destroy-method="shutdown" lazy-init="true">
<constructor-arg ref="jcr-config"/>
</bean>
@@ -46,7 +47,7 @@
<constructor-arg value="${appserver.base}/conf/repository.xml"/>
<constructor-arg value="${appserver.base}/data/jcr"/>
</bean>
-
+ -->
<jee:jndi-lookup id="dataSource" jndi-name="java:/comp/env/jdbc/users" />
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
index f22ee0691..5496e442a 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
@@ -78,12 +78,6 @@
<logger name="org.quartz" level="info"/>
- <logger name="org.apache.jasper" level="info"/>
-
- <logger name="com.opensymphony.xwork2" level="info"/>
-
- <logger name="org.apache.struts2" level="info"/>
-
-->
<!-- WebDav objects -->