[wsas-java-dev] svn commit r1112 - in
branches/wsas/java/standalone-tomcat/java/modules:
admin/src/org/wso2/wsas/admin/service/logging
core/conf/hibernate core/src/org/wso2/wsas/persistence
core/src/org/wso2/wsas/persistence/dao
core/src/org/wso2/wsas/persistence/dataobject
core/src/org/wso2/wsas/util
svn at wso2.org
svn at wso2.org
Fri Mar 2 15:11:19 PST 2007
Author: azeez
Date: Fri Mar 2 15:10:51 2007
New Revision: 1112
Modified:
branches/wsas/java/standalone-tomcat/java/modules/admin/src/org/wso2/wsas/admin/service/logging/LoggingAdmin.java
branches/wsas/java/standalone-tomcat/java/modules/core/conf/hibernate/wso2wsas.hbm.xml
branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java
branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/persistence/dao/LoggerDAO.java
branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/persistence/dataobject/LoggerDO.java
branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/util/HibernateConfigFactory.java
branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/util/LoggingUtil.java
Log:
Refactoring
Modified: branches/wsas/java/standalone-tomcat/java/modules/admin/src/org/wso2/wsas/admin/service/logging/LoggingAdmin.java
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/admin/src/org/wso2/wsas/admin/service/logging/LoggingAdmin.java (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/admin/src/org/wso2/wsas/admin/service/logging/LoggingAdmin.java Fri Mar 2 15:10:51 2007
@@ -80,7 +80,7 @@
loggerDO = pm.getLoggerDO(logger.getName());
logger.setLevel(Level.toLevel(logLevel));
pm.updateLoggerData(loggerDO.getName(), logLevel,
- loggerDO.getAditivity());
+ loggerDO.getAdditivity());
log.debug("set the logger ==> " + logger.getName() +
" to " + logger.getLevel().toString());
}
@@ -144,7 +144,7 @@
LoggerDO loggerDO = pm.getLoggerDO(loggerName);
loggerData.setName(loggerDO.getName());
loggerData.setLevel(loggerDO.getLogLevel());
- loggerData.setAditivity(loggerDO.getAditivity());
+ loggerData.setAditivity(loggerDO.getAdditivity());
return loggerData;
}
@@ -340,7 +340,7 @@
loggerDO = (LoggerDO) loggerDOs.get(i);
loggerDatas[i] = new LoggerData(loggerDO.getName(),
loggerDO.getLogLevel(),
- loggerDO.getAditivity());
+ loggerDO.getAdditivity());
}
return loggerDatas;
Modified: branches/wsas/java/standalone-tomcat/java/modules/core/conf/hibernate/wso2wsas.hbm.xml
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/core/conf/hibernate/wso2wsas.hbm.xml (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/core/conf/hibernate/wso2wsas.hbm.xml Fri Mar 2 15:10:51 2007
@@ -242,7 +242,7 @@
<generator class="native"/>
</id>
<property name="lastUpdatedTime" type="timestamp" column="c_last_updated" not-null="true"/>
- <property name="isGloballyEngaged" type="boolean" column="c_is_globally_engaged"/>
+ <property name="isGloballyEngaged" column="c_is_globally_engaged"/>
<component name="moduleIdentifierDO"
class="org.wso2.wsas.persistence.dataobject.ModuleIdentifierDO"
@@ -505,9 +505,9 @@
<property name="name" column="c_name" not-null="true"/>
<property name="pattern" column="c_pattern" not-null="false"/>
<property name="logFileName" column="c_logFileName" not-null="false"/>
- <property name="isFileAppender" type="boolean" column="c_is_file_appender" not-null="true"/>
+ <property name="isFileAppender" column="c_is_file_appender" not-null="true"/>
- <property name="isSysLogAppender" type="boolean" column="c_is_sys_log_appender"
+ <property name="isSysLogAppender" column="c_is_sys_log_appender"
not-null="true"/>
<property name="sysLogHost" column="c_sys_log_host" not-null="false"/>
<property name="facility" column="c_facility" not-null="false"/>
@@ -533,7 +533,7 @@
<property name="name" column="c_name" not-null="true"/>
<property name="logLevel" column="c_log_level" not-null="true"/>
- <property name="aditivity" type="boolean" column="c_log_aditivity" not-null="true"/>
+ <property name="additivity" column="c_log_additivity" not-null="true"/>
</class>
</hibernate-mapping>
\ No newline at end of file
Modified: branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java Fri Mar 2 15:10:51 2007
@@ -1247,7 +1247,7 @@
LoggerDO loggerDO = new LoggerDO();
loggerDO.setName(loggerName);
loggerDO.setLogLevel(loggerLevel);
- loggerDO.setAditivity(aditivity);
+ loggerDO.setAdditivity(aditivity);
new LoggerDAO(hbConfig).updateLoggerDO(loggerDO);
}
Modified: branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/persistence/dao/LoggerDAO.java
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/persistence/dao/LoggerDAO.java (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/persistence/dao/LoggerDAO.java Fri Mar 2 15:10:51 2007
@@ -60,7 +60,7 @@
(LoggerDO) session.createQuery(query).uniqueResult();
if (existingLoggerDO != null) {
existingLoggerDO.setLogLevel(loggerDO.getLogLevel());
- existingLoggerDO.setAditivity(loggerDO.getAditivity());
+ existingLoggerDO.setAdditivity(loggerDO.getAdditivity());
session.update(existingLoggerDO);
} else {
session.save(loggerDO);
Modified: branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/persistence/dataobject/LoggerDO.java
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/persistence/dataobject/LoggerDO.java (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/persistence/dataobject/LoggerDO.java Fri Mar 2 15:10:51 2007
@@ -22,7 +22,7 @@
private String name;
private String logLevel;
- private boolean aditivity;
+ private boolean additivity;
public String getName() {
return name;
@@ -40,15 +40,15 @@
this.logLevel = logLevel;
}
- public boolean getAditivity() {
- return aditivity;
+ public boolean getAdditivity() {
+ return additivity;
}
- public void setAditivity(boolean aditivity) {
- this.aditivity = aditivity;
+ public void setAdditivity(boolean additivity) {
+ this.additivity = additivity;
}
public String toString() {
- return "Name ==>" + name + " Log level ==>" + logLevel + " aditivity " + aditivity;
+ return "Name ==>" + name + " Log level ==>" + logLevel + " additivity " + additivity;
}
}
Modified: branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/util/HibernateConfigFactory.java
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/util/HibernateConfigFactory.java (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/util/HibernateConfigFactory.java Fri Mar 2 15:10:51 2007
@@ -22,7 +22,7 @@
* Caches the HibernateConfig for a particular database
*/
public final class HibernateConfigFactory {
- private static Map hibernateConfigMap = new HashMap();
+ private static final Map hibernateConfigMap = new HashMap();
public static HibernateConfig getDefaultConfig(String hbConfigKey) {
HibernateConfig hbConfig;
Modified: branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/util/LoggingUtil.java
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/util/LoggingUtil.java (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/core/src/org/wso2/wsas/util/LoggingUtil.java Fri Mar 2 15:10:51 2007
@@ -109,7 +109,7 @@
loggerDO = pm.getLoggerDO(logger.getName());
if (loggerDO != null) {
logger.setLevel(Level.toLevel(loggerDO.getLogLevel()));
- logger.setAdditivity(loggerDO.getAditivity());
+ logger.setAdditivity(loggerDO.getAdditivity());
}
}
}
@@ -193,7 +193,7 @@
loggerDO = new LoggerDO();
loggerDO.setName(logger.getName());
loggerDO.setLogLevel(logger.getLevel().toString());
- loggerDO.setAditivity(logger.getAdditivity());
+ loggerDO.setAdditivity(logger.getAdditivity());
}
return loggerDO;
}
More information about the Wsas-java-dev
mailing list