Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
ids-server.1.8.0-patched
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Jira
Jira
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ICAT
ids-server.1.8.0-patched
Commits
30941a1c
Commit
30941a1c
authored
Jun 06, 2019
by
Alejandro De Maria Antolinos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#1
parent
b5e171c1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
69 additions
and
3 deletions
+69
-3
deploy.sh
deploy.sh
+3
-0
run.properties
run.properties
+52
-0
setup.properties
setup.properties
+8
-0
src/main/java/org/icatproject/ids/IdsBean.java
src/main/java/org/icatproject/ids/IdsBean.java
+6
-3
No files found.
deploy.sh
0 → 100755
View file @
30941a1c
mvn package
-Dmaven
.test.skip
&&
cd
target/
&&
unzip ids.server-1.8.0-patched-distro.zip
&&
cd
ids.server
&&
cp
../../
*
properties
.
&&
python setup
install
&&
cd
..
&&
cd
..
run.properties
0 → 100644
View file @
30941a1c
# General properties
icat.url
=
https://icat.esrf.fr
plugin.zipMapper.class
=
org.icatproject.ids.storage.esrf.ZipMapper
# Properties for main storage
plugin.main.class
=
org.icatproject.ids.storage.esrf.MainFileStorage
plugin.main.dir
=
/data/icat/main
plugin.main.icat.url
=
https://icat.esrf.fr
plugin.main.icat.user
=
admin
plugin.main.icat.password
=
1dM!n
plugin.main.icat.auth
=
db
cache.dir
=
/data/icat/cache
# Ids server settings
preparedCount
=
10000
processQueueIntervalSeconds
=
5
rootUserNames
=
root
sizeCheckIntervalSeconds
=
60
reader
=
db username admin password 1dM!n
!readOnly = true
maxIdsInQuery
=
1000
# Properties for archive storage
plugin.archive.class
=
org.icatproject.ids.storage.esrf.ArchiveFileStorage
plugin.archive.dir
=
/data/iti/restored
plugin.archive.queue_out_tmp
=
/data/iti/outq/tmp
plugin.archive.queue_out_wait
=
/data/iti/outq/wait
plugin.archive.restoration_time_out
=
86400
writeDelaySeconds
=
60
startArchivingLevel1024bytes
=
5000000
stopArchivingLevel1024bytes
=
4000000
storageUnit
=
dataset
tidyBlockSize
=
500
# File checking properties
filesCheck.parallelCount
=
0
filesCheck.gapSeconds
=
5
filesCheck.lastIdFile
=
/tmp/ids/lastIdFile
filesCheck.errorLog
=
/tmp/ids/errorLog
# Link properties
linkLifetimeSeconds
=
3600
# JMS Logging
log.list
=
READ WRITE INFO LINK MIGRATE PREPARE
# JMS - uncomment and edit if needed
!jms.topicConnectionFactory = java:comp/DefaultJMSConnectionFactory
setup.properties
0 → 100644
View file @
30941a1c
# Glassfish
secure
=
false
container
=
Glassfish
home
=
/opt2/glassfish4
port
=
4848
# Any libraries needed (space separated list of jars in domain's lib/applibs
libraries
=
ids.storage_esrf-1.8.0.jar
src/main/java/org/icatproject/ids/IdsBean.java
View file @
30941a1c
...
...
@@ -217,22 +217,25 @@ public class IdsBean {
String
entryName
=
zipMapper
.
getFullEntryName
(
dsInfo
,
dfInfo
);
InputStream
stream
=
null
;
try
{
zos
.
putNextEntry
(
new
ZipEntry
(
entryName
));
if
(
new
File
(
dfInfo
.
getDfLocation
()).
exists
()){
//System.out.println("Main path: " + mainStorage.getPath(dfInfo.getDfLocation(), dfInfo.getCreateId(), dfInfo.getModId()));
if
(
new
File
(
dfInfo
.
getDfLocation
()).
exists
()
||
mainStorage
.
exists
(
dsInfo
)){
zos
.
putNextEntry
(
new
ZipEntry
(
entryName
));
stream
=
mainStorage
.
get
(
dfInfo
.
getDfLocation
(),
dfInfo
.
getCreateId
(),
dfInfo
.
getModId
());
int
length
;
while
((
length
=
stream
.
read
(
bytes
))
>=
0
)
{
zos
.
write
(
bytes
,
0
,
length
);
}
zos
.
closeEntry
();
}
else
{
System
.
out
.
println
(
"File does not exist: "
+
dfInfo
.
getDfLocation
());
missingFiles
.
add
(
dfInfo
.
getDfLocation
());
}
}
catch
(
ZipException
e
)
{
e
.
printStackTrace
();
logger
.
debug
(
"Skipped duplicate"
);
}
zos
.
closeEntry
();
if
(
stream
!=
null
)
{
stream
.
close
();
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment