diff options
author | Martin Stockhammer <martin_s@apache.org> | 2017-06-21 23:52:17 +0200 |
---|---|---|
committer | olivier lamy <olamy@apache.org> | 2017-06-24 09:05:49 +1000 |
commit | 7d2cc26b4bf41a5e9429aba3a54665669cf6cf79 (patch) | |
tree | 5c06c9cb818b8ec661ab058d32adf9ba6b097eb5 /archiva-modules/archiva-web/archiva-webapp | |
parent | 42df217cd095a98ab935885a1c6e6e4f10a37954 (diff) | |
download | archiva-7d2cc26b4bf41a5e9429aba3a54665669cf6cf79.tar.gz archiva-7d2cc26b4bf41a5e9429aba3a54665669cf6cf79.zip |
Adding jcr oak implementation
Diffstat (limited to 'archiva-modules/archiva-web/archiva-webapp')
-rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/pom.xml | 23 | ||||
-rwxr-xr-x | archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml | 3 |
2 files changed, 2 insertions, 24 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 1d3c53ed1..bdb0b6b68 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -131,29 +131,6 @@ </dependency> <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-jcr-commons</artifactId> - </dependency> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-core</artifactId> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - </exclusion> - <exclusion> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> <exclusions> 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" /> |