hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 23:13:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Handle server version.

Browse Source
This commit is contained in:
Ian Little
2019-03-29 10:42:38 -04:00
parent d25463fedb
commit d17a9072d4
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dspace-api/pom.xml
View File

@@ -452,11 +452,11 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId> <artifactId>bcprov-jdk15on</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcmail-jdk15</artifactId> <artifactId>bcmail-jdk15on</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>

2
dspace-api/src/main/java/org/dspace/handle/HandlePlugin.java
View File

@@ -20,7 +20,7 @@ import net.handle.hdllib.HandleStorage;
import net.handle.hdllib.HandleValue; import net.handle.hdllib.HandleValue;
import net.handle.hdllib.ScanCallback; import net.handle.hdllib.ScanCallback;
import net.handle.hdllib.Util; import net.handle.hdllib.Util;
import net.handle.util.StreamTable; import net.cnri.util.StreamTable;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.dspace.core.Context; import org.dspace.core.Context;
import org.dspace.handle.factory.HandleServiceFactory; import org.dspace.handle.factory.HandleServiceFactory;

17
dspace/bin/make-handle-config
View File

@@ -26,13 +26,13 @@ tempfile=/tmp/handleconfig$$
contactemail=`$BINDIR/dspace dsprop --property mail.admin` contactemail=`$BINDIR/dspace dsprop --property mail.admin`
# Write the options to a file we can pipe into the setup tool # Write the options to a file we can pipe into the setup tool
echo "1" >$tempfile # 1 = non-caching server, 2 = caching server echo "" >$tempfile # Primary server? Default = y (n = mirror server)
echo "" >>$tempfile # Primary server? Default = y (n = mirror server) echo "" >>$tempfile # Dual-stack (IPv4 and IPv6)? (default=n)
echo $dshostip >>$tempfile # IP address echo $dshostip >>$tempfile # IP address
echo "" >>$tempfile # DBind address (default=same as IP)
echo "" >>$tempfile # Port to listen to (default=2641) echo "" >>$tempfile # Port to listen to (default=2641)
echo "" >>$tempfile # Port for HTTP i/f to listen to (default=8000) echo "" >>$tempfile # Port for HTTP i/f to listen to (default=8000)
echo "" >>$tempfile # Log all accesses? ("y" or "n", default=n) echo "n" >>$tempfile # Log all accesses? ("y" or "n", default=y)
echo "" >>$tempfile # Rotate logs? (default=No)
echo "" >>$tempfile # Version/serial no. of site (default=1) echo "" >>$tempfile # Version/serial no. of site (default=1)
echo $dsname Handle Server >>$tempfile # Server description echo $dsname Handle Server >>$tempfile # Server description
echo $dsname >>$tempfile # Server descriptive name echo $dsname >>$tempfile # Server descriptive name
@@ -53,16 +53,17 @@ rm -f $tempfile
# Now update server configuration (config.dct) with our handle prefix and the # Now update server configuration (config.dct) with our handle prefix and the
# DSpace Handle plugin # DSpace Handle plugin
sed 's/YOUR_NAMING_AUTHORITY/'$handle'/' <$handledir/config.dct >$tempfile sed 's/YOUR_PREFIX/'$handle'/' <$handledir/config.dct >$tempfile
# Remove original config file - will replace # Remove original config file - will replace
rm -f $handledir/config.dct rm -f $handledir/config.dct
# Insert our HandlePlugin - this awk script inserts these lines in the # Insert our HandlePlugin and turn off transaction queue.
# server_config section: # This awk script inserts these lines in the server_config section:
# "storage_type" = "CUSTOM" # "storage_type" = "CUSTOM"
# "storage_class" = "org.dspace.handle.HandlePlugin" # "storage_class" = "org.dspace.handle.HandlePlugin"
awk '/.*/ {print $0} /"server_config" = {/ {printf "\"storage_type\" = \"CUSTOM\"\n\"storage_class\" = \"org.dspace.handle.HandlePlugin\"\n\n",$0}' <$tempfile >$handledir/config.dct # "enable_txn_queue" = "n"
awk '/.*/ {print $0} /"server_config" = {/ {printf "\"storage_type\" = \"CUSTOM\"\n\"storage_class\" = \"org.dspace.handle.HandlePlugin\"\n\"enable_txn_queue\" = \"no\"\n\n",$0}' <$tempfile >$handledir/config.dct
#sed 's/"server_config" = {/"server_config" = {\n"storage_type" = "CUSTOM"\n"storage_class" = "org.dspace.handle.HandlePlugin"/' <$tempfile >$handledir/config.dct #sed 's/"server_config" = {/"server_config" = {\n"storage_type" = "CUSTOM"\n"storage_class" = "org.dspace.handle.HandlePlugin"/' <$tempfile >$handledir/config.dct

10
pom.xml
View File

@@ -1126,7 +1126,7 @@
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>handle</artifactId> <artifactId>handle</artifactId>
<version>6.2</version> <version>9.1.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
@@ -1289,13 +1289,13 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId> <artifactId>bcprov-jdk15on</artifactId>
<version>1.46</version> <version>1.59</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcmail-jdk15</artifactId> <artifactId>bcmail-jdk15on</artifactId>
<version>1.46</version> <version>1.59</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>