Author: jflesch
Date: 2006-07-10 21:05:40 +0000 (Mon, 10 Jul 2006)
New Revision: 9551
Added:
trunk/apps/Thaw/src/thaw/fcp/FCPListPersistentRequests.java
Modified:
trunk/apps/Thaw/src/thaw/core/Core.java
trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java
trunk/apps/Thaw/src/thaw/fcp/FCPQuery.java
trunk/apps/Thaw/src/thaw/fcp/FCPTransferQuery.java
trunk/apps/Thaw/src/thaw/fcp/FCPWatchGlobal.java
Log:
Now send a ListPersistentRequests to the Node when starting
Modified: trunk/apps/Thaw/src/thaw/core/Core.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Core.java 2006-07-10 20:42:30 UTC (rev
9550)
+++ trunk/apps/Thaw/src/thaw/core/Core.java 2006-07-10 21:05:40 UTC (rev
9551)
@@ -201,6 +201,9 @@
FCPWatchGlobal watchGlobal = new FCPWatchGlobal(true);
watchGlobal.start(queueManager);
+
+ FCPListPersistentRequests listPersistent = new
FCPListPersistentRequests();
+ listPersistent.start(queueManager);
}
return true;
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java 2006-07-10 20:42:30 UTC
(rev 9550)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientHello.java 2006-07-10 21:05:40 UTC
(rev 9551)
@@ -42,10 +42,6 @@
this.id = id;
}
- public int getThawPriority() {
- return -1;
- }
-
public String getNodeFCPVersion() {
return nodeFCPVersion;
}
@@ -153,57 +149,5 @@
return 0;
}
- public String getStatus() {
- return null;
- }
-
- public int getProgression() {
- return 0;
- }
-
- public String getFileKey() {
- return null;
- }
-
- public long getFileSize() {
- return 0;
- }
-
- public boolean isRunning() {
- return false;
- }
-
- public boolean isFinished() {
- return true;
- }
-
- public String getPath() {
- return null;
- }
-
- public int getAttempt() {
- return -1;
- }
-
- public boolean isSuccessful() {
- return successful;
- }
-
-
- public HashMap getParameters() {
- return null;
- }
-
- public boolean setParameters(HashMap parameters) {
- return true;
- }
-
- public boolean isPersistent() {
- return false;
- }
-
- public String getIdentifier() {
- return null;
- }
}
Added: trunk/apps/Thaw/src/thaw/fcp/FCPListPersistentRequests.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPListPersistentRequests.java 2006-07-10
20:42:30 UTC (rev 9550)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPListPersistentRequests.java 2006-07-10
21:05:40 UTC (rev 9551)
@@ -0,0 +1,30 @@
+package thaw.fcp;
+
+public class FCPListPersistentRequests implements FCPQuery {
+
+
+ public FCPListPersistentRequests() { }
+
+
+ public boolean start(FCPQueueManager queueManager) {
+ FCPMessage newMessage = new FCPMessage();
+
+ newMessage.setMessageName("ListPersistentRequests");
+
+ queueManager.getQueryManager().writeMessage(newMessage);
+
+ return true;
+ }
+
+ public boolean stop(FCPQueueManager queueManager) {
+
+ return false;
+ }
+
+ public int getQueryType() {
+ return 0;
+ }
+
+
+
+}
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPQuery.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPQuery.java 2006-07-10 20:42:30 UTC (rev
9550)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPQuery.java 2006-07-10 21:05:40 UTC (rev
9551)
@@ -18,16 +18,6 @@
public boolean stop(FCPQueueManager queueManager);
/**
- * Used by the QueueManager only.
- * Currently these priority are the same
- * as FCP priority, but it can change in the
- * future.
- * -1 = No priority
- * Always between -1 and 6.
- */
- public int getThawPriority();
-
- /**
* Tell if the query is a download query or an upload query.
* If >= 1 then *must* be Observable and implements FCPTransfertQuery.
* @return 0 : Meaningless ; 1 : Download ; 2 : Upload ; >= 2 : ?
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPTransferQuery.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPTransferQuery.java 2006-07-10 20:42:30 UTC
(rev 9550)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPTransferQuery.java 2006-07-10 21:05:40 UTC
(rev 9551)
@@ -8,7 +8,15 @@
*/
public interface FCPTransferQuery extends FCPQuery {
-
+ /**
+ * Used by the QueueManager only.
+ * Currently these priority are the same
+ * as FCP priority, but it can change in the
+ * future.
+ * -1 = No priority
+ * Always between -1 and 6.
+ */
+ public int getThawPriority();
/**
* Informal.
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPWatchGlobal.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPWatchGlobal.java 2006-07-10 20:42:30 UTC
(rev 9550)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPWatchGlobal.java 2006-07-10 21:05:40 UTC
(rev 9551)
@@ -31,64 +31,8 @@
return true;
}
- public int getThawPriority() {
- return -1;
- }
-
public int getQueryType() {
return 0;
}
- public String getStatus() {
- return null;
- }
-
- public int getProgression() {
- return 100;
- }
-
- public String getFileKey() {
- return null;
- }
-
- public long getFileSize() {
- return 0;
- }
-
- public String getPath() {
- return null;
- }
-
- public int getAttempt() {
- return 0;
- }
-
- public boolean isFinished() {
- return true;
- }
-
- public boolean isSuccessful() {
- return true;
- }
-
- public boolean isRunning() {
- return false;
- }
-
- public HashMap getParameters() {
- return null;
- }
-
- public boolean setParameters(HashMap parameters) {
- return true;
- }
-
-
- public boolean isPersistent() {
- return false;
- }
-
- public String getIdentifier() {
- return null;
- }
}
