|
3 | 3 | xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
4 | 4 | xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd" default-lazy-init="true"> |
5 | 5 |
|
6 | | - <bean name="org.dspace.storage.bitstore.BitstreamStorageService" class="org.dspace.storage.bitstore.SyncBitstreamStorageServiceImpl"> |
| 6 | + <bean name="org.dspace.storage.bitstore.BitstreamStorageService" class="org.dspace.storage.bitstore.BitstreamStorageServiceImpl"> |
7 | 7 | <property name="incoming" value="${assetstore.index.primary}"/> |
8 | 8 | <property name="stores"> |
9 | 9 | <map> |
|
17 | 17 | <property name="baseDir" value="${assetstore.dir}"/> |
18 | 18 | </bean> |
19 | 19 |
|
20 | | -<!-- <bean name="s3Store" class="org.dspace.storage.bitstore.S3BitStoreService" scope="singleton" lazy-init="true">--> |
21 | | -<!-- <property name="enabled" value="${assetstore.s3.enabled}"/>--> |
22 | | -<!-- <!– AWS Security credentials, with policies for specified bucket –>--> |
23 | | -<!-- <property name="awsAccessKey" value="${assetstore.s3.awsAccessKey}"/>--> |
24 | | -<!-- <property name="awsSecretKey" value="${assetstore.s3.awsSecretKey}"/>--> |
25 | | -<!-- <property name="useRelativePath" value="${assetstore.s3.useRelativePath}"/>--> |
| 20 | + <bean name="s3Store" class="org.dspace.storage.bitstore.S3BitStoreService" scope="singleton" lazy-init="true"> |
| 21 | + <property name="enabled" value="${assetstore.s3.enabled}"/> |
| 22 | + <!-- AWS Security credentials, with policies for specified bucket --> |
| 23 | + <property name="awsAccessKey" value="${assetstore.s3.awsAccessKey}"/> |
| 24 | + <property name="awsSecretKey" value="${assetstore.s3.awsSecretKey}"/> |
| 25 | + <property name="useRelativePath" value="${assetstore.s3.useRelativePath}"/> |
26 | 26 |
|
27 | | -<!-- <!– S3 bucket name to store assets in. example: longsight-dspace-auk –>--> |
28 | | -<!-- <property name="bucketName" value="${assetstore.s3.bucketName}"/>--> |
| 27 | + <!-- S3 bucket name to store assets in. example: longsight-dspace-auk --> |
| 28 | + <property name="bucketName" value="${assetstore.s3.bucketName}"/> |
29 | 29 |
|
30 | | -<!-- <!– AWS S3 Region to use: {us-east-1, us-west-1, eu-west-1, eu-central-1, ap-southeast-1, ... } –>--> |
31 | | -<!-- <!– Optional, sdk default is us-east-1 –>--> |
32 | | -<!-- <property name="awsRegionName" value="${assetstore.s3.awsRegionName}"/>--> |
| 30 | + <!-- AWS S3 Region to use: {us-east-1, us-west-1, eu-west-1, eu-central-1, ap-southeast-1, ... } --> |
| 31 | + <!-- Optional, sdk default is us-east-1 --> |
| 32 | + <property name="awsRegionName" value="${assetstore.s3.awsRegionName}"/> |
33 | 33 |
|
34 | | -<!-- <!– Subfolder to organize assets within the bucket, in case this bucket is shared –>--> |
35 | | -<!-- <!– Optional, default is root level of bucket –>--> |
36 | | -<!-- <property name="subfolder" value="${assetstore.s3.subfolder}"/>--> |
| 34 | + <!-- Subfolder to organize assets within the bucket, in case this bucket is shared --> |
| 35 | + <!-- Optional, default is root level of bucket --> |
| 36 | + <property name="subfolder" value="${assetstore.s3.subfolder}"/> |
37 | 37 |
|
38 | | -<!--<!– Endpoint for other S3 providers than amazon AWS–>--> |
39 | | -<!-- <property name="endpoint" value="${assetstore.s3.endpoint}"/>--> |
40 | | -<!-- <property name="pathStyleAccessEnabled" value="${assetstore.s3.pathStyleAccessEnabled}"/>--> |
41 | | -<!-- </bean>--> |
| 38 | +<!-- Endpoint for other S3 providers than amazon AWS--> |
| 39 | + <property name="endpoint" value="${assetstore.s3.endpoint}"/> |
| 40 | + <property name="pathStyleAccessEnabled" value="${assetstore.s3.pathStyleAccessEnabled}"/> |
| 41 | + </bean> |
42 | 42 |
|
43 | 43 |
|
44 | 44 | <bean name="s3DirectDownload" class="org.dspace.storage.bitstore.S3DirectDownloadServiceImpl"/> |
|
0 commit comments