perfsonar development work

Author: trzaszcz
Date: 2010-01-04 06:19:08 -0500 (Mon, 04 Jan 2010)
New Revision: 5452

Modified:
   branches/new-structure-with-base2/ps-mdm-web-admin/.classpath
   branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml
   
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
   
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/XMLUtil.java
Log:
log4j dep added

Modified: branches/new-structure-with-base2/ps-mdm-web-admin/.classpath
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/.classpath       
2010-01-04 10:46:45 UTC (rev 5451)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/.classpath       
2010-01-04 11:19:08 UTC (rev 5452)
@@ -20,5 +20,6 @@
        <classpathentry kind="lib" 
path="lib/librt/xmldb/xmldb-xupdate-20040205.jar"/>
        <classpathentry kind="lib" 
path="lib/repository/org/apache/httpcomponents/httpclient/4.0/httpclient-4.0.jar"/>
        <classpathentry kind="lib" 
path="lib/repository/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar"/>
+       <classpathentry kind="lib" 
path="lib/repository/log4j/log4j/1.2.9/log4j-1.2.9.jar"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

Modified: branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml    
2010-01-04 10:46:45 UTC (rev 5451)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml    
2010-01-04 11:19:08 UTC (rev 5452)
@@ -61,8 +61,8 @@
                        <dependency groupId="xalan" artifactId="xalan" 
version="2.7.0" />
                        <dependency groupId="xalan" artifactId="serializer" 
version="2.7.1" />
                        <dependency groupId="org.apache.httpcomponents" 
artifactId="httpclient" version="4.0" />
+                       <dependency groupId="log4j" artifactId="log4j" 
version="1.2.9" />
 
-
                        <localRepository refid="local.repository" />
                        <remoteRepository refid="remote.repository" />
                </artifact:dependencies>

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
     2010-01-04 10:46:45 UTC (rev 5451)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
     2010-01-04 11:19:08 UTC (rev 5452)
@@ -5,8 +5,8 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.logging.Logger;
 
+import org.apache.log4j.Logger;
 import org.perfsonar.webadmin.base2.util.HTMLUtil;
 import org.perfsonar.webadmin.base2.util.NSContext;
 import org.perfsonar.webadmin.base2.util.StringOutputStream;
@@ -25,7 +25,7 @@
 
 public class HTMLGenerator {
 
-       private final Logger logger = Logger.getAnonymousLogger();
+       private final Logger logger = Logger.getLogger(HTMLGenerator.class);
 
        public enum UIType {
                DROPDOWN, RADIO, RADIOGROUP, TEXTBOX, PASSOWRD;
@@ -349,7 +349,7 @@
        }
 
        public void drawPasswordBox(String title, Tuple<Integer, String> t) {
-               logger.info("WA --- Drawing a password box : title: \"" + 
title
+               logger.debug("WA --- Drawing a password box : title: \"" + 
title
                                + "\" value : \"" + t.second() + "\"");
                try {
                        html.singlerow_begin(20);
@@ -363,7 +363,7 @@
        // ////////////////////////////////////////////////////
        // TODO: External HTMLUtil.java -> HTML tags and so on
        public void drawTextBox(String title, Tuple<Integer, String> t) {
-               logger.info("WA --- Drawing a box : title: \"" + title
+               logger.debug("WA --- Drawing a box : title: \"" + title
                                + "\" value : \"" + t.second() + "\"");
                try {
                        html.singlerow_begin(20);
@@ -376,7 +376,7 @@
 
        public void drawRadio(Tuple<Integer, String> title,
                        Tuple<Integer, String[]> values) {
-               logger.info("WA --- Drawing a radio : title: \"" + 
title.second()
+               logger.debug("WA --- Drawing a radio : title: \"" + 
title.second()
                                + "\"");
                // for( String s : values.second() ) println("\nradio value : 
" + s);
                try {
@@ -390,7 +390,7 @@
 
        public void drawDropdown(Tuple<Integer, String> title,
                        Tuple<Integer, String[]> values) {
-               logger.info("WA --- Drawing a drop-down : title: \"" + 
title.second()
+               logger.debug("WA --- Drawing a drop-down : title: \"" + 
title.second()
                                + "\"");
                // for( String s : values.second() ) println("\ndrop-down 
value : " +
                // s);
@@ -405,7 +405,7 @@
        }
 
        public void drawRadiogroup(Tuple<Integer, String[]> values, String 
innerHTML) {
-               logger.info("Drawing a group radio: ");
+               logger.debug("Drawing a group radio: ");
                boolean enabled = false;
                // FIXME: Hardcoded values
                try {

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/XMLUtil.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/XMLUtil.java
     2010-01-04 10:46:45 UTC (rev 5451)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/util/XMLUtil.java
     2010-01-04 11:19:08 UTC (rev 5452)
@@ -6,8 +6,6 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.logging.Logger;
-
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -25,13 +23,14 @@
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
+import org.apache.log4j.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
 public class XMLUtil {
 
-       private final static Logger logger = Logger.getAnonymousLogger();
+       private final static Logger logger = Logger.getLogger(XMLUtil.class);
 
        @SuppressWarnings("deprecation")
        public static String readFile(String fname) throws Exception {
@@ -98,7 +97,7 @@
                        throws Exception {
                try {
                        if (document == null) {
-                               logger.warning("WA -- Cann't write XML to 
file - Null doc");
+                               logger.warn("WA -- Cann't write XML to file - 
Null doc");
                                return;
                        }
                        // Prepare the DOM document for writing
@@ -117,9 +116,9 @@
                        // Write to a file
                        xformer.transform(source, result);
                } catch (TransformerConfigurationException e) {
-                       logger.warning("TransformerConfigurationException: " 
+ e);
+                       logger.warn("TransformerConfigurationException: " + 
e);
                } catch (TransformerException e) {
-                       logger.warning("TransformerException: " + e);
+                       logger.warn("TransformerException: " + e);
                }
        }