You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by le...@apache.org on 2014/03/11 22:44:47 UTC
svn commit: r1576514 - in /oodt/trunk: CHANGES.txt protocol/ftp/pom.xml
protocol/ftp/src/main/java/org/apache/oodt/cas/protocol/ftp/CogJGlobusFtpProtocol.java
Author: lewismc
Date: Tue Mar 11 21:44:46 2014
New Revision: 1576514
URL: http://svn.apache.org/r1576514
Log:
OODT-662 Upgrade cog-jglobus dependency in protocol-ftp
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/protocol/ftp/pom.xml
oodt/trunk/protocol/ftp/src/main/java/org/apache/oodt/cas/protocol/ftp/CogJGlobusFtpProtocol.java
Modified: oodt/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1576514&r1=1576513&r2=1576514&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Tue Mar 11 21:44:46 2014
@@ -4,6 +4,8 @@ Apache OODT Change Log
Release 0.7 - Current Development
---------------------------------
+* OODT-662 Upgrade cog-jglobus dependency in protocol-ftp (lewismc)
+
* OODT-668 ProductQueryServlet will now rename zip attachments with proper ".zip" extension,
and the conventions used can be overridden by subclasses (luca)
Modified: oodt/trunk/protocol/ftp/pom.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/protocol/ftp/pom.xml?rev=1576514&r1=1576513&r2=1576514&view=diff
==============================================================================
--- oodt/trunk/protocol/ftp/pom.xml (original)
+++ oodt/trunk/protocol/ftp/pom.xml Tue Mar 11 21:44:46 2014
@@ -49,19 +49,6 @@
</build>
</profile>
</profiles>
- <repositories>
- <repository>
- <id>globus-repo</id>
- <name>Globus Toolkit Internal Maven2 Repository</name>
- <url>http://projects.iplantcollaborative.org/archiva/repository/internal</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
<build>
<resources>
<resource>
@@ -80,9 +67,14 @@
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>org.globus</groupId>
- <artifactId>cog-jglobus</artifactId>
- <version>1.8.0</version>
+ <groupId>org.jglobus</groupId>
+ <artifactId>JGlobus-GridFTP</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jglobus</groupId>
+ <artifactId>gss</artifactId>
+ <version>2.0.6</version>
</dependency>
<dependency>
<groupId>commons-net</groupId>
Modified: oodt/trunk/protocol/ftp/src/main/java/org/apache/oodt/cas/protocol/ftp/CogJGlobusFtpProtocol.java
URL: http://svn.apache.org/viewvc/oodt/trunk/protocol/ftp/src/main/java/org/apache/oodt/cas/protocol/ftp/CogJGlobusFtpProtocol.java?rev=1576514&r1=1576513&r2=1576514&view=diff
==============================================================================
--- oodt/trunk/protocol/ftp/src/main/java/org/apache/oodt/cas/protocol/ftp/CogJGlobusFtpProtocol.java (original)
+++ oodt/trunk/protocol/ftp/src/main/java/org/apache/oodt/cas/protocol/ftp/CogJGlobusFtpProtocol.java Tue Mar 11 21:44:46 2014
@@ -21,6 +21,8 @@ import java.io.File;
import java.util.List;
import java.util.Vector;
+
+
//Globus imports
import org.apache.oodt.cas.protocol.Protocol;
import org.apache.oodt.cas.protocol.ProtocolFile;
@@ -118,6 +120,7 @@ public class CogJGlobusFtpProtocol imple
public List<ProtocolFile> ls() throws ProtocolException {
try {
ftp.setActive(ftp.setLocalPassive());
+ @SuppressWarnings("unchecked")
Vector<FileInfo> fileList = (Vector<FileInfo>) ftp.list("*", null);
Vector<ProtocolFile> returnList = new Vector<ProtocolFile>();
for (FileInfo file : fileList) {
@@ -133,6 +136,7 @@ public class CogJGlobusFtpProtocol imple
public List<ProtocolFile> ls(ProtocolFileFilter filter) throws ProtocolException {
try {
ftp.setActive(ftp.setLocalPassive());
+ @SuppressWarnings("unchecked")
Vector<FileInfo> fileList = (Vector<FileInfo>) ftp.list("*", null);
Vector<ProtocolFile> returnList = new Vector<ProtocolFile>();
for (FileInfo file : fileList) {