Author: tv
Date: Mon Sep 30 09:10:09 2013
New Revision: 1527491
URL: http://svn.apache.org/r1527491
Log:
Remove dependency on commons-logging
Modified:
turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicACLTest.java
turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicModelManagerTest.java
turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTDynamicModelManagerTest.java
turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTUserManagerTest.java
Modified:
turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicACLTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicACLTest.java?rev=1527491&r1=1527490&r2=1527491&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicACLTest.java
(original)
+++
turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicACLTest.java
Mon Sep 30 09:10:09 2013
@@ -19,8 +19,6 @@ package org.apache.fulcrum.security.nt.d
* under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.UserManager;
import org.apache.fulcrum.security.acl.AccessControlList;
@@ -31,16 +29,15 @@ import org.apache.fulcrum.security.util.
import org.apache.fulcrum.testcontainer.BaseUnitTest;
/**
- *
+ *
* Test the NT implementation of the user manager. This test traps some
* exceptions that can be thrown if there is NO nt dll.
- *
+ *
* @author <a href="mailto:[email protected]">Eric Pugh</a>
* @version $Id$
*/
public class NTBasicACLTest extends BaseUnitTest implements TestConstants
{
- private static Log log = LogFactory.getLog(NTBasicACLTest.class);
private static final String DOMAIN = "IQUITOS";
private static final String GUESTUSER = DOMAIN + "/" + "Guest";
private SecurityService securityService;
@@ -66,7 +63,7 @@ public class NTBasicACLTest extends Base
/**
* Constructor for NTBasicACLTest.
- *
+ *
* @param arg0
*/
public NTBasicACLTest(String arg0)
@@ -97,7 +94,7 @@ public class NTBasicACLTest extends Base
}
catch (UnsatisfiedLinkError ule)
{
- log.info("Unit test not being run due to missing NT DLL");
+ System.out.println("Unit test not being run due to missing NT
DLL");
}
}
}
Modified:
turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicModelManagerTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicModelManagerTest.java?rev=1527491&r1=1527490&r2=1527491&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicModelManagerTest.java
(original)
+++
turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicModelManagerTest.java
Mon Sep 30 09:10:09 2013
@@ -19,8 +19,6 @@ package org.apache.fulcrum.security.nt.d
* under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.UserManager;
import org.apache.fulcrum.security.entity.Group;
@@ -31,16 +29,15 @@ import org.apache.fulcrum.security.util.
import org.apache.fulcrum.testcontainer.BaseUnitTest;
/**
- *
+ *
* Test the NT implementation of the user manager. This test traps some
* exceptions that can be thrown if there is NO nt dll.
- *
+ *
* @author <a href="mailto:[email protected]">Eric Pugh</a>
* @version $Id$
*/
public class NTBasicModelManagerTest extends BaseUnitTest implements
TestConstants
{
- private static Log log = LogFactory.getLog(NTBasicModelManagerTest.class);
private BasicModelManager modelManager;
private SecurityService securityService;
private UserManager userManager;
@@ -66,7 +63,7 @@ public class NTBasicModelManagerTest ext
/**
* Constructor for NTBasicModelManagerTest.
- *
+ *
* @param arg0
*/
public NTBasicModelManagerTest(String arg0)
@@ -93,7 +90,7 @@ public class NTBasicModelManagerTest ext
}
catch (UnsatisfiedLinkError ule)
{
- log.info("Unit test not being run due to missing NT DLL");
+ System.out.println("Unit test not being run due to missing NT
DLL");
}
}
@@ -115,11 +112,11 @@ public class NTBasicModelManagerTest ext
}
catch (UnsatisfiedLinkError ule)
{
- log.info("Unit test not being run due to missing NT DLL");
+ System.out.println("Unit test not being run due to missing NT
DLL");
}
catch (java.lang.NoClassDefFoundError ncdfe)
{
- log.info("Unit test not being run due to missing NT DLL");
+ System.out.println("Unit test not being run due to missing NT
DLL");
}
}
@@ -141,11 +138,11 @@ public class NTBasicModelManagerTest ext
}
catch (UnsatisfiedLinkError ule)
{
- log.info("Unit test not being run due to missing NT DLL");
+ System.out.println("Unit test not being run due to missing NT
DLL");
}
catch (java.lang.NoClassDefFoundError ncdfe)
{
- log.info("Unit test not being run due to missing NT DLL");
+ System.out.println("Unit test not being run due to missing NT
DLL");
}
}
}
Modified:
turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTDynamicModelManagerTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTDynamicModelManagerTest.java?rev=1527491&r1=1527490&r2=1527491&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTDynamicModelManagerTest.java
(original)
+++
turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTDynamicModelManagerTest.java
Mon Sep 30 09:10:09 2013
@@ -19,8 +19,6 @@ package org.apache.fulcrum.security.nt.d
* under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.UserManager;
import org.apache.fulcrum.security.entity.Group;
@@ -31,17 +29,16 @@ import org.apache.fulcrum.security.util.
import org.apache.fulcrum.testcontainer.BaseUnitTest;
/**
- *
+ *
* Test the NT implementation of the user manager. This test traps some
* exceptions that can be thrown if there is NO nt dll.
- *
+ *
* @author <a href="mailto:[email protected]">Eric Pugh</a>
* @version $Id: NTDynamicModelManagerTest.java 1374015 2012-08-16 19:48:54Z tv
* $
*/
public class NTDynamicModelManagerTest extends BaseUnitTest implements
TestConstants
{
- private static Log log =
LogFactory.getLog(NTDynamicModelManagerTest.class);
private DynamicModelManager modelManager;
private SecurityService securityService;
private UserManager userManager;
@@ -67,7 +64,7 @@ public class NTDynamicModelManagerTest e
/**
* Constructor for NTDynamicModelManagerTest.
- *
+ *
* @param arg0
*/
public NTDynamicModelManagerTest(String arg0)
@@ -94,7 +91,7 @@ public class NTDynamicModelManagerTest e
}
catch (UnsatisfiedLinkError ule)
{
- log.info("Unit test not being run due to missing NT DLL");
+ System.out.println("Unit test not being run due to missing NT
DLL");
}
}
@@ -116,11 +113,11 @@ public class NTDynamicModelManagerTest e
}
catch (UnsatisfiedLinkError ule)
{
- log.info("Unit test not being run due to missing NT DLL");
+ System.out.println("Unit test not being run due to missing NT
DLL");
}
catch (java.lang.NoClassDefFoundError ncdfe)
{
- log.info("Unit test not being run due to missing NT DLL");
+ System.out.println("Unit test not being run due to missing NT
DLL");
}
}
@@ -142,11 +139,11 @@ public class NTDynamicModelManagerTest e
}
catch (UnsatisfiedLinkError ule)
{
- log.info("Unit test not being run due to missing NT DLL");
+ System.out.println("Unit test not being run due to missing NT
DLL");
}
catch (java.lang.NoClassDefFoundError ncdfe)
{
- log.info("Unit test not being run due to missing NT DLL");
+ System.out.println("Unit test not being run due to missing NT
DLL");
}
}
}
Modified:
turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTUserManagerTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTUserManagerTest.java?rev=1527491&r1=1527490&r2=1527491&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTUserManagerTest.java
(original)
+++
turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTUserManagerTest.java
Mon Sep 30 09:10:09 2013
@@ -19,8 +19,6 @@ package org.apache.fulcrum.security.nt.d
* under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.acl.AccessControlList;
import org.apache.fulcrum.security.model.dynamic.entity.DynamicUser;
@@ -31,16 +29,15 @@ import org.apache.fulcrum.security.util.
import com.tagish.auth.win32.NTSystem;
/**
- *
+ *
* Test the NT implementation of the user manager. This test traps some
* exceptions that can be thrown if there is NO nt dll.
- *
+ *
* @author <a href="mailto:[email protected]">Eric Pugh</a>
* @version $Id$
*/
public class NTUserManagerTest extends AbstractUserManagerTest implements
TestConstants
{
- private static Log log = LogFactory.getLog(NTUserManagerTest.class);
private static final String ERROR_MSG = "Not supported by NT User Manager";
private static final String USERNAME = "Eric Pugh";
private static final String DOMAIN = "IQUITOS";
@@ -66,7 +63,7 @@ public class NTUserManagerTest extends A
/**
* Constructor for NTUserManagerTest.
- *
+ *
* @param arg0
*/
public NTUserManagerTest(String arg0)
@@ -89,7 +86,7 @@ public class NTUserManagerTest extends A
}
catch (UnsatisfiedLinkError ule)
{
- log.info("Unit test not being run due to missing NT DLL");
+ System.out.println("Unit test not being run due to missing NT
DLL");
}
}
@@ -104,7 +101,7 @@ public class NTUserManagerTest extends A
}
catch (NoClassDefFoundError ule)
{
- log.info("Unit test not being run due to missing NT DLL");
+ System.out.println("Unit test not being run due to missing NT
DLL");
}
}
@@ -120,7 +117,7 @@ public class NTUserManagerTest extends A
}
catch (NoClassDefFoundError ule)
{
- log.info("Unit test not being run due to missing NT DLL");
+ System.out.println("Unit test not being run due to missing NT
DLL");
}
}
@@ -136,7 +133,7 @@ public class NTUserManagerTest extends A
}
catch (NoClassDefFoundError ule)
{
- log.info("Unit test not being run due to missing NT DLL");
+ System.out.println("Unit test not being run due to missing NT
DLL");
}
}
@@ -162,7 +159,7 @@ public class NTUserManagerTest extends A
}
catch (NoClassDefFoundError ule)
{
- log.info("Unit test not being run due to missing NT DLL");
+ System.out.println("Unit test not being run due to missing NT
DLL");
}
}
@@ -180,7 +177,7 @@ public class NTUserManagerTest extends A
}
catch (NoClassDefFoundError ule)
{
- log.info("Unit test not being run due to missing NT DLL");
+ System.out.println("Unit test not being run due to missing NT
DLL");
}
}
@@ -194,7 +191,7 @@ public class NTUserManagerTest extends A
}
catch (NoClassDefFoundError ule)
{
- log.info("Unit test not being run due to missing NT DLL");
+ System.out.println("Unit test not being run due to missing NT
DLL");
}
}
@@ -210,7 +207,7 @@ public class NTUserManagerTest extends A
}
catch (NoClassDefFoundError ule)
{
- log.info("Unit test not being run due to missing NT DLL");
+ System.out.println("Unit test not being run due to missing NT
DLL");
}
}
@@ -276,7 +273,7 @@ public class NTUserManagerTest extends A
}
catch (NoClassDefFoundError ule)
{
- log.info("Unit test not being run due to missing NT DLL");
+ System.out.println("Unit test not being run due to missing NT
DLL");
}
catch (RuntimeException re)
{
@@ -297,7 +294,7 @@ public class NTUserManagerTest extends A
}
catch (NoClassDefFoundError ule)
{
- log.info("Unit test not being run due to missing NT DLL");
+ System.out.println("Unit test not being run due to missing NT
DLL");
}
catch (RuntimeException re)
{