Author: olamy
Date: Thu Mar 27 06:02:01 2014
New Revision: 1582199
URL: http://svn.apache.org/r1582199
Log:
the repository session factory is now configurable via a sysprops
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/filtered-resources/application.properties
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/filtered-resources/application.properties
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/filtered-resources/application.properties?rev=1582199&r1=1582198&r2=1582199&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/filtered-resources/application.properties
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/filtered-resources/application.properties
Thu Mar 27 06:02:01 2014
@@ -19,4 +19,4 @@
user.agent=Apache Archiva/${project.version}
archiva.version=${project.version}
archiva.buildNumber=${buildNumber}
-archiva.timestamp=${timestamp}
+archiva.timestamp=${timestamp}
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1582199&r1=1582198&r2=1582199&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Thu Mar 27
06:02:01 2014
@@ -42,6 +42,7 @@
<test.useTomcat>false</test.useTomcat>
<archiva.groupIndexTtl>30</archiva.groupIndexTtl>
<archiva.sirona.configuration />
+
<archiva.repositorySessionFactory.id>jcr</archiva.repositorySessionFactory.id>
</properties>
<dependencies>
@@ -124,12 +125,17 @@
<groupId>org.apache.archiva</groupId>
<artifactId>metadata-store-jcr</artifactId>
</dependency>
- <!--
+
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>metadata-store-cassandra</artifactId>
</dependency>
- -->
+
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>metadata-store-file</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
@@ -1005,6 +1011,7 @@
<archiva.logMissingI18n>${archiva.logMissingI18n}</archiva.logMissingI18n>
<cassandra.host>localhost</cassandra.host>
<cassandra.port>9160</cassandra.port>
+
<archiva.repositorySessionFactory.id>${archiva.repositorySessionFactory.id}</archiva.repositorySessionFactory.id>
<org.apache.sirona.configuration.sirona.properties>${archiva.sirona.configuration}</org.apache.sirona.configuration.sirona.properties>
</systemProperties>
<additionalClasspathDirs>
@@ -1090,4 +1097,13 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>cassandra</id>
+ <properties>
+
<archiva.repositorySessionFactory.id>cassandra</archiva.repositorySessionFactory.id>
+ </properties>
+ </profile>
+ </profiles>
+
</project>
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=1582199&r1=1582198&r2=1582199&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
Thu Mar 27 06:02:01 2014
@@ -20,26 +20,29 @@
<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:task="http://www.springframework.org/schema/task";
+ xmlns:task="http://www.springframework.org/schema/task";
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/task
- http://www.springframework.org/schema/task/spring-task-3.0.xsd";>
+ http://www.springframework.org/schema/task/spring-task-3.0.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util.xsd";>
- <context:property-placeholder location="classpath:application.properties"/>
+ <context:property-placeholder location="classpath:application.properties" />
<alias name="userConfiguration#archiva" alias="userConfiguration#default" />
<alias name="authorizer#rbac" alias="authorizer#default"/>
<alias name="repositoryStatisticsManager#default"
alias="repositoryStatisticsManager"/>
- <!-- TODO olamy need to find a more dynamic way if using jcr impl -->
- <alias name="repositorySessionFactory#jcr" alias="repositorySessionFactory"/>
- <!--
- <alias name="repositorySessionFactory#cassandra"
alias="repositorySessionFactory"/>
- -->
+ <!-- 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"/>
