diff options
| author | Olivier Lamy <olamy@apache.org> | 2014-03-28 11:43:24 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2014-03-28 11:43:24 +0000 |
| commit | bef128817d76a8aac1fa575df8197f8af5a62921 (patch) | |
| tree | 8eef57af1b1bc9ac655d485aa267b88787f93c28 /archiva-modules/archiva-web/archiva-webapp | |
| parent | d4aee19ee6b233bff720ac573106565a2d0976b7 (diff) | |
| download | archiva-bef128817d76a8aac1fa575df8197f8af5a62921.tar.gz archiva-bef128817d76a8aac1fa575df8197f8af5a62921.zip | |
move the factory bean to the api
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1582713 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-webapp')
3 files changed, 2 insertions, 27 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 a948d74aa..06cf58a64 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 @@ -40,7 +40,8 @@ <constructor-arg ref="jcr-config"/> </bean> - <bean id="jcr-config" class="org.apache.archiva.metadata.repository.jcr.ArchivaJcrRepositoryConfig" factory-method="create"> + <bean id="jcr-config" class="org.apache.archiva.metadata.repository.jcr.ArchivaJcrRepositoryConfig" factory-method="create" + lazy-init="true"> <constructor-arg value="${appserver.base}/conf/repository.xml"/> <constructor-arg value="${appserver.base}/data/jcr"/> </bean> diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/archiva-runtime.properties b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/archiva-runtime.properties deleted file mode 100644 index ad69475d7..000000000 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/archiva-runtime.properties +++ /dev/null @@ -1,20 +0,0 @@ -# -# 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. -# - -archiva.repositorySessionFactory.id=jcr
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml index 155d08000..254bf6206 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml @@ -37,12 +37,6 @@ <alias name="authorizer#rbac" alias="authorizer#default"/> <alias name="repositoryStatisticsManager#default" alias="repositoryStatisticsManager"/> - <!-- so can be override with -Darchiva.repositorySessionFactory.id= jcr or cassandra or file --> - <bean name="repositorySessionFactory" class="org.apache.archiva.web.startup.RepositorySessionFactoryBean"> - <constructor-arg> - <util:properties location="classpath:archiva-runtime.properties" local-override="true"/> - </constructor-arg> - </bean> <alias name="environmentCheck#archiva-locked-admin-check" alias="environmentCheck#locked-admin-check"/> <alias name="userManager#archiva" alias="userManager#default"/> |