You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2016/01/20 20:40:13 UTC
svn commit: r1725795 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main:
java/org/apache/uima/ducc/ws/ java/org/apache/uima/ducc/ws/server/
webapp/root/ webapp/root/$banner/ webapp/root/js/ webapp/root/opensources/
Author: degenaro
Date: Wed Jan 20 19:40:12 2016
New Revision: 1725795
URL: http://svn.apache.org/viewvc?rev=1725795&view=rev
Log:
UIMA-4762 DUCC Web Server (WS) cannot use colon : in cookie names in Jetty 8 and beyond
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccDaemonsData.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccCookies.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-job-details.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-jobs.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-reservation-details.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-reservations.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-service-details.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-services.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-system-administration.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-system-broker.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-system-classes.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-system-daemons.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-system-machines.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-viz.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$imports-scroll.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$imports.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/login.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/logout.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/opensources/sorttable.js
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/preferences.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/uima-initialization-report.jsp
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccDaemonsData.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccDaemonsData.java?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccDaemonsData.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccDaemonsData.java Wed Jan 20 19:40:12 2016
@@ -18,7 +18,6 @@
*/
package org.apache.uima.ducc.ws;
-import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.uima.ducc.common.boot.DuccDaemonRuntimeProperties.DaemonName;
@@ -37,9 +36,7 @@ public class DuccDaemonsData {
private static ConcurrentHashMap<DaemonName,Long> eventSize = new ConcurrentHashMap<DaemonName,Long>();
private static ConcurrentHashMap<DaemonName,Long> eventSizeMax = new ConcurrentHashMap<DaemonName,Long>();
private static ConcurrentHashMap<DaemonName,String> eventSizeMaxTOD = new ConcurrentHashMap<DaemonName,String>();
-
- private static ConcurrentHashMap<DaemonName,Properties> daemonProperties = new ConcurrentHashMap<DaemonName,Properties>();
-
+
public static DuccDaemonsData getInstance() {
return duccDaemonsData;
}
@@ -164,11 +161,4 @@ public class DuccDaemonsData {
return retVal;
}
- public Properties getProperties(DaemonName key) {
- Properties retVal = new Properties();
- if(daemonProperties.containsKey(key)) {
- retVal = daemonProperties.get(key);
- }
- return retVal;
- }
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccCookies.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccCookies.java?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccCookies.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccCookies.java Wed Jan 20 19:40:12 2016
@@ -33,9 +33,7 @@ public class DuccCookies {
public static final String cookieUri = "/";
- public static final String join = ":";
-
- public static final String application = "ducc";
+ public static final String duccCookiePrefix = "DUCC";
private static final String refreshmode = "refreshmode";
private static final String valueRefreshmodeAutomatic = "automatic";
@@ -49,20 +47,20 @@ public class DuccCookies {
public static final String users = "users";
//private static final String qualifier = "qualifier";
- public static final String cookieRefreshMode = application+join+refreshmode;
- public static final String cookieJobsMax = application+join+jobs+max;
- public static final String cookieJobsUsers = application+join+jobs+users;
- //public static final String cookieJobsUsersQualifier = application+join+jobs+users+qualifier;
- public static final String cookieReservationsMax = application+join+reservations+max;
- public static final String cookieReservationsUsers = application+join+reservations+users;
- //public static final String cookieReservationsUsersQualifier = application+join+reservations+users+qualifier;
- public static final String cookieServicesMax = application+join+services+max;
- public static final String cookieServicesUsers = application+join+services+users;
- //public static final String cookieServicesUsersQualifier = application+join+services+users+qualifier;
+ public static final String cookieRefreshMode = duccCookiePrefix+refreshmode;
+ public static final String cookieJobsMax = duccCookiePrefix+jobs+max;
+ public static final String cookieJobsUsers = duccCookiePrefix+jobs+users;
+ //public static final String cookieJobsUsersQualifier = duccCookiePrefix+jobs+users+qualifier;
+ public static final String cookieReservationsMax = duccCookiePrefix+reservations+max;
+ public static final String cookieReservationsUsers = duccCookiePrefix+reservations+users;
+ //public static final String cookieReservationsUsersQualifier = duccCookiePrefix+reservations+users+qualifier;
+ public static final String cookieServicesMax = duccCookiePrefix+services+max;
+ public static final String cookieServicesUsers = duccCookiePrefix+services+users;
+ //public static final String cookieServicesUsersQualifier = duccCookiePrefix+services+users+qualifier;
private static final String agents = "agents";
- public static final String cookieAgents = application+join+agents;
+ public static final String cookieAgents = duccCookiePrefix+agents;
public static final String valueAgentsShow = "show";
private static final String table_style = "table_style";
@@ -72,12 +70,12 @@ public class DuccCookies {
private static final String filter_users_style = "filter_users_style";
private static final String role = "role";
- public static final String cookieStyleTable = application+join+table_style;
- public static final String cookieStyleDate = application+join+date_style;
- public static final String cookieStyleDescription = application+join+description_style;
- public static final String cookieStyleDisplay = application+join+display_style;
- public static final String cookieStyleFilterUsers = application+join+filter_users_style;
- public static final String cookieRole = application+join+role;
+ public static final String cookieStyleTable = duccCookiePrefix+table_style;
+ public static final String cookieStyleDate = duccCookiePrefix+date_style;
+ public static final String cookieStyleDescription = duccCookiePrefix+description_style;
+ public static final String cookieStyleDisplay = duccCookiePrefix+display_style;
+ public static final String cookieStyleFilterUsers = duccCookiePrefix+filter_users_style;
+ public static final String cookieRole = duccCookiePrefix+role;
public static final String valueStyleDateLong = "long";
public static final String valueStyleDateMedium = "medium";
@@ -101,7 +99,7 @@ public class DuccCookies {
public static final String valueRoleUser = "user";
protected static final String getCookieKey(String name) {
- return application+join+"name";
+ return duccCookiePrefix+"name";
}
public static String getCookie(String defaultValue, HttpServletRequest request, String name) {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-job-details.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24banner/c1-refresh-job-details.jsp?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-job-details.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-job-details.jsp Wed Jan 20 19:40:12 2016
@@ -33,9 +33,9 @@ under the License.
<form name="duccform" style="margin-bottom:0;">
<fieldset>
<legend>Refresh</legend>
-<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('ducc:refreshmode','manual' )" /> Manual
+<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('DUCCrefreshmode','manual' )" /> Manual
<br>
-<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('ducc:refreshmode','automatic')" /> Automatic
+<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('DUCCrefreshmode','automatic')" /> Automatic
</fieldset>
</form>
</table>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-jobs.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24banner/c1-refresh-jobs.jsp?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-jobs.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-jobs.jsp Wed Jan 20 19:40:12 2016
@@ -33,9 +33,9 @@ under the License.
<form name="duccform" style="margin-bottom:0;">
<fieldset>
<legend>Refresh</legend>
-<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('ducc:refreshmode','manual' )" /> Manual
+<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('DUCCrefreshmode','manual' )" /> Manual
<br>
-<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('ducc:refreshmode','automatic')" /> Automatic
+<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('DUCCrefreshmode','automatic')" /> Automatic
</fieldset>
</form>
</table>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-reservation-details.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24banner/c1-refresh-reservation-details.jsp?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-reservation-details.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-reservation-details.jsp Wed Jan 20 19:40:12 2016
@@ -33,9 +33,9 @@ under the License.
<form name="duccform" style="margin-bottom:0;">
<fieldset>
<legend>Refresh</legend>
-<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('ducc:refreshmode','manual' )" /> Manual
+<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('DUCCrefreshmode','manual' )" /> Manual
<br>
-<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('ducc:refreshmode','automatic')" /> Automatic
+<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('DUCCrefreshmode','automatic')" /> Automatic
</fieldset>
</form>
</table>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-reservations.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24banner/c1-refresh-reservations.jsp?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-reservations.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-reservations.jsp Wed Jan 20 19:40:12 2016
@@ -33,9 +33,9 @@ under the License.
<form name="duccform" style="margin-bottom:0;">
<fieldset>
<legend>Refresh</legend>
-<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('ducc:refreshmode','manual' )" /> Manual
+<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('DUCCrefreshmode','manual' )" /> Manual
<br>
-<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('ducc:refreshmode','automatic')" /> Automatic
+<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('DUCCrefreshmode','automatic')" /> Automatic
</fieldset>
</form>
</table>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-service-details.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24banner/c1-refresh-service-details.jsp?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-service-details.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-service-details.jsp Wed Jan 20 19:40:12 2016
@@ -33,9 +33,9 @@ under the License.
<form name="duccform" style="margin-bottom:0;">
<fieldset>
<legend>Refresh</legend>
-<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('ducc:refreshmode','manual' )" /> Manual
+<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('DUCCrefreshmode','manual' )" /> Manual
<br>
-<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('ducc:refreshmode','automatic')" /> Automatic
+<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('DUCCrefreshmode','automatic')" /> Automatic
</fieldset>
</form>
</table>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-services.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24banner/c1-refresh-services.jsp?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-services.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-services.jsp Wed Jan 20 19:40:12 2016
@@ -33,9 +33,9 @@ under the License.
<form name="duccform" style="margin-bottom:0;">
<fieldset>
<legend>Refresh</legend>
-<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('ducc:refreshmode','manual' )" /> Manual
+<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('DUCCrefreshmode','manual' )" /> Manual
<br>
-<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('ducc:refreshmode','automatic')" /> Automatic
+<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('DUCCrefreshmode','automatic')" /> Automatic
</fieldset>
</form>
</table>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-system-administration.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24banner/c1-refresh-system-administration.jsp?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-system-administration.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-system-administration.jsp Wed Jan 20 19:40:12 2016
@@ -33,9 +33,9 @@ under the License.
<form name="duccform" style="margin-bottom:0;">
<fieldset>
<legend>Refresh</legend>
-<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('ducc:refreshmode','manual' )" /> Manual
+<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('DUCCrefreshmode','manual' )" /> Manual
<br>
-<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('ducc:refreshmode','automatic')" /> Automatic
+<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('DUCCrefreshmode','automatic')" /> Automatic
</fieldset>
</form>
</table>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-system-broker.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24banner/c1-refresh-system-broker.jsp?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-system-broker.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-system-broker.jsp Wed Jan 20 19:40:12 2016
@@ -33,9 +33,9 @@ under the License.
<form name="duccform" style="margin-bottom:0;">
<fieldset>
<legend>Refresh</legend>
-<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('ducc:refreshmode','manual' )" /> Manual
+<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('DUCCrefreshmode','manual' )" /> Manual
<br>
-<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('ducc:refreshmode','automatic')" /> Automatic
+<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('DUCCrefreshmode','automatic')" /> Automatic
</fieldset>
</form>
</table>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-system-classes.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24banner/c1-refresh-system-classes.jsp?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-system-classes.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-system-classes.jsp Wed Jan 20 19:40:12 2016
@@ -33,9 +33,9 @@ under the License.
<form name="duccform" style="margin-bottom:0;">
<fieldset>
<legend>Refresh</legend>
-<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('ducc:refreshmode','manual' )" /> Manual
+<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('DUCCrefreshmode','manual' )" /> Manual
<br>
-<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('ducc:refreshmode','automatic')" /> Automatic
+<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('DUCCrefreshmode','automatic')" /> Automatic
</fieldset>
</form>
</table>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-system-daemons.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24banner/c1-refresh-system-daemons.jsp?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-system-daemons.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-system-daemons.jsp Wed Jan 20 19:40:12 2016
@@ -33,9 +33,9 @@ under the License.
<form name="duccform" style="margin-bottom:0;">
<fieldset>
<legend>Refresh</legend>
-<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('ducc:refreshmode','manual' )" /> Manual
+<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('DUCCrefreshmode','manual' )" /> Manual
<br>
-<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('ducc:refreshmode','automatic')" /> Automatic
+<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('DUCCrefreshmode','automatic')" /> Automatic
</fieldset>
</form>
</table>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-system-machines.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24banner/c1-refresh-system-machines.jsp?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-system-machines.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-system-machines.jsp Wed Jan 20 19:40:12 2016
@@ -33,9 +33,9 @@ under the License.
<form name="duccform" style="margin-bottom:0;">
<fieldset>
<legend>Refresh</legend>
-<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('ducc:refreshmode','manual' )" /> Manual
+<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('DUCCrefreshmode','manual' )" /> Manual
<br>
-<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('ducc:refreshmode','automatic')" /> Automatic
+<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('DUCCrefreshmode','automatic')" /> Automatic
</fieldset>
</form>
</table>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-viz.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24banner/c1-refresh-viz.jsp?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-viz.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c1-refresh-viz.jsp Wed Jan 20 19:40:12 2016
@@ -33,9 +33,9 @@ under the License.
<form name="duccform" style="margin-bottom:0;">
<fieldset>
<legend>Refresh</legend>
-<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('ducc:refreshmode','manual' )" /> Manual
+<input type="radio" name="refresh" value="manual" onclick="ducc_put_cookie('DUCCrefreshmode','manual' )" /> Manual
<br>
-<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('ducc:refreshmode','automatic')" /> Automatic
+<input type="radio" name="refresh" value="automatic" checked onclick="ducc_put_cookie('DUCCrefreshmode','automatic')" /> Automatic
</fieldset>
</form>
</table>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$imports-scroll.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24imports-scroll.jsp?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$imports-scroll.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$imports-scroll.jsp Wed Jan 20 19:40:12 2016
@@ -18,7 +18,7 @@ under the License.
-->
<%
String table_style = "scroll";
-String cookieName = "ducc:table_style";
+String cookieName = "DUCCtable_style";
String cookieValue = null;
Cookie cookie = null;
Cookie cookies [] = request.getCookies ();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$imports.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24imports.jsp?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$imports.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$imports.jsp Wed Jan 20 19:40:12 2016
@@ -18,7 +18,7 @@ under the License.
-->
<%
String table_style = "classic";
-String cookieName = "ducc:table_style";
+String cookieName = "DUCCtable_style";
String cookieValue = null;
Cookie cookie = null;
Cookie cookies [] = request.getCookies ();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js Wed Jan 20 19:40:12 2016
@@ -2608,9 +2608,38 @@ function ducc_init(type) {
}
}
+/*
+ * transition function for use in converting
+ * cookie names from ducc:xxxx to DUCCxxxx
+ */
+// @Deprecated
+function ducc_transform_all_cookies() {
+ var fname = "ducc_transform_all_cookies";
+ try {
+ var pairs = document.cookie.split(";");
+ var cookies = {};
+ for (var i=0; i<pairs.length; i++){
+ var pair = pairs[i].split("=");
+ var name = pair[0].trim();
+ var value = pair[1].trim();
+ if(name.startsWith("ducc:")) {
+ var nameSuffix = name.substring(5);
+ var nameModern = "DUCC"+nameSuffix;
+ // delete bad cookie
+ document.cookie = name +'=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;';
+ // create good cookie
+ ducc_put_cookie(nameModern, value);
+ }
+ }
+ } catch (err) {
+ ducc_error(fname, err);
+ }
+}
+
function ducc_cookies() {
var fname = "ducc_cookies";
try {
+ ducc_transform_all_cookies();
var refreshmode = ducc_appl("refreshmode");
var c_value = ducc_get_cookie(refreshmode);
if (c_value == "automatic") {
@@ -2712,7 +2741,7 @@ function uima_initialization_report(name
function ducc_appl(name) {
var fname = "ducc_appl";
try {
- var appl = "ducc:";
+ var appl = "DUCC";
return appl + name;
} catch (err) {
ducc_error(fname, err);
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/login.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/login.jsp?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/login.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/login.jsp Wed Jan 20 19:40:12 2016
@@ -87,8 +87,8 @@ under the License.
<td>
<div>
<form name="duccform">
- <input type="radio" name="refresh" value="manual" onClick="ducc_put_cookie('ducc:refreshmode','manual' )" /> Manual
- <input type="radio" name="refresh" value="automatic" checked onClick="ducc_put_cookie('ducc:refreshmode','automatic')" /> Automatic
+ <input type="radio" name="refresh" value="manual" onClick="ducc_put_cookie('DUCCrefreshmode','manual' )" /> Manual
+ <input type="radio" name="refresh" value="automatic" checked onClick="ducc_put_cookie('DUCCrefreshmode','automatic')" /> Automatic
</form>
</div>
</table>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/logout.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/logout.jsp?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/logout.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/logout.jsp Wed Jan 20 19:40:12 2016
@@ -86,8 +86,8 @@ under the License.
<td>
<div>
<form name="duccform">
- <input type="radio" name="refresh" value="manual" onClick="ducc_put_cookie('ducc:refreshmode','manual' )" /> Manual
- <input type="radio" name="refresh" value="automatic" checked onClick="ducc_put_cookie('ducc:refreshmode','automatic')" /> Automatic
+ <input type="radio" name="refresh" value="manual" onClick="ducc_put_cookie('DUCCrefreshmode','manual' )" /> Manual
+ <input type="radio" name="refresh" value="automatic" checked onClick="ducc_put_cookie('DUCCrefreshmode','automatic')" /> Automatic
</form>
</div>
</table>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/opensources/sorttable.js
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/opensources/sorttable.js?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/opensources/sorttable.js (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/opensources/sorttable.js Wed Jan 20 19:40:12 2016
@@ -92,7 +92,7 @@ sorttable = {
dean_addEvent(headrow[i],"click", function(e) {
// <***** DUCC modification *****>
- var c_value = ducc_get_cookie('ducc:refreshmode');
+ var c_value = ducc_get_cookie('DUCCrefreshmode');
if(c_value == 'automatic') {
$.jGrowl(' Sort is disabled when Refresh is Automatic.');
return;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/preferences.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/preferences.jsp?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/preferences.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/preferences.jsp Wed Jan 20 19:40:12 2016
@@ -92,8 +92,8 @@ boolean role = true;
<td>
<div>
<form name="duccform">
- <input type="radio" name="refresh" value="manual" onClick="ducc_put_cookie('ducc:refreshmode','manual' )" /> Manual
- <input type="radio" name="refresh" value="automatic" checked onClick="ducc_put_cookie('ducc:refreshmode','automatic')" /> Automatic
+ <input type="radio" name="refresh" value="manual" onClick="ducc_put_cookie('DUCCrefreshmode','manual' )" /> Manual
+ <input type="radio" name="refresh" value="automatic" checked onClick="ducc_put_cookie('DUCCrefreshmode','automatic')" /> Automatic
</form>
</div>
</table>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.jsp?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.jsp Wed Jan 20 19:40:12 2016
@@ -85,8 +85,8 @@ under the License.
<td>
<div>
<form name="duccform">
- <input type="radio" name="refresh" value="manual" onClick="ducc_put_cookie('ducc:refreshmode','manual' )" /> Manual
- <input type="radio" name="refresh" value="automatic" checked onClick="ducc_put_cookie('ducc:refreshmode','automatic')" /> Automatic
+ <input type="radio" name="refresh" value="manual" onClick="ducc_put_cookie('DUCCrefreshmode','manual' )" /> Manual
+ <input type="radio" name="refresh" value="automatic" checked onClick="ducc_put_cookie('DUCCrefreshmode','automatic')" /> Automatic
</form>
</div>
</table>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/uima-initialization-report.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/uima-initialization-report.jsp?rev=1725795&r1=1725794&r2=1725795&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/uima-initialization-report.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/uima-initialization-report.jsp Wed Jan 20 19:40:12 2016
@@ -52,8 +52,8 @@ under the License.
<td>
<div>
<form name="duccform">
- <input type="radio" name="refresh" value="manual" onClick="ducc_put_cookie('ducc:refreshmode','manual' )" /> Manual
- <input type="radio" name="refresh" value="automatic" checked onClick="ducc_put_cookie('ducc:refreshmode','automatic')" /> Automatic
+ <input type="radio" name="refresh" value="manual" onClick="ducc_put_cookie('DUCCrefreshmode','manual' )" /> Manual
+ <input type="radio" name="refresh" value="automatic" checked onClick="ducc_put_cookie('DUCCrefreshmode','automatic')" /> Automatic
</form>
</div>
</table>