Merge remote-tracking branch 'origin/master'

pydio · Jul 25, 2013 · 0f0f6e6 · 0f0f6e6
2 parents 5e54b71 + bcb9b46
commit 0f0f6e6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/dist/phing/deploy.properties.sample b/dist/phing/deploy.properties.sample
@@ -16,6 +16,7 @@ ws.ftp.path=
 
 #sFTP server
 ws.sftp.host=
+ws.sftp.port=
 ws.sftp.user=
 ws.sftp.password=
 ws.sftp.path=
@@ -24,4 +25,4 @@ ws.sftp.path=
 ws.webdav.host=
 ws.webdav.user=
 ws.webdav.password=
-ws.webdav.uri=
+ws.webdav.uri=
diff --git a/dist/phing/deploy.xml b/dist/phing/deploy.xml
@@ -25,8 +25,11 @@
         </if>
         <property name="cliPath" value="${installPath}/ajaxplorer-latest"/>
         <touch file="${cliPath}/data/cache/diag_result.php"/>
-
-        <echo message="**** Creating all workspaces"/>
+
+	<echo message="**** Getting jumploader_z.jar"/>
+	<httpget url="http://jumploader.com/jumploader_z.jar" dir="${installPath}/ajaxplorer-latest/plugins/uploader.jumploader/" filename="jumploader_z.jar"/>
+
+	<echo message="**** Creating all workspaces"/>
 
         <!-- RUN FIRST INSTALL -->
         <ajaxplorer_sdk
@@ -62,7 +65,7 @@
                 user="${admin_user}"
                 password="${admin_password}"
                 action="create_repository"
-                params='--DISPLAY="sftp" --DRIVER=sftp --json_data={\"SERV\":\"${ws.sftp.host}\",\"PATH\":\"${ws.sftp.path}\",\"USER\":\"${ws.sftp.user}\",\"PASS\":\"${ws.sftp.password}\"}'/>
+                params='--DISPLAY="sftp" --DRIVER=sftp --json_data={\"SERV\":\"${ws.sftp.host}\",\"PATH\":\"${ws.sftp.path}\",\"USER\":\"${ws.sftp.user}\",\"PASS\":\"${ws.sftp.password}\",\"PORT\":\"${ws.sftp.port}\"}'/>
 
         <ajaxplorer_sdk
                 cliPath="${cliPath}"