You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xap-commits@incubator.apache.org by jm...@apache.org on 2007/02/13 02:08:30 UTC
svn commit: r506809 -
/incubator/xap/trunk/codebase/src/xap/data/datasource/AbstractDataSource.js
Author: jmargaris
Date: Mon Feb 12 18:08:29 2007
New Revision: 506809
URL: http://svn.apache.org/viewvc?view=rev&rev=506809
Log:
fixed bad merge
Modified:
incubator/xap/trunk/codebase/src/xap/data/datasource/AbstractDataSource.js
Modified: incubator/xap/trunk/codebase/src/xap/data/datasource/AbstractDataSource.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/codebase/src/xap/data/datasource/AbstractDataSource.js?view=diff&rev=506809&r1=506808&r2=506809
==============================================================================
--- incubator/xap/trunk/codebase/src/xap/data/datasource/AbstractDataSource.js (original)
+++ incubator/xap/trunk/codebase/src/xap/data/datasource/AbstractDataSource.js Mon Feb 12 18:08:29 2007
@@ -17,12 +17,11 @@
*
*/
Xap.provide("xap.data.datasource.AbstractDataSource");
-Xap.require("xap.mco.ContainerLifeCycleObject");
Xap.require("xap.requestservice.NetServiceListener");
Xap.require("xap.requestservice.RequestService");
Xap.require("xap.session.ClientSession");
Xap.require("xap.session.Container");
-Xap.require("xap.util.LogFactory");
+Xap.require("xap.log.Logger");
Xap.require("xap.util.ResourceDictionary");
Xap.require("xap.util.ArrayHelper");
Xap.require("xap.data.datasource.QueryRecord") ;
@@ -195,27 +194,6 @@
}
};
-//-----------------------------------------------------------------------
-// ContainerLifecycleObject Interface.
-//-----------------------------------------------------------------------
-
-/**
- * @public
- * @return {void}
- **/
-/**
- * @param container{Container}
- * @param name{String}
- **/
-xap.data.datasource.AbstractDataSource.prototype.addedToContainer = function (container, name) {
- //NOOP
-};
-
-
-/**
- * @public
- * @return {void}
- **/
/**
* @param container{Container}
* @param name{String}
@@ -453,7 +431,7 @@
* @return {Log}
**/
xap.data.datasource.AbstractDataSource.prototype.getLog = function () {
- return xap.util.LogFactory.getLog("DataSource");
+ return xap.log.Logger.getLogger("DataSource");
};
//-----------------------------------------------------------------------