diff --git a/api/pom.xml b/api/pom.xml index 8e3d283..2ec55ee 100755 --- a/api/pom.xml +++ b/api/pom.xml @@ -9,7 +9,7 @@ bigbird-api 0.1-SNAPSHOT API - + org.slf4j @@ -36,7 +36,7 @@ log4j 1.2.14 - + junit junit diff --git a/api/src/main/java/bigbird/BackendException.java b/api/src/main/java/bigbird/BackendException.java index 5c7c673..a135a3b 100755 --- a/api/src/main/java/bigbird/BackendException.java +++ b/api/src/main/java/bigbird/BackendException.java @@ -16,4 +16,3 @@ public BackendException(Throwable cause) { } - \ No newline at end of file diff --git a/benchmark/pom.xml b/benchmark/pom.xml index 1f3809d..813d20c 100755 --- a/benchmark/pom.xml +++ b/benchmark/pom.xml @@ -33,7 +33,7 @@ 4.0.1 - + @@ -46,5 +46,5 @@ - + \ No newline at end of file diff --git a/benchmark/src/main/java/bigbird/benchmark/BenchmarkWorker.java b/benchmark/src/main/java/bigbird/benchmark/BenchmarkWorker.java index c1bc26e..4decc0d 100644 --- a/benchmark/src/main/java/bigbird/benchmark/BenchmarkWorker.java +++ b/benchmark/src/main/java/bigbird/benchmark/BenchmarkWorker.java @@ -131,7 +131,7 @@ public void run() { try { HttpRequest req = requestGenerator.generateRequest(count); - + if (!conn.isOpen()) { Socket socket = null; if ("https".equals(targetHost.getSchemeName())) { diff --git a/benchmark/src/main/java/bigbird/benchmark/HttpBenchmark.java b/benchmark/src/main/java/bigbird/benchmark/HttpBenchmark.java index 37f85d8..3cf9f7d 100644 --- a/benchmark/src/main/java/bigbird/benchmark/HttpBenchmark.java +++ b/benchmark/src/main/java/bigbird/benchmark/HttpBenchmark.java @@ -59,7 +59,7 @@ public class HttpBenchmark { protected int socketTimeout = 60000; protected boolean useHttp1_0 = false; protected RequestGenerator[] requestGenerators; - + public void setRequests(int requests) { this.requests = requests; } @@ -82,29 +82,29 @@ public void execute() { for (RequestGenerator g : requestGenerators) { g.setParameters(params); } - + host = new HttpHost(url.getHost(), url.getPort(), url.getProtocol()); ThreadPoolExecutor workerPool = new ThreadPoolExecutor( threads, threads, 5, TimeUnit.SECONDS, new LinkedBlockingQueue(), new ThreadFactory() { - + public Thread newThread(Runnable r) { return new Thread(r, "ClientPool"); } - + }); workerPool.prestartAllCoreThreads(); BenchmarkWorker[] workers = new BenchmarkWorker[threads]; for (int i = 0; i < threads; i++) { workers[i] = new BenchmarkWorker( - params, - verbosity, - requestGenerators[i], - host, - requests, + params, + verbosity, + requestGenerators[i], + host, + requests, keepAlive); workerPool.execute(workers[i]); } diff --git a/buildsetup/pom.xml b/buildsetup/pom.xml index 926659a..f60b443 100755 --- a/buildsetup/pom.xml +++ b/buildsetup/pom.xml @@ -164,5 +164,5 @@ - + \ No newline at end of file diff --git a/cacti-templates/c_cq_snapshot.xml b/cacti-templates/c_cq_snapshot.xml index 0e7d409..eb12cd2 100644 --- a/cacti-templates/c_cq_snapshot.xml +++ b/cacti-templates/c_cq_snapshot.xml @@ -1,4 +1,4 @@ - + Voldemort Command Queue Snapshot diff --git a/cacti-templates/t_cq_thread_status.xml b/cacti-templates/t_cq_thread_status.xml index f507416..7a72a19 100644 --- a/cacti-templates/t_cq_thread_status.xml +++ b/cacti-templates/t_cq_thread_status.xml @@ -1,4 +1,4 @@ - + Tatter CQ Thread Status diff --git a/cacti-templates/t_t_thread_status.xml b/cacti-templates/t_t_thread_status.xml index ac62cec..caad55c 100644 --- a/cacti-templates/t_t_thread_status.xml +++ b/cacti-templates/t_t_thread_status.xml @@ -1,4 +1,4 @@ - + Tatter T Thread Status diff --git a/cacti-templates/v_f_snapshot.xml b/cacti-templates/v_f_snapshot.xml index 56717f8..2b43f31 100644 --- a/cacti-templates/v_f_snapshot.xml +++ b/cacti-templates/v_f_snapshot.xml @@ -1,4 +1,4 @@ - + Voldemort Friends Timeline Snapshot diff --git a/cacti-templates/v_store_ex.xml b/cacti-templates/v_store_ex.xml index d9b190c..0b45551 100644 --- a/cacti-templates/v_store_ex.xml +++ b/cacti-templates/v_store_ex.xml @@ -1,4 +1,4 @@ - + Voldemort Store Exceptions diff --git a/cacti-templates/v_t_snapshot.xml b/cacti-templates/v_t_snapshot.xml index 2c2ecae..2d5f8ac 100644 --- a/cacti-templates/v_t_snapshot.xml +++ b/cacti-templates/v_t_snapshot.xml @@ -1,4 +1,4 @@ - + Voldemort Tweets Snapshot diff --git a/cacti-templates/v_thead_status.xml b/cacti-templates/v_thead_status.xml index 353f48c..3e94e3e 100644 --- a/cacti-templates/v_thead_status.xml +++ b/cacti-templates/v_thead_status.xml @@ -1,4 +1,4 @@ - + Voldemort Node Thread Status diff --git a/cacti-templates/v_users_snapshot.xml b/cacti-templates/v_users_snapshot.xml index 1d4db10..fe8d31a 100644 --- a/cacti-templates/v_users_snapshot.xml +++ b/cacti-templates/v_users_snapshot.xml @@ -1,4 +1,4 @@ - + Voldemort Users Snapshot diff --git a/couchdb/pom.xml b/couchdb/pom.xml index 980d1d3..db179e1 100755 --- a/couchdb/pom.xml +++ b/couchdb/pom.xml @@ -9,14 +9,14 @@ bigbird-couchdb 0.1-SNAPSHOT CouchDB Backend - + bigbird bigbird-api ${version} - + com.google.code.jcouchdb jcouchdb diff --git a/couchdb/src/test/java/log4j.properties b/couchdb/src/test/java/log4j.properties index 2174798..cbad588 100755 --- a/couchdb/src/test/java/log4j.properties +++ b/couchdb/src/test/java/log4j.properties @@ -31,7 +31,7 @@ log4j.appender.DRFA.layout.ConversionPattern=%d %-5p [%t] %C{2}(%L): %m%n # # console -# Add "console" to rootlogger above if you want to use this +# Add "console" to rootlogger above if you want to use this # log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console.target=System.err diff --git a/ops/src/main/scripts/tomcat-init.d b/ops/src/main/scripts/tomcat-init.d index 5b49fa8..390116e 100644 --- a/ops/src/main/scripts/tomcat-init.d +++ b/ops/src/main/scripts/tomcat-init.d @@ -17,13 +17,13 @@ status() { echo 'foo' } -case $1 in +case $1 in 'status') status ;; 'start') - start + start ;; 'stop') diff --git a/ops/src/main/scripts/voldemort b/ops/src/main/scripts/voldemort index ea22a41..aad0f6f 100644 --- a/ops/src/main/scripts/voldemort +++ b/ops/src/main/scripts/voldemort @@ -4,10 +4,10 @@ start() { pids=`ps xwww | grep voldemort.server.VoldemortServe[r] | awk '{print $1}'` if [ "$pids" != "" ] - then + then echo $(hostname)': Voldemort is already running under ${pids}...' else - echo $(hostname)': Starting Voldemort...' + echo $(hostname)': Starting Voldemort...' /opt/voldemort/bin/voldemort-server.sh /opt/voldemort/config > /var/log/voldemort.log & fi } @@ -31,17 +31,17 @@ status() { else echo $(hostname)': Voldemort is not running.' fi - + } -case $1 in +case $1 in 'status') status ;; 'start') - start + start ;; 'stop') diff --git a/ops/src/main/scripts/voldemort-init.d b/ops/src/main/scripts/voldemort-init.d index d71711e..0f0aa7f 100644 --- a/ops/src/main/scripts/voldemort-init.d +++ b/ops/src/main/scripts/voldemort-init.d @@ -4,7 +4,7 @@ start() { pids=`ps xwww | grep voldemort.server.VoldemortServe[r] | awk '{print $1}'` if [ "$pids" != "" ] - then + then echo $(hostname)': Voldemort is already running under '${pids}'...' else /opt/voldemort/bin/voldemort-server.sh /opt/voldemort-home >> /var/log/voldemort.log 2>&1 & @@ -29,17 +29,17 @@ status() { else echo $(hostname)': Voldemort is not running.' fi - + } -case $1 in +case $1 in 'status') status ;; 'start') - start + start ;; 'stop') diff --git a/pom.xml b/pom.xml index 4e47fa3..337fb89 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 0.1-SNAPSHOT pom Tatter - + 0.18.1 SNAPSHOT @@ -13,7 +13,7 @@ 0.1.2 1.3.0 - + api benchmark @@ -22,7 +22,7 @@ voldemort web - + junit @@ -75,5 +75,5 @@ - + diff --git a/queue/src/test/resources/log4j.properties b/queue/src/test/resources/log4j.properties index 2174798..cbad588 100755 --- a/queue/src/test/resources/log4j.properties +++ b/queue/src/test/resources/log4j.properties @@ -31,7 +31,7 @@ log4j.appender.DRFA.layout.ConversionPattern=%d %-5p [%t] %C{2}(%L): %m%n # # console -# Add "console" to rootlogger above if you want to use this +# Add "console" to rootlogger above if you want to use this # log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console.target=System.err diff --git a/voldemort/pom.xml b/voldemort/pom.xml index 0f68cf7..5bd6591 100755 --- a/voldemort/pom.xml +++ b/voldemort/pom.xml @@ -9,7 +9,7 @@ bigbird-voldemort 0.1-SNAPSHOT Voldemort! - + bigbird @@ -109,7 +109,7 @@ 1.2.14 - + @@ -125,5 +125,5 @@ - + \ No newline at end of file diff --git a/web/pom.xml b/web/pom.xml index 7e1d0dd..c106c57 100755 --- a/web/pom.xml +++ b/web/pom.xml @@ -11,7 +11,7 @@ 0.1-SNAPSHOT Web Interface war - + bigbird @@ -29,13 +29,13 @@ ${version} test-jar - + org.springframework.security spring-security-core 2.0.4 - + com.sun.jersey jersey-server @@ -80,7 +80,7 @@ 1.1.0 - + @@ -107,7 +107,7 @@ - + java.net diff --git a/web/src/main/webapp/public/jquery-1.3.1.js b/web/src/main/webapp/public/jquery-1.3.1.js index 94e9c17..4cb31de 100755 --- a/web/src/main/webapp/public/jquery-1.3.1.js +++ b/web/src/main/webapp/public/jquery-1.3.1.js @@ -11,7 +11,7 @@ */ (function(){ -var +var // Will speed up references to window, and allows munging its name. window = this, // Will speed up references to undefined, and allows munging its name. @@ -399,13 +399,13 @@ jQuery.fn = jQuery.prototype = { }, val: function( value ) { - if ( value === undefined ) { + if ( value === undefined ) { var elem = this[0]; if ( elem ) { if( jQuery.nodeName( elem, 'option' ) ) return (elem.attributes.value || {}).specified ? elem.value : elem.text; - + // We need to handle select boxes special if ( jQuery.nodeName( elem, "select" ) ) { var index = elem.selectedIndex, @@ -434,7 +434,7 @@ jQuery.fn = jQuery.prototype = { } } - return values; + return values; } // Everything else, we just grab the value @@ -513,13 +513,13 @@ jQuery.fn = jQuery.prototype = { if ( first ) for ( var i = 0, l = this.length; i < l; i++ ) callback.call( root(this[i], first), i > 0 ? extra.cloneNode(true) : fragment ); - + if ( scripts ) jQuery.each( scripts, evalScript ); } return this; - + function root( elem, cur ) { return table && jQuery.nodeName(elem, "table") && jQuery.nodeName(cur, "tr") ? (elem.getElementsByTagName("tbody")[0] || @@ -586,7 +586,7 @@ jQuery.extend = jQuery.fn.extend = function() { // Recurse if we're merging object values if ( deep && copy && typeof copy === "object" && !copy.nodeType ) - target[ name ] = jQuery.extend( deep, + target[ name ] = jQuery.extend( deep, // Never move original objects, clone them src || ( copy.length != null ? [ ] : { } ) , copy ); @@ -923,7 +923,7 @@ jQuery.extend({ // IE completely kills leading whitespace when innerHTML is used if ( !jQuery.support.leadingWhitespace && /^\s/.test( elem ) ) div.insertBefore( context.createTextNode( elem.match(/^\s*/)[0] ), div.firstChild ); - + elem = jQuery.makeArray( div.childNodes ); } @@ -944,7 +944,7 @@ jQuery.extend({ fragment.appendChild( ret[i] ); } } - + return scripts; } @@ -1412,19 +1412,19 @@ var Sizzle = function(selector, context, results, seed) { if ( context.nodeType !== 1 && context.nodeType !== 9 ) return []; - + if ( !selector || typeof selector !== "string" ) { return results; } var parts = [], m, set, checkSet, check, mode, extra, prune = true; - + // Reset the position of the chunker regexp (start from head) chunker.lastIndex = 0; - + while ( (m = chunker.exec(selector)) !== null ) { parts.push( m[1] ); - + if ( m[2] ) { extra = RegExp.rightContext; break; @@ -1525,7 +1525,7 @@ Sizzle.find = function(expr, context, isXML){ for ( var i = 0, l = Expr.order.length; i < l; i++ ) { var type = Expr.order[i], match; - + if ( (match = Expr.match[ type ].exec( expr )) ) { var left = RegExp.leftContext; @@ -1770,7 +1770,7 @@ var Expr = Sizzle.selectors = { }, ATTR: function(match){ var name = match[1].replace(/\\/g, ""); - + if ( Expr.attrMap[name] ) { match[1] = Expr.attrMap[name]; } @@ -1796,7 +1796,7 @@ var Expr = Sizzle.selectors = { } else if ( Expr.match.POS.test( match[0] ) ) { return true; } - + return match; }, POS: function(match){ @@ -1894,7 +1894,7 @@ var Expr = Sizzle.selectors = { var type = match[1], parent = elem.parentNode; var doneName = match[0]; - + if ( parent && (!parent[ doneName ] || !elem.nodeIndex) ) { var count = 1; @@ -2004,7 +2004,7 @@ var makeArray = function(array, results) { results.push.apply( results, array ); return results; } - + return array; }; @@ -2115,7 +2115,7 @@ if ( document.querySelectorAll ) (function(){ if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) { return; } - + Sizzle = function(query, context, extra, seed){ context = context || document; @@ -2126,7 +2126,7 @@ if ( document.querySelectorAll ) (function(){ return makeArray( context.querySelectorAll(query), extra ); } catch(e){} } - + return oldSizzle(query, context, extra, seed); }; @@ -2368,7 +2368,7 @@ jQuery.event = { // Get the current list of functions bound to this event var handlers = events[type]; - + if ( jQuery.event.specialAll[type] ) jQuery.event.specialAll[type].setup.call(elem, data, namespaces); @@ -2441,7 +2441,7 @@ jQuery.event = { // Handle the removal of namespaced events if ( namespace.test(events[type][handle].type) ) delete events[type][handle]; - + if ( jQuery.event.specialAll[type] ) jQuery.event.specialAll[type].teardown.call(elem, namespaces); @@ -2508,11 +2508,11 @@ jQuery.event = { // don't do events on text and comment nodes if ( !elem || elem.nodeType == 3 || elem.nodeType == 8 ) return undefined; - + // Clean up in case it is reused event.result = undefined; event.target = elem; - + // Clone the incoming data, if any data = jQuery.makeArray(data); data.unshift( event ); @@ -2559,7 +2559,7 @@ jQuery.event = { // Cache this now, all = true means, any handler all = !namespaces.length && !event.exclusive; - + var namespace = RegExp("(^|\\.)" + namespaces.slice().sort().join(".*\\.") + "(\\.|$)"); handlers = ( jQuery.data(this, "events") || {} )[event.type]; @@ -2657,7 +2657,7 @@ jQuery.event = { teardown: function() {} } }, - + specialAll: { live: { setup: function( selector, namespaces ){ @@ -2666,12 +2666,12 @@ jQuery.event = { teardown: function( namespaces ){ if ( namespaces.length ) { var remove = 0, name = RegExp("(^|\\.)" + namespaces[0] + "(\\.|$)"); - + jQuery.each( (jQuery.data(this, "events").live || {}), function(){ if ( name.test(this.type) ) remove++; }); - + if ( remove < 1 ) jQuery.event.remove( this, namespaces[0], liveHandler ); } @@ -2684,7 +2684,7 @@ jQuery.Event = function( src ){ // Allow instantiation without the 'new' keyword if( !this.preventDefault ) return new jQuery.Event(src); - + // Event object if( src && src.type ){ this.originalEvent = src; @@ -2696,7 +2696,7 @@ jQuery.Event = function( src ){ // timeStamp is buggy for some events on Firefox(#3843) // So we won't rely on the native value this.timeStamp = now(); - + // Mark it as fixed this[expando] = true; }; @@ -2752,7 +2752,7 @@ var withinElement = function(event) { while ( parent && parent != this ) try { parent = parent.parentNode; } catch(e) { parent = this; } - + if( parent != this ){ // set the correct event type event.type = event.data; @@ -2760,9 +2760,9 @@ var withinElement = function(event) { jQuery.event.handle.apply( this, arguments ); } }; - -jQuery.each({ - mouseover: 'mouseenter', + +jQuery.each({ + mouseover: 'mouseenter', mouseout: 'mouseleave' }, function( orig, fix ){ jQuery.event.special[ fix ] = { @@ -2772,7 +2772,7 @@ jQuery.each({ teardown: function(){ jQuery.event.remove( this, orig, withinElement ); } - }; + }; }); jQuery.fn.extend({ @@ -2811,7 +2811,7 @@ jQuery.fn.extend({ event.stopPropagation(); jQuery.event.trigger( event, data, this[0] ); return event.result; - } + } }, toggle: function( fn ) { @@ -2854,7 +2854,7 @@ jQuery.fn.extend({ return this; }, - + live: function( type, fn ){ var proxy = jQuery.event.proxy( fn ); proxy.guid += this.selector + type; @@ -2863,7 +2863,7 @@ jQuery.fn.extend({ return this; }, - + die: function( type, fn ){ jQuery(document).unbind( liveConvert(type, this.selector), fn ? { guid: fn.guid + this.selector + type } : null ); return this; @@ -2983,12 +2983,12 @@ jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," + // Prevent memory leaks in IE // And prevent errors on refresh with events like mouseover in other browsers // Window isn't included so as not to unbind existing unload events -jQuery( window ).bind( 'unload', function(){ +jQuery( window ).bind( 'unload', function(){ for ( var id in jQuery.cache ) // Skip the window if ( id != 1 && jQuery.cache[ id ].handle ) jQuery.event.remove( jQuery.cache[ id ].handle.elem ); -}); +}); (function(){ jQuery.support = {}; @@ -3012,32 +3012,32 @@ jQuery( window ).bind( 'unload', function(){ jQuery.support = { // IE strips leading whitespace when .innerHTML is used leadingWhitespace: div.firstChild.nodeType == 3, - + // Make sure that tbody elements aren't automatically inserted // IE will insert them into empty tables tbody: !div.getElementsByTagName("tbody").length, - + // Make sure that you can get all elements in an element // IE 7 always returns no results objectAll: !!div.getElementsByTagName("object")[0] .getElementsByTagName("*").length, - + // Make sure that link elements get serialized correctly by innerHTML // This requires a wrapper element in IE htmlSerialize: !!div.getElementsByTagName("link").length, - + // Get the style information from getAttribute // (IE uses .cssText insted) style: /red/.test( a.getAttribute("style") ), - + // Make sure that URLs aren't manipulated // (IE normalizes it by default) hrefNormalized: a.getAttribute("href") === "/a", - + // Make sure that element opacity exists // (IE uses filter instead) opacity: a.style.opacity === "0.5", - + // Verify style float existence // (IE uses styleFloat instead of cssFloat) cssFloat: !!a.style.cssFloat, @@ -3047,14 +3047,14 @@ jQuery( window ).bind( 'unload', function(){ noCloneEvent: true, boxModel: null }; - + script.type = "text/javascript"; try { script.appendChild( document.createTextNode( "window." + id + "=1;" ) ); } catch(e){} root.insertBefore( script, root.firstChild ); - + // Make sure that the execution of code works by injecting a script // tag with appendChild/createTextNode // (IE doesn't support this, fails, and uses .text instead) @@ -3199,7 +3199,7 @@ jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".sp var jsc = now(); jQuery.extend({ - + get: function( url, data, callback, type ) { // shift arguments if data argument was ommited if ( jQuery.isFunction( data ) ) { @@ -3585,7 +3585,7 @@ jQuery.extend({ if ( xml && data.documentElement.tagName == "parsererror" ) throw "parsererror"; - + // Allow a pre-filtering function to sanitize the response // s != null is checked to keep backwards compatibility if( s && s.dataFilter ) @@ -3602,7 +3602,7 @@ jQuery.extend({ if ( type == "json" ) data = window["eval"]("(" + data + ")"); } - + return data; }, @@ -3666,30 +3666,30 @@ jQuery.fn.extend({ } else { for ( var i = 0, l = this.length; i < l; i++ ){ var old = jQuery.data(this[i], "olddisplay"); - + this[i].style.display = old || ""; - + if ( jQuery.css(this[i], "display") === "none" ) { var tagName = this[i].tagName, display; - + if ( elemdisplay[ tagName ] ) { display = elemdisplay[ tagName ]; } else { var elem = jQuery("<" + tagName + " />").appendTo("body"); - + display = elem.css("display"); if ( display === "none" ) display = "block"; - + elem.remove(); - + elemdisplay[ tagName ] = display; } - + this[i].style.display = jQuery.data(this[i], "olddisplay", display); } } - + return this; } }, @@ -3732,11 +3732,11 @@ jQuery.fn.extend({ var optall = jQuery.speed(speed, easing, callback); return this[ optall.queue === false ? "each" : "queue" ](function(){ - + var opt = jQuery.extend({}, optall), p, hidden = this.nodeType == 1 && jQuery(this).is(":hidden"), self = this; - + for ( p in prop ) { if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden ) return opt.complete.call(this); @@ -3990,7 +3990,7 @@ jQuery.fx.prototype = { if ( this.options.hide || this.options.show ) for ( var p in this.options.curAnim ) jQuery.attr(this.elem.style, p, this.options.orig[p]); - + // Execute the complete function this.options.complete.call( this.elem ); } @@ -4044,7 +4044,7 @@ if ( document.documentElement["getBoundingClientRect"] ) left = box.left + (self.pageXOffset || jQuery.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft; return { top: top, left: left }; }; -else +else jQuery.fn.offset = function() { if ( !this[0] ) return { top: 0, left: 0 }; if ( this[0] === this[0].ownerDocument.body ) return jQuery.offset.bodyOffset( this[0] ); @@ -4134,7 +4134,7 @@ jQuery.fn.extend({ parentOffset = /^body|html$/i.test(offsetParent[0].tagName) ? { top: 0, left: 0 } : offsetParent.offset(); // Subtract element margins - // note: when an element has margin: auto the offsetLeft and marginLeft + // note: when an element has margin: auto the offsetLeft and marginLeft // are the same in Safari causing offset.left to incorrectly be 0 offset.top -= num( this, 'marginTop' ); offset.left -= num( this, 'marginLeft' ); @@ -4165,7 +4165,7 @@ jQuery.fn.extend({ // Create scrollLeft and scrollTop methods jQuery.each( ['Left', 'Top'], function(i, name) { var method = 'scroll' + name; - + jQuery.fn[ method ] = function(val) { if (!this[0]) return null; @@ -4210,7 +4210,7 @@ jQuery.each([ "Height", "Width" ], function(i, name){ (margin ? num(this, "margin" + tl) + num(this, "margin" + br) : 0); }; - + var type = name.toLowerCase(); jQuery.fn[ type ] = function( size ) { diff --git a/web/src/test/java/bigbird/web/EmbeddedWeb.java b/web/src/test/java/bigbird/web/EmbeddedWeb.java index 0fdac87..30ac08d 100755 --- a/web/src/test/java/bigbird/web/EmbeddedWeb.java +++ b/web/src/test/java/bigbird/web/EmbeddedWeb.java @@ -13,42 +13,42 @@ public class EmbeddedWeb { private Server server; private WebAppContext context; - + public void start() throws Exception { server = new Server(); - + Connector connector = new SelectChannelConnector(); connector.setPort(8080); connector.setHost("0.0.0.0"); server.addConnector(connector); - + context = new WebAppContext(); context.setContextPath("/"); context.setWar("./src/main/webapp"); context.setDefaultsDescriptor("./src/test/resources/webdefault.xml"); - + Map params = new HashMap(); params.put("useFileMappedBuffer", Boolean.FALSE); context.setInitParams(params); - + server.addHandler(context); - + server.setStopAtShutdown(true); server.start(); } - + public void stop() throws Exception { server.stop(); } - + public static void main(String[] args) throws Exception { System.out.println("Starting embedded web server."); System.setProperty("voldemortHome", "./src/test/resources/bdb"); EmbeddedWeb web = new EmbeddedWeb(); web.start(); - + // Initializer.main(new String[0]); } @@ -56,5 +56,5 @@ public WebAppContext getContext() { return context; } - + }