diff --git a/scripts/rest-clients/export-calendar-exception-types.sh b/scripts/rest-clients/export-calendar-exception-types.sh index 19115f98e..e6ed4b167 100755 --- a/scripts/rest-clients/export-calendar-exception-types.sh +++ b/scripts/rest-clients/export-calendar-exception-types.sh @@ -1,21 +1,3 @@ #!/bin/sh -. ./rest-common-env.sh - -printf "Login name: " -read loginName -printf "Password: " -read password - -if [ "$1" = "--prod" ]; then - baseServiceURL=$PRODUCTION_BASE_SERVICE_URL - certificate=$PRODUCTION_CERTIFICATE -else - baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL - certificate=$DEVELOPMENT_CERTIFICATE -fi - -authorization=`./base64.sh $loginName:$password` - -curl -sv -X GET $certificate --header "Authorization: Basic $authorization" \ - $baseServiceURL/calendarexceptiontypes | tidy -xml -i -q -utf8 +. ./export.sh calendarexceptiontypes $* diff --git a/scripts/rest-clients/export-calendars.sh b/scripts/rest-clients/export-calendars.sh index ceeaa29f2..a04e3a5ee 100755 --- a/scripts/rest-clients/export-calendars.sh +++ b/scripts/rest-clients/export-calendars.sh @@ -1,21 +1,3 @@ #!/bin/sh -. ./rest-common-env.sh - -printf "Login name: " -read loginName -printf "Password: " -read password - -if [ "$1" = "--prod" ]; then - baseServiceURL=$PRODUCTION_BASE_SERVICE_URL - certificate=$PRODUCTION_CERTIFICATE -else - baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL - certificate=$DEVELOPMENT_CERTIFICATE -fi - -authorization=`./base64.sh $loginName:$password` - -curl -sv -X GET $certificate --header "Authorization: Basic $authorization" \ - $baseServiceURL/calendars | tidy -xml -i -q -utf8 +. ./export.sh calendars $* diff --git a/scripts/rest-clients/export-cost-categories.sh b/scripts/rest-clients/export-cost-categories.sh index 5d1b9b866..a0645d5ae 100755 --- a/scripts/rest-clients/export-cost-categories.sh +++ b/scripts/rest-clients/export-cost-categories.sh @@ -1,21 +1,3 @@ #!/bin/sh -. ./rest-common-env.sh - -printf "Login name: " -read loginName -printf "Password: " -read password - -if [ "$1" = "--prod" ]; then - baseServiceURL=$PRODUCTION_BASE_SERVICE_URL - certificate=$PRODUCTION_CERTIFICATE -else - baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL - certificate=$DEVELOPMENT_CERTIFICATE -fi - -authorization=`./base64.sh $loginName:$password` - -curl -sv -X GET $certificate --header "Authorization: Basic $authorization" \ - $baseServiceURL/costcategories | tidy -xml -i -q -utf8 +. ./export.sh costcategories $* diff --git a/scripts/rest-clients/export-criterion-types.sh b/scripts/rest-clients/export-criterion-types.sh index 548829b1f..5db4a777d 100755 --- a/scripts/rest-clients/export-criterion-types.sh +++ b/scripts/rest-clients/export-criterion-types.sh @@ -1,21 +1,3 @@ #!/bin/sh -. ./rest-common-env.sh - -printf "Login name: " -read loginName -printf "Password: " -read password - -if [ "$1" = "--prod" ]; then - baseServiceURL=$PRODUCTION_BASE_SERVICE_URL - certificate=$PRODUCTION_CERTIFICATE -else - baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL - certificate=$DEVELOPMENT_CERTIFICATE -fi - -authorization=`./base64.sh $loginName:$password` - -curl -sv -X GET $certificate --header "Authorization: Basic $authorization" \ - $baseServiceURL/criteriontypes | tidy -xml -i -q -utf8 +. ./export.sh criteriontypes $* diff --git a/scripts/rest-clients/export-label-types.sh b/scripts/rest-clients/export-label-types.sh index db13ac6b8..a3afbf65a 100755 --- a/scripts/rest-clients/export-label-types.sh +++ b/scripts/rest-clients/export-label-types.sh @@ -1,21 +1,3 @@ #!/bin/sh -. ./rest-common-env.sh - -printf "Login name: " -read loginName -printf "Password: " -read password - -if [ "$1" = "--prod" ]; then - baseServiceURL=$PRODUCTION_BASE_SERVICE_URL - certificate=$PRODUCTION_CERTIFICATE -else - baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL - certificate=$DEVELOPMENT_CERTIFICATE -fi - -authorization=`./base64.sh $loginName:$password` - -curl -sv -X GET $certificate --header "Authorization: Basic $authorization" \ - $baseServiceURL/labels | tidy -xml -i -q -utf8 +. ./export.sh labels $* diff --git a/scripts/rest-clients/export-material-categories.sh b/scripts/rest-clients/export-material-categories.sh index fdd242d5a..1a8ef07ba 100755 --- a/scripts/rest-clients/export-material-categories.sh +++ b/scripts/rest-clients/export-material-categories.sh @@ -1,21 +1,3 @@ #!/bin/sh -. ./rest-common-env.sh - -printf "Login name: " -read loginName -printf "Password: " -read password - -if [ "$1" = "--prod" ]; then - baseServiceURL=$PRODUCTION_BASE_SERVICE_URL - certificate=$PRODUCTION_CERTIFICATE -else - baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL - certificate=$DEVELOPMENT_CERTIFICATE -fi - -authorization=`./base64.sh $loginName:$password` - -curl -sv -X GET $certificate --header "Authorization: Basic $authorization" \ - $baseServiceURL/materialcategories | tidy -xml -i -q -utf8 +. ./export.sh materialcategories $* diff --git a/scripts/rest-clients/export-orders.sh b/scripts/rest-clients/export-orders.sh index f98c97e4c..677a0e08c 100755 --- a/scripts/rest-clients/export-orders.sh +++ b/scripts/rest-clients/export-orders.sh @@ -1,21 +1,3 @@ #!/bin/sh -. ./rest-common-env.sh - -printf "Login name: " -read loginName -printf "Password: " -read password - -if [ "$1" = "--prod" ]; then - baseServiceURL=$PRODUCTION_BASE_SERVICE_URL - certificate=$PRODUCTION_CERTIFICATE -else - baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL - certificate=$DEVELOPMENT_CERTIFICATE -fi - -authorization=`./base64.sh $loginName:$password` - -curl -sv -X GET $certificate --header "Authorization: Basic $authorization" \ - $baseServiceURL/orderelements/ | tidy -xml -i -q -utf8 +. ./export.sh orderelements $* diff --git a/scripts/rest-clients/export-resources-hours.sh b/scripts/rest-clients/export-resources-hours.sh index ee59d913f..e6be9ccb9 100755 --- a/scripts/rest-clients/export-resources-hours.sh +++ b/scripts/rest-clients/export-resources-hours.sh @@ -7,8 +7,8 @@ read loginName printf "Password: " read password -baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL -certificate=$DEVELOPMENT_CERTIFICATE +baseServiceURL=$DEMO_BASE_SERVICE_URL +certificate=$DEMO_CERTIFICATE if [ "$1" = "--prod" ]; then baseServiceURL=$PRODUCTION_BASE_SERVICE_URL @@ -21,6 +21,17 @@ if [ "$1" = "--prod" ]; then startDate=$2 endDate=$3 fi +elif [ "$1" = "--dev" ]; then + baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL + certificate=$DEVELOPMENT_CERTIFICATE + if [ "$#" = 4 ]; then + resourceCode=$2 + startDate=$3 + endDate=$4 + else + startDate=$2 + endDate=$3 + fi else if [ "$#" = 3 ]; then resourceCode=$1 diff --git a/scripts/rest-clients/export-resources.sh b/scripts/rest-clients/export-resources.sh index 62a830d96..d6e83617f 100755 --- a/scripts/rest-clients/export-resources.sh +++ b/scripts/rest-clients/export-resources.sh @@ -2,20 +2,4 @@ . ./rest-common-env.sh -printf "Login name: " -read loginName -printf "Password: " -read password - -if [ "$1" = "--prod" ]; then - baseServiceURL=$PRODUCTION_BASE_SERVICE_URL - certificate=$PRODUCTION_CERTIFICATE -else - baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL - certificate=$DEVELOPMENT_CERTIFICATE -fi - -authorization=`./base64.sh $loginName:$password` - -curl -sv -X GET $certificate --header "Authorization: Basic $authorization" \ - $baseServiceURL/resources | tidy -xml -i -q -utf8 +. ./export.sh resources $* diff --git a/scripts/rest-clients/export-type-work-hours.sh b/scripts/rest-clients/export-type-work-hours.sh index a8d966bb1..41f809cb4 100755 --- a/scripts/rest-clients/export-type-work-hours.sh +++ b/scripts/rest-clients/export-type-work-hours.sh @@ -2,20 +2,4 @@ . ./rest-common-env.sh -printf "Login name: " -read loginName -printf "Password: " -read password - -if [ "$1" = "--prod" ]; then - baseServiceURL=$PRODUCTION_BASE_SERVICE_URL - certificate=$PRODUCTION_CERTIFICATE -else - baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL - certificate=$DEVELOPMENT_CERTIFICATE -fi - -authorization=`./base64.sh $loginName:$password` - -curl -sv -X GET $certificate --header "Authorization: Basic $authorization" \ - $baseServiceURL/typeofworkhours | tidy -xml -i -q -utf8 +. ./export.sh typeofworkhours $* diff --git a/scripts/rest-clients/export-unit-types.sh b/scripts/rest-clients/export-unit-types.sh index b721d9b57..efc107006 100755 --- a/scripts/rest-clients/export-unit-types.sh +++ b/scripts/rest-clients/export-unit-types.sh @@ -1,21 +1,3 @@ #!/bin/sh -. ./rest-common-env.sh - -printf "Login name: " -read loginName -printf "Password: " -read password - -if [ "$1" = "--prod" ]; then - baseServiceURL=$PRODUCTION_BASE_SERVICE_URL - certificate=$PRODUCTION_CERTIFICATE -else - baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL - certificate=$DEVELOPMENT_CERTIFICATE -fi - -authorization=`./base64.sh $loginName:$password` - -curl -sv -X GET $certificate --header "Authorization: Basic $authorization" \ - $baseServiceURL/unittypes | tidy -xml -i -q -utf8 +. ./export.sh unittypes $* diff --git a/scripts/rest-clients/export-work-reports.sh b/scripts/rest-clients/export-work-reports.sh index 8373d6985..67b6624fd 100755 --- a/scripts/rest-clients/export-work-reports.sh +++ b/scripts/rest-clients/export-work-reports.sh @@ -1,21 +1,3 @@ #!/bin/sh -. ./rest-common-env.sh - -printf "Login name: " -read loginName -printf "Password: " -read password - -if [ "$1" = "--prod" ]; then - baseServiceURL=$PRODUCTION_BASE_SERVICE_URL - certificate=$PRODUCTION_CERTIFICATE -else - baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL - certificate=$DEVELOPMENT_CERTIFICATE -fi - -authorization=`./base64.sh $loginName:$password` - -curl -sv -X GET $certificate --header "Authorization: Basic $authorization" \ - $baseServiceURL/workreports | tidy -xml -i -q -utf8 +. ./export.sh workreports $* diff --git a/scripts/rest-clients/export.sh b/scripts/rest-clients/export.sh new file mode 100755 index 000000000..6747ce5f1 --- /dev/null +++ b/scripts/rest-clients/export.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +. ./rest-common-env.sh + +printf "Login name: " +read loginName +printf "Password: " +read password + +if [ "$2" = "--prod" ]; then + baseServiceURL=$PRODUCTION_BASE_SERVICE_URL + certificate=$PRODUCTION_CERTIFICATE +elif [ "$2" = "--dev" ]; then + baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL + certificate=$DEVELOPMENT_CERTIFICATE +else + baseServiceURL=$DEMO_BASE_SERVICE_URL + certificate=$DEMO_CERTIFICATE +fi + +authorization=`./base64.sh $loginName:$password` + +curl -sv -X GET $certificate --header "Authorization: Basic $authorization" \ + $baseServiceURL/$1 | tidy -xml -i -q -utf8 diff --git a/scripts/rest-clients/import-calendar-exception-types.sh b/scripts/rest-clients/import-calendar-exception-types.sh index e15cd20b5..f87c8acd1 100755 --- a/scripts/rest-clients/import-calendar-exception-types.sh +++ b/scripts/rest-clients/import-calendar-exception-types.sh @@ -1,33 +1,3 @@ #!/bin/sh -. ./rest-common-env.sh - -printf "Login name: " -read loginName -printf "Password: " -read password - -baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL -certificate=$DEVELOPMENT_CERTIFICATE - -for i in "$@" -do - if [ "$i" = "--prod" ]; then - baseServiceURL=$PRODUCTION_BASE_SERVICE_URL - certificate=$PRODUCTION_CERTIFICATE - else - file=$i - fi -done - -if [ "$file" = "" ]; then - printf "Missing file\n" 1>&2 - exit 1 -fi - -authorization=`./base64.sh $loginName:$password` - -curl -sv -X POST $certificate -d @$file \ - --header "Content-type: application/xml" \ - --header "Authorization: Basic $authorization" \ - $baseServiceURL/calendarexceptiontypes | tidy -xml -i -q -utf8 +. ./import.sh calendarexceptiontypes $* diff --git a/scripts/rest-clients/import-calendars.sh b/scripts/rest-clients/import-calendars.sh index c3e707963..c675967c3 100755 --- a/scripts/rest-clients/import-calendars.sh +++ b/scripts/rest-clients/import-calendars.sh @@ -1,33 +1,3 @@ #!/bin/sh -. ./rest-common-env.sh - -printf "Login name: " -read loginName -printf "Password: " -read password - -baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL -certificate=$DEVELOPMENT_CERTIFICATE - -for i in "$@" -do - if [ "$i" = "--prod" ]; then - baseServiceURL=$PRODUCTION_BASE_SERVICE_URL - certificate=$PRODUCTION_CERTIFICATE - else - file=$i - fi -done - -if [ "$file" = "" ]; then - printf "Missing file\n" 1>&2 - exit 1 -fi - -authorization=`./base64.sh $loginName:$password` - -curl -sv -X POST $certificate -d @$file \ - --header "Content-type: application/xml" \ - --header "Authorization: Basic $authorization" \ - $baseServiceURL/calendars | tidy -xml -i -q -utf8 +. ./import.sh calendars $* diff --git a/scripts/rest-clients/import-cost-categories.sh b/scripts/rest-clients/import-cost-categories.sh index 470f492b6..9415e0e02 100755 --- a/scripts/rest-clients/import-cost-categories.sh +++ b/scripts/rest-clients/import-cost-categories.sh @@ -1,33 +1,3 @@ #!/bin/sh -. ./rest-common-env.sh - -printf "Login name: " -read loginName -printf "Password: " -read password - -baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL -certificate=$DEVELOPMENT_CERTIFICATE - -for i in "$@" -do - if [ "$i" = "--prod" ]; then - baseServiceURL=$PRODUCTION_BASE_SERVICE_URL - certificate=$PRODUCTION_CERTIFICATE - else - file=$i - fi -done - -if [ "$file" = "" ]; then - printf "Missing file\n" 1>&2 - exit 1 -fi - -authorization=`./base64.sh $loginName:$password` - -curl -sv -X POST $certificate -d @$file \ - --header "Content-type: application/xml" \ - --header "Authorization: Basic $authorization" \ - $baseServiceURL/costcategories | tidy -xml -i -q -utf8 +. ./import.sh costcategories $* diff --git a/scripts/rest-clients/import-criterions-types.sh b/scripts/rest-clients/import-criterions-types.sh index 2b189484a..c6621bdbb 100755 --- a/scripts/rest-clients/import-criterions-types.sh +++ b/scripts/rest-clients/import-criterions-types.sh @@ -1,33 +1,3 @@ #!/bin/sh -. ./rest-common-env.sh - -printf "Login name: " -read loginName -printf "Password: " -read password - -baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL -certificate=$DEVELOPMENT_CERTIFICATE - -for i in "$@" -do - if [ "$i" = "--prod" ]; then - baseServiceURL=$PRODUCTION_BASE_SERVICE_URL - certificate=$PRODUCTION_CERTIFICATE - else - file=$i - fi -done - -if [ "$file" = "" ]; then - printf "Missing file\n" 1>&2 - exit 1 -fi - -authorization=`./base64.sh $loginName:$password` - -curl -sv -X POST $certificate -d @$file \ - --header "Content-type: application/xml" \ - --header "Authorization: Basic $authorization" \ - $baseServiceURL/criteriontypes | tidy -xml -i -q -utf8 +. ./import.sh criteriontypes $* diff --git a/scripts/rest-clients/import-label-types.sh b/scripts/rest-clients/import-label-types.sh index 8f9db5666..7533f9c29 100755 --- a/scripts/rest-clients/import-label-types.sh +++ b/scripts/rest-clients/import-label-types.sh @@ -1,33 +1,3 @@ #!/bin/sh -. ./rest-common-env.sh - -printf "Login name: " -read loginName -printf "Password: " -read password - -baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL -certificate=$DEVELOPMENT_CERTIFICATE - -for i in "$@" -do - if [ "$i" = "--prod" ]; then - baseServiceURL=$PRODUCTION_BASE_SERVICE_URL - certificate=$PRODUCTION_CERTIFICATE - else - file=$i - fi -done - -if [ "$file" = "" ]; then - printf "Missing file\n" 1>&2 - exit 1 -fi - -authorization=`./base64.sh $loginName:$password` - -curl -sv -X POST $certificate -d @$file \ - --header "Content-type: application/xml" \ - --header "Authorization: Basic $authorization" \ - $baseServiceURL/labels | tidy -xml -i -q -utf8 +. ./import.sh labels $* diff --git a/scripts/rest-clients/import-material-categories.sh b/scripts/rest-clients/import-material-categories.sh index 91419197c..7f9cb1539 100755 --- a/scripts/rest-clients/import-material-categories.sh +++ b/scripts/rest-clients/import-material-categories.sh @@ -1,33 +1,3 @@ #!/bin/sh -. ./rest-common-env.sh - -printf "Login name: " -read loginName -printf "Password: " -read password - -baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL -certificate=$DEVELOPMENT_CERTIFICATE - -for i in "$@" -do - if [ "$i" = "--prod" ]; then - baseServiceURL=$PRODUCTION_BASE_SERVICE_URL - certificate=$PRODUCTION_CERTIFICATE - else - file=$i - fi -done - -if [ "$file" = "" ]; then - printf "Missing file\n" 1>&2 - exit 1 -fi - -authorization=`./base64.sh $loginName:$password` - -curl -sv -X POST $certificate -d @$file \ - --header "Content-type: application/xml" \ - --header "Authorization: Basic $authorization" \ - $baseServiceURL/materialcategories | tidy -xml -i -q -utf8 +. ./import.sh materialcategories $* diff --git a/scripts/rest-clients/import-orders.sh b/scripts/rest-clients/import-orders.sh index 7087dc56d..0164f4bac 100755 --- a/scripts/rest-clients/import-orders.sh +++ b/scripts/rest-clients/import-orders.sh @@ -1,33 +1,3 @@ #!/bin/sh -. ./rest-common-env.sh - -printf "Login name: " -read loginName -printf "Password: " -read password - -baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL -certificate=$DEVELOPMENT_CERTIFICATE - -for i in "$@" -do - if [ "$i" = "--prod" ]; then - baseServiceURL=$PRODUCTION_BASE_SERVICE_URL - certificate=$PRODUCTION_CERTIFICATE - else - file=$i - fi -done - -if [ "$file" = "" ]; then - printf "Missing file\n" 1>&2 - exit 1 -fi - -authorization=`./base64.sh $loginName:$password` - -curl -sv -X POST $certificate -d @$file \ - --header "Content-type: application/xml" \ - --header "Authorization: Basic $authorization" \ - $baseServiceURL/orderelements/ | tidy -xml -i -q -utf8 +. ./import.sh orderelements $* diff --git a/scripts/rest-clients/import-resources.sh b/scripts/rest-clients/import-resources.sh index e1d9c7323..ba59f5b6d 100755 --- a/scripts/rest-clients/import-resources.sh +++ b/scripts/rest-clients/import-resources.sh @@ -1,33 +1,3 @@ #!/bin/sh -. ./rest-common-env.sh - -printf "Login name: " -read loginName -printf "Password: " -read password - -baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL -certificate=$DEVELOPMENT_CERTIFICATE - -for i in "$@" -do - if [ "$i" = "--prod" ]; then - baseServiceURL=$PRODUCTION_BASE_SERVICE_URL - certificate=$PRODUCTION_CERTIFICATE - else - file=$i - fi -done - -if [ "$file" = "" ]; then - printf "Missing file\n" 1>&2 - exit 1 -fi - -authorization=`./base64.sh $loginName:$password` - -curl -sv -X POST $certificate -d @$file \ - --header "Content-type: application/xml" \ - --header "Authorization: Basic $authorization" \ - $baseServiceURL/resources | tidy -xml -i -q -utf8 +. ./import.sh resources $* diff --git a/scripts/rest-clients/import-type-work-hours.sh b/scripts/rest-clients/import-type-work-hours.sh index 0761b9385..008e198c9 100755 --- a/scripts/rest-clients/import-type-work-hours.sh +++ b/scripts/rest-clients/import-type-work-hours.sh @@ -1,33 +1,3 @@ #!/bin/sh -. ./rest-common-env.sh - -printf "Login name: " -read loginName -printf "Password: " -read password - -baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL -certificate=$DEVELOPMENT_CERTIFICATE - -for i in "$@" -do - if [ "$i" = "--prod" ]; then - baseServiceURL=$PRODUCTION_BASE_SERVICE_URL - certificate=$PRODUCTION_CERTIFICATE - else - file=$i - fi -done - -if [ "$file" = "" ]; then - printf "Missing file\n" 1>&2 - exit 1 -fi - -authorization=`./base64.sh $loginName:$password` - -curl -sv -X POST $certificate -d @$file \ - --header "Content-type: application/xml" \ - --header "Authorization: Basic $authorization" \ - $baseServiceURL/typeofworkhours | tidy -xml -i -q -utf8 +. ./import.sh typeofworkhours $* diff --git a/scripts/rest-clients/import-unit-types.sh b/scripts/rest-clients/import-unit-types.sh index 5badb3710..aef049fc8 100755 --- a/scripts/rest-clients/import-unit-types.sh +++ b/scripts/rest-clients/import-unit-types.sh @@ -1,33 +1,3 @@ #!/bin/sh -. ./rest-common-env.sh - -printf "Login name: " -read loginName -printf "Password: " -read password - -baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL -certificate=$DEVELOPMENT_CERTIFICATE - -for i in "$@" -do - if [ "$i" = "--prod" ]; then - baseServiceURL=$PRODUCTION_BASE_SERVICE_URL - certificate=$PRODUCTION_CERTIFICATE - else - file=$i - fi -done - -if [ "$file" = "" ]; then - printf "Missing file\n" 1>&2 - exit 1 -fi - -authorization=`./base64.sh $loginName:$password` - -curl -sv -X POST $certificate -d @$file \ - --header "Content-type: application/xml" \ - --header "Authorization: Basic $authorization" \ - $baseServiceURL/unittypes | tidy -xml -i -q -utf8 +. ./import.sh unittypes $* diff --git a/scripts/rest-clients/import-work-reports.sh b/scripts/rest-clients/import-work-reports.sh index 2af545520..2ae2be015 100755 --- a/scripts/rest-clients/import-work-reports.sh +++ b/scripts/rest-clients/import-work-reports.sh @@ -1,33 +1,3 @@ #!/bin/sh -. ./rest-common-env.sh - -printf "Login name: " -read loginName -printf "Password: " -read password - -baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL -certificate=$DEVELOPMENT_CERTIFICATE - -for i in "$@" -do - if [ "$i" = "--prod" ]; then - baseServiceURL=$PRODUCTION_BASE_SERVICE_URL - certificate=$PRODUCTION_CERTIFICATE - else - file=$i - fi -done - -if [ "$file" = "" ]; then - printf "Missing file\n" 1>&2 - exit 1 -fi - -authorization=`./base64.sh $loginName:$password` - -curl -sv -X POST $certificate -d @$file \ - --header "Content-type: application/xml" \ - --header "Authorization: Basic $authorization" \ - $baseServiceURL/workreports | tidy -xml -i -q -utf8 +. ./import.sh workreports $* diff --git a/scripts/rest-clients/import.sh b/scripts/rest-clients/import.sh new file mode 100644 index 000000000..912fa2297 --- /dev/null +++ b/scripts/rest-clients/import.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +. ./rest-common-env.sh + +printf "Login name: " +read loginName +printf "Password: " +read password + +if [ "$3" = "--prod" ]; then + baseServiceURL=$PRODUCTION_BASE_SERVICE_URL + certificate=$PRODUCTION_CERTIFICATE +elif [ "$3" = "--dev" ]; then + baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL + certificate=$DEVELOPMENT_CERTIFICATE +else + baseServiceURL=$DEMO_BASE_SERVICE_URL + certificate=$DEMO_CERTIFICATE +fi + +file=$2 + +if [ "$file" = "" ]; then + printf "Missing file\n" 1>&2 + exit 1 +fi + +authorization=`./base64.sh $loginName:$password` + +curl -sv -X POST $certificate -d @$file \ + --header "Content-type: application/xml" \ + --header "Authorization: Basic $authorization" \ + $baseServiceURL/$1 | tidy -xml -i -q -utf8 diff --git a/scripts/rest-clients/rest-common-env.sh b/scripts/rest-clients/rest-common-env.sh index 17646de4c..faa60d147 100755 --- a/scripts/rest-clients/rest-common-env.sh +++ b/scripts/rest-clients/rest-common-env.sh @@ -1,6 +1,8 @@ +DEMO_BASE_SERVICE_URL=http://demo.navalplan.org/navalplan-demo/ws/rest DEVELOPMENT_BASE_SERVICE_URL=http://localhost:8080/navalplanner-webapp/ws/rest -PRODUCTION_BASE_SERVICE_URL=http://www.navalplan.org/navalplanner-webapp/ws/rest +PRODUCTION_BASE_SERVICE_URL=http://localhost:8080/navalplan/ws/rest +DEMO_CERTIFICATE="" DEVELOPMENT_CERTIFICATE="" PRODUCTION_CERTIFICATE="" # FIXME: Until we have a valid production certificate, accept any