Author: degenaro
Date: Tue Apr 30 12:28:58 2013
New Revision: 1477589
URL: http://svn.apache.org/r1477589
Log:
UIMA-2852 DUCC webserver (WS) JConsole links not working
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.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
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java?rev=1477589&r1=1477588&r2=1477589&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
Tue Apr 30 12:28:58 2013
@@ -92,6 +92,21 @@ public abstract class DuccAbstractHandle
public static final String valueStateTypeInactive = "inactive";
public static final String valueStateTypeDefault = valueStateTypeAll;
+ protected String root_dir = null;
+ protected String jconsole_wrapper_signed_jar = null;
+
+ protected DuccWebServer duccWebServer = null;
+
+ public void init(DuccWebServer duccWebServer) {
+ this.duccWebServer = duccWebServer;
+ root_dir = duccWebServer.getRootDir();
+ jconsole_wrapper_signed_jar =
root_dir+File.separator+"lib"+File.separator+"webstart"+File.separator+"jconsole-wrapper-signed.jar";
+ }
+
+ public DuccWebServer getDuccWebServer() {
+ return duccWebServer;
+ }
+
public enum RequestStateType {
Active,
Inactive,
@@ -828,9 +843,15 @@ public abstract class DuccAbstractHandle
public String buildjConsoleLink(String service) {
String location = "buildjConsoleLink";
- String href = "<a
href=\""+duccjConsoleLink+"?"+"service="+service+"\" onclick=\"var newWin =
window.open(this.href,'child','height=800,width=1200,scrollbars');
newWin.focus(); return false;\">"+service+"</a>";
- duccLogger.trace(location, null, href);
- return href;
+ String retVal = service;
+ if(jconsole_wrapper_signed_jar != null) {
+ File file = new File(jconsole_wrapper_signed_jar);
+ if(file.exists()) {
+ retVal = "<a
href=\""+duccjConsoleLink+"?"+"service="+service+"\" onclick=\"var newWin =
window.open(this.href,'child','height=800,width=1200,scrollbars');
newWin.focus(); return false;\">"+service+"</a>";
+ }
+ }
+ duccLogger.trace(location, null, retVal);
+ return retVal;
}
public String buildErrorLink(IDuccWorkJob job) {
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=1477589&r1=1477588&r2=1477589&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
Tue Apr 30 12:28:58 2013
@@ -154,18 +154,12 @@ public class DuccHandler extends DuccAbs
private String duccReservationInstanceMemorySizes =
duccContext+"/reservation-instance-memory-sizes";
private String duccReservationInstanceMemoryUnits =
duccContext+"/reservation-instance-memory-units";
private String duccReservationNumberOfInstances =
duccContext+"/reservation-number-of-instances";
-
- private DuccWebServer duccWebServer = null;
public DuccHandler(DuccWebServer duccWebServer) {
- this.duccWebServer = duccWebServer;
+ super.init(duccWebServer);
initializeAuthenticator();
}
- public DuccWebServer getDuccWebServer() {
- return duccWebServer;
- }
-
public String getFileName() {
return
dir_home+File.separator+dir_resources+File.separator+getDuccWebServer().getClassDefinitionFile();
}
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=1477589&r1=1477588&r2=1477589&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
Tue Apr 30 12:28:58 2013
@@ -102,14 +102,9 @@ public class DuccHandlerJsonFormat exten
private final String jsonFormatMachines =
duccContextJsonFormat+"-machines";
private final String jsonFormatReservations =
duccContextJsonFormat+"-reservations";
- private DuccWebServer duccWebServer = null;
public DuccHandlerJsonFormat(DuccWebServer duccWebServer) {
- this.duccWebServer = duccWebServer;
- }
-
- public DuccWebServer getDuccWebServer() {
- return duccWebServer;
+ super.init(duccWebServer);
}
public String getFileName() {
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=1477589&r1=1477588&r2=1477589&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
Tue Apr 30 12:28:58 2013
@@ -87,16 +87,10 @@ public class DuccHandlerLegacy extends D
public final String legacySystemDaemons =
duccContextLegacy+"-system-daemons-data";
public final String legacySystemMachines =
duccContextLegacy+"-system-machines-data";
- private DuccWebServer duccWebServer = null;
-
public DuccHandlerLegacy(DuccWebServer duccWebServer) {
- this.duccWebServer = duccWebServer;
- }
-
- public DuccWebServer getDuccWebServer() {
- return duccWebServer;
+ super.init(duccWebServer);
}
-
+
public String getFileName() {
return
dir_home+File.separator+dir_resources+File.separator+getDuccWebServer().getClassDefinitionFile();
}
