From f13b2039aec7d25aae4089f83efb2e033c93a9d3 Mon Sep 17 00:00:00 2001 From: Sujen Shah Date: Tue, 2 Jun 2015 12:02:57 -0700 Subject: [PATCH 1/4] Added methods to stop server --- src/java/org/apache/nutch/service/NutchServer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/org/apache/nutch/service/NutchServer.java b/src/java/org/apache/nutch/service/NutchServer.java index 14f84d45b3..fec97bef03 100644 --- a/src/java/org/apache/nutch/service/NutchServer.java +++ b/src/java/org/apache/nutch/service/NutchServer.java @@ -200,11 +200,11 @@ private static Options createOptions() { return options; } - + public boolean canStop(boolean force){ if(force) return true; - + Collection jobs = getJobManager().list(null, State.RUNNING); return jobs.isEmpty(); } From d8af6c0014379109299996d0ded7f0b4bd0947cd Mon Sep 17 00:00:00 2001 From: Sujen Shah Date: Tue, 2 Jun 2015 12:03:28 -0700 Subject: [PATCH 2/4] Added NutchServer instance --- .../org/apache/nutch/service/resources/AbstractResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/org/apache/nutch/service/resources/AbstractResource.java b/src/java/org/apache/nutch/service/resources/AbstractResource.java index ebe41383d1..b5d7e9a65a 100644 --- a/src/java/org/apache/nutch/service/resources/AbstractResource.java +++ b/src/java/org/apache/nutch/service/resources/AbstractResource.java @@ -32,7 +32,7 @@ public abstract class AbstractResource { protected JobManager jobManager; protected ConfManager configManager; protected NutchServer server; - + public AbstractResource() { server = NutchServer.getInstance(); configManager = NutchServer.getInstance().getConfManager(); From 0b2bf7c16512b2905f8459a715cf9a7778b9bab4 Mon Sep 17 00:00:00 2001 From: Sujen Shah Date: Tue, 2 Jun 2015 12:07:03 -0700 Subject: [PATCH 3/4] Formatted to Nutch source code formatting --- src/java/org/apache/nutch/service/NutchServer.java | 4 ++-- .../org/apache/nutch/service/resources/AbstractResource.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/java/org/apache/nutch/service/NutchServer.java b/src/java/org/apache/nutch/service/NutchServer.java index fec97bef03..14f84d45b3 100644 --- a/src/java/org/apache/nutch/service/NutchServer.java +++ b/src/java/org/apache/nutch/service/NutchServer.java @@ -200,11 +200,11 @@ private static Options createOptions() { return options; } - + public boolean canStop(boolean force){ if(force) return true; - + Collection jobs = getJobManager().list(null, State.RUNNING); return jobs.isEmpty(); } diff --git a/src/java/org/apache/nutch/service/resources/AbstractResource.java b/src/java/org/apache/nutch/service/resources/AbstractResource.java index b5d7e9a65a..ebe41383d1 100644 --- a/src/java/org/apache/nutch/service/resources/AbstractResource.java +++ b/src/java/org/apache/nutch/service/resources/AbstractResource.java @@ -32,7 +32,7 @@ public abstract class AbstractResource { protected JobManager jobManager; protected ConfManager configManager; protected NutchServer server; - + public AbstractResource() { server = NutchServer.getInstance(); configManager = NutchServer.getInstance().getConfManager(); From dc945f57506254827ffd793084824b0b218cdd26 Mon Sep 17 00:00:00 2001 From: Sujen Shah Date: Tue, 2 Jun 2015 21:11:33 -0700 Subject: [PATCH 4/4] NutchServerInfo response class --- .../model/response/NutchServerInfo.java | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 src/java/org/apache/nutch/service/model/response/NutchServerInfo.java diff --git a/src/java/org/apache/nutch/service/model/response/NutchServerInfo.java b/src/java/org/apache/nutch/service/model/response/NutchServerInfo.java new file mode 100644 index 0000000000..f8867e6ce6 --- /dev/null +++ b/src/java/org/apache/nutch/service/model/response/NutchServerInfo.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.nutch.service.model.response; + +import java.util.Collection; +import java.util.Date; +import java.util.Set; + +public class NutchServerInfo { + + private Date startDate; + private Set configuration; + private Collection jobs; + private Collection runningJobs; + public Date getStartDate() { + return startDate; + } + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + public Set getConfiguration() { + return configuration; + } + public void setConfiguration(Set configuration) { + this.configuration = configuration; + } + public Collection getJobs() { + return jobs; + } + public void setJobs(Collection jobs) { + this.jobs = jobs; + } + public Collection getRunningJobs() { + return runningJobs; + } + public void setRunningJobs(Collection runningJobs) { + this.runningJobs = runningJobs; + } + + +}