You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2013/04/29 18:58:08 UTC

svn commit: r1477200 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws: ./ server/

Author: cwiklik
Date: Mon Apr 29 16:57:59 2013
New Revision: 1477200

URL: http://svn.apache.org/r1477200
Log:
UIMA-2851 Removed @Override

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/Info.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/JobInfo.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/ReservationInfo.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/WebServerComponent.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerProxy.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerUserAuthentication.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitor.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/Info.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/Info.java?rev=1477200&r1=1477199&r2=1477200&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/Info.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/Info.java Mon Apr 29 16:57:59 2013
@@ -59,7 +59,7 @@ public class Info implements Comparable<
 		return _dw.isOperational();
 	}
 	
-	@Override
+	
 	public int compareTo(Info info) {
 		int retVal = 0;
 		IDuccWork dw1 = this._dw;
@@ -83,7 +83,7 @@ public class Info implements Comparable<
 		return retVal;
 	}
 	
-	@Override 
+	 
 	public boolean equals(Object object) {
 		boolean retVal = false;
 		try {
@@ -102,7 +102,7 @@ public class Info implements Comparable<
 		return retVal;
 	}
 	
-	@Override 
+	 
 	public int hashCode() {
 		IDuccWork dw = this._dw;
 		String s1 = dw.getDuccId().toString();

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/JobInfo.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/JobInfo.java?rev=1477200&r1=1477199&r2=1477200&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/JobInfo.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/JobInfo.java Mon Apr 29 16:57:59 2013
@@ -36,7 +36,7 @@ public class JobInfo implements Comparab
 		return _job.isOperational();
 	}
 	
-	@Override
+	
 	public int compareTo(JobInfo job) {
 		int retVal = 0;
 		JobInfo j1 = this;
@@ -60,7 +60,7 @@ public class JobInfo implements Comparab
 		return retVal;
 	}
 	
-	@Override 
+	 
 	public boolean equals(Object object) {
 		boolean retVal = false;
 		try {
@@ -77,7 +77,7 @@ public class JobInfo implements Comparab
 		return retVal;
 	}
 	
-	@Override 
+	 
 	public int hashCode() {
 		JobInfo i1 = this;
 		DuccWorkJob j1 = i1.getJob();

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java?rev=1477200&r1=1477199&r2=1477200&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java Mon Apr 29 16:57:59 2013
@@ -230,7 +230,7 @@ public class MachineInfo implements Comp
 		return retVal;
 	}	
 	
-	@Override
+	
 	public int compareTo(MachineInfo machine) {
 		int retVal = 0;
 		MachineInfo m1 = this;

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/ReservationInfo.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/ReservationInfo.java?rev=1477200&r1=1477199&r2=1477200&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/ReservationInfo.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/ReservationInfo.java Mon Apr 29 16:57:59 2013
@@ -36,7 +36,7 @@ public class ReservationInfo implements 
 		return _reservation.isOperational();
 	}
 	
-	@Override
+	
 	public int compareTo(ReservationInfo reservation) {
 		int retVal = 0;
 		ReservationInfo r1 = this;
@@ -60,7 +60,7 @@ public class ReservationInfo implements 
 		return retVal;
 	}
 	
-	@Override 
+	 
 	public boolean equals(Object object) {
 		boolean retVal = false;
 		try {
@@ -77,7 +77,7 @@ public class ReservationInfo implements 
 		return retVal;
 	}
 	
-	@Override 
+	 
 	public int hashCode() {
 		ReservationInfo i1 = this;
 		DuccWorkReservation j1 = i1.getReservation();

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/WebServerComponent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/WebServerComponent.java?rev=1477200&r1=1477199&r2=1477200&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/WebServerComponent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/WebServerComponent.java Mon Apr 29 16:57:59 2013
@@ -100,7 +100,7 @@ implements IWebServer {
 		duccLogger.trace(methodName, jobid, duccMsg.fetch("exit"));
 	}
 	
-	@Override
+	
 	public void update(OrchestratorStateDuccEvent duccEvent) {
 		String methodName = "update";
 		duccLogger.trace(methodName, jobid, duccMsg.fetch("enter"));
@@ -132,7 +132,7 @@ implements IWebServer {
 		duccLogger.trace(methodName, jobid, duccMsg.fetch("exit"));
 	}
 
-	@Override
+	
 	public void update(NodeMetricsUpdateDuccEvent duccEvent) {
 		String methodName = "update";
 		duccLogger.trace(methodName, jobid, duccMsg.fetch("enter"));
@@ -141,7 +141,7 @@ implements IWebServer {
 		duccLogger.trace(methodName, jobid, duccMsg.fetch("exit"));
 	}
 
-	@Override
+	
 	public void update(RmStateDuccEvent duccEvent) {
 		String methodName = "update";
 		duccLogger.trace(methodName, jobid, duccMsg.fetch("enter"));
@@ -150,7 +150,7 @@ implements IWebServer {
 		duccLogger.trace(methodName, jobid, duccMsg.fetch("exit"));
 	}
 	
-	@Override
+	
 	public void update(SmStateDuccEvent duccEvent) {
 		String methodName = "update";
 		duccLogger.trace(methodName, jobid, duccMsg.fetch("enter"));
@@ -159,7 +159,7 @@ implements IWebServer {
 		duccLogger.trace(methodName, jobid, duccMsg.fetch("exit"));
 	}
 	
-	@Override
+	
 	public void update(PmStateDuccEvent duccEvent) {
 		String methodName = "update";
 		duccLogger.trace(methodName, jobid, duccMsg.fetch("enter"));

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java?rev=1477200&r1=1477199&r2=1477200&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java Mon Apr 29 16:57:59 2013
@@ -1765,7 +1765,7 @@ public class DuccHandlerJsonFormat exten
 		duccLogger.trace(methodName, jobid, messages.fetch("exit"));
 	}
 	
-	@Override
+	
 	public void handle(String target,Request baseRequest,HttpServletRequest request,HttpServletResponse response) 
 	throws IOException, ServletException {
 		String methodName = "handle";

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java?rev=1477200&r1=1477199&r2=1477200&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java Mon Apr 29 16:57:59 2013
@@ -1547,7 +1547,7 @@ public class DuccHandlerLegacy extends D
 		duccLogger.trace(methodName, jobid, messages.fetch("exit"));
 	}
 	
-	@Override
+	
 	public void handle(String target,Request baseRequest,HttpServletRequest request,HttpServletResponse response) 
 	throws IOException, ServletException {
 		String methodName = "handle";

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerProxy.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerProxy.java?rev=1477200&r1=1477199&r2=1477200&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerProxy.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerProxy.java Mon Apr 29 16:57:59 2013
@@ -214,7 +214,7 @@ public class DuccHandlerProxy extends Du
 		duccLogger.trace(location, jobid, "exit");
 	}
 	
-	@Override
+	
 	public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) 
 	throws IOException, ServletException {
 		String location = "handle";

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerUserAuthentication.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerUserAuthentication.java?rev=1477200&r1=1477199&r2=1477200&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerUserAuthentication.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerUserAuthentication.java Mon Apr 29 16:57:59 2013
@@ -188,7 +188,7 @@ public class DuccHandlerUserAuthenticati
 		duccLogger.trace(methodName, jobid, messages.fetch("exit"));
 	}
 	
-	@Override
+	
 	public void handle(String target,Request baseRequest,HttpServletRequest request,HttpServletResponse response) 
 	throws IOException, ServletException {
 		String methodName = "handle";

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitor.java?rev=1477200&r1=1477199&r2=1477200&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitor.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitor.java Mon Apr 29 16:57:59 2013
@@ -107,7 +107,7 @@ public class DuccWebMonitor implements I
 		duccWebMonitorManagedReservation = new DuccWebMonitorManagedReservation(timeoutMillis);
 	}
 	
-	@Override
+	
 	public void update(OrchestratorStateDuccEvent duccEvent) {
 		String location = "update";
 		duccLogger.trace(location, jobid, "enter");
@@ -141,7 +141,7 @@ public class DuccWebMonitor implements I
 		duccLogger.trace(location, jobid, "exit");
 	}
 	
-	@Override
+	
 	public void register(String host, String port) {
 		String location = "register";
 		actual_host = host;
@@ -154,7 +154,7 @@ public class DuccWebMonitor implements I
 		}
 	}
 
-	@Override
+	
 	public boolean isAutoCancelEnabled() {
 		if(actual_host == null) {
 			return false;
@@ -181,7 +181,7 @@ public class DuccWebMonitor implements I
 		return true;
 	}
 
-	@Override
+	
 	public MonitorInfo renew(DuccType duccType, String id) {
 		MonitorInfo monitorInfo = new MonitorInfo();
 		if(duccType != null) {
@@ -203,7 +203,7 @@ public class DuccWebMonitor implements I
 		return monitorInfo;
 	}
 
-	@Override
+	
 	public Long getExpiry(DuccType duccType, DuccId duccId) {
 		Long expiry = null;
 		if(duccType != null) {
@@ -225,7 +225,7 @@ public class DuccWebMonitor implements I
 		return expiry;
 	}
 
-	@Override
+	
 	public boolean isCanceled(DuccType duccType, DuccId duccId) {
 		boolean flag = false;
 		if(duccType != null) {
@@ -247,7 +247,7 @@ public class DuccWebMonitor implements I
 		return flag;
 	}
 	
-	@Override
+	
 	public ConcurrentHashMap<DuccId,Long> getExpiryMap(DuccType duccType) {
 		ConcurrentHashMap<DuccId,Long> eMap = new ConcurrentHashMap<DuccId,Long>();
 		if(duccType != null) {