+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.argeo.slc.jsch;
import java.io.ByteArrayInputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.argeo.slc.SlcException;
+import org.springframework.core.io.ByteArrayResource;
import org.springframework.core.io.Resource;
import org.springframework.util.AntPathMatcher;
import org.springframework.util.PathMatcher;
}
if (localResource != null) {
- uploadResource(session, localResource, remoteDir);
+ uploadResource(session, localResource);
}
}
protected void uploadFile(Session session, File file, String remoteFile) {
try {
- uploadFile(session, new FileInputStream(file), file.length(), file
+ upload(session, new FileInputStream(file), file.length(), file
.getPath(), file.toString(), remoteFile);
} catch (FileNotFoundException e) {
throw new SlcException("Cannot upload " + file, e);
}
}
- protected void uploadResource(Session session, Resource resource,
- String remoteFile) {
+ protected void uploadResource(Session session, Resource resource) {
+ String targetPath = remotePath != null ? remotePath : remoteDir + '/'
+ + resource.getFilename();
try {
File lFile = resource.getFile();
- uploadFile(session, lFile, remotePath);
+ uploadFile(session, lFile, targetPath);
} catch (IOException e) {
// no underlying file found
// load the resource in memory before transferring it
InputStream in = null;
try {
- in = resource.getInputStream();
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- IOUtils.copy(in, out);
- byte[] arr = out.toByteArray();
+ byte[] arr;
+ String path;
+ if (resource instanceof ByteArrayResource) {
+ arr = ((ByteArrayResource) resource).getByteArray();
+ path = "bytearray";
+ } else {
+ in = resource.getInputStream();
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ IOUtils.copy(in, out);
+ arr = out.toByteArray();
+ path = resource.getURL().getPath();
+ if (path.startsWith("/"))
+ path = path.substring(1);
+ }
ByteArrayInputStream content = new ByteArrayInputStream(arr);
- uploadFile(session, content, arr.length, resource.getURL()
- .getPath(), resource.toString(), remotePath);
+ upload(session, content, arr.length, path, resource.toString(),
+ targetPath);
arr = null;
} catch (IOException e1) {
- throw new SlcException("Can neither interpret resource "
- + localResource
- + " as file, nor create a temporary file", e1);
+ throw new SlcException("Can not interpret resource "
+ + localResource, e1);
} finally {
IOUtils.closeQuietly(in);
// no need to close byte arrays streams
}
}
- protected void uploadFile(Session session, InputStream in, long size,
+ protected void upload(Session session, InputStream in, long size,
String path, String sourceDesc, String remoteFile) {
OutputStream channelOut;
InputStream channelIn;