[idwsfconsumer] 08/25: Add initial POM based on v2. Remove some seemingly unintentional use of the log4j Logger API.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository idwsfconsumer.

commit 7b0db94cda2510b4c491b6c397a92c3d8892c62a
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Wed Apr 1 15:53:45 2015 -0400

    Add initial POM based on v2.
    Remove some seemingly unintentional use of the log4j Logger API.
---
 pom.xml                                            | 68 ++++++++++++++++++++++
 src/main/java/org/openliberty/wsc/WSFMessage.java  | 16 +----
 .../openliberty/wsc/test/PeopleServiceTest.java    |  2 -
 3 files changed, 71 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..6b6d70f
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <name>ID-WSF WSC</name>
+    <groupId>net.shibboleth.liberty</groupId>
+    <artifactId>idwsfconsumer</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <repositories>
+        <repository>
+            <id>shib-release</id>
+            <url>https://build.shibboleth.net/nexus/content/groups/public</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>shib-snapshot</id>
+            <url>https://build.shibboleth.net/nexus/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
+    <dependencies>
+    
+        <!-- Compile -->
+        <dependency>
+            <groupId>org.opensaml</groupId>
+            <artifactId>opensaml</artifactId>
+            <version>2.2.3</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.4</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.5.6</version>
+        </dependency>
+        
+        <!-- Test -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>xmlunit</groupId>
+            <artifactId>xmlunit</artifactId>
+            <version>1.0</version>
+            <scope>test</scope>
+        </dependency>
+        
+    </dependencies>
+
+</project>
diff --git a/src/main/java/org/openliberty/wsc/WSFMessage.java b/src/main/java/org/openliberty/wsc/WSFMessage.java
index be75477..16fd848 100644
--- a/src/main/java/org/openliberty/wsc/WSFMessage.java
+++ b/src/main/java/org/openliberty/wsc/WSFMessage.java
@@ -59,6 +59,7 @@ import org.opensaml.xml.parse.XMLParserException;
 import org.opensaml.xml.util.AttributeMap;
 import org.opensaml.xml.util.XMLHelper;
 import org.opensaml.xml.util.XMLObjectChildrenList;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -72,7 +73,7 @@ import org.w3c.dom.NodeList;
  */
 public class WSFMessage 
 {
-	protected static Logger log = Logger.getLogger(WSFMessage.class);
+    protected static org.slf4j.Logger log = LoggerFactory.getLogger(WSFMessage.class);
 
 	/** Parser manager used to parse XML. */
 	protected static BasicParserPool parser;
@@ -180,17 +181,6 @@ public class WSFMessage
 		return message;
 	}
 
-	/**
-	 * Allows the log level to be set on the fly from anywhere.  This
-	 * will expose the ID-WSF Message trail
-	 * 
-	 * @param level
-	 */
-	public static void setLogLevel(Level level)
-	{
-		log.setLevel(level);
-	}
-
 	public static void setDebugJustSOAPBody(boolean _debugJustSOAPBody)
 	{
 		debugJustSOAPBody = _debugJustSOAPBody;
@@ -303,7 +293,7 @@ public class WSFMessage
 						// {urn:liberty:security:2006-08}Token
 						for(XMLObject obj : securityContext.getUnknownXMLObjects())
 						{
-							if(log.isDebugEnabled()) log.debug(obj.getElementQName());
+							if(log.isDebugEnabled()) log.debug(obj.getElementQName().toString());
 						}
 					}
 
diff --git a/src/test/java/org/openliberty/wsc/test/PeopleServiceTest.java b/src/test/java/org/openliberty/wsc/test/PeopleServiceTest.java
index 461b603..a7f9100 100644
--- a/src/test/java/org/openliberty/wsc/test/PeopleServiceTest.java
+++ b/src/test/java/org/openliberty/wsc/test/PeopleServiceTest.java
@@ -78,10 +78,8 @@ public class PeopleServiceTest
 						ServiceType serviceType = epr.getMetadata().getServiceTypes().get(0);
 						if(DiscoveryService.WSFServiceType.PEOPLE_SERVICE==DiscoveryService.WSFServiceType.serviceForUrn( serviceType.getValue() ))
 						{
-							WSFMessage.setLogLevel(Level.DEBUG);
 							WSFMessage.setDebugJustSOAPBody(true);
 							ClientLibTest.peopleServiceTest(conorsDisco, epr);
-							WSFMessage.setLogLevel(Level.ERROR);
 							// demo.doPeopleServiceStuff(conorsDisco, epr);
 						}
 						else

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.