Author: bfoster
Date: Fri Feb 18 23:43:30 2011
New Revision: 1072201
URL: http://svn.apache.org/viewvc?rev=1072201&view=rev
Log:
- GetPage action now supports sorting ... therefore GetSortedPage action was
ditched
------------------------
Removed:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/action/GetSortedPage.java
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineClient.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineLocal.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/queue/QueueManager.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/action/GetPage.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/AbstractCommunicationChannelServer.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/CommunicationChannelClient.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/CommunicationChannelServer.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/MultiCommunicationChannelClient.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelClient.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServer.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServerInterface.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServerMBean.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationServerInterface.java
oodt/branches/wengine-branch/wengine/src/main/resources/policy/action-beans.xml
oodt/branches/wengine-branch/wengine/src/main/resources/policy/engine-client-cmd-line-beans.xml
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java?rev=1072201&r1=1072200&r2=1072201&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngine.java
Fri Feb 18 23:43:30 2011
@@ -130,6 +130,8 @@ public interface WorkflowEngine {
public QueuePage getPage(PageInfo pageInfo, PageFilter filter) throws
EngineException;
public QueuePage getPage(PageInfo pageInfo, Comparator<ProcessorStub>
comparator) throws EngineException;
+
+ public QueuePage getPage(PageInfo pageInfo, PageFilter filter,
Comparator<ProcessorStub> comparator) throws EngineException;
public QueuePage getPage(PageInfo pageInfo, WorkflowState state) throws
EngineException;
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineClient.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineClient.java?rev=1072201&r1=1072200&r2=1072201&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineClient.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineClient.java
Fri Feb 18 23:43:30 2011
@@ -381,6 +381,14 @@ public class WorkflowEngineClient implem
}
}
+ public QueuePage getPage(PageInfo pageInfo, PageFilter filter,
Comparator<ProcessorStub> comparator) throws EngineException {
+ try {
+ return this.client.getPage(pageInfo, filter,
comparator);
+ }catch (Exception e) {
+ throw new EngineException(e);
+ }
+ }
+
public QueuePage getPage(PageInfo pageInfo, WorkflowState state) throws
EngineException {
try {
return this.client.getPage(pageInfo, state);
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineLocal.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineLocal.java?rev=1072201&r1=1072200&r2=1072201&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineLocal.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineLocal.java
Fri Feb 18 23:43:30 2011
@@ -412,6 +412,10 @@ public class WorkflowEngineLocal impleme
return this.queueManager.getPage(pageInfo, comparator);
}
+ public QueuePage getPage(PageInfo pageInfo, PageFilter filter,
Comparator<ProcessorStub> comparator) throws EngineException {
+ return this.queueManager.getPage(pageInfo, filter, comparator);
+ }
+
public QueuePage getPage(PageInfo pageInfo, WorkflowState state) throws
EngineException {
return this.queueManager.getPage(pageInfo, state);
}
@@ -439,6 +443,8 @@ public class WorkflowEngineLocal impleme
return this.getPage(new
PageInfo(page.getPageInfo().getPageSize(), page.getPageInfo().getPageNum() +
1), (WorkflowState.Category) page.getFilter());
else if (page.getFilter() instanceof String)
return this.getPage(new
PageInfo(page.getPageInfo().getPageSize(), page.getPageInfo().getPageNum() +
1), (String) page.getFilter());
+ else if (page.getFilter() instanceof List)
+ return this.getPage(new
PageInfo(page.getPageInfo().getPageSize(), page.getPageInfo().getPageNum() +
1), (PageFilter) ((List) page.getFilter()).get(0), (Comparator<ProcessorStub>)
((List) page.getFilter()).get(1));
else
return this.getPage(new
PageInfo(page.getPageInfo().getPageSize(), page.getPageInfo().getPageNum() +
1));
}
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/queue/QueueManager.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/queue/QueueManager.java?rev=1072201&r1=1072200&r2=1072201&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/queue/QueueManager.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/queue/QueueManager.java
Fri Feb 18 23:43:30 2011
@@ -39,6 +39,7 @@ import org.apache.oodt.cas.workflow.stat
import org.apache.oodt.cas.workflow.util.WorkflowUtils;
//JDK imports
+import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
@@ -393,6 +394,28 @@ public class QueueManager {
}
return new QueuePage(this.getProcessedPageInfo(pageInfo,
sortedCachedWPs.size()), this.getPage(pageInfo, sortedCachedWPs), comparator);
}
+
+ public QueuePage getPage(PageInfo pageInfo, PageFilter filter,
Comparator<ProcessorStub> comparator) {
+ Vector<CachedWorkflowProcessor> acceptedWPs = new
Vector<CachedWorkflowProcessor>();
+ Vector<CachedWorkflowProcessor> cachedWPs = null;
+ synchronized(processorQueue) {
+ cachedWPs = new
Vector<CachedWorkflowProcessor>(this.processorQueue.values());
+ }
+ if (filter != null)
+ for (CachedWorkflowProcessor cachedWP : cachedWPs)
+ if (filter.accept(cachedWP.getStub(),
cachedWP.getCachedMetadata()))
+ acceptedWPs.add(cachedWP);
+ if (comparator != null) {
+ final Comparator<ProcessorStub> comparatorFinal =
comparator;
+ Collections.sort(cachedWPs, new
Comparator<CachedWorkflowProcessor>() {
+ public int compare(CachedWorkflowProcessor o1,
+ CachedWorkflowProcessor o2) {
+ return
comparatorFinal.compare(o1.getStub(), o2.getStub());
+ }
+ });
+ }
+ return new QueuePage(this.getProcessedPageInfo(pageInfo,
acceptedWPs.size()), this.getPage(pageInfo, acceptedWPs), Arrays.asList(filter,
comparator));
+ }
public QueuePage getPage(PageInfo pageInfo, WorkflowState state) {
List<CachedWorkflowProcessor> processorsOfGivenState = new
Vector<CachedWorkflowProcessor>();
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/action/GetPage.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/action/GetPage.java?rev=1072201&r1=1072200&r2=1072201&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/action/GetPage.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/action/GetPage.java
Fri Feb 18 23:43:30 2011
@@ -17,6 +17,10 @@
package org.apache.oodt.cas.workflow.server.action;
//OODT imports
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+
import org.apache.oodt.cas.catalog.page.PageInfo;
import org.apache.oodt.cas.workflow.engine.WorkflowEngineClient;
import org.apache.oodt.cas.workflow.page.QueuePage;
@@ -34,6 +38,7 @@ public class GetPage extends FilteredAct
private int pageNum;
private int pageSize;
+ private boolean reverse;
private boolean showMessage;
public GetPage() {
@@ -41,15 +46,28 @@ public class GetPage extends FilteredAct
this.pageNum = 1;
this.pageSize = 10;
this.showMessage = false;
+ this.reverse = false;
}
@Override
public void performAction(WorkflowEngineClient weClient) throws
Exception {
PageInfo pageInfo = new PageInfo(pageSize, pageNum);
- QueuePage page = weClient.getPage(pageInfo,
this.createFilter(weClient));
+ QueuePage page = weClient.getPage(pageInfo,
this.createFilter(weClient), this.reverse ?
Collections.reverseOrder(this.comparator.getComparator()) :
this.comparator.getComparator());
System.out.println("Workflows " + getFilterAsString() + "
(Page: " + page.getPageInfo().getPageNum() + "/" +
page.getPageInfo().getTotalPages() + "; Total: " +
page.getPageInfo().getNumOfHits() + "):");
for (ProcessorStub stub : page.getStubs()) {
- System.out.println(" - InstanceId = '" +
stub.getInstanceId() + "', ModelId = '" + stub.getModelId() +"', State = '" +
stub.getState().getName() + "'");
+ System.out.print(" - InstanceId = '" +
stub.getInstanceId() + "', ModelId = '" + stub.getModelId() +"', State = '" +
stub.getState().getName() + "'");
+ if (this.comparator == null)
+ System.out.println();
+ else if
(this.comparator.name().equals(COMPARATOR.CreationDate.name()))
+ System.out.println(", CreationDate = '" +
stub.getProcessorInfo().getCreationDate() + "'");
+ else if
(this.comparator.name().equals(COMPARATOR.ExecutionDate.name()))
+ System.out.println(", ExecutionDate = '" +
stub.getProcessorInfo().getExecutionDate() + "'");
+ else if
(this.comparator.name().equals(COMPARATOR.CompletionDate.name()))
+ System.out.println(", CompletionDate = '" +
stub.getProcessorInfo().getCompletionDate() + "'");
+ else if
(this.comparator.name().equals(COMPARATOR.AliveTime.name()))
+ System.out.println(", AliveTime = '" +
(stub.getProcessorInfo().getCompletionDate() != null ?
((stub.getProcessorInfo().getCompletionDate().getTime() -
stub.getProcessorInfo().getCreationDate().getTime()) / 1000 / 60) :
((System.currentTimeMillis() -
stub.getProcessorInfo().getCreationDate().getTime()) / 1000 / 60)) + " mins'");
+ else if
(this.comparator.name().equals(COMPARATOR.TimesBlocked.name()))
+ System.out.println(", TimesBlocked = '" +
stub.getTimesBlocked() + "'");
if (this.showMessage)
System.out.println(" (Message = '" +
stub.getState().getMessage() + "')");
}
@@ -67,6 +85,14 @@ public class GetPage extends FilteredAct
public void showMessage(boolean showMessage) {
this.showMessage = showMessage;
}
+
+ public void setComparator(String comparator) {
+ this.comparator = COMPARATOR.valueOf(COMPARATOR.class,
comparator);
+ }
+
+ public void setReverse(boolean reverse) {
+ this.reverse = reverse;
+ }
protected String getFilterAsString() {
String filter = "[";
@@ -82,4 +108,92 @@ public class GetPage extends FilteredAct
return filter;
}
+ public static enum COMPARATOR {
+
+ CreationDate {
+ @Override
+ public Comparator<ProcessorStub> getComparator() {
+ return new Comparator<ProcessorStub>() {
+ public int compare(ProcessorStub o1,
+ ProcessorStub o2) {
+ return
o1.getProcessorInfo().getCreationDate()
+
.compareTo(o2.getProcessorInfo().getCreationDate());
+ }
+ };
+ }
+ },
+ ExecutionDate {
+ @Override
+ public Comparator<ProcessorStub> getComparator() {
+ return new Comparator<ProcessorStub>() {
+ public int compare(ProcessorStub o1,
+ ProcessorStub o2) {
+ if
(o1.getProcessorInfo().getExecutionDate() != null
+ &&
o2.getProcessorInfo().getExecutionDate() != null) {
+ return
o1.getProcessorInfo().getExecutionDate()
+
.compareTo(o2.getProcessorInfo().getExecutionDate());
+ }else if
(o1.getProcessorInfo().getExecutionDate() != null) {
+ return -1;
+ }else if
(o2.getProcessorInfo().getExecutionDate() != null) {
+ return 1;
+ }else {
+ return 0;
+ }
+ }
+ };
+ }
+ },
+ CompletionDate {
+ @Override
+ public Comparator<ProcessorStub> getComparator() {
+ return new Comparator<ProcessorStub>() {
+ public int compare(ProcessorStub o1,
+ ProcessorStub o2) {
+ if
(o1.getProcessorInfo().getCompletionDate() != null
+ &&
o2.getProcessorInfo().getCompletionDate() != null) {
+ return
o1.getProcessorInfo().getCompletionDate()
+
.compareTo(o2.getProcessorInfo().getCompletionDate());
+ }else if
(o1.getProcessorInfo().getCompletionDate() != null) {
+ return -1;
+ }else if
(o2.getProcessorInfo().getCompletionDate() != null) {
+ return 1;
+ }else {
+ return 0;
+ }
+ }
+ };
+ }
+ },
+ AliveTime {
+ @Override
+ public Comparator<ProcessorStub> getComparator() {
+ return new Comparator<ProcessorStub>() {
+ public int compare(ProcessorStub o1,
+ ProcessorStub o2) {
+ Date nowDate = new Date();
+ Date o1CompDate =
o1.getProcessorInfo().getCompletionDate() != null ?
o1.getProcessorInfo().getCompletionDate() : nowDate;
+ Date o2CompDate =
o2.getProcessorInfo().getCompletionDate() != null ?
o2.getProcessorInfo().getCompletionDate() : nowDate;
+ return
Long.valueOf(o1CompDate.getTime() -
o1.getProcessorInfo().getCreationDate().getTime())
+
.compareTo(o2CompDate.getTime() -
o2.getProcessorInfo().getCreationDate().getTime());
+ }
+ };
+ }
+ },
+ TimesBlocked {
+ @Override
+ public Comparator<ProcessorStub> getComparator() {
+ return new Comparator<ProcessorStub>() {
+ public int compare(ProcessorStub o1,
+ ProcessorStub o2) {
+ return
Integer.valueOf(o2.getTimesBlocked()).compareTo(Integer.valueOf(o1.getTimesBlocked()));
+ }
+ };
+ }
+ };
+
+ public abstract Comparator<ProcessorStub> getComparator();
+
+ };
+ private COMPARATOR comparator;
+
}
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/AbstractCommunicationChannelServer.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/AbstractCommunicationChannelServer.java?rev=1072201&r1=1072200&r2=1072201&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/AbstractCommunicationChannelServer.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/AbstractCommunicationChannelServer.java
Fri Feb 18 23:43:30 2011
@@ -416,6 +416,15 @@ public abstract class AbstractCommunicat
throw new Exception("Failed to get page '" + pageInfo +
"' with comparator '" + comparator + "' from engine : " + e.getMessage(), e);
}
}
+
+ public QueuePage getPage(PageInfo pageInfo, PageFilter filter,
Comparator<ProcessorStub> comparator) throws Exception {
+ try {
+ return this.workflowEngine.getPage(pageInfo, filter,
comparator);
+ }catch (Exception e) {
+ LOG.log(Level.SEVERE, "Failed to get page '" + pageInfo
+ "' with filter '" + filter + "' and comparator '" + comparator + "' from
engine : " + e.getMessage(), e);
+ throw new Exception("Failed to get page '" + pageInfo +
"' with filter '" + filter + "' and comparator '" + comparator + "' from engine
: " + e.getMessage(), e);
+ }
+ }
public QueuePage getPage(PageInfo pageInfo, WorkflowState state) throws
Exception {
try {
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/CommunicationChannelClient.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/CommunicationChannelClient.java?rev=1072201&r1=1072200&r2=1072201&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/CommunicationChannelClient.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/CommunicationChannelClient.java
Fri Feb 18 23:43:30 2011
@@ -125,6 +125,8 @@ public interface CommunicationChannelCli
public QueuePage getPage(PageInfo pageInfo, Comparator<ProcessorStub>
comparator) throws Exception;
+ public QueuePage getPage(PageInfo pageInfo, PageFilter filter,
Comparator<ProcessorStub> comparator) throws Exception;
+
public QueuePage getPage(PageInfo pageInfo, WorkflowState state) throws
Exception;
public QueuePage getPage(PageInfo pageInfo, WorkflowState.Category
category) throws Exception;
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/CommunicationChannelServer.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/CommunicationChannelServer.java?rev=1072201&r1=1072200&r2=1072201&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/CommunicationChannelServer.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/CommunicationChannelServer.java
Fri Feb 18 23:43:30 2011
@@ -132,6 +132,8 @@ public interface CommunicationChannelSer
public QueuePage getPage(PageInfo pageInfo, Comparator<ProcessorStub>
comparator) throws Exception;
+ public QueuePage getPage(PageInfo pageInfo, PageFilter filter,
Comparator<ProcessorStub> comparator) throws Exception;
+
public QueuePage getPage(PageInfo pageInfo, WorkflowState state) throws
Exception;
public QueuePage getPage(PageInfo pageInfo, WorkflowState.Category
category) throws Exception;
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/MultiCommunicationChannelClient.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/MultiCommunicationChannelClient.java?rev=1072201&r1=1072200&r2=1072201&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/MultiCommunicationChannelClient.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/MultiCommunicationChannelClient.java
Fri Feb 18 23:43:30 2011
@@ -132,6 +132,11 @@ public class MultiCommunicationChannelCl
Comparator<ProcessorStub> comparator) throws Exception {
return useClient.getPage(pageInfo, comparator);
}
+
+ public QueuePage getPage(PageInfo pageInfo, PageFilter filter,
+ Comparator<ProcessorStub> comparator) throws Exception {
+ return useClient.getPage(pageInfo, filter, comparator);
+ }
public QueuePage getPage(PageInfo pageInfo, WorkflowState state)
throws Exception {
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelClient.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelClient.java?rev=1072201&r1=1072200&r2=1072201&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelClient.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelClient.java
Fri Feb 18 23:43:30 2011
@@ -210,6 +210,10 @@ public class RmiCommunicationChannelClie
public QueuePage getPage(PageInfo pageInfo, Comparator<ProcessorStub>
comparator) throws Exception {
return this.serializer.deserializeObject(QueuePage.class,
this.getRmiServer().rmi_getPage_WithComparator(this.serializer.serializeObject(pageInfo),
this.serializer.serializeObject(comparator)));
}
+
+ public QueuePage getPage(PageInfo pageInfo, PageFilter filter,
Comparator<ProcessorStub> comparator) throws Exception {
+ return this.serializer.deserializeObject(QueuePage.class,
this.getRmiServer().rmi_getPage_WithFilterAndComparator(this.serializer.serializeObject(pageInfo),
this.serializer.serializeObject(filter),
this.serializer.serializeObject(comparator)));
+ }
public QueuePage getPage(PageInfo pageInfo, WorkflowState state) throws
Exception {
return this.serializer.deserializeObject(QueuePage.class,
this.getRmiServer().rmi_getPage_WithState(this.serializer.serializeObject(pageInfo),
this.serializer.serializeObject(state)));
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServer.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServer.java?rev=1072201&r1=1072200&r2=1072201&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServer.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServer.java
Fri Feb 18 23:43:30 2011
@@ -390,6 +390,14 @@ public class RmiCommunicationChannelServ
throw new RemoteException(e.getMessage(), e);
}
}
+
+ public String rmi_getPage_WithFilterAndComparator(String pageInfo, String
filter, String comparator) throws RemoteException {
+ try {
+ return
this.serializer.serializeObject(this.getPage(this.serializer.deserializeObject(PageInfo.class,
pageInfo), this.serializer.deserializeObject(PageFilter.class, filter),
this.serializer.deserializeObject(Comparator.class, comparator)));
+ }catch (Exception e) {
+ throw new RemoteException(e.getMessage(), e);
+ }
+ }
public String rmi_getPage_WithState(String pageInfo, String state) throws
RemoteException {
try {
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServerInterface.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServerInterface.java?rev=1072201&r1=1072200&r2=1072201&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServerInterface.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServerInterface.java
Fri Feb 18 23:43:30 2011
@@ -100,7 +100,9 @@ public interface RmiCommunicationChannel
public String rmi_getPage_WithFilter(String pageInfo, String filter)
throws RemoteException;
public String rmi_getPage_WithComparator(String pageInfo, String
comparator) throws RemoteException;
-
+
+ public String rmi_getPage_WithFilterAndComparator(String pageInfo, String
filter, String comparator) throws RemoteException;
+
public String rmi_getPage_WithState(String pageInfo, String state) throws
RemoteException ;
public String rmi_getPage_WithCategory(String pageInfo, String category)
throws RemoteException;
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServerMBean.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServerMBean.java?rev=1072201&r1=1072200&r2=1072201&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServerMBean.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/rmi/RmiCommunicationChannelServerMBean.java
Fri Feb 18 23:43:30 2011
@@ -120,6 +120,8 @@ public interface RmiCommunicationChannel
public QueuePage getPage(PageInfo pageInfo, Comparator<ProcessorStub>
comparator) throws Exception;
+ public QueuePage getPage(PageInfo pageInfo, PageFilter filter,
Comparator<ProcessorStub> comparator) throws Exception;
+
public QueuePage getPage(PageInfo pageInfo, WorkflowState state) throws
Exception;
public QueuePage getPage(PageInfo pageInfo, WorkflowState.Category
category) throws Exception;
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java?rev=1072201&r1=1072200&r2=1072201&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
Fri Feb 18 23:43:30 2011
@@ -350,6 +350,14 @@ public class XmlRpcCommunicationChannelC
args.add(this.serializer.serializeObject(comparator));
return this.serializer.deserializeObject(QueuePage.class,
(String)
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() +
".xmlrpc_getPage2", args));
}
+
+ public QueuePage getPage(PageInfo pageInfo, PageFilter filter,
Comparator<ProcessorStub> comparator) throws Exception {
+ Vector<Object> args = new Vector<Object>();
+ args.add(this.serializer.serializeObject(pageInfo));
+ args.add(this.serializer.serializeObject(filter));
+ args.add(this.serializer.serializeObject(comparator));
+ return this.serializer.deserializeObject(QueuePage.class,
(String)
this.client.execute(XmlRpcCommunicationChannelServer.class.getSimpleName() +
".xmlrpc_getPageWithFilterAndComparator", args));
+ }
public QueuePage getPage(PageInfo pageInfo, WorkflowState state) throws
Exception {
Vector<Object> args = new Vector<Object>();
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java?rev=1072201&r1=1072200&r2=1072201&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
Fri Feb 18 23:43:30 2011
@@ -215,6 +215,10 @@ public class XmlRpcCommunicationChannelS
return
this.serializer.serializeObject(this.getPage(this.serializer.deserializeObject(PageInfo.class,
pageInfo)));
}
+ public String xmlrpc_getPageWithFilterAndComparator(String pageInfo,
String pageFilter, String comparator) throws Exception {
+ return
this.serializer.serializeObject(this.getPage(this.serializer.deserializeObject(PageInfo.class,
pageInfo), this.serializer.deserializeObject(PageFilter.class, pageFilter),
this.serializer.deserializeObject(Comparator.class, comparator)));
+ }
+
public String xmlrpc_getPage_filtered(String pageInfo, String pageFilter)
throws Exception {
return
this.serializer.serializeObject(this.getPage(this.serializer.deserializeObject(PageInfo.class,
pageInfo), this.serializer.deserializeObject(PageFilter.class, pageFilter)));
}
Modified:
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationServerInterface.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationServerInterface.java?rev=1072201&r1=1072200&r2=1072201&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationServerInterface.java
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/server/channel/xmlrpc/XmlRpcCommunicationServerInterface.java
Fri Feb 18 23:43:30 2011
@@ -92,6 +92,10 @@ public interface XmlRpcCommunicationServ
public String xmlrpc_getPage(String pageInfo) throws Exception;
+ public String xmlrpc_getPage_filtered(String pageInfo, String pageFilter)
throws Exception;
+
+ public String xmlrpc_getPageWithFilterAndComparator(String pageInfo,
String pageFilter, String comparator) throws Exception;
+
public String xmlrpc_getPage2(String pageInfo, String comparator) throws
Exception;
public String xmlrpc_getPage3(String pageInfo, String state) throws
Exception;
Modified:
oodt/branches/wengine-branch/wengine/src/main/resources/policy/action-beans.xml
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/resources/policy/action-beans.xml?rev=1072201&r1=1072200&r2=1072201&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/resources/policy/action-beans.xml
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/resources/policy/action-beans.xml
Fri Feb 18 23:43:30 2011
@@ -43,7 +43,7 @@
</property>
</bean>
<bean id="GetPage" parent="PagedAction" lazy-init="true"
class="org.apache.oodt.cas.workflow.server.action.GetPage">
- <property name="description" value="Gets a page of workflows
that match filter criteria"/>
+ <property name="description" value="Gets a page of workflows
that match filter criteria and sort by given comparator"/>
<property name="preConditions">
<list>
<ref bean="EnsureServerFullyLoaded"/>
@@ -74,14 +74,6 @@
<bean id="GetExecutingPage" parent="PagedAction" lazy-init="true"
class="org.apache.oodt.cas.workflow.server.action.GetExecutingPage">
<property name="description" value="Returns a page of executing
Workflow Task Processors"/>
</bean>
- <bean id="GetSortedPage" parent="PagedAction" lazy-init="true"
class="org.apache.oodt.cas.workflow.server.action.GetSortedPage">
- <property name="description" value="Returns a sorted results
page of Workflow Processors"/>
- <property name="preConditions">
- <list>
- <ref bean="EnsureServerFullyLoaded"/>
- </list>
- </property>
- </bean>
<bean id="GetPercentLoaded" lazy-init="true"
class="org.apache.oodt.cas.workflow.server.action.GetPercentLoaded">
<property name="description" value="Returns percent of loaded
Workflow Processors"/>
</bean>
Modified:
oodt/branches/wengine-branch/wengine/src/main/resources/policy/engine-client-cmd-line-beans.xml
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/resources/policy/engine-client-cmd-line-beans.xml?rev=1072201&r1=1072200&r2=1072201&view=diff
==============================================================================
---
oodt/branches/wengine-branch/wengine/src/main/resources/policy/engine-client-cmd-line-beans.xml
(original)
+++
oodt/branches/wengine-branch/wengine/src/main/resources/policy/engine-client-cmd-line-beans.xml
Fri Feb 18 23:43:30 2011
@@ -262,7 +262,6 @@
<bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="PagedQuery"/>
<bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="GetRunnablesPage"/>
<bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="GetExecutingPage"/>
- <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="GetSortedPage"/>
</list>
</property>
</bean>
@@ -285,7 +284,6 @@
<bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="PagedQuery"/>
<bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="GetRunnablesPage"/>
<bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="GetExecutingPage"/>
- <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="GetSortedPage"/>
<bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="GetStatusByState"/>
<bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="GetStatusByCategory"/>
</list>
@@ -377,7 +375,7 @@
<bean
class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler">
<property name="applyToBeans">
<list>
- <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="GetSortedPage"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo" p:bean-ref="GetPage"/>
</list>
</property>
</bean>
@@ -417,7 +415,7 @@
<property name="requireAllValues"
value="false"/>
<property name="optionValues">
<list>
-
<value>GetSortedPage</value>
+ <value>GetPage</value>
</list>
</property>
</bean>
@@ -427,7 +425,7 @@
<bean
class="org.apache.oodt.commons.option.handler.CmdLineOptionBeanHandler">
<property name="applyToBeans">
<list>
- <bean
class="org.apache.oodt.commons.option.handler.BeanInfo"
p:bean-ref="GetSortedPage"/>
+ <bean
class="org.apache.oodt.commons.option.handler.BeanInfo" p:bean-ref="GetPage"/>
</list>
</property>
</bean>
