perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r6023 - in trunk/perfsonar-java-web-admin: . perfsonar-java-we b-admin-component/src/main/java/org/perfsonar/webadmin/bas e2/config perfsonar-java-web-admin-component/src/main/java /org/perfsonar/webadmin/base2/servlet/util perfsonar-java- web-admin-component/src/main/java/org/perfsonar/webadmin/b ase2/test perfsonar-java-web-admin-component/src/main/java /org/perfsonar/webadmin/base2/util perfsonar-java-web-admi n-component/src/test/java/org/perfsonar
Subject: perfsonar development work
List archive
[pS-dev] [GEANT/SA2/ps-java-services] r6023 - in trunk/perfsonar-java-web-admin: . perfsonar-java-we b-admin-component/src/main/java/org/perfsonar/webadmin/bas e2/config perfsonar-java-web-admin-component/src/main/java /org/perfsonar/webadmin/base2/servlet/util perfsonar-java- web-admin-component/src/main/java/org/perfsonar/webadmin/b ase2/test perfsonar-java-web-admin-component/src/main/java /org/perfsonar/webadmin/base2/util perfsonar-java-web-admi n-component/src/test/java/org/perfsonar
Chronological Thread
- From:
- To:
- Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6023 - in trunk/perfsonar-java-web-admin: . perfsonar-java-we b-admin-component/src/main/java/org/perfsonar/webadmin/bas e2/config perfsonar-java-web-admin-component/src/main/java /org/perfsonar/webadmin/base2/servlet/util perfsonar-java- web-admin-component/src/main/java/org/perfsonar/webadmin/b ase2/test perfsonar-java-web-admin-component/src/main/java /org/perfsonar/webadmin/base2/util perfsonar-java-web-admi n-component/src/test/java/org/perfsonar
- Date: Sat, 6 Oct 2012 18:26:23 +0100 (BST)
Author: dante.delvaux
Date: 2012-10-06 18:26:23 +0100 (Sat, 06 Oct 2012)
New Revision: 6023
Removed:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/test/java/org/perfsonar/SelftTestResponseTest.java
Modified:
trunk/perfsonar-java-web-admin/
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/config/ObjectMap.java
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/servlet/util/ConfigurationServletHelper.java
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/test/SOAPClient.java
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/util/WAXMLReader.java
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/util/XMLUtil.java
trunk/perfsonar-java-web-admin/pom.xml
Log:
Using SLF4j as API to logging.
Property changes on: trunk/perfsonar-java-web-admin
___________________________________________________________________
Modified: svn:ignore
- .project
.settings
+ .project
.settings
logs
Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
2012-10-05 09:22:58 UTC (rev 6022)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/config/HTMLGenerator.java
2012-10-06 17:26:23 UTC (rev 6023)
@@ -5,7 +5,6 @@
import java.util.List;
import java.util.Set;
-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.Tuple;
@@ -19,11 +18,13 @@
import org.perfsonar.webadmin.base2.waschema.v20090201.PageType;
import org.perfsonar.webadmin.base2.waschema.v20090201.PlainType;
import org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.NodeList;
public class HTMLGenerator {
- private final Logger logger = Logger.getLogger(HTMLGenerator.class);
+ private final Logger logger = LoggerFactory.getLogger(getClass());
public enum UIType {
DROPDOWN, RADIO, RADIOGROUP, TEXTBOX, PASSOWRD;
Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/config/ObjectMap.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/config/ObjectMap.java
2012-10-05 09:22:58 UTC (rev 6022)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/config/ObjectMap.java
2012-10-06 17:26:23 UTC (rev 6023)
@@ -12,8 +12,6 @@
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
-import org.apache.log4j.Logger;
-
import org.perfsonar.webadmin.base2.util.NSContext;
import org.perfsonar.webadmin.base2.util.Tuple;
import org.perfsonar.webadmin.base2.util.WAXMLReader;
@@ -21,6 +19,8 @@
import org.perfsonar.webadmin.base2.waschema.v20090201.BaseType;
import org.perfsonar.webadmin.base2.waschema.v20090201.NsMap;
import org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -34,7 +34,7 @@
@SuppressWarnings("serial")
public class ObjectMap extends Hashtable<Integer, Object> {
- private Logger logger = Logger.getLogger(ObjectMap.class);
+ private final Logger logger = LoggerFactory.getLogger(getClass());
Tuple<WebAdminInterface, JAXBContext> waconfig;
String waconfigfile = "";
Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/servlet/util/ConfigurationServletHelper.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/servlet/util/ConfigurationServletHelper.java
2012-10-05 09:22:58 UTC (rev 6022)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/servlet/util/ConfigurationServletHelper.java
2012-10-06 17:26:23 UTC (rev 6023)
@@ -7,15 +7,15 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.log4j.Logger;
-
import org.perfsonar.webadmin.base2.config.HTMLGenerator;
import org.perfsonar.webadmin.base2.config.ObjectMap;
import org.perfsonar.webadmin.base2.util.HTMLUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ConfigurationServletHelper {
- private static final Logger logger =
Logger.getLogger(ConfigurationServletHelper.class);
+ private final Logger logger = LoggerFactory.getLogger(getClass());
//TODO: Isn't the Session timeout set in the WebAdmin configuration
file?
static final short SESSION_INTERVAL = 3600;
Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/test/SOAPClient.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/test/SOAPClient.java
2012-10-05 09:22:58 UTC (rev 6022)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/test/SOAPClient.java
2012-10-06 17:26:23 UTC (rev 6023)
@@ -22,7 +22,7 @@
*/
public class SOAPClient {
- protected Logger logger = LoggerFactory.getLogger(getClass());
+ private final Logger logger = LoggerFactory.getLogger(getClass());
private final String url;
Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/util/WAXMLReader.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/util/WAXMLReader.java
2012-10-05 09:22:58 UTC (rev 6022)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/util/WAXMLReader.java
2012-10-06 17:26:23 UTC (rev 6023)
@@ -10,14 +10,15 @@
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
-import org.apache.log4j.Logger;
import org.perfsonar.webadmin.base2.waschema.v20090201.PageType;
import org.perfsonar.webadmin.base2.waschema.v20090201.WebAdminInterface;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xml.sax.InputSource;
public class WAXMLReader {
- private final static Logger logger =
Logger.getLogger(WAXMLReader.class);
+ private final static Logger logger =
LoggerFactory.getLogger(WAXMLReader.class);
// The NS of the WebAdmin configuration file schema
private final static String CLASS_NAME =
"org.perfsonar.webadmin.base2.waschema.v20090201";
Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/util/XMLUtil.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/util/XMLUtil.java
2012-10-05 09:22:58 UTC (rev 6022)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/base2/util/XMLUtil.java
2012-10-06 17:26:23 UTC (rev 6023)
@@ -23,14 +23,15 @@
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
public class XMLUtil {
- private final static Logger logger = Logger.getLogger(XMLUtil.class);
+ private final static Logger logger =
LoggerFactory.getLogger(XMLUtil.class);
@SuppressWarnings("deprecation")
public static String readFile(String fname) throws Exception {
Deleted:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/test/java/org/perfsonar/SelftTestResponseTest.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/test/java/org/perfsonar/SelftTestResponseTest.java
2012-10-05 09:22:58 UTC (rev 6022)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/test/java/org/perfsonar/SelftTestResponseTest.java
2012-10-06 17:26:23 UTC (rev 6023)
@@ -1,53 +0,0 @@
-package org.perfsonar;
-
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-
-import junit.framework.TestCase;
-
-public class SelftTestResponseTest extends TestCase {
-
- private String getFileContent(String fileName) {
- StringBuffer sb=new StringBuffer();
- try {
- FileInputStream fstream = new
FileInputStream(fileName);
- DataInputStream in = new DataInputStream(fstream);
- BufferedReader br = new BufferedReader(new
InputStreamReader(in));
- String strLine;
- while ((strLine = br.readLine()) != null) {
- sb.append(strLine);
- }
- in.close();
- } catch (Exception e) {
- System.err.println("Error: " + e.getMessage());
- }
-
- return sb.toString();
- }
-
- public void testParsing() {
- //FIXME: remove and do proper unit testing on the other
classes
- assertEquals(1,1);
- }
-
-/* public void testParsing1() {
-
- SelfTestMessageParser selfTestMessageParser = new
SelfTestMessageParser();
- String
fileContent=getFileContent("src/test/resources/soapResponse1.xml");
- Map<String,String>
result=selfTestMessageParser.parseMessage(fileContent);
-
- assertEquals(3,result.size());
- }
-
- public void testParsing2() {
-
- SelfTestMessageParser selfTestMessageParser = new
SelfTestMessageParser();
- String
fileContent=getFileContent("src/test/resources/soapResponse2.xml");
- Map<String,String>
result=selfTestMessageParser.parseMessage(fileContent);
-
- assertEquals(3,result.size());
- }
-*/
-}
Modified: trunk/perfsonar-java-web-admin/pom.xml
===================================================================
--- trunk/perfsonar-java-web-admin/pom.xml 2012-10-05 09:22:58 UTC (rev
6022)
+++ trunk/perfsonar-java-web-admin/pom.xml 2012-10-06 17:26:23 UTC (rev
6023)
@@ -33,14 +33,8 @@
<id>wiku</id>
<name>Wiktor Procyk</name>
<email></email>
- <url></url>
<organization>Poznan Supercomputing and Networking
Center</organization>
<organizationUrl>http://www.man.poznan.pl/</organizationUrl>
- <roles>
- <role>designer</role>
- <role>developer</role>
- </roles>
- <timezone>1</timezone>
<properties>
<skype>wiktorpr</skype>
</properties>
@@ -80,23 +74,34 @@
<artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version>
</plugin>
+ <plugin>
+
<groupId>org.apache.tomcat.maven</groupId>
+
<artifactId>tomcat6-maven-plugin</artifactId>
+ <version>2.0-beta-1</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.6</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.6</version>
- </dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.6</version>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
@@ -136,4 +141,17 @@
</repository>
</repositories>
+ <distributionManagement>
+ <repository>
+ <id>GEANT Artifactory</id>
+ <name>GEANT Artifactory perfSONAR-release</name>
+
<url>https://artifactory.geant.net/artifactory/perfsonar-release-local</url>
+ </repository>
+ <snapshotRepository>
+ <id>GEANT Artifactory</id>
+ <name>GEANT Artifactory perfSONAR-snapshots</name>
+
<url>https://artifactory.geant.net/artifactory/perfsonar-snapshot-local</url>
+ </snapshotRepository>
+ </distributionManagement>
+
</project>
- [pS-dev] [GEANT/SA2/ps-java-services] r6023 - in trunk/perfsonar-java-web-admin: . perfsonar-java-we b-admin-component/src/main/java/org/perfsonar/webadmin/bas e2/config perfsonar-java-web-admin-component/src/main/java /org/perfsonar/webadmin/base2/servlet/util perfsonar-java- web-admin-component/src/main/java/org/perfsonar/webadmin/b ase2/test perfsonar-java-web-admin-component/src/main/java /org/perfsonar/webadmin/base2/util perfsonar-java-web-admi n-component/src/test/java/org/perfsonar, svn-noreply, 10/06/2012
Archive powered by MHonArc 2.6.16.