Repository: airavata Updated Branches: refs/heads/master 67910311d -> aed31d3eb
http://git-wip-us.apache.org/repos/asf/airavata/blob/aed31d3e/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/ExperimentStatus.java ---------------------------------------------------------------------- diff --git a/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/ExperimentStatus.java b/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/ExperimentStatus.java deleted file mode 100644 index 4070275..0000000 --- a/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/ExperimentStatus.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.apache.airavata.job.monitor.state; - -import org.apache.airavata.job.monitor.MonitorID; -import org.apache.airavata.model.workspace.experiment.ExperimentState; - -/** - * This is the primary job state object used in - * through out the monitor module. This use airavata-data-model JobState enum - * Ideally after processing each event or monitoring message from remote system - * Each monitoring implementation has to return this object with a state and - * the monitoring ID - */ -public class ExperimentStatus { - private ExperimentState state; - - private MonitorID monitorID; - - - // this constructor can be used in Qstat monitor to handle errors - public ExperimentStatus() { - } - - public ExperimentStatus(MonitorID monitorID, ExperimentState state) { - this.monitorID = monitorID; - this.state = state; - } - - public ExperimentState getState() { - return state; - } - - public void setState(ExperimentState state) { - this.state = state; - } - - public MonitorID getMonitorID() { - return monitorID; - } - - public void setMonitorID(MonitorID monitorID) { - this.monitorID = monitorID; - } - - -} http://git-wip-us.apache.org/repos/asf/airavata/blob/aed31d3e/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/ExperimentStatusChangeRequest.java ---------------------------------------------------------------------- diff --git a/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/ExperimentStatusChangeRequest.java b/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/ExperimentStatusChangeRequest.java new file mode 100644 index 0000000..d664161 --- /dev/null +++ b/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/ExperimentStatusChangeRequest.java @@ -0,0 +1,55 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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.apache.airavata.job.monitor.state; + +import org.apache.airavata.job.monitor.MonitorID; +import org.apache.airavata.model.workspace.experiment.ExperimentState; + +/** + * This is the primary job state object used in + * through out the monitor module. This use airavata-data-model JobState enum + * Ideally after processing each event or monitoring message from remote system + * Each monitoring implementation has to return this object with a state and + * the monitoring ID + */ +public class ExperimentStatusChangeRequest extends AbstractStateChangeRequest{ + private ExperimentState state; + + + // this constructor can be used in Qstat monitor to handle errors + public ExperimentStatusChangeRequest() { + } + + public ExperimentStatusChangeRequest(MonitorID monitorID, ExperimentState state) { + setMonitorID(monitorID); + this.state = state; + } + + public ExperimentState getState() { + return state; + } + + public void setState(ExperimentState state) { + this.state = state; + } + + +} http://git-wip-us.apache.org/repos/asf/airavata/blob/aed31d3e/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/JobStatus.java ---------------------------------------------------------------------- diff --git a/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/JobStatus.java b/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/JobStatus.java deleted file mode 100644 index 8f05124..0000000 --- a/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/JobStatus.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.apache.airavata.job.monitor.state; - -import org.apache.airavata.job.monitor.MonitorID; -import org.apache.airavata.model.workspace.experiment.JobState; - -import java.util.Properties; - -/** - * This is the primary job state object used in - * through out the monitor module. This use airavata-data-model JobState enum - * Ideally after processing each event or monitoring message from remote system - * Each monitoring implementation has to return this object with a state and - * the monitoring ID - */ -public class JobStatus { - private JobState state; - - private MonitorID monitorID; - - - // this constructor can be used in Qstat monitor to handle errors - public JobStatus() { - } - - public JobStatus(MonitorID monitorID, JobState state) { - this.monitorID = monitorID; - this.state = state; - } - - public JobState getState() { - return state; - } - - public void setState(JobState state) { - this.state = state; - } - - public MonitorID getMonitorID() { - return monitorID; - } - - public void setMonitorID(MonitorID monitorID) { - this.monitorID = monitorID; - } - - -} http://git-wip-us.apache.org/repos/asf/airavata/blob/aed31d3e/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/JobStatusChangeRequest.java ---------------------------------------------------------------------- diff --git a/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/JobStatusChangeRequest.java b/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/JobStatusChangeRequest.java new file mode 100644 index 0000000..9669b75 --- /dev/null +++ b/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/JobStatusChangeRequest.java @@ -0,0 +1,56 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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.apache.airavata.job.monitor.state; + +import org.apache.airavata.job.monitor.MonitorID; +import org.apache.airavata.model.workspace.experiment.JobState; + +import java.util.Properties; + +/** + * This is the primary job state object used in + * through out the monitor module. This use airavata-data-model JobState enum + * Ideally after processing each event or monitoring message from remote system + * Each monitoring implementation has to return this object with a state and + * the monitoring ID + */ +public class JobStatusChangeRequest extends AbstractStateChangeRequest{ + private JobState state; + + + // this constructor can be used in Qstat monitor to handle errors + public JobStatusChangeRequest() { + } + + public JobStatusChangeRequest(MonitorID monitorID, JobState state) { + setMonitorID(monitorID); + this.state = state; + } + + public JobState getState() { + return state; + } + + public void setState(JobState state) { + this.state = state; + } + +} http://git-wip-us.apache.org/repos/asf/airavata/blob/aed31d3e/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/PublisherMessage.java ---------------------------------------------------------------------- diff --git a/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/PublisherMessage.java b/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/PublisherMessage.java new file mode 100644 index 0000000..055deb1 --- /dev/null +++ b/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/PublisherMessage.java @@ -0,0 +1,26 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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.apache.airavata.job.monitor.state; + +public interface PublisherMessage { +// public String getType(); +} http://git-wip-us.apache.org/repos/asf/airavata/blob/aed31d3e/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/TaskStatus.java ---------------------------------------------------------------------- diff --git a/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/TaskStatus.java b/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/TaskStatus.java deleted file mode 100644 index 4151a66..0000000 --- a/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/TaskStatus.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.apache.airavata.job.monitor.state; - -import org.apache.airavata.job.monitor.MonitorID; -import org.apache.airavata.model.workspace.experiment.TaskState; - -/** - * This is the primary job state object used in - * through out the monitor module. This use airavata-data-model JobState enum - * Ideally after processing each event or monitoring message from remote system - * Each monitoring implementation has to return this object with a state and - * the monitoring ID - */ -public class TaskStatus { - private TaskState state; - - private MonitorID monitorID; - - - // this constructor can be used in Qstat monitor to handle errors - public TaskStatus() { - } - - public TaskStatus(MonitorID monitorID, TaskState state) { - this.monitorID = monitorID; - this.state = state; - } - - public TaskState getState() { - return state; - } - - public void setState(TaskState state) { - this.state = state; - } - - public MonitorID getMonitorID() { - return monitorID; - } - - public void setMonitorID(MonitorID monitorID) { - this.monitorID = monitorID; - } - - -} http://git-wip-us.apache.org/repos/asf/airavata/blob/aed31d3e/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/TaskStatusChangeRequest.java ---------------------------------------------------------------------- diff --git a/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/TaskStatusChangeRequest.java b/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/TaskStatusChangeRequest.java new file mode 100644 index 0000000..f35310b --- /dev/null +++ b/tools/job-monitor/src/main/java/org/apache/airavata/job/monitor/state/TaskStatusChangeRequest.java @@ -0,0 +1,53 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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.apache.airavata.job.monitor.state; + +import org.apache.airavata.job.monitor.MonitorID; +import org.apache.airavata.model.workspace.experiment.TaskState; + +/** + * This is the primary job state object used in + * through out the monitor module. This use airavata-data-model JobState enum + * Ideally after processing each event or monitoring message from remote system + * Each monitoring implementation has to return this object with a state and + * the monitoring ID + */ +public class TaskStatusChangeRequest extends AbstractStateChangeRequest{ + private TaskState state; + + // this constructor can be used in Qstat monitor to handle errors + public TaskStatusChangeRequest() { + } + + public TaskStatusChangeRequest(MonitorID monitorID, TaskState state) { + setMonitorID(monitorID); + this.state = state; + } + + public TaskState getState() { + return state; + } + + public void setState(TaskState state) { + this.state = state; + } + +} http://git-wip-us.apache.org/repos/asf/airavata/blob/aed31d3e/tools/job-monitor/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java ---------------------------------------------------------------------- diff --git a/tools/job-monitor/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java b/tools/job-monitor/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java index aa42a9d..980c2fa 100644 --- a/tools/job-monitor/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java +++ b/tools/job-monitor/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java @@ -35,7 +35,7 @@ import org.apache.airavata.job.monitor.UserMonitorData; import org.apache.airavata.job.monitor.event.MonitorPublisher; import org.apache.airavata.job.monitor.exception.AiravataMonitorException; import org.apache.airavata.job.monitor.impl.push.amqp.AMQPMonitor; -import org.apache.airavata.job.monitor.state.JobStatus; +import org.apache.airavata.job.monitor.state.JobStatusChangeRequest; import org.apache.airavata.schemas.gfac.GsisshHostType; import org.junit.Assert; import org.junit.Before; @@ -161,7 +161,7 @@ public class AMQPMonitorTest { } class InnerClassAMQP{ @Subscribe - private void getStatus(JobStatus status){ + private void getStatus(JobStatusChangeRequest status){ Assert.assertNotNull(status); pushThread.interrupt(); } http://git-wip-us.apache.org/repos/asf/airavata/blob/aed31d3e/tools/job-monitor/src/test/java/org/apache/airavata/job/QstatMonitorTestWithMyProxyAuth.java ---------------------------------------------------------------------- diff --git a/tools/job-monitor/src/test/java/org/apache/airavata/job/QstatMonitorTestWithMyProxyAuth.java b/tools/job-monitor/src/test/java/org/apache/airavata/job/QstatMonitorTestWithMyProxyAuth.java index c086c65..735d1d2 100644 --- a/tools/job-monitor/src/test/java/org/apache/airavata/job/QstatMonitorTestWithMyProxyAuth.java +++ b/tools/job-monitor/src/test/java/org/apache/airavata/job/QstatMonitorTestWithMyProxyAuth.java @@ -35,7 +35,7 @@ import org.apache.airavata.job.monitor.MonitorID; import org.apache.airavata.job.monitor.UserMonitorData; import org.apache.airavata.job.monitor.event.MonitorPublisher; import org.apache.airavata.job.monitor.impl.pull.qstat.QstatMonitor; -import org.apache.airavata.job.monitor.state.JobStatus; +import org.apache.airavata.job.monitor.state.JobStatusChangeRequest; import org.apache.airavata.schemas.gfac.GsisshHostType; import org.junit.Assert; import org.testng.annotations.Test; @@ -79,7 +79,7 @@ public class QstatMonitorTestWithMyProxyAuth { class InnerClassQstat { @Subscribe - private void getStatus(JobStatus status) { + private void getStatus(JobStatusChangeRequest status) { Assert.assertNotNull(status); System.out.println(status.getState().toString()); monitorThread.interrupt(); @@ -161,7 +161,7 @@ public class QstatMonitorTestWithMyProxyAuth { } @Subscribe - public void testCaseShutDown(JobStatus status) { + public void testCaseShutDown(JobStatusChangeRequest status) { Assert.assertNotNull(status.getState()); monitorThread.stop(); }
