Menu
▾
▴
cogkit-svn
|
From: <ha...@us...> - 2007-03-08 19:48:12
|
Revision: 1599
http://svn.sourceforge.net/cogkit/?rev=1599&view=rev
Author: hategan
Date: 2007-03-08 11:47:59 -0800 (Thu, 08 Mar 2007)
Log Message:
-----------
increased timeout to 30s
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java
Modified: trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java 2007-02-28 01:52:19 UTC (rev 1598)
+++ trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java 2007-03-08 19:47:59 UTC (rev 1599)
@@ -62,7 +62,7 @@
* By default JGlobus sets this to 6000 ms. Experience has proved that it
* may be too low.
*/
- public static final int MAX_REPLY_WAIT_TIME = 12000; // ms
+ public static final int MAX_REPLY_WAIT_TIME = 30000; // ms
private GridFTPClient gridFTPClient;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-10 23:09:31
|
Revision: 1667
http://cogkit.svn.sourceforge.net/cogkit/?rev=1667&view=rev
Author: hategan
Date: 2007-08-10 16:09:27 -0700 (Fri, 10 Aug 2007)
Log Message:
-----------
?!?!
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java
Modified: trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java 2007-07-28 20:17:31 UTC (rev 1666)
+++ trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java 2007-08-10 23:09:27 UTC (rev 1667)
@@ -285,7 +285,6 @@
/** get a remote file to the local stream */
public void get(String remoteFileName, DataSink sink,
MarkerListener mListener) throws FileResourceException {
- String currentDirectory = getCurrentDirectory();
try {
gridFTPClient.setPassiveMode(true);
gridFTPClient.get(remoteFileName, sink, mListener);
@@ -298,7 +297,6 @@
/** get a remote file */
public void get(String remoteFileName, File localFile)
throws FileResourceException {
- String currentDirectory = getCurrentDirectory();
try {
gridFTPClient.setPassiveMode(true);
gridFTPClient.get(remoteFileName, localFile);
@@ -318,7 +316,6 @@
public void getFile(String remoteFileName, String localFileName,
final ProgressMonitor progressMonitor) throws FileResourceException {
File localFile = new File(localFileName);
- String currentDirectory = getCurrentDirectory();
try {
gridFTPClient.setPassiveMode(true);
final long size = localFile.length();
@@ -351,7 +348,6 @@
public void putFile(String localFileName, String remoteFileName,
final ProgressMonitor progressMonitor) throws FileResourceException {
- String currentDirectory = getCurrentDirectory();
File localFile = new File(localFileName);
try {
gridFTPClient.setPassiveMode(true);
@@ -379,7 +375,6 @@
public void put(File localFile, String remoteFileName, boolean append)
throws FileResourceException {
- String currentDirectory = getCurrentDirectory();
try {
gridFTPClient.setPassiveMode(true);
gridFTPClient.put(localFile, remoteFileName, append);
@@ -395,7 +390,6 @@
*/
public void put(DataSource source, String remoteFileName,
MarkerListener mListener) throws FileResourceException {
- String currentDirectory = getCurrentDirectory();
try {
gridFTPClient.setPassiveMode(true);
gridFTPClient.put(remoteFileName, source, mListener);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-24 02:55:35
|
Revision: 1727
http://cogkit.svn.sourceforge.net/cogkit/?rev=1727&view=rev
Author: hategan
Date: 2007-08-23 19:55:34 -0700 (Thu, 23 Aug 2007)
Log Message:
-----------
hmm
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java
Modified: trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java 2007-08-24 02:53:18 UTC (rev 1726)
+++ trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java 2007-08-24 02:55:34 UTC (rev 1727)
@@ -527,16 +527,16 @@
gridFile.setLastModified(fileInfo.getDate());
- if (fileInfo.isFile() == true) {
+ if (fileInfo.isFile()) {
gridFile.setFileType(GridFile.FILE);
}
- if (fileInfo.isDirectory() == true) {
+ if (fileInfo.isDirectory()) {
gridFile.setFileType(GridFile.DIRECTORY);
}
- if (fileInfo.isDevice() == true) {
+ if (fileInfo.isDevice()) {
gridFile.setFileType(GridFile.DEVICE);
}
- if (fileInfo.isSoftLink() == true) {
+ if (fileInfo.isSoftLink()) {
gridFile.setFileType(GridFile.SOFTLINK);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-19 20:40:52
|
Revision: 1748
http://cogkit.svn.sourceforge.net/cogkit/?rev=1748&view=rev
Author: hategan
Date: 2007-09-19 13:40:51 -0700 (Wed, 19 Sep 2007)
Log Message:
-----------
cleaned up a bit
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java
Modified: trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java 2007-09-19 20:38:52 UTC (rev 1747)
+++ trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java 2007-09-19 20:40:51 UTC (rev 1748)
@@ -25,6 +25,7 @@
import org.globus.cog.abstraction.impl.file.FileResourceException;
import org.globus.cog.abstraction.impl.file.GridFileImpl;
import org.globus.cog.abstraction.impl.file.IllegalHostException;
+import org.globus.cog.abstraction.impl.file.PermissionsImpl;
import org.globus.cog.abstraction.impl.file.ftp.AbstractFTPFileResource;
import org.globus.cog.abstraction.impl.file.gridftp.DataChannelAuthenticationType;
import org.globus.cog.abstraction.impl.file.gridftp.DataChannelProtectionType;
@@ -194,7 +195,7 @@
gridFTPClient.setPassiveMode(true);
Enumeration list = gridFTPClient.list().elements();
while (list.hasMoreElements()) {
- gridFileList.add(createGridFile(list.nextElement()));
+ gridFileList.add(createGridFile((FileInfo) list.nextElement()));
}
return gridFileList;
@@ -511,62 +512,56 @@
}
/** create the file information object */
- private GridFile createGridFile(Object obj) throws FileResourceException {
+ private GridFile createGridFile(FileInfo fi) throws FileResourceException {
GridFile gridFile = new GridFileImpl();
- FileInfo fileInfo = (FileInfo) obj;
-
String directory = getCurrentDirectory();
if (directory.endsWith("/")) {
- gridFile.setAbsolutePathName(directory + fileInfo.getName());
+ gridFile.setAbsolutePathName(directory + fi.getName());
}
else {
- gridFile.setAbsolutePathName(directory + "/" + fileInfo.getName());
+ gridFile.setAbsolutePathName(directory + "/" + fi.getName());
}
- gridFile.setLastModified(fileInfo.getDate());
+ gridFile.setLastModified(fi.getDate());
- if (fileInfo.isFile()) {
+ if (fi.isFile()) {
gridFile.setFileType(GridFile.FILE);
}
- if (fileInfo.isDirectory()) {
+ if (fi.isDirectory()) {
gridFile.setFileType(GridFile.DIRECTORY);
}
- if (fileInfo.isDevice()) {
+ if (fi.isDevice()) {
gridFile.setFileType(GridFile.DEVICE);
}
- if (fileInfo.isSoftLink()) {
+ //Grr. softlink and all the other ones are orthogonal
+ if (fi.isSoftLink()) {
gridFile.setFileType(GridFile.SOFTLINK);
}
- gridFile.setMode(fileInfo.getModeAsString());
- gridFile.setName(fileInfo.getName());
- gridFile.setSize(fileInfo.getSize());
+ gridFile.setMode(fi.getModeAsString());
+ gridFile.setName(fi.getName());
+ gridFile.setSize(fi.getSize());
- Permissions userPermissions = gridFile.getUserPermissions();
- Permissions groupPermissions = gridFile.getGroupPermissions();
- Permissions allPermissions = gridFile.getAllPermissions();
+ gridFile.setUserPermissions(getPermissions(fi.userCanRead(), fi
+ .userCanWrite(), fi.userCanExecute()));
+ gridFile.setGroupPermissions(getPermissions(fi.groupCanRead(), fi
+ .groupCanWrite(), fi.groupCanExecute()));
+ gridFile.setAllPermissions(getPermissions(fi.allCanRead(), fi
+ .allCanWrite(), fi.allCanExecute()));
- userPermissions.setRead(fileInfo.userCanRead());
- userPermissions.setWrite(fileInfo.userCanWrite());
- userPermissions.setExecute(fileInfo.userCanExecute());
-
- groupPermissions.setRead(fileInfo.groupCanRead());
- groupPermissions.setWrite(fileInfo.groupCanWrite());
- groupPermissions.setExecute(fileInfo.groupCanExecute());
-
- allPermissions.setRead(fileInfo.allCanRead());
- allPermissions.setWrite(fileInfo.allCanWrite());
- allPermissions.setExecute(fileInfo.allCanExecute());
-
- gridFile.setUserPermissions(userPermissions);
- gridFile.setGroupPermissions(groupPermissions);
- gridFile.setAllPermissions(allPermissions);
-
return gridFile;
}
+ protected Permissions getPermissions(boolean r, boolean w, boolean x) {
+ Permissions perm = new PermissionsImpl();
+ perm.setRead(r);
+ perm.setWrite(w);
+ perm.setExecute(x);
+ return perm;
+ }
+
private void removeLocalDirectory(String tempDirName) {
File tempFile = new File(tempDirName);
String[] fileNames = tempFile.list();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-27 00:09:19
|
Revision: 1759
http://cogkit.svn.sourceforge.net/cogkit/?rev=1759&view=rev
Author: hategan
Date: 2007-09-26 17:09:15 -0700 (Wed, 26 Sep 2007)
Log Message:
-----------
be specific about what file cannot be deleted
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java
Modified: trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java 2007-09-26 16:32:29 UTC (rev 1758)
+++ trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java 2007-09-27 00:09:15 UTC (rev 1759)
@@ -279,7 +279,7 @@
gridFTPClient.deleteFile(file);
}
catch (Exception e) {
- throw translateException("Cannot delete the given file", e);
+ throw translateException("Cannot delete " + file, e);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-09-27 00:12:41
|
Revision: 1760
http://cogkit.svn.sourceforge.net/cogkit/?rev=1760&view=rev
Author: hategan
Date: 2007-09-26 17:12:38 -0700 (Wed, 26 Sep 2007)
Log Message:
-----------
improved more error messages
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java
Modified: trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java 2007-09-27 00:09:15 UTC (rev 1759)
+++ trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java 2007-09-27 00:12:38 UTC (rev 1760)
@@ -269,7 +269,7 @@
gridFTPClient.deleteDir(directory);
}
catch (Exception e) {
- throw translateException("Cannot delete the given directory", e);
+ throw translateException("Cannot delete " + directory, e);
}
}
@@ -291,7 +291,7 @@
gridFTPClient.get(remoteFileName, sink, mListener);
}
catch (Exception e) {
- throw translateException("Cannot retrieve the given file", e);
+ throw translateException("Cannot retrieve " + remoteFileName, e);
}
}
@@ -303,7 +303,8 @@
gridFTPClient.get(remoteFileName, localFile);
}
catch (Exception e) {
- throw translateException("Cannot retrieve the given file", e);
+ throw translateException("Cannot retrieve " + remoteFileName
+ + " to " + localFile, e);
}
}
@@ -381,7 +382,8 @@
gridFTPClient.put(localFile, remoteFileName, append);
}
catch (Exception e) {
- throw translateException("Cannot transfer the given file", e);
+ throw translateException("Cannot transfer " + localFile + " to "
+ + remoteFileName, e);
}
}
@@ -396,7 +398,7 @@
gridFTPClient.put(remoteFileName, source, mListener);
}
catch (Exception e) {
- throw translateException("Cannot transfer the given file", e);
+ throw translateException("Cannot transfer to " + remoteFileName, e);
}
}
@@ -409,7 +411,8 @@
gridFTPClient.rename(remoteFileName1, remoteFileName2);
}
catch (Exception e) {
- throw translateException("Rename for gridftp failed", e);
+ throw translateException("Renaming of " + remoteFileName1 + " to "
+ + remoteFileName2 + " failed", e);
}
}
@@ -423,7 +426,8 @@
gridFTPClient.site(cmd);
}
catch (Exception e) {
- throw translateException("Cannot change the file permissions.", e);
+ throw translateException("Cannot change the file permissions for "
+ + filename, e);
}
}
@@ -535,7 +539,7 @@
if (fi.isDevice()) {
gridFile.setFileType(GridFile.DEVICE);
}
- //Grr. softlink and all the other ones are orthogonal
+ // Grr. softlink and all the other ones are orthogonal
if (fi.isSoftLink()) {
gridFile.setFileType(GridFile.SOFTLINK);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-10-01 19:14:41
|
Revision: 1767
http://cogkit.svn.sourceforge.net/cogkit/?rev=1767&view=rev
Author: hategan
Date: 2007-10-01 12:14:39 -0700 (Mon, 01 Oct 2007)
Log Message:
-----------
fixed file info
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java
Modified: trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java 2007-10-01 19:13:58 UTC (rev 1766)
+++ trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java 2007-10-01 19:14:39 UTC (rev 1767)
@@ -47,6 +47,7 @@
import org.globus.ftp.GridFTPClient;
import org.globus.ftp.GridFTPSession;
import org.globus.ftp.MarkerListener;
+import org.globus.ftp.MlsxEntry;
import org.globus.ftp.Session;
import org.globus.ftp.exception.ServerException;
import org.ietf.jgss.GSSCredential;
@@ -473,27 +474,13 @@
/** get remote file information */
public GridFile getGridFile(String fileName) throws FileResourceException {
-
- String directory = null;
- int endIndex = fileName.lastIndexOf("/");
- if (endIndex < 0) {
- directory = getCurrentDirectory();
+ try {
+ MlsxEntry e = gridFTPClient.mlst(fileName);
+ return createGridFile(e);
}
- else {
- directory = fileName.substring(0, endIndex);
- fileName = fileName.substring(endIndex + 1, fileName.length());
+ catch (Exception e) {
+ throw translateException("Failed to retrieve file information about " + fileName, e);
}
-
- Iterator gridFiles = list(directory).iterator();
-
- while (gridFiles.hasNext()) {
- GridFile gridFile = (GridFile) gridFiles.next();
- if (gridFile.getName().equals(fileName)) {
- return gridFile;
- }
- }
-
- return null;
}
/** change permissions to a remote file */
@@ -557,7 +544,35 @@
return gridFile;
}
+
+ private GridFile createGridFile(MlsxEntry e) throws FileResourceException {
+ GridFile gridFile = new GridFileImpl();
+
+ String directory = getCurrentDirectory();
+ if (directory.endsWith("/")) {
+ gridFile.setAbsolutePathName(directory + e.getFileName());
+ }
+ else {
+ gridFile.setAbsolutePathName(directory + "/" + e.getFileName());
+ }
+
+ gridFile.setLastModified(e.get(MlsxEntry.MODIFY));
+
+ String type = e.get(MlsxEntry.TYPE);
+ if (MlsxEntry.TYPE_FILE.equals(type)) {
+ gridFile.setFileType(GridFile.FILE);
+ }
+ if (MlsxEntry.TYPE_DIR.equals(type) || MlsxEntry.TYPE_PDIR.equals(type) || MlsxEntry.TYPE_CDIR.equals(type)) {
+ gridFile.setFileType(GridFile.DIRECTORY);
+ }
+
+ gridFile.setName(e.getFileName());
+ gridFile.setSize(Long.parseLong(e.get(MlsxEntry.SIZE)));
+
+ return gridFile;
+ }
+
protected Permissions getPermissions(boolean r, boolean w, boolean x) {
Permissions perm = new PermissionsImpl();
perm.setRead(r);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-10-30 20:17:53
|
Revision: 1815
http://cogkit.svn.sourceforge.net/cogkit/?rev=1815&view=rev
Author: hategan
Date: 2007-10-30 13:17:50 -0700 (Tue, 30 Oct 2007)
Log Message:
-----------
added totalSize implementation for data sources
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java
Modified: trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java 2007-10-30 20:17:02 UTC (rev 1814)
+++ trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java 2007-10-30 20:17:50 UTC (rev 1815)
@@ -351,7 +351,7 @@
public void putFile(String localFileName, String remoteFileName,
final ProgressMonitor progressMonitor) throws FileResourceException {
- File localFile = new File(localFileName);
+ final File localFile = new File(localFileName);
try {
gridFTPClient.setPassiveMode(true);
final long size = localFile.length();
@@ -362,10 +362,18 @@
progressMonitor.progress(totalRead, size);
return super.read();
}
+
+ public long totalSize() {
+ return localFile.length();
+ }
};
}
else {
- source = new DataSourceStream(new FileInputStream(localFile));
+ source = new DataSourceStream(new FileInputStream(localFile)) {
+ public long totalSize() {
+ return localFile.length();
+ }
+ };
}
gridFTPClient.put(remoteFileName, source, null, false);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-11-05 16:13:14
|
Revision: 1830
http://cogkit.svn.sourceforge.net/cogkit/?rev=1830&view=rev
Author: hategan
Date: 2007-11-05 08:13:12 -0800 (Mon, 05 Nov 2007)
Log Message:
-----------
fixed call to wrong method
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java
Modified: trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java 2007-11-03 04:46:50 UTC (rev 1829)
+++ trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/file/gridftp/old/FileResourceImpl.java 2007-11-05 16:13:12 UTC (rev 1830)
@@ -344,7 +344,7 @@
public void putFile(String localFileName, String remoteFileName)
throws FileResourceException {
- putFile(localFileName, remoteFileName);
+ putFile(localFileName, remoteFileName, null);
}
/** Copy a local file to a remote file. Default option 'overwrite' */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X