Skip to content

Commit 2997a2f

Browse files
committed
Do not use SyncBitstorageService
1 parent fb76ff4 commit 2997a2f

1 file changed

Lines changed: 19 additions & 19 deletions

File tree

dspace/config/spring/api/bitstore.xml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd" default-lazy-init="true">
55

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">
77
<property name="incoming" value="${assetstore.index.primary}"/>
88
<property name="stores">
99
<map>
@@ -17,28 +17,28 @@
1717
<property name="baseDir" value="${assetstore.dir}"/>
1818
</bean>
1919

20-
<!-- <bean name="s3Store" class="org.dspace.storage.bitstore.S3BitStoreService" scope="singleton" lazy-init="true">-->
21-
<!-- <property name="enabled" value="${assetstore.s3.enabled}"/>-->
22-
<!-- &lt;!&ndash; AWS Security credentials, with policies for specified bucket &ndash;&gt;-->
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}"/>
2626

27-
<!-- &lt;!&ndash; S3 bucket name to store assets in. example: longsight-dspace-auk &ndash;&gt;-->
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}"/>
2929

30-
<!-- &lt;!&ndash; AWS S3 Region to use: {us-east-1, us-west-1, eu-west-1, eu-central-1, ap-southeast-1, ... } &ndash;&gt;-->
31-
<!-- &lt;!&ndash; Optional, sdk default is us-east-1 &ndash;&gt;-->
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}"/>
3333

34-
<!-- &lt;!&ndash; Subfolder to organize assets within the bucket, in case this bucket is shared &ndash;&gt;-->
35-
<!-- &lt;!&ndash; Optional, default is root level of bucket &ndash;&gt;-->
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}"/>
3737

38-
<!--&lt;!&ndash; Endpoint for other S3 providers than amazon AWS&ndash;&gt;-->
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>
4242

4343

4444
<bean name="s3DirectDownload" class="org.dspace.storage.bitstore.S3DirectDownloadServiceImpl"/>

0 commit comments

Comments
 (0)