[Carbon-commits] [Carbon] svn commit r93004 - in trunk/carbon/components/logging: org.wso2.carbon.logging.admin.ui/src/main/resources/web/log-admin org.wso2.carbon.logging.service/src/main/java/org/wso2/carbon/logging/util

[amani at wso2.com]

Author: amani
Date: Fri Apr 29 04:15:46 2011
New Revision: 93004
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=93004

Log:
Fixing duplicate appender names display in log4j appenders -> logging configuration admin UI


Modified:
   trunk/carbon/components/logging/org.wso2.carbon.logging.admin.ui/src/main/resources/web/log-admin/appenders-ajaxprocessor.jsp
   trunk/carbon/components/logging/org.wso2.carbon.logging.service/src/main/java/org/wso2/carbon/logging/util/LoggingReader.java

Modified: trunk/carbon/components/logging/org.wso2.carbon.logging.admin.ui/src/main/resources/web/log-admin/appenders-ajaxprocessor.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/logging/org.wso2.carbon.logging.admin.ui/src/main/resources/web/log-admin/appenders-ajaxprocessor.jsp?rev=93004&r1=93003&r2=93004&view=diff
==============================================================================
--- trunk/carbon/components/logging/org.wso2.carbon.logging.admin.ui/src/main/resources/web/log-admin/appenders-ajaxprocessor.jsp	(original)
+++ trunk/carbon/components/logging/org.wso2.carbon.logging.admin.ui/src/main/resources/web/log-admin/appenders-ajaxprocessor.jsp	Fri Apr 29 04:15:46 2011
@@ -26,7 +26,27 @@
 <%@ page import="org.wso2.carbon.logging.admin.stub.types.carbon.AppenderData" %>
 <%@ page import="java.util.Map" %>
 <%@ page import="java.util.Iterator" %>
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.ArrayList" %>
+<%!
+    private String[] getAppenderNames(String[] allNames) {
+		List<String> resultList = new ArrayList<String>();
+		for (String currName :allNames ) {
+			boolean isAdded = false;
+			for (String name : resultList) {
+				if (name.equals(currName)) {
+					isAdded = true;
+				}
+			}
+			if (!isAdded) {
+				resultList.add(currName);
+			}
+		}
+		return resultList.toArray(new String[resultList.size()]);
+    }
+
 
+%>
 <%
     response.setHeader("Cache-Control", "no-cache");
     String selectedAppenderName = request.getParameter("appenderName");
@@ -38,17 +58,19 @@
     LoggingAdminClient client;
     LogData globalLogData;
     AppenderData appenderData;
-    String[] appenderNames;
+    String[] allAppenderNames;
+    String [] appenderNames;
     try {
         client = new LoggingAdminClient(cookie, backendServerURL, configContext);
         //Getting appender name list
         //TODO Add the method to the backend service
         globalLogData = client.getSysLog();
         AppenderData[] appenderDataArray = globalLogData.getAppenderData();
-        appenderNames = new String[appenderDataArray.length];
+        allAppenderNames = new String[appenderDataArray.length];
         for (int i = 0; i < appenderDataArray.length; i++) {
-            appenderNames[i] = appenderDataArray[i].getName();
+        	allAppenderNames[i] = appenderDataArray[i].getName();
         }
+        appenderNames = getAppenderNames(allAppenderNames);
         appenderData = client.getAppenderData(selectedAppenderName);
     } catch (Exception e) {
 %>

Modified: trunk/carbon/components/logging/org.wso2.carbon.logging.service/src/main/java/org/wso2/carbon/logging/util/LoggingReader.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/logging/org.wso2.carbon.logging.service/src/main/java/org/wso2/carbon/logging/util/LoggingReader.java?rev=93004&r1=93003&r2=93004&view=diff
==============================================================================
--- trunk/carbon/components/logging/org.wso2.carbon.logging.service/src/main/java/org/wso2/carbon/logging/util/LoggingReader.java	(original)
+++ trunk/carbon/components/logging/org.wso2.carbon.logging.service/src/main/java/org/wso2/carbon/logging/util/LoggingReader.java	Fri Apr 29 04:15:46 2011
@@ -720,7 +720,7 @@
 
 	private boolean isSysLogAppender() throws LogViewerException {
 		try {
-			return LoggingUtil.isSysLogAppender();
+			return LoggingUtil.isSyslogConfigured();
 		} catch (Exception e) {
 			throw new LogViewerException(
 					"Cannot access the registry configuration to get syslogappender", e);