'+title+'
'); - if (message) $m.append(''+message+'
'); - if (timeout == undefined) timeout = 3000; - $.blockUI({ - message: $m, fadeIn: 700, fadeOut: 1000, centerY: false, - timeout: timeout, showOverlay: false, - onUnblock: onClose, - css: $.blockUI.defaults.growlCSS - }); -}; - -// plugin method for blocking element content -$.fn.block = function(opts) { - return this.unblock({ fadeOut: 0 }).each(function() { - if ($.css(this,'position') == 'static') - this.style.position = 'relative'; - if ($.browser.msie) - this.style.zoom = 1; // force 'hasLayout' - install(this, opts); - }); -}; - -// plugin method for unblocking element content -$.fn.unblock = function(opts) { - return this.each(function() { - remove(this, opts); - }); -}; - -$.blockUI.version = 2.31; // 2nd generation blocking at no extra cost! - -// override these in your code to change the default behavior and style -$.blockUI.defaults = { - // message displayed when blocking (use null for no message) - message: 'Please wait...
', - - title: null, // title string; only used when theme == true - draggable: true, // only used when theme == true (requires jquery-ui.js to be loaded) - - theme: false, // set to true to use with jQuery UI themes - - // styles for the message when blocking; if you wish to disable - // these and use an external stylesheet then do this in your code: - // $.blockUI.defaults.css = {}; - css: { - padding: 0, - margin: 0, - width: '30%', - top: '40%', - left: '35%', - textAlign: 'center', - color: '#000', - border: '3px solid #aaa', - backgroundColor:'#fff', - cursor: 'wait' - }, - - // minimal style set used when themes are used - themedCSS: { - width: '30%', - top: '40%', - left: '35%' - }, - - // styles for the overlay - overlayCSS: { - backgroundColor: '#000', - opacity: 0.6, - cursor: 'wait' - }, - - // styles applied when using $.growlUI - growlCSS: { - width: '350px', - top: '10px', - left: '', - right: '10px', - border: 'none', - padding: '5px', - opacity: 0.6, - cursor: 'default', - color: '#fff', - backgroundColor: '#000', - '-webkit-border-radius': '10px', - '-moz-border-radius': '10px' - }, - - // IE issues: 'about:blank' fails on HTTPS and javascript:false is s-l-o-w - // (hat tip to Jorge H. N. de Vasconcelos) - iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank', - - // force usage of iframe in non-IE browsers (handy for blocking applets) - forceIframe: false, - - // z-index for the blocking overlay - baseZ: 1000, - - // set these to true to have the message automatically centered - centerX: true, // <-- only effects element blocking (page block controlled via css above) - centerY: true, - - // allow body element to be stetched in ie6; this makes blocking look better - // on "short" pages. disable if you wish to prevent changes to the body height - allowBodyStretch: true, - - // enable if you want key and mouse events to be disabled for content that is blocked - bindEvents: true, - - // be default blockUI will supress tab navigation from leaving blocking content - // (if bindEvents is true) - constrainTabKey: true, - - // fadeIn time in millis; set to 0 to disable fadeIn on block - fadeIn: 200, - - // fadeOut time in millis; set to 0 to disable fadeOut on unblock - fadeOut: 400, - - // time in millis to wait before auto-unblocking; set to 0 to disable auto-unblock - timeout: 0, - - // disable if you don't want to show the overlay - showOverlay: true, - - // if true, focus will be placed in the first available input field when - // page blocking - focusInput: true, - - // suppresses the use of overlay styles on FF/Linux (due to performance issues with opacity) - applyPlatformOpacityRules: true, - - // callback method invoked when fadeIn has completed and blocking message is visible - onBlock: null, - - // callback method invoked when unblocking has completed; the callback is - // passed the element that has been unblocked (which is the window object for page - // blocks) and the options that were passed to the unblock call: - // onUnblock(element, options) - onUnblock: null, - - // don't ask; if you really must know: http://groups.google.com/group/jquery-en/browse_thread/thread/36640a8730503595/2f6a79a77a78e493#2f6a79a77a78e493 - quirksmodeOffsetHack: 4 -}; - -// private data and functions follow... - -var pageBlock = null; -var pageBlockEls = []; - -function install(el, opts) { - var full = (el == window); - var msg = opts && opts.message !== undefined ? opts.message : undefined; - opts = $.extend({}, $.blockUI.defaults, opts || {}); - opts.overlayCSS = $.extend({}, $.blockUI.defaults.overlayCSS, opts.overlayCSS || {}); - var css = $.extend({}, $.blockUI.defaults.css, opts.css || {}); - var themedCSS = $.extend({}, $.blockUI.defaults.themedCSS, opts.themedCSS || {}); - msg = msg === undefined ? opts.message : msg; - - // remove the current block (if there is one) - if (full && pageBlock) - remove(window, {fadeOut:0}); - - // if an existing element is being used as the blocking content then we capture - // its current place in the DOM (and current display style) so we can restore - // it when we unblock - if (msg && typeof msg != 'string' && (msg.parentNode || msg.jquery)) { - var node = msg.jquery ? msg[0] : msg; - var data = {}; - $(el).data('blockUI.history', data); - data.el = node; - data.parent = node.parentNode; - data.display = node.style.display; - data.position = node.style.position; - if (data.parent) - data.parent.removeChild(node); - } - - var z = opts.baseZ; - - // blockUI uses 3 layers for blocking, for simplicity they are all used on every platform; - // layer1 is the iframe layer which is used to supress bleed through of underlying content - // layer2 is the overlay layer which has opacity and a wait cursor (by default) - // layer3 is the message content that is displayed while blocking - - var lyr1 = ($.browser.msie || opts.forceIframe) - ? $('') - : $(''); - var lyr2 = $(''); - - var lyr3; - if (opts.theme && full) { - var s = ''; - lyr3 = $(s); - } - else { - lyr3 = full ? $('') - : $(''); - } - - // if we have a message, style it - if (msg) { - if (opts.theme) { - lyr3.css(themedCSS); - lyr3.addClass('ui-widget-content'); - } - else - lyr3.css(css); - } - - // style the overlay - if (!opts.applyPlatformOpacityRules || !($.browser.mozilla && /Linux/.test(navigator.platform))) - lyr2.css(opts.overlayCSS); - lyr2.css('position', full ? 'fixed' : 'absolute'); - - // make iframe layer transparent in IE - if ($.browser.msie || opts.forceIframe) - lyr1.css('opacity',0.0); - - //$([lyr1[0],lyr2[0],lyr3[0]]).appendTo(full ? 'body' : el); - var layers = [lyr1,lyr2,lyr3], $par = full ? $('body') : $(el); - $.each(layers, function() { - this.appendTo($par); - }); - - if (opts.theme && opts.draggable && $.fn.draggable) { - lyr3.draggable({ - handle: '.ui-dialog-titlebar', - cancel: 'li' - }); - } - - // ie7 must use absolute positioning in quirks mode and to account for activex issues (when scrolling) - var expr = setExpr && (!$.boxModel || $('object,embed', full ? null : el).length > 0); - if (ie6 || expr) { - // give body 100% height - if (full && opts.allowBodyStretch && $.boxModel) - $('html,body').css('height','100%'); - - // fix ie6 issue when blocked element has a border width - if ((ie6 || !$.boxModel) && !full) { - var t = sz(el,'borderTopWidth'), l = sz(el,'borderLeftWidth'); - var fixT = t ? '(0 - '+t+')' : 0; - var fixL = l ? '(0 - '+l+')' : 0; - } - - // simulate fixed position - $.each([lyr1,lyr2,lyr3], function(i,o) { - var s = o[0].style; - s.position = 'absolute'; - if (i < 2) { - full ? s.setExpression('height','Math.max(document.body.scrollHeight, document.body.offsetHeight) - (jQuery.boxModel?0:'+opts.quirksmodeOffsetHack+') + "px"') - : s.setExpression('height','this.parentNode.offsetHeight + "px"'); - full ? s.setExpression('width','jQuery.boxModel && document.documentElement.clientWidth || document.body.clientWidth + "px"') - : s.setExpression('width','this.parentNode.offsetWidth + "px"'); - if (fixL) s.setExpression('left', fixL); - if (fixT) s.setExpression('top', fixT); - } - else if (opts.centerY) { - if (full) s.setExpression('top','(document.documentElement.clientHeight || document.body.clientHeight) / 2 - (this.offsetHeight / 2) + (blah = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"'); - s.marginTop = 0; - } - else if (!opts.centerY && full) { - var top = (opts.css && opts.css.top) ? parseInt(opts.css.top) : 0; - var expression = '((document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + '+top+') + "px"'; - s.setExpression('top',expression); - } - }); - } - - // show the message - if (msg) { - if (opts.theme) - lyr3.find('.ui-widget-content').append(msg); - else - lyr3.append(msg); - if (msg.jquery || msg.nodeType) - $(msg).show(); - } - - if (($.browser.msie || opts.forceIframe) && opts.showOverlay) - lyr1.show(); // opacity is zero - if (opts.fadeIn) { - var cb = opts.onBlock ? opts.onBlock : noOp; - var cb1 = (opts.showOverlay && !msg) ? cb : noOp; - var cb2 = msg ? cb : noOp; - if (opts.showOverlay) - lyr2._fadeIn(opts.fadeIn, cb1); - if (msg) - lyr3._fadeIn(opts.fadeIn, cb2); - } - else { - if (opts.showOverlay) - lyr2.show(); - if (msg) - lyr3.show(); - if (opts.onBlock) - opts.onBlock(); - } - - // bind key and mouse events - bind(1, el, opts); - - if (full) { - pageBlock = lyr3[0]; - pageBlockEls = $(':input:enabled:visible',pageBlock); - if (opts.focusInput) - setTimeout(focus, 20); - } - else - center(lyr3[0], opts.centerX, opts.centerY); - - if (opts.timeout) { - // auto-unblock - var to = setTimeout(function() { - full ? $.unblockUI(opts) : $(el).unblock(opts); - }, opts.timeout); - $(el).data('blockUI.timeout', to); - } -}; - -// remove the block -function remove(el, opts) { - var full = (el == window); - var $el = $(el); - var data = $el.data('blockUI.history'); - var to = $el.data('blockUI.timeout'); - if (to) { - clearTimeout(to); - $el.removeData('blockUI.timeout'); - } - opts = $.extend({}, $.blockUI.defaults, opts || {}); - bind(0, el, opts); // unbind events - - var els; - if (full) // crazy selector to handle odd field errors in ie6/7 - els = $('body').children().filter('.blockUI').add('body > .blockUI'); - else - els = $('.blockUI', el); - - if (full) - pageBlock = pageBlockEls = null; - - if (opts.fadeOut) { - els.fadeOut(opts.fadeOut); - setTimeout(function() { reset(els,data,opts,el); }, opts.fadeOut); - } - else - reset(els, data, opts, el); -}; - -// move blocking element back into the DOM where it started -function reset(els,data,opts,el) { - els.each(function(i,o) { - // remove via DOM calls so we don't lose event handlers - if (this.parentNode) - this.parentNode.removeChild(this); - }); - - if (data && data.el) { - data.el.style.display = data.display; - data.el.style.position = data.position; - if (data.parent) - data.parent.appendChild(data.el); - $(el).removeData('blockUI.history'); - } - - if (typeof opts.onUnblock == 'function') - opts.onUnblock(el,opts); -}; - -// bind/unbind the handler -function bind(b, el, opts) { - var full = el == window, $el = $(el); - - // don't bother unbinding if there is nothing to unbind - if (!b && (full && !pageBlock || !full && !$el.data('blockUI.isBlocked'))) - return; - if (!full) - $el.data('blockUI.isBlocked', b); - - // don't bind events when overlay is not in use or if bindEvents is false - if (!opts.bindEvents || (b && !opts.showOverlay)) - return; - - // bind anchors and inputs for mouse and key events - var events = 'mousedown mouseup keydown keypress'; - b ? $(document).bind(events, opts, handler) : $(document).unbind(events, handler); - -// former impl... -// var $e = $('a,:input'); -// b ? $e.bind(events, opts, handler) : $e.unbind(events, handler); -}; - -// event handler to suppress keyboard/mouse events when blocking -function handler(e) { - // allow tab navigation (conditionally) - if (e.keyCode && e.keyCode == 9) { - if (pageBlock && e.data.constrainTabKey) { - var els = pageBlockEls; - var fwd = !e.shiftKey && e.target == els[els.length-1]; - var back = e.shiftKey && e.target == els[0]; - if (fwd || back) { - setTimeout(function(){focus(back)},10); - return false; - } - } - } - // allow events within the message content - if ($(e.target).parents('div.blockMsg').length > 0) - return true; - - // allow events for content that is not being blocked - return $(e.target).parents().children().filter('div.blockUI').length == 0; -}; - -function focus(back) { - if (!pageBlockEls) - return; - var e = pageBlockEls[back===true ? pageBlockEls.length-1 : 0]; - if (e) - e.focus(); -}; - -function center(el, x, y) { - var p = el.parentNode, s = el.style; - var l = ((p.offsetWidth - el.offsetWidth)/2) - sz(p,'borderLeftWidth'); - var t = ((p.offsetHeight - el.offsetHeight)/2) - sz(p,'borderTopWidth'); - if (x) s.left = l > 0 ? (l+'px') : '0'; - if (y) s.top = t > 0 ? (t+'px') : '0'; -}; - -function sz(el, p) { - return parseInt($.css(el,p))||0; -}; - -})(jQuery); - diff --git a/src/main/webapp/project.html b/src/main/webapp/project.html index a8b876170..6a91a5740 100644 --- a/src/main/webapp/project.html +++ b/src/main/webapp/project.html @@ -1 +1 @@ -
starting up ... starting up ...' + data + '');
+ console.log(data);
+ body.html(
+ '
' + data + '
' +
+ '' +
+ '
'
+ );
self._level = DialogSystem.showDialog(frame);
}
);
- var left_footer = footer.find(".left");
- $('').text("Cancel").click(function() {
+ var left_footer = footer.find(".left");
+
+ var cancel_button = $('').text("Cancel").click(function() {
self._dismiss();
}).appendTo(left_footer);
+ var center_footer = footer.find(".center");
+
+ var authorization = $('Describe the data you\'re about to load ¬
' +
+ '' +
+ '').addClass("freebase-loading-authorization").hide().appendTo(center_footer);
+
var right_footer = footer.find(".right");
- //$('').appendTo(right_footer);
-
- var selector = $('').addClass("freebase-loading-graph-selector").html("Load into " +
+ var selector = $('').addClass("freebase-loading-graph-selector").html("Load this data into " +
'' +
- ''
+ ''
).buttonset().appendTo(right_footer);
-
- $('').text("Load").click(function() {
- self._check_authorization(self._load);
- }).appendTo(right_footer);
+
+ var load_button = $('').text("Sign In").appendTo(right_footer);
this._elmts = DOM.bind(frame);
+
+ var provider = "www.freebase.com";
- this._elmts.otg.click(function() {
- if (!confirm("are you sure?")) {
- self._elmts.sandbox.attr("checked","checked");
- self._elmts.otg.removeAttr("checked");
- selector.find("input").button('refresh');
- }
+ var check_authorization = function() {
+ $.get("/command/check-authorization/" + provider, function(data) {
+ if ("status" in data && data.status == "200 OK") {
+ authorization.html('Signed in as: ' + data.username + ' | Sign Out').show();
+ DOM.bind(authorization).signout.click(function() {
+ Sign.signout(check_authorization,provider);
+ });
+ load_button.text("Load").unbind().click(function() {
+ self._load(self);
+ });
+ } else {
+ authorization.html("").hide();
+ load_button.text("Sign In").removeAttr("disabled").unbind().click(function() {
+ Sign.signin(check_authorization,provider);
+ });
+ }
+ },"json");
+ };
+
+ check_authorization();
+
+ this._elmts.sandbox.click(function() {
+ //check_authorization();
});
-};
-
-FreebaseLoadingDialog.prototype._check_authorization = function(cont) {
- var freebase = this._elmts.otg.attr("checked");
- var provider = (freebase) ? "freebase" : "sandbox";
- $.get("/command/check-authorization",{ "provider" : provider }, function(data) {
- if ("status" in data && data.status == "200 OK") {
- if (typeof cont == "function") cont();
- } else {
- alert("Sorry, we're working very hard to make this happen.");
- //Sign.signin(cont,provider);
+ this._elmts.freebase.click(function() {
+ if (!confirm("Are you sure your data is clean enough to enter Freebase?")) {
+ self._elmts.sandbox.attr("checked","checked");
+ self._elmts.freebase.removeAttr("checked");
+ selector.find("input").button('refresh');
}
- },"json");
+ //check_authorization();
+ });
};
-FreebaseLoadingDialog.prototype._load = function() {
- // do the real loading here
+FreebaseLoadingDialog.prototype._load = function(self) {
+ $.post("/command/upload-data",
+ {
+ project: theProject.id,
+ "graph" : ($("#freebase-loading-graph-selector-freebase").attr("checked")) ? "otg" : "sandbox",
+ "info" : $("#freebase-loading-tripleloader-info textarea").val()
+ },
+ function(data) {
+ var body = $(".dialog-body");
+ if ("status" in data && data.status == "200 OK") {
+ body.html('');
+ } else {
+ body.html('');
+ }
+ $("button#freebase-loading-load").text("Close").unbind().click(function() {
+ self._dismiss();
+ });
+ $("button#freebase-loading-cancel").hide();
+ },
+ "json"
+ );
}
FreebaseLoadingDialog.prototype._dismiss = function() {
diff --git a/src/main/webapp/scripts/util/sign.js b/src/main/webapp/scripts/util/sign.js
index fd2ef350d..4522488e7 100644
--- a/src/main/webapp/scripts/util/sign.js
+++ b/src/main/webapp/scripts/util/sign.js
@@ -56,27 +56,7 @@
return window.open(url, windowname || "", params_list.join(","));
},
-
- block : function() {
- if ($.blockUI) {
- $.blockUI({ css: {
- border: 'none',
- padding: '15px',
- backgroundColor: '#000',
- '-webkit-border-radius': '10px',
- '-moz-border-radius': '10px',
- opacity: .5,
- color: '#fff'
- } });
- }
- },
-
- unblock : function() {
- if ($.unblockUI) {
- $.unblockUI();
- }
- },
-
+
signintize : function(cont) {
$('.signedin').show();
$('.signedout').hide();
@@ -87,33 +67,31 @@
},
signin : function(success, provider, width, height) {
- var newwin = window.Sign.popup("/command/authorize?" + $.param({ "provider" : provider}), width, height);
+ var newwin = window.Sign.popup("/command/authorize/" + provider, width, height);
- console.log(newwin);
-
- newwin.opener = window;
+ if (newwin !== null) {
+ newwin.opener = window;
+ }
window.onauthorization = function() {
- window.Sign.block();
if (typeof success == 'undefined') {
window.location.reload();
} else {
$.ajax({
- url: "/command/check-authorization",
+ url: "/command/check-authorization/" + provider,
dataType: "json",
success: function(data) {
window.user = data;
window.Sign.signintize(success);
- window.Sign.unblock();
}
});
}
};
- if (window.focus) {
+ if (window.focus && newwin !== null) {
newwin.focus();
- console.log("focus");
}
+
return false;
},
@@ -124,17 +102,13 @@
},
signout : function(success,provider) {
- window.Sign.block();
-
$.ajax({
- url: "/command/deauthorize",
- data: { "provider" : provider },
+ url: "/command/deauthorize/" + provider,
success: function() {
if (typeof success == 'undefined') {
window.location.reload();
} else {
window.Sign.signoutize(success);
- window.Sign.unblock();
}
}
});
diff --git a/src/main/webapp/styles/dialogs/freebase-loading-dialog.css b/src/main/webapp/styles/dialogs/freebase-loading-dialog.css
index 8c9eac7f8..8b76b2f18 100644
--- a/src/main/webapp/styles/dialogs/freebase-loading-dialog.css
+++ b/src/main/webapp/styles/dialogs/freebase-loading-dialog.css
@@ -1,8 +1,34 @@
.freebase-loading-tripleloader-data {
- height: 500px;
+ height: 400px;
+ width: 99%;
overflow: auto;
border: 1px solid #aaa;
white-space: pre;
padding: 0.3em 0.5em 0.5em 0.5em;
font-family: monospace;
}
+
+.freebase-loading-tripleloader-message {
+ height: 500px;
+ overflow: auto;
+ border: 1px solid #aaa;
+ padding: 0.3em 0.5em 0.5em 0.5em;
+}
+
+.freebase-loading-authorization {
+ margin: 0em 2em;
+ padding: 0.6em 0.8em;
+ border: 1px solid #ccc;
+ background-color: #fff;
+ -moz-border-radius: 0.8em;
+ -webkit-border-radius: 0.8em;
+}
+
+.freebase-loading-tripleloader-info {
+ margin-top: 1em;
+}
+
+.freebase-loading-tripleloader-info textarea {
+ width: 99%;
+ height: 5em;
+}
\ No newline at end of file
diff --git a/src/server/java/com/metaweb/gridworks/Gridworks.java b/src/server/java/com/metaweb/gridworks/Gridworks.java
index 2b1cd7859..f981a3250 100644
--- a/src/server/java/com/metaweb/gridworks/Gridworks.java
+++ b/src/server/java/com/metaweb/gridworks/Gridworks.java
@@ -20,18 +20,15 @@ import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
-import org.apache.log4j.Appender;
-import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
import org.mortbay.jetty.Connector;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.bio.SocketConnector;
import org.mortbay.jetty.webapp.WebAppContext;
-import org.mortbay.log.Log;
import org.mortbay.util.Scanner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import com.metaweb.util.logging.IndentingLayout;
import com.metaweb.util.signal.AbstractSignalHandler;
import com.metaweb.util.threads.ThreadPoolExecutorAdapter;
@@ -45,29 +42,8 @@ public class Gridworks {
static private File tempDir;
static private int port;
static private String host;
-
- private static Logger root = Logger.getRootLogger();
- private static Logger logger = Logger.getLogger("com.metaweb.gridworks");
- public static void log(String message) {
- logger.info(message);
- }
-
- public static void info(String message) {
- logger.info(message);
- }
-
- public static void error(String message, Throwable t) {
- logger.error(message, t);
- }
-
- public static void warn(String message) {
- logger.warn(message);
- }
-
- public static void warn(String message, Throwable t) {
- logger.warn(message, t);
- }
+ final static Logger logger = LoggerFactory.getLogger("gridworks");
public static String getVersion() {
return VERSION;
@@ -100,20 +76,15 @@ public class Gridworks {
System.setProperty("com.apple.eawt.CocoaComponent.CompatibilityMode", "false");
// tell the signpost library to log
- System.setProperty("debug","true");
+ //System.setProperty("debug","true");
// if not already set, make sure jython can find its python stuff
if (System.getProperty("python.path") == null) {
System.setProperty("python.path","lib/python");
}
- // initialize the log4j system
- Appender console = new ConsoleAppender(new IndentingLayout());
- root.setLevel(Level.ALL);
- root.addAppender(console);
-
- Logger jetty_logger = Logger.getLogger("org.mortbay.log");
- jetty_logger.setLevel(Level.WARN);
+ // set the log verbosity level
+ org.apache.log4j.Logger.getRootLogger().setLevel(Level.toLevel(Configurations.get("gridworks.verbosity","info")));
tempDir = new File(Configurations.get("gridworks.temp","temp"));
if (!tempDir.exists()) tempDir.mkdirs();
@@ -137,7 +108,7 @@ public class Gridworks {
GridworksClient client = new GridworksClient();
client.init(host,port);
} catch (Exception e) {
- Log.warn("Sorry, some error prevented us from launching the browser for you.\n\n Point your browser to http://" + host + ":" + port + "/ to start using Gridworks.");
+ logger.warn("Sorry, some error prevented us from launching the browser for you.\n\n Point your browser to http://" + host + ":" + port + "/ to start using Gridworks.");
}
}
@@ -152,6 +123,8 @@ public class Gridworks {
class GridworksServer extends Server {
+ final static Logger logger = LoggerFactory.getLogger("gridworks_server");
+
private ThreadPoolExecutor threadPool;
public void init(String host, int port) throws Exception {
@@ -177,11 +150,11 @@ class GridworksServer extends Server {
File webXml = new File(contextRoot, "WEB-INF/web.xml");
if (!webXml.isFile()) {
- Gridworks.warn("Warning: Failed to find web application. Could not find 'web.xml' at '" + webXml.getAbsolutePath() + "'");
+ logger.warn("Warning: Failed to find web application. Could not find 'web.xml' at '" + webXml.getAbsolutePath() + "'");
System.exit(-1);
}
- Gridworks.info("Initializing context: '" + contextPath + "' from '" + contextRoot.getAbsolutePath() + "'");
+ logger.info("Initializing context: '" + contextPath + "' from '" + contextRoot.getAbsolutePath() + "'");
WebAppContext context = new WebAppContext(contextRoot.getAbsolutePath(), contextPath);
//context.setCopyWebDir(false);
//context.setDefaultsDescriptor(null);
@@ -217,7 +190,7 @@ class GridworksServer extends Server {
scanList.add(new File(contextRoot, "WEB-INF/web.xml"));
findFiles(".class", new File(contextRoot, "WEB-INF/classes"), scanList);
- Gridworks.info("Starting autoreloading scanner... ");
+ logger.info("Starting autoreloading scanner... ");
Scanner scanner = new Scanner();
scanner.setScanInterval(Configurations.getInteger("gridworks.scanner.period",1));
@@ -228,10 +201,10 @@ class GridworksServer extends Server {
@SuppressWarnings("unchecked")
public void filesChanged(List changedFiles) {
try {
- Gridworks.info("Stopping context: " + contextRoot.getAbsolutePath());
+ logger.info("Stopping context: " + contextRoot.getAbsolutePath());
context.stop();
- Gridworks.info("Starting context: " + contextRoot.getAbsolutePath());
+ logger.info("Starting context: " + contextRoot.getAbsolutePath());
context.start();
} catch (Exception ex) {
throw new RuntimeException(ex);