You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/01/14 13:13:33 UTC
svn commit: r1778766 - in
/axis/axis2/java/rampart/branches/RAMPART-433/modules:
rampart-core/src/test/java/org/apache/rampart/policy/builders/KerberosConfigBuilderTest.java
rampart-integration/src/test/java/org/apache/rampart/util/KerberosServer.java
Author: veithen
Date: Sat Jan 14 13:13:33 2017
New Revision: 1778766
URL: http://svn.apache.org/viewvc?rev=1778766&view=rev
Log:
Use Commons Logging as we do elsewhere.
Modified:
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/test/java/org/apache/rampart/policy/builders/KerberosConfigBuilderTest.java
axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/java/org/apache/rampart/util/KerberosServer.java
Modified: axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/test/java/org/apache/rampart/policy/builders/KerberosConfigBuilderTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/test/java/org/apache/rampart/policy/builders/KerberosConfigBuilderTest.java?rev=1778766&r1=1778765&r2=1778766&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/test/java/org/apache/rampart/policy/builders/KerberosConfigBuilderTest.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-core/src/test/java/org/apache/rampart/policy/builders/KerberosConfigBuilderTest.java Sat Jan 14 13:13:33 2017
@@ -31,6 +31,8 @@ import javax.xml.stream.XMLStreamWriter;
import junit.framework.TestCase;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyBuilder;
@@ -42,8 +44,6 @@ import org.apache.ws.secpolicy.WSSPolicy
import org.custommonkey.xmlunit.XMLAssert;
import org.custommonkey.xmlunit.XMLUnit;
import org.custommonkey.xmlunit.exceptions.XpathException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -51,7 +51,7 @@ public class KerberosConfigBuilderTest e
public static final String KERBEROS_CONFIG_POLICY_FILE = "kerberosConfig.policy";
- private static Logger log = LoggerFactory.getLogger(KerberosConfigBuilderTest.class);
+ private static Log log = LogFactory.getLog(KerberosConfigBuilderTest.class);
public void testBuildKerberosConfig() throws WSSPolicyException {
Policy kerberosConfigPolicy = loadKerberosConfigPolicy();
Modified: axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/java/org/apache/rampart/util/KerberosServer.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/java/org/apache/rampart/util/KerberosServer.java?rev=1778766&r1=1778765&r2=1778766&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/java/org/apache/rampart/util/KerberosServer.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-433/modules/rampart-integration/src/test/java/org/apache/rampart/util/KerberosServer.java Sat Jan 14 13:13:33 2017
@@ -29,6 +29,8 @@ import java.util.List;
import org.apache.axis2.testutils.PortAllocator;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
import org.apache.directory.api.ldap.model.ldif.LdifEntry;
import org.apache.directory.api.ldap.model.ldif.LdifReader;
@@ -44,8 +46,6 @@ import org.apache.directory.server.kerbe
import org.apache.directory.server.protocol.shared.transport.Transport;
import org.apache.directory.server.protocol.shared.transport.UdpTransport;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Runs an Apache DS Kerberos server.
@@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory;
*/
public class KerberosServer {
- private static final Logger logger = LoggerFactory.getLogger(KerberosServer.class);
+ private static final Log log = LogFactory.getLog(KerberosServer.class);
/**
* The used DirectoryService instance
@@ -143,7 +143,7 @@ public class KerberosServer {
kdcServer.setServiceName("DefaultKrbServer");
final String kdcHostname = "localhost";
- logger.info(String.format("Starting service on %s:%s", kdcHostname, kdcPort));
+ log.info(String.format("Starting service on %s:%s", kdcHostname, kdcPort));
UdpTransport udp = new UdpTransport(kdcHostname, kdcPort);
kdcServer.addTransports(udp);
@@ -181,7 +181,7 @@ public class KerberosServer {
* @throws Exception
*/
public static synchronized void stopKerberosServer() throws Exception {
- logger.info("Stop called");
+ log.info("Stop called");
try {
if (directoryService != null) {
try {
@@ -192,7 +192,7 @@ public class KerberosServer {
FileUtils.deleteDirectory(workDir);
}
catch (IOException e) {
- logger.error("Failed to delete Apache DS working directory: " + workDir.getAbsolutePath() , e);
+ log.error("Failed to delete Apache DS working directory: " + workDir.getAbsolutePath() , e);
}
}
directoryService = null;