Author: tv
Date: Thu Aug 16 19:48:54 2012
New Revision: 1374015
URL: http://svn.apache.org/viewvc?rev=1374015&view=rev
Log:
Adjust build to current api
Added:
turbine/fulcrum/trunk/security/nt/.settings/
turbine/fulcrum/trunk/security/nt/.settings/org.eclipse.jdt.core.prefs
(with props)
turbine/fulcrum/trunk/security/nt/.settings/org.maven.ide.eclipse.prefs
(with props)
Modified:
turbine/fulcrum/trunk/security/nt/pom.xml
turbine/fulcrum/trunk/security/nt/src/java/org/apache/fulcrum/security/nt/ParseUtils.java
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
Added: turbine/fulcrum/trunk/security/nt/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/nt/.settings/org.eclipse.jdt.core.prefs?rev=1374015&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/nt/.settings/org.eclipse.jdt.core.prefs
(added)
+++ turbine/fulcrum/trunk/security/nt/.settings/org.eclipse.jdt.core.prefs Thu
Aug 16 19:48:54 2012
@@ -0,0 +1,6 @@
+#Thu Aug 16 20:16:17 CEST 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
Propchange:
turbine/fulcrum/trunk/security/nt/.settings/org.eclipse.jdt.core.prefs
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: turbine/fulcrum/trunk/security/nt/.settings/org.maven.ide.eclipse.prefs
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/nt/.settings/org.maven.ide.eclipse.prefs?rev=1374015&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/nt/.settings/org.maven.ide.eclipse.prefs
(added)
+++ turbine/fulcrum/trunk/security/nt/.settings/org.maven.ide.eclipse.prefs Thu
Aug 16 19:48:54 2012
@@ -0,0 +1,8 @@
+#Mon Sep 12 21:14:22 CEST 2011
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Propchange:
turbine/fulcrum/trunk/security/nt/.settings/org.maven.ide.eclipse.prefs
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: turbine/fulcrum/trunk/security/nt/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/nt/pom.xml?rev=1374015&r1=1374014&r2=1374015&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/nt/pom.xml (original)
+++ turbine/fulcrum/trunk/security/nt/pom.xml Thu Aug 16 19:48:54 2012
@@ -54,23 +54,36 @@
<version>1.0.3</version>
</dependency>
<dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-security-memory</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <scope>test</scope>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-security-api</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-crypto</artifactId>
- <version>1.0.7</version>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-testcontainer</artifactId>
+ <version>1.0.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-yaafi</artifactId>
+ <version>1.0.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
<type>jar</type>
- <scope>compile</scope>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified:
turbine/fulcrum/trunk/security/nt/src/java/org/apache/fulcrum/security/nt/ParseUtils.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/nt/src/java/org/apache/fulcrum/security/nt/ParseUtils.java?rev=1374015&r1=1374014&r2=1374015&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/nt/src/java/org/apache/fulcrum/security/nt/ParseUtils.java
(original)
+++
turbine/fulcrum/trunk/security/nt/src/java/org/apache/fulcrum/security/nt/ParseUtils.java
Thu Aug 16 19:48:54 2012
@@ -31,25 +31,26 @@ public class ParseUtils
public static String parseForUsername(String usernameAndDomain) throws
LoginException
{
// fix up angles in case user puts in wrong one!
- usernameAndDomain = usernameAndDomain.replace('/', '\\');
+ String _usernameAndDomain = usernameAndDomain.replace('/', '\\');
// parse the domain and username values out of the username
- int separator = usernameAndDomain.indexOf("\\");
+ int separator = _usernameAndDomain.indexOf("\\");
if (separator == -1)
{
- throw new LoginException("Error: no separator (\\) found in the
username pased in to distingush between domain and username");
+ throw new LoginException("Error: no separator (\\) found in the
username pased in to distinguish between domain and username");
}
- return usernameAndDomain.substring(separator + 1);
+ return _usernameAndDomain.substring(separator + 1);
}
+
public static String parseForDomain(String usernameAndDomain) throws
LoginException
{
// fix up angles in case user puts in wrong one!
- usernameAndDomain = usernameAndDomain.replace('/', '\\');
+ String _usernameAndDomain = usernameAndDomain.replace('/', '\\');
// parse the domain and username values out of the username
- int separator = usernameAndDomain.indexOf("\\");
+ int separator = _usernameAndDomain.indexOf("\\");
if (separator == -1)
{
- throw new LoginException("Error: no separator (\\) found in the
username pased in to distingush between domain and username");
+ throw new LoginException("Error: no separator (\\) found in the
username pased in to distinguish between domain and username");
}
- return usernameAndDomain.substring(0, separator);
+ return _usernameAndDomain.substring(0, separator);
}
}
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=1374015&r1=1374014&r2=1374015&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
Thu Aug 16 19:48:54 2012
@@ -25,7 +25,6 @@ import org.apache.fulcrum.security.UserM
import org.apache.fulcrum.security.acl.AccessControlList;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.model.basic.BasicAccessControlList;
-import org.apache.fulcrum.security.model.basic.BasicModelManager;
import org.apache.fulcrum.security.util.DataBackendException;
import org.apache.fulcrum.security.util.UnknownEntityException;
import org.apache.fulcrum.testcontainer.BaseUnitTest;
@@ -40,13 +39,8 @@ import org.apache.fulcrum.testcontainer.
public class NTBasicACLTest extends BaseUnitTest implements TestConstants
{
private static Log log = LogFactory.getLog(NTBasicACLTest.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";
- private static final String PASSWORD = "";
private static final String GUESTUSER = DOMAIN + "/" + "Guest";
- private static final String TESTUSER = DOMAIN + "/" + USERNAME;
- private BasicModelManager modelManager;
private SecurityService securityService;
private UserManager userManager;
private User user;
@@ -57,16 +51,17 @@ public class NTBasicACLTest extends Base
this.setConfigurationFileName("src/test/BasicNTComponentConfig.xml");
securityService = (SecurityService) lookup(SecurityService.ROLE);
userManager = securityService.getUserManager();
- modelManager = (BasicModelManager) securityService.getModelManager();
}
+
public void tearDown()
{
user = null;
userManager = null;
securityService = null;
}
+
/**
- * Constructor for MemoryPermissionManagerTest.
+ * Constructor for NTBasicACLTest.
*
* @param arg0
*/
@@ -74,6 +69,7 @@ public class NTBasicACLTest extends Base
{
super(arg0);
}
+
public void testLoadingUpGroupsForBasicModelACL() throws Exception
{
try
@@ -86,7 +82,6 @@ public class NTBasicACLTest extends Base
assertEquals(4,bacl.getGroups().size());
assertTrue(bacl.hasGroup("Guests"));
assertTrue(bacl.hasGroup("gUEsts"));
-
}
catch(DataBackendException dbe){
assertTrue(dbe.getMessage().indexOf(SCB_INVALID)>-1);
@@ -100,7 +95,4 @@ public class NTBasicACLTest extends Base
log.info("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=1374015&r1=1374014&r2=1374015&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
Thu Aug 16 19:48:54 2012
@@ -39,12 +39,6 @@ import org.apache.fulcrum.testcontainer.
public class NTBasicModelManagerTest extends BaseUnitTest implements
TestConstants
{
private static Log log = LogFactory.getLog(NTBasicModelManagerTest.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";
- private static final String PASSWORD = "";
- private static final String GUESTUSER = DOMAIN + "/" + "Guest";
- private static final String TESTUSER = DOMAIN + "/" + USERNAME;
private BasicModelManager modelManager;
private SecurityService securityService;
private UserManager userManager;
@@ -58,14 +52,16 @@ public class NTBasicModelManagerTest ext
userManager = securityService.getUserManager();
modelManager = (BasicModelManager) securityService.getModelManager();
}
+
public void tearDown()
{
user = null;
userManager = null;
securityService = null;
}
+
/**
- * Constructor for MemoryPermissionManagerTest.
+ * Constructor for NTBasicModelManagerTest.
*
* @param arg0
*/
@@ -73,6 +69,7 @@ public class NTBasicModelManagerTest ext
{
super(arg0);
}
+
public void testRevokeAll() throws Exception
{
try
@@ -119,6 +116,7 @@ public class NTBasicModelManagerTest ext
log.info("Unit test not being run due to missing NT DLL");
}
}
+
public void testRevokeUserGroup() throws Exception
{
try
@@ -143,5 +141,4 @@ public class NTBasicModelManagerTest ext
log.info("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=1374015&r1=1374014&r2=1374015&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
Thu Aug 16 19:48:54 2012
@@ -39,12 +39,6 @@ import org.apache.fulcrum.testcontainer.
public class NTDynamicModelManagerTest extends BaseUnitTest implements
TestConstants
{
private static Log log =
LogFactory.getLog(NTDynamicModelManagerTest.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";
- private static final String PASSWORD = "";
- private static final String GUESTUSER = DOMAIN + "/" + "Guest";
- private static final String TESTUSER = DOMAIN + "/" + USERNAME;
private DynamicModelManager modelManager;
private SecurityService securityService;
private UserManager userManager;
@@ -58,14 +52,16 @@ public class NTDynamicModelManagerTest e
userManager = securityService.getUserManager();
modelManager = (DynamicModelManager) securityService.getModelManager();
}
+
public void tearDown()
{
user = null;
userManager = null;
securityService = null;
}
+
/**
- * Constructor for MemoryPermissionManagerTest.
+ * Constructor for NTDynamicModelManagerTest.
*
* @param arg0
*/
@@ -73,6 +69,7 @@ public class NTDynamicModelManagerTest e
{
super(arg0);
}
+
public void testRevokeAll() throws Exception
{
try
@@ -119,6 +116,7 @@ public class NTDynamicModelManagerTest e
log.info("Unit test not being run due to missing NT DLL");
}
}
+
public void testRevokeUserGroup() throws Exception
{
try
@@ -143,5 +141,4 @@ public class NTDynamicModelManagerTest e
log.info("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=1374015&r1=1374014&r2=1374015&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
Thu Aug 16 19:48:54 2012
@@ -44,7 +44,6 @@ public class NTUserManagerTest extends A
private static final String DOMAIN = "IQUITOS";
private static final String PASSWORD = "";
private static final String GUESTUSER = DOMAIN + "/" + "Guest";
- private static final String TESTUSER = DOMAIN + "/" + USERNAME;
public void setUp() throws Exception
{
@@ -53,14 +52,16 @@ public class NTUserManagerTest extends A
securityService = (SecurityService) lookup(SecurityService.ROLE);
userManager = securityService.getUserManager();
}
+
public void tearDown()
{
user = null;
userManager = null;
securityService = null;
}
+
/**
- * Constructor for MemoryPermissionManagerTest.
+ * Constructor for NTUserManagerTest.
*
* @param arg0
*/
@@ -68,6 +69,7 @@ public class NTUserManagerTest extends A
{
super(arg0);
}
+
public void testCheckExists() throws Exception
{
try
@@ -84,6 +86,7 @@ public class NTUserManagerTest extends A
log.info("Unit test not being run due to missing NT DLL");
}
}
+
public void testCheckExistsFails() throws Exception
{
try
@@ -98,6 +101,7 @@ public class NTUserManagerTest extends A
log.info("Unit test not being run due to missing NT DLL");
}
}
+
/**
* tests getting an NT username
*/
@@ -115,6 +119,7 @@ public class NTUserManagerTest extends A
log.info("Unit test not being run due to missing NT DLL");
}
}
+
/**
* tests getting an NT Domain
*/
@@ -132,6 +137,7 @@ public class NTUserManagerTest extends A
log.info("Unit test not being run due to missing NT DLL");
}
}
+
/**
* tests logging on a different user
*/
@@ -163,8 +169,9 @@ public class NTUserManagerTest extends A
log.info("Unit test not being run due to missing NT DLL");
}
}
+
/*
- * Class to test for User retrieve(String, String)
+ * test for User retrieve(String, String)
*/
public void testGetUserStringString() throws Exception
{
@@ -179,6 +186,7 @@ public class NTUserManagerTest extends A
log.info("Unit test not being run due to missing NT DLL");
}
}
+
public void testAuthenticate() throws Exception
{
try
@@ -191,6 +199,7 @@ public class NTUserManagerTest extends A
log.info("Unit test not being run due to missing NT DLL");
}
}
+
public void testGetACL() throws Exception
{
try
@@ -205,9 +214,10 @@ public class NTUserManagerTest extends A
log.info("Unit test not being run due to missing NT DLL");
}
}
+
/** ******* ALL BELOW HERE THROW RUNTIME EXCEPTIONS ******** */
/*
- * Class to test for User retrieve(String, String)
+ * test for User retrieve(String, String)
*/
public void testGetAllUsers() throws Exception
{
@@ -221,6 +231,7 @@ public class NTUserManagerTest extends A
assertTrue(re.getMessage().equals(ERROR_MSG));
}
}
+
/*
* Class to test for User retrieve(String)
*/
@@ -249,6 +260,7 @@ public class NTUserManagerTest extends A
assertTrue(re.getMessage().equals(ERROR_MSG));
}
}
+
public void testChangePassword() throws Exception
{
try
@@ -263,12 +275,12 @@ public class NTUserManagerTest extends A
{
log.info("Unit test not being run due to missing NT DLL");
}
-
catch (RuntimeException re)
{
assertTrue(re.getMessage().equals(ERROR_MSG));
}
}
+
public void testForcePassword() throws Exception
{
try
@@ -314,6 +326,7 @@ public class NTUserManagerTest extends A
assertTrue(re.getMessage().equals(ERROR_MSG));
}
}
+
public void testAddUser() throws Exception
{
try
@@ -326,6 +339,7 @@ public class NTUserManagerTest extends A
assertTrue(re.getMessage().equals(ERROR_MSG));
}
}
+
public void testRetrieveingUsersByGroup() throws Exception
{
try
@@ -344,7 +358,7 @@ public class NTUserManagerTest extends A
*/
public void testCheckExistsWithString() throws Exception
{
-
+ // empty
}
/*
@@ -352,14 +366,14 @@ public class NTUserManagerTest extends A
*/
public void testAddUserTwiceFails() throws Exception
{
-
+ // empty
}
+
/*
* Override parent class, doesn't make sense..
*/
public void testCheckUserCaseSensitiveExists() throws Exception
{
-
+ // empty
}
-
}
