Author: challngr
Date: Fri Feb 1 15:39:09 2013
New Revision: 1441491
URL: http://svn.apache.org/viewvc?rev=1441491&view=rev
Log:
UIMA-2631
Remove unused imports and clean up unused vars.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/UimaAsServiceMonitor.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/launcher/ssh/DuccRemoteLauncher.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java?rev=1441491&r1=1441490&r2=1441491&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java
Fri Feb 1 15:39:09 2013
@@ -42,7 +42,6 @@ import org.apache.uima.ducc.transport.di
import org.apache.uima.ducc.transport.event.DuccEvent;
import org.apache.uima.ducc.transport.event.SubmitReservationDuccEvent;
import org.apache.uima.ducc.transport.event.SubmitReservationReplyDuccEvent;
-import org.apache.uima.ducc.transport.event.cli.JobSpecificationProperties;
import org.apache.uima.ducc.transport.event.cli.ReservationRequestProperties;
import
org.apache.uima.ducc.transport.event.cli.ReservationSpecificationProperties;
import org.apache.uima.ducc.transport.event.cli.SpecificationProperties;
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java?rev=1441491&r1=1441490&r2=1441491&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
Fri Feb 1 15:39:09 2013
@@ -28,9 +28,9 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Set;
import java.util.Map.Entry;
import java.util.Properties;
+import java.util.Set;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
@@ -51,7 +51,6 @@ import org.apache.uima.ducc.transport.di
import org.apache.uima.ducc.transport.event.DuccEvent;
import org.apache.uima.ducc.transport.event.SubmitServiceDuccEvent;
import org.apache.uima.ducc.transport.event.SubmitServiceReplyDuccEvent;
-import org.apache.uima.ducc.transport.event.cli.JobRequestProperties;
import org.apache.uima.ducc.transport.event.cli.ServiceRequestProperties;
import org.apache.uima.ducc.transport.event.cli.ServiceSpecificationProperties;
import org.apache.uima.ducc.transport.event.cli.SpecificationProperties;
@@ -310,19 +309,19 @@ public class DuccServiceSubmit extends D
//**********
- private String getDuccProperty(String propertyName, String
defaultValue) {
- String propertyValue = defaultValue;
- try {
- String value =
DuccPropertiesResolver.getInstance().getProperty(propertyName);
- if(value != null) {
- propertyValue = value;
- }
- }
- catch(Throwable t) {
- duccMessageProcessor.throwable(t);
- }
- return propertyValue;
- }
+// private String getDuccProperty(String propertyName, String
defaultValue) {
+// String propertyValue = defaultValue;
+// try {
+// String value =
DuccPropertiesResolver.getInstance().getProperty(propertyName);
+// if(value != null) {
+// propertyValue = value;
+// }
+// }
+// catch(Throwable t) {
+// duccMessageProcessor.throwable(t);
+// }
+// return propertyValue;
+// }
/*
* resolve ${defaultBrokerURL} in service dependencies - must fail if
resolution needed but can't resolve
@@ -390,6 +389,7 @@ public class DuccServiceSubmit extends D
private boolean use_signature = false;
+ @SuppressWarnings("unused")
public int run(String[] args) throws Exception {
ServiceRequestProperties serviceRequestProperties = new
ServiceRequestProperties();
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/UimaAsServiceMonitor.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/UimaAsServiceMonitor.java?rev=1441491&r1=1441490&r2=1441491&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/UimaAsServiceMonitor.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/UimaAsServiceMonitor.java
Fri Feb 1 15:39:09 2013
@@ -102,12 +102,12 @@ public class UimaAsServiceMonitor
for (Object nameObject : conn.queryNames(new ObjectName(jmxDomain +
":*,Type=Broker"), (QueryExp) null)) {
//find the brokername object
brokerObjectName = (ObjectName) nameObject;
- if (brokerObjectName.getCanonicalName().endsWith("Type=Broker")) {
+ //if (brokerObjectName.getCanonicalName().endsWith("Type=Broker"))
{
// Extract just the name from the canonical name
- String brokerName =
brokerObjectName.getCanonicalName().substring(0,
brokerObjectName.getCanonicalName().indexOf(","));
+ //String brokerName =
brokerObjectName.getCanonicalName().substring(0,
brokerObjectName.getCanonicalName().indexOf(","));
//System.out.println("Canonical name of broker is " +
brokerObjectName.getCanonicalName());
//System.out.println("broker name is " + brokerName);
- }
+ //}
}
//ObjectName activeMQ = new
ObjectName("org.apache.activemq:BrokerName=" + broker_name +",Type=Broker");
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/launcher/ssh/DuccRemoteLauncher.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/launcher/ssh/DuccRemoteLauncher.java?rev=1441491&r1=1441490&r2=1441491&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/launcher/ssh/DuccRemoteLauncher.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/launcher/ssh/DuccRemoteLauncher.java
Fri Feb 1 15:39:09 2013
@@ -28,7 +28,6 @@ import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
-import java.util.logging.Logger;
import com.jcraft.jsch.ChannelExec;
import com.jcraft.jsch.JSch;
@@ -38,7 +37,7 @@ import com.jcraft.jsch.Session;
public class DuccRemoteLauncher {
public static final String FileSeparator =
System.getProperty("file.separator");
- private final Logger logger =
Logger.getLogger(DuccRemoteLauncher.class.getName());
+ //private final Logger logger =
Logger.getLogger(DuccRemoteLauncher.class.getName());
private String sshUser;
private JSch jsch = new JSch();
private Executor executor = Executors.newCachedThreadPool();
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java?rev=1441491&r1=1441490&r2=1441491&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
Fri Feb 1 15:39:09 2013
@@ -84,7 +84,6 @@ import org.apache.uima.ducc.ws.DuccDaemo
import org.apache.uima.ducc.ws.DuccData;
import org.apache.uima.ducc.ws.DuccMachinesData;
import org.apache.uima.ducc.ws.MachineInfo;
-import org.apache.uima.ducc.ws.server.DuccAbstractHandler.RequestRole;
import org.eclipse.jetty.server.Request;
public class DuccHandler extends DuccAbstractHandler {
