Author: olamy
Date: Fri Mar 28 11:43:24 2014
New Revision: 1582713
URL: http://svn.apache.org/r1582713
Log:
move the factory bean to the api
Added:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySessionFactoryBean.java
(contents, props changed)
- copied, changed from r1582570,
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/RepositorySessionFactoryBean.java
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/resources/archiva-runtime.properties
(contents, props changed)
- copied, changed from r1582570,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/archiva-runtime.properties
Removed:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/RepositorySessionFactoryBean.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/archiva-runtime.properties
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml?rev=1582713&r1=1582712&r2=1582713&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
Fri Mar 28 11:43:24 2014
@@ -160,6 +160,7 @@
<redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url>
<redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name>
<archiva.user.configFileName>${project.build.directory}/archiva.xml</archiva.user.configFileName>
+
<archiva.repositorySessionFactory.id>test</archiva.repositorySessionFactory.id>
</systemPropertyVariables>
</configuration>
</plugin>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml?rev=1582713&r1=1582712&r2=1582713&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/pom.xml Fri Mar
28 11:43:24 2014
@@ -219,6 +219,7 @@
<derby.system.home>${project.build.directory}/appserver-base</derby.system.home>
<redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url>
<redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name>
+
<archiva.repositorySessionFactory.id>mock</archiva.repositorySessionFactory.id>
</systemPropertyVariables>
</configuration>
</plugin>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java?rev=1582713&r1=1582712&r2=1582713&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java
Fri Mar 28 11:43:24 2014
@@ -38,7 +38,7 @@ import java.util.List;
/**
* @author Olivier Lamy
*/
-@Service( "RepositorySessionFactory#mock" )
+@Service( "repositorySessionFactory#mock" )
public class MockRepositorySessionFactory
implements RepositorySessionFactory
{
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml?rev=1582713&r1=1582712&r2=1582713&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml Fri Mar 28
11:43:24 2014
@@ -250,6 +250,7 @@
<derby.system.home>${project.build.directory}/appserver-base</derby.system.home>
<redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url>
<redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name>
+
<archiva.repositorySessionFactory.id>test</archiva.repositorySessionFactory.id>
</systemPropertyVariables>
</configuration>
</plugin>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java?rev=1582713&r1=1582712&r2=1582713&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
Fri Mar 28 11:43:24 2014
@@ -23,7 +23,7 @@ import org.springframework.stereotype.Se
* specific language governing permissions and limitations
* under the License.
*/
-@Service("repositorySessionFactory")
+@Service("repositorySessionFactory#test")
public class TestRepositorySessionFactory
implements RepositorySessionFactory
{
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml?rev=1582713&r1=1582712&r2=1582713&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
Fri Mar 28 11:43:24 2014
@@ -287,6 +287,7 @@
<derby.system.home>${project.build.directory}/appserver-base</derby.system.home>
<redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url>
<redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name>
+
<archiva.repositorySessionFactory.id>mock</archiva.repositorySessionFactory.id>
</systemPropertyVariables>
</configuration>
</plugin>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java?rev=1582713&r1=1582712&r2=1582713&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java
Fri Mar 28 11:43:24 2014
@@ -38,7 +38,7 @@ import java.util.List;
/**
* @author Olivier Lamy
*/
-@Service( "RepositorySessionFactory#mock" )
+@Service( "repositorySessionFactory#mock" )
public class MockRepositorySessionFactory
implements RepositorySessionFactory
{
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml?rev=1582713&r1=1582712&r2=1582713&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
Fri Mar 28 11:43:24 2014
@@ -236,6 +236,7 @@
<redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url>
<redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name>
<basedir>${basedir}</basedir>
+
<archiva.repositorySessionFactory.id>mock</archiva.repositorySessionFactory.id>
</systemPropertyVariables>
</configuration>
</plugin>
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java?rev=1582713&r1=1582712&r2=1582713&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java
Fri Mar 28 11:43:24 2014
@@ -38,7 +38,7 @@ import java.util.List;
/**
* @author Olivier Lamy
*/
-@Service( "RepositorySessionFactory#mock" )
+@Service( "repositorySessionFactory#mock" )
public class MockRepositorySessionFactory
implements RepositorySessionFactory
{
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml?rev=1582713&r1=1582712&r2=1582713&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
Fri Mar 28 11:43:24 2014
@@ -171,6 +171,15 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+
<archiva.repositorySessionFactory.id>test</archiva.repositorySessionFactory.id>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml?rev=1582713&r1=1582712&r2=1582713&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-security/pom.xml Fri Mar
28 11:43:24 2014
@@ -243,6 +243,7 @@
<derby.system.home>${project.build.directory}/appserver-base</derby.system.home>
<redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url>
<redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name>
+
<archiva.repositorySessionFactory.id>file</archiva.repositorySessionFactory.id>
</systemPropertyVariables>
</configuration>
</plugin>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml?rev=1582713&r1=1582712&r2=1582713&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
Fri Mar 28 11:43:24 2014
@@ -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>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=1582713&r1=1582712&r2=1582713&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
Fri Mar 28 11:43:24 2014
@@ -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"/>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml?rev=1582713&r1=1582712&r2=1582713&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml Fri Mar 28
11:43:24 2014
@@ -308,6 +308,7 @@
<archiva.user.configFileName>${project.build.testOutputDirectory}/repository-archiva.xml</archiva.user.configFileName>
<redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url>
<redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name>
+
<archiva.repositorySessionFactory.id>beer</archiva.repositorySessionFactory.id>
</systemPropertyVariables>
<forkMode>${webdav.forkMode}</forkMode>
</configuration>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java?rev=1582713&r1=1582712&r2=1582713&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
Fri Mar 28 11:43:24 2014
@@ -21,7 +21,7 @@ package org.apache.archiva.metadata.repo
import org.springframework.stereotype.Service;
-@Service
+@Service("repositorySessionFactory#beer")
public class TestRepositorySessionFactory
implements RepositorySessionFactory
{
Copied:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySessionFactoryBean.java
(from r1582570,
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/RepositorySessionFactoryBean.java)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySessionFactoryBean.java?p2=archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySessionFactoryBean.java&p1=archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/RepositorySessionFactoryBean.java&r1=1582570&r2=1582713&rev=1582713&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/RepositorySessionFactoryBean.java
(original)
+++
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySessionFactoryBean.java
Fri Mar 28 11:43:24 2014
@@ -1,4 +1,4 @@
-package org.apache.archiva.web.startup;
+package org.apache.archiva.metadata.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,6 @@ package org.apache.archiva.web.startup;
* 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;
@@ -36,16 +35,22 @@ public class RepositorySessionFactoryBea
private Logger logger = LoggerFactory.getLogger( getClass() );
- //@Value(
"repositorySessionFactory#${archiva.repositorySessionFactory.id}" )
- //private String beanName;
+ private static final String BEAN_ID_SYS_PROPS =
"archiva.repositorySessionFactory.id";
private Properties properties;
+ private String id;
+
public RepositorySessionFactoryBean( Properties properties )
{
this.properties = properties;
// we can override with system props
- this.properties.putAll( System.getProperties() );
+ String value = System.getProperty( BEAN_ID_SYS_PROPS );
+ if ( value != null )
+ {
+ this.properties.put( BEAN_ID_SYS_PROPS, value );
+ }
+ id = properties.getProperty( BEAN_ID_SYS_PROPS );
}
@Override
@@ -58,13 +63,22 @@ public class RepositorySessionFactoryBea
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 String getId()
+ {
+ return id;
+ }
+
+ public void setId( String id )
+ {
+ this.id = id;
+ }
+
public Properties getProperties()
{
return properties;
Propchange:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySessionFactoryBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySessionFactoryBean.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/resources/META-INF/spring-context.xml?rev=1582713&r1=1582712&r2=1582713&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/resources/META-INF/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/resources/META-INF/spring-context.xml
Fri Mar 28 11:43:24 2014
@@ -21,14 +21,22 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:context="http://www.springframework.org/schema/context";
+ xmlns:util="http://www.springframework.org/schema/util";
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/context
-
http://www.springframework.org/schema/context/spring-context-3.0.xsd";
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd
+ http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util.xsd";
default-lazy-init="true">
<context:annotation-config/>
<context:component-scan
base-package="org.apache.archiva.metadata.repository"/>
+ <!-- so can be override with -Darchiva.repositorySessionFactory.id= jcr or
cassandra or file -->
+ <bean name="repositorySessionFactory"
class="org.apache.archiva.metadata.repository.RepositorySessionFactoryBean">
+ <constructor-arg>
+ <util:properties location="classpath:archiva-runtime.properties"
local-override="true"/>
+ </constructor-arg>
+ </bean>
</beans>
\ No newline at end of file
Copied:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/resources/archiva-runtime.properties
(from r1582570,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/archiva-runtime.properties)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/resources/archiva-runtime.properties?p2=archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/resources/archiva-runtime.properties&p1=archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/archiva-runtime.properties&r1=1582570&r2=1582713&rev=1582713&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/archiva-runtime.properties
(original)
+++
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/resources/archiva-runtime.properties
Fri Mar 28 11:43:24 2014
@@ -16,5 +16,5 @@
# specific language governing permissions and limitations
# under the License.
#
-
+#default value
archiva.repositorySessionFactory.id=jcr
\ No newline at end of file
Propchange:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/resources/archiva-runtime.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/resources/archiva-runtime.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java?rev=1582713&r1=1582712&r2=1582713&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
(original)
+++
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
Fri Mar 28 11:43:24 2014
@@ -31,6 +31,8 @@ import me.prettyprint.hector.api.ddl.Col
import me.prettyprint.hector.api.ddl.ColumnIndexType;
import me.prettyprint.hector.api.ddl.ComparatorType;
import me.prettyprint.hector.api.factory.HFactory;
+import org.apache.archiva.metadata.repository.RepositorySessionFactoryBean;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
@@ -89,35 +91,40 @@ public class DefaultCassandraArchivaMana
private String dependencyFamilyName = "dependency";
@Value("${cassandra.host}")
- private String cassandraHost;// = System.getProperty( "cassandra.host",
"localhost" );
+ private String cassandraHost;
@Value("${cassandra.port}")
- private String cassandraPort;// = System.getProperty( "cassandra.port",
"9160" );
+ private String cassandraPort;
@Value("${cassandra.maxActive}")
- private int maxActive;// = Integer.getInteger( "cassandra.maxActive", 20 );
+ private int maxActive;
@Value("${cassandra.readConsistencyLevel}")
- private String readConsistencyLevel;// =
- //System.getProperty( "cassandra.readConsistencyLevel",
HConsistencyLevel.QUORUM.name() );
+ private String readConsistencyLevel;
@Value("${cassandra.writeConsistencyLevel}")
private String writeConsistencyLevel;
- //= System.getProperty( "cassandra.writeConsistencyLevel",
HConsistencyLevel.QUORUM.name() );
@Value("${cassandra.replicationFactor}")
- private int replicationFactor;// = Integer.getInteger(
"cassandra.replicationFactor", 1 );
+ private int replicationFactor;
@Value("${cassandra.keyspace.name}")
- private String keyspaceName;// = System.getProperty(
"cassandra.keyspace.name", KEYSPACE_NAME );
+ private String keyspaceName;
@Value("${cassandra.cluster.name}")
- private String clusterName;// = System.getProperty(
"cassandra.cluster.name", CLUSTER_NAME );
+ private String clusterName;
+
+ @Inject
+ private RepositorySessionFactoryBean repositorySessionFactoryBean;
@PostConstruct
public void initialize()
{
-
+ // skip initialisation if not cassandra
+ if ( !StringUtils.equals( repositorySessionFactoryBean.getId(),
"cassandra" ) )
+ {
+ return;
+ }
final CassandraHostConfigurator configurator =
new CassandraHostConfigurator( cassandraHost + ":" + cassandraPort
);
configurator.setMaxActive( maxActive );
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java?rev=1582713&r1=1582712&r2=1582713&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
(original)
+++
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
Fri Mar 28 11:43:24 2014
@@ -51,20 +51,11 @@ public class JcrRepositorySessionFactory
@Inject
private ApplicationContext applicationContext;
- /**
- *
- */
private Map<String, MetadataFacetFactory> metadataFacetFactories;
- /**
- *
- */
@Inject
private Repository repository;
- /**
- *
- */
@Inject
private MetadataResolver metadataResolver;
