Skip to content
GitLab
Explore
Sign in
Marco Molinaro
tap_schema_manager
Compare revisions
26184ca4ad84c38618b344ec406aac94468ef84a to 93bb5141cbb820796a07aacb049b8269cdf93cd0
Commits on Source (2)
Installer build improvements
· 644b2ade
Sonia Zorba
authored
Mar 11, 2021
644b2ade
openLoaded method NPE check
· 93bb5141
Sonia Zorba
authored
Mar 11, 2021
93bb5141
Show whitespace changes
Inline
Side-by-side
TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/TapSchemaLoader.java
View file @
93bb5141
...
@@ -184,6 +184,12 @@ public class TapSchemaLoader implements Serializable {
...
@@ -184,6 +184,12 @@ public class TapSchemaLoader implements Serializable {
}
}
public
String
openLoaded
()
{
public
String
openLoaded
()
{
if
(
loadedTapSchema
==
null
)
{
throw
new
IllegalStateException
(
"Attempted to access a TAP_SCHEMA not loaded yet. "
+
"This may be caused by an error on frontend or a browser cache issue."
);
}
ConsistencyChecks
checks
=
loadedTapSchema
.
getConsistencyChecks
();
ConsistencyChecks
checks
=
loadedTapSchema
.
getConsistencyChecks
();
if
(
checks
!=
null
&&
(
checks
.
isInconsistent
()
||
checks
.
isHasWarnings
()))
{
if
(
checks
!=
null
&&
(
checks
.
isInconsistent
()
||
checks
.
isHasWarnings
()))
{
consistencyChecksBean
.
setTapSchema
(
loadedTapSchema
);
consistencyChecksBean
.
setTapSchema
(
loadedTapSchema
);
...
...
build.sh
View file @
93bb5141
...
@@ -133,6 +133,8 @@ function build_installer_package {
...
@@ -133,6 +133,8 @@ function build_installer_package {
rm
tasman-webapp.war
rm
tasman-webapp.war
rm
tasman-embedded.jar
rm
tasman-embedded.jar
cp
install_template.sh install.sh
cp
install_template.sh install.sh
config_dir
=
$(
cat
config.properties |
grep
config_directory |
cut
-d
"="
-f2
| xargs
)
sed
-i
"s/__CONFIG_DIR__/
${
config_dir
//\//\\/
}
/g"
install.sh
cat
tasman.tar.gz
>>
install.sh
cat
tasman.tar.gz
>>
install.sh
rm
tasman.tar.gz
rm
tasman.tar.gz
echo
"TASMAN install.sh built"
echo
"TASMAN install.sh built"
...
...
install_template.sh
View file @
93bb5141
...
@@ -73,10 +73,10 @@ if [[ -z "$ucd_service_url" ]]; then
...
@@ -73,10 +73,10 @@ if [[ -z "$ucd_service_url" ]]; then
fi
fi
# TASMAN configuration directory
# TASMAN configuration directory
echo
-e
"Specify TASMAN configuration directory [
/etc/tasman
]:
\c
"
echo
-e
"Specify TASMAN configuration directory [
__CONFIG_DIR__
]:
\c
"
read
tasman_config_dir
read
tasman_config_dir
if
[[
-z
"
$tasman_config_dir
"
]]
;
then
if
[[
-z
"
$tasman_config_dir
"
]]
;
then
tasman_config_dir
=
"
/etc/tasman
"
tasman_config_dir
=
"
__CONFIG_DIR__
"
fi
fi
mkdir
-p
"
$tasman_config_dir
"
mkdir
-p
"
$tasman_config_dir
"
if
[
!
$?
-eq
0
]
;
then
if
[
!
$?
-eq
0
]
;
then
...
...