Author: deepal
Date: Fri Jan 25 01:47:16 2008
New Revision: 12884
Log:
fixing REGISTRY-132
- updating log configurations
Modified:
trunk/registry/modules/core/conf/log4j.properties
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/DefaultMediaTypeHandler.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryServlet.java
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java
Modified: trunk/registry/modules/core/conf/log4j.properties
==============================================================================
--- trunk/registry/modules/core/conf/log4j.properties (original)
+++ trunk/registry/modules/core/conf/log4j.properties Fri Jan 25 01:47:16 2008
@@ -22,8 +22,9 @@
#log4j.rootCategory=INFO, CONSOLE, LOGFILE
# Set the enterprise logger priority to FATAL
-log4j.logger.org.apache.axis2.enterprise=FATAL
+log4j.logger.org.wso2.registry.enterprise=FATAL
log4j.logger.de.hunsicker.jalopy.io=FATAL
+log4j.logger.org.mortbay=INFO
log4j.logger.httpclient.wire.header=FATAL
log4j.logger.org.apache.commons.httpclient=FATAL
@@ -34,7 +35,7 @@
# LOGFILE is set to be a File appender using a PatternLayout.
log4j.appender.LOGFILE=org.apache.log4j.FileAppender
-log4j.appender.LOGFILE.File=axis2.log
+log4j.appender.LOGFILE.File=registry.log
log4j.appender.LOGFILE.Append=true
log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
\ No newline at end of file
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/DefaultMediaTypeHandler.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/DefaultMediaTypeHandler.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/mediatypes/builtin/DefaultMediaTypeHandler.java
Fri Jan 25 01:47:16 2008
@@ -137,7 +137,7 @@
resource.setLastUpdaterUserName(userID);
resourceDAO.update(path, resource, conn);
- if (resource.isContentModified()) {
+ if (resource.isContentModified() || a.getState() ==
RegistryConstants.DELETED_STATE) {
resourceDAO.addResourceVersion(resource, conn);
}
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryServlet.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryServlet.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryServlet.java
Fri Jan 25 01:47:16 2008
@@ -252,28 +252,6 @@
.include(httpServletRequest, httpServletResponse);
}
-
- public void destroy() {
- super.destroy();
-
- // we don't need to update the registry.xml at shutdown as for now we
consider the config
- // as static. therefore, this may confuse users.
-
- //if (configPath == null) {
- // configPath = getServletConfig().getServletContext().
- // getRealPath("/WEB-INF/registry.xml");
- //}
- //try {
- // FileOutputStream fio = new FileOutputStream(configPath);
- // OMElement registryXml =
registryConfigurationProcessor.getRegistryConfigAsXML();
- // registryXml.serialize(fio);
- // fio.flush();
- // fio.close();
- //} catch (Exception e) {
- // //
- //}
- }
-
// private void setErrorMessage(HttpServletRequest request, String message)
{
// request.getSession().setAttribute(RegistryConstants.ERROR_MESSAGE,
message);
// }
Modified:
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java
==============================================================================
---
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java
(original)
+++
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java
Fri Jan 25 01:47:16 2008
@@ -51,8 +51,6 @@
}
}
-
-
public void testCollectionDetails() throws Exception {
Resource r1 = new Resource();
String str = "My Content";
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
