jomu/shared
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 7 Activity

migrated to slf4j

Browse Source
This commit is contained in:
jomu
2015-12-27 15:54:06 +00:00
parent 055d2dffd9
commit 88a180703a
34 changed files with 123 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sharepoint/api/pom.xml
View File

@ -256,12 +256,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
</project>

6
sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/SPJaxbObject.java
View File

@ -14,8 +14,8 @@ import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
@ -27,7 +27,7 @@ import org.xml.sax.SAXException;
public abstract class SPJaxbObject<T> extends AbstractSpJaxbObject {
/** the logging object. */
private final static Logger LOGGER = LogManager.getLogger(SPJaxbObject.class);
private final static Logger LOGGER = LoggerFactory.getLogger(SPJaxbObject.class);
/**
* list of packages to search in

6
sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/SPValidationEventHandler.java
View File

@ -2,8 +2,8 @@ package de.muehlencord.shared.sharepoint.api;
import javax.xml.bind.ValidationEvent;
import javax.xml.bind.ValidationEventHandler;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
@ -12,7 +12,7 @@ import org.apache.logging.log4j.Logger;
*/
public class SPValidationEventHandler implements ValidationEventHandler {
private final static Logger LOGGER = LogManager.getLogger(SPValidationEventHandler.class);
private final static Logger LOGGER = LoggerFactory.getLogger(SPValidationEventHandler.class);
@Override
public boolean handleEvent(ValidationEvent event) {

15
sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/ServiceLogHandler.java
View File

@ -9,9 +9,8 @@ import javax.xml.soap.SOAPMessage;
import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.handler.soap.SOAPHandler;
import javax.xml.ws.handler.soap.SOAPMessageContext;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
*
@ -22,7 +21,7 @@ public class ServiceLogHandler implements SOAPHandler<SOAPMessageContext> {
/**
* the logging object.
*/
private final static Logger LOGGER = LogManager.getLogger(ServiceLogHandler.class);
private final static Logger LOGGER = LoggerFactory.getLogger(ServiceLogHandler.class);
@Override
public Set<QName> getHeaders() {
@ -55,16 +54,16 @@ public class ServiceLogHandler implements SOAPHandler<SOAPMessageContext> {
boolean isOutboundMessage = (Boolean) arg0.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
if (LOGGER.isTraceEnabled()) {
if (isOutboundMessage) {
LOGGER.log(Level.TRACE, "OUTBOUND MESSAGE");
LOGGER.trace( "OUTBOUND MESSAGE");
} else {
LOGGER.log(Level.TRACE, "INBOUND MESSAGE");
LOGGER.trace( "INBOUND MESSAGE");
}
}
try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
message.writeTo(os);
LOGGER.log(Level.TRACE, os.toString("UTF-8"));
LOGGER.trace(os.toString("UTF-8"));
} catch (SOAPException | IOException e) {
LOGGER.log(Level.DEBUG, e.toString(), e);
LOGGER.debug(e.toString(), e);
}
return true;

13
sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/usergroup/SPUserGroup.java
View File

@ -19,9 +19,8 @@ import javax.xml.bind.JAXBException;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.handler.Handler;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@ -34,7 +33,7 @@ import org.xml.sax.SAXException;
*/
public class SPUserGroup extends SPObject {
private final static Logger LOGGER = LogManager.getLogger(SPUserGroup.class.getName());
private final static Logger LOGGER = LoggerFactory.getLogger(SPUserGroup.class.getName());
public SPUserGroup(SPContext context) {
super(context);
@ -80,19 +79,19 @@ public class SPUserGroup extends SPObject {
if ((attributes.getNamedItem("LoginName") != null)
&& (attributes.getNamedItem("LoginName").getNodeValue().equals("i:0#.w|" + userLoginName))) {
if (LOGGER.isDebugEnabled()) {
LOGGER.log(Level.DEBUG, "User " + userLoginName + " is member of group " + groupName);
LOGGER.debug("User " + userLoginName + " is member of group " + groupName);
}
return true; // user found
}
}
}
if (LOGGER.isDebugEnabled()) {
LOGGER.log(Level.DEBUG, "User " + userLoginName + " is not a member of group " + groupName);
LOGGER.debug("User " + userLoginName + " is not a member of group " + groupName);
}
return false;
} else {
if (LOGGER.isDebugEnabled()) {
LOGGER.log(Level.DEBUG, "User " + userLoginName + " not found");
LOGGER.debug("User " + userLoginName + " not found");
}
return false;
}