[Xmpp4js-commit] SF.net SVN: xmpp4js:[756] trunk
Status: Beta
Brought to you by:
h-iverson
Menu
▾
▴
[Xmpp4js-commit] SF.net SVN: xmpp4js:[756] trunk
|
From: <h-i...@us...> - 2008-07-27 22:02:19
|
Revision: 756
http://xmpp4js.svn.sourceforge.net/xmpp4js/?rev=756&view=rev
Author: h-iverson
Date: 2008-07-27 22:02:28 +0000 (Sun, 27 Jul 2008)
Log Message:
-----------
added log4js to try to avoid console stuff and got rid of some old compat stuff
Modified Paths:
--------------
trunk/pom.xml
trunk/src/assembler/xmpp4js.xml
trunk/src/main/javascript/adapter/Default.js
trunk/src/main/javascript/ext/DataForm.js
trunk/src/main/javascript/transport/Base.js
trunk/src/test/javascript/PacketReaderTest.html
trunk/src/test/javascript/broken/DataFormTest.html
Removed Paths:
-------------
trunk/src/main/javascript/console.js
trunk/src/main/javascript/msie-createElementNS.js
trunk/src/main/javascript/msie-importNode.js
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-07-27 21:43:41 UTC (rev 755)
+++ trunk/pom.xml 2008-07-27 22:02:28 UTC (rev 756)
@@ -27,6 +27,12 @@
<type>javascript</type>
<version>3.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>de.berlios.log4js</groupId>
+ <artifactId>log4js</artifactId>
+ <type>javascript</type>
+ <version>1.0-RC1</version>
+ </dependency>
</dependencies>
<build>
<extensions>
Modified: trunk/src/assembler/xmpp4js.xml
===================================================================
--- trunk/src/assembler/xmpp4js.xml 2008-07-27 21:43:41 UTC (rev 755)
+++ trunk/src/assembler/xmpp4js.xml 2008-07-27 22:02:28 UTC (rev 756)
@@ -8,9 +8,7 @@
<include>adapter/Default.js</include>
<!-- utils -->
- <include>console.js</include>
<include>Jid.js</include>
- <include>msie-createElementNS.js</include>
<include>DomBuilder.js</include>
<!-- packets -->
Modified: trunk/src/main/javascript/adapter/Default.js
===================================================================
--- trunk/src/main/javascript/adapter/Default.js 2008-07-27 21:43:41 UTC (rev 755)
+++ trunk/src/main/javascript/adapter/Default.js 2008-07-27 22:02:28 UTC (rev 756)
@@ -1,6 +1,18 @@
var Xmpp4Js = {};
+
+Xmpp4Js.logLevel = Log4js.Level.ALL;
+Xmpp4Js.appender = new Log4js.ConsoleAppender();
+Xmpp4Js.createLogger = function(logId) {
+ var logger = Log4js.getLogger( logId );
+ logger.setLevel( Xmpp4Js.logLevel );
+ logger.addAppender( Xmpp4Js.appender );
+
+ return logger;
+}
+
+
/**
* Do not fork for a browser if it can be avoided. Use feature detection when
* you can. Use the user agent as a last resort. YAHOO.env.ua stores a version
@@ -153,6 +165,8 @@
}();
Xmpp4Js.Lang = {
+ logger: Xmpp4Js.createLogger("xmpp4js.lang"),
+
/**
* Determines whether or not the property was added
* to the object instance. Returns false if the property is not present
@@ -409,7 +423,7 @@
}
Function.prototype.bind = function(scope) {
-;;; console.warn( "Using Function.prototype.bind" );
+;;; Xmpp4Js.Lang.logger.warn( "Using Function.prototype.bind" );
var args = Array.prototype.slice.call(arguments);
args.unshift( this ); // add fn argument to the beginning
return Xmpp4Js.Lang.bind.apply( this, args );
Deleted: trunk/src/main/javascript/console.js
===================================================================
--- trunk/src/main/javascript/console.js 2008-07-27 21:43:41 UTC (rev 755)
+++ trunk/src/main/javascript/console.js 2008-07-27 22:02:28 UTC (rev 756)
@@ -1,10 +0,0 @@
-if( window['console'] == undefined ) {
- console = {
- info: Xmpp4Js.Lang.noOp,
- log: Xmpp4Js.Lang.noOp,
- dir: Xmpp4Js.Lang.noOp,
- dirxml: Xmpp4Js.Lang.noOp,
- warn: Xmpp4Js.Lang.noOp,
- error: Xmpp4Js.Lang.noOp
- }
-}
Modified: trunk/src/main/javascript/ext/DataForm.js
===================================================================
--- trunk/src/main/javascript/ext/DataForm.js 2008-07-27 21:43:41 UTC (rev 755)
+++ trunk/src/main/javascript/ext/DataForm.js 2008-07-27 22:02:28 UTC (rev 756)
@@ -338,7 +338,7 @@
// dataForm, formId, template
if( arguments.length > 1 ) {
-;;; console.warn( "Using deprecated ctor for DataFormView" );
+//;;; console.warn( "Using deprecated ctor for DataFormView" );
config = {
dataForm: arguments[0],
@@ -413,7 +413,7 @@
* @deprecated in favor of renderAndReturn
*/
getRenderedNode: function() {
-;;; console.warn( "renderAndReturn is deprecated." );
+//;;; console.warn( "renderAndReturn is deprecated." );
return this.renderAndReturn();
},
Modified: trunk/src/main/javascript/transport/Base.js
===================================================================
--- trunk/src/main/javascript/transport/Base.js 2008-07-27 21:43:41 UTC (rev 755)
+++ trunk/src/main/javascript/transport/Base.js 2008-07-27 22:02:28 UTC (rev 756)
@@ -215,6 +215,8 @@
}
+Xmpp4Js.Transport.Base.logger = Xmpp4Js.createLogger("xmpp4js.transport.base");
+
Xmpp4Js.Transport.Base.prototype = {
@@ -307,7 +309,7 @@
* @private
*/
shutdown: function() {
-;;; console.debug( "Transport Shutdown (stopping tasks)" );
+;;; Xmpp4Js.Transport.Base.logger.debug( "Transport Shutdown (stopping tasks)" );
this.isSessionOpen = false;
this.taskRunner.stop( this.sendQueueTask );
this.taskRunner.stop( this.sendPollTask );
@@ -376,7 +378,6 @@
* @private
*/
sendPoll: function() {
-;;; console.debug( "Send Poll" );
// if we're trying to poll too frequently
/*var now = new Date().getTime();
@@ -387,6 +388,7 @@
*/
if( this.openRequestCount == 0 && this.queue.length == 0 ) {
+;;; Xmpp4Js.Transport.Base.logger.debug( "Send Poll" );
var packetNode = this.createPacketNode();
this.write( packetNode );
}
Modified: trunk/src/test/javascript/PacketReaderTest.html
===================================================================
--- trunk/src/test/javascript/PacketReaderTest.html 2008-07-27 21:43:41 UTC (rev 755)
+++ trunk/src/test/javascript/PacketReaderTest.html 2008-07-27 22:02:28 UTC (rev 756)
@@ -41,7 +41,6 @@
var wasInvoked = false;
con.addPacketListener( function(stanza) {
wasInvoked = true;
- console.dir( stanza );
assertEquals( stanzaNode, stanza.getNode() );
} );
Modified: trunk/src/test/javascript/broken/DataFormTest.html
===================================================================
--- trunk/src/test/javascript/broken/DataFormTest.html 2008-07-27 21:43:41 UTC (rev 755)
+++ trunk/src/test/javascript/broken/DataFormTest.html 2008-07-27 22:02:28 UTC (rev 756)
@@ -25,8 +25,7 @@
var node = loadTestPacket( "packets/dataform_get.xml" );
df.read( node );
-
- console.dir( df );
+
}
</script>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
