From cdd0df057c96378cbc084fcb8fc520bb30e5d135 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 27 Mar 2014 06:02:12 +0000 Subject: [PATCH] missed to add new files git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1582200 13f79535-47bb-0310-9956-ffa450edef68 --- .../startup/RepositorySessionFactoryBean.java | 77 +++++++++++++++++++ .../main/resources/archiva-runtime.properties | 1 + 2 files changed, 78 insertions(+) create mode 100644 archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/RepositorySessionFactoryBean.java create mode 100644 archiva-modules/archiva-web/archiva-webapp/src/main/resources/archiva-runtime.properties diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/RepositorySessionFactoryBean.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/RepositorySessionFactoryBean.java new file mode 100644 index 000000000..f3bc9daf9 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/RepositorySessionFactoryBean.java @@ -0,0 +1,77 @@ +package org.apache.archiva.web.startup; + +/* + * 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. + */ + +import org.apache.archiva.metadata.repository.RepositorySessionFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.config.AbstractFactoryBean; + +import java.util.Properties; + +/** + * @author Olivier Lamy + * @since 2.0.1 + */ +public class RepositorySessionFactoryBean + extends AbstractFactoryBean +{ + + private Logger logger = LoggerFactory.getLogger( getClass() ); + + //@Value( "repositorySessionFactory#${archiva.repositorySessionFactory.id}" ) + //private String beanName; + + private Properties properties; + + public RepositorySessionFactoryBean( Properties properties ) + { + this.properties = properties; + // we can override with system props + this.properties.putAll( System.getProperties() ); + } + + @Override + public Class getObjectType() + { + return RepositorySessionFactory.class; + } + + @Override + protected RepositorySessionFactory createInstance() + throws Exception + { + String id = properties.getProperty( "archiva.repositorySessionFactory.id" ); + RepositorySessionFactory repositorySessionFactory = + getBeanFactory().getBean( "repositorySessionFactory#" + id, RepositorySessionFactory.class ); + logger.info( "create RepositorySessionFactory instance of {}", repositorySessionFactory.getClass().getName() ); + return repositorySessionFactory; + } + + public Properties getProperties() + { + return properties; + } + + public void setProperties( Properties properties ) + { + this.properties = properties; + } +} 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 new file mode 100644 index 000000000..79174d875 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/archiva-runtime.properties @@ -0,0 +1 @@ +archiva.repositorySessionFactory.id=jcr \ No newline at end of file -- 2.39.5