Merge branch 'master' of https://github.com/apache/incubator-ariatosca
diff --git a/aria/cli/csar.py b/aria/cli/csar.py
index ba80bad..6def213 100644
--- a/aria/cli/csar.py
+++ b/aria/cli/csar.py
@@ -56,7 +56,7 @@
         raise ValueError('{0} is not a directory. Please specify the service template '
                          'directory.'.format(source))
     if not os.path.isfile(service_template_path):
-        raise ValueError('{0} does not exists. Please specify a valid entry point.'
+        raise ValueError('{0} does not exist. Please specify a valid entry point.'
                          .format(service_template_path))
     if os.path.exists(destination):
         raise ValueError('{0} already exists. Please provide a path to where the CSAR should be '
@@ -97,7 +97,7 @@
         self.metadata = {}
         try:
             if not os.path.exists(self.source):
-                raise ValueError('{0} does not exists. Please specify a valid CSAR path.'
+                raise ValueError('{0} does not exist. Please specify a valid CSAR path.'
                                  .format(self.source))
             if not zipfile.is_zipfile(self.source):
                 raise ValueError('{0} is not a valid CSAR.'.format(self.source))
diff --git a/release/asf-release.sh b/release/asf-release.sh
index 18f5b38..6b09543 100755
--- a/release/asf-release.sh
+++ b/release/asf-release.sh
@@ -135,7 +135,7 @@
     echo "Signing archive ${ARCHIVE_NAME}..."
     gpg --armor --output ${ARCHIVE_NAME}.asc --detach-sig ${ARCHIVE_NAME}
     gpg --print-md MD5 ${ARCHIVE_NAME} > ${ARCHIVE_NAME}.md5
-    gpg --print-md SHA512 ${ARCHIVE_NAME} > ${ARCHIVE_NAME}.sha
+    gpg --print-md SHA512 ${ARCHIVE_NAME} > ${ARCHIVE_NAME}.sha512
 }
 
 
@@ -227,23 +227,9 @@
 
     echo "Publishing to Apache dist..."
 
-    local TMP_DIR=$(mktemp -d)
-    echo "Checking out ARIA dist dev to ${TMP_DIR}"
-    pushd ${TMP_DIR}
-
-    svn co https://dist.apache.org/repos/dist/dev/incubator/ariatosca/ ariatosca-dev
-    svn co https://dist.apache.org/repos/dist/release/incubator/ariatosca/ ariatosca-release
-    cp -r ariatosca-dev/${RELEASE_DIR} ariatosca-release
-
-    pushd ariatosca-release
-    svn add ${RELEASE_DIR}
-    # TODO: remove older releases?
-    svn commit -m "ARIA ${VERSION} release"
-    popd
-    popd
+    svn mv https://dist.apache.org/repos/dist/dev/incubator/ariatosca/${RELEASE_DIR} https://dist.apache.org/repos/dist/release/incubator/ariatosca/${RELEASE_DIR} -m "ARIATOSCA ${VERSION} publish"
 }
 
-
 function _create_git_tag {
     local VERSION=$1