Merge branch 's1890' of gimli2:/srv/cadc/git/ac into s1890 (5377ac97) · Commits · OATS-CADC / ac

cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractCommand.java

+14 −15

Original line number	Diff line number	Diff line
		@@ -71,7 +71,6 @@ package ca.nrc.cadc.ac.admin;

		import java.io.PrintStream;
		import java.security.AccessControlException;
		import java.security.Principal;
		import java.security.PrivilegedAction;

		import ca.nrc.cadc.ac.server.UserPersistence;
		@@ -88,7 +87,7 @@ public abstract class AbstractCommand implements PrivilegedAction<Object>
		protected PrintStream systemOut = System.out;
		protected PrintStream systemErr = System.err;

		private UserPersistence<Principal> userPersistence;
		private UserPersistence userPersistence;


		protected abstract void doRun()
		@@ -135,12 +134,12 @@ public abstract class AbstractCommand implements PrivilegedAction<Object>
		}

		protected void setUserPersistence(
		final UserPersistence<Principal> userPersistence)
		final UserPersistence userPersistence)
		{
		this.userPersistence = userPersistence;
		}

		public UserPersistence<Principal> getUserPersistence()
		public UserPersistence getUserPersistence()
		{
		return userPersistence;
		}

+4 −9

Original line number	Diff line number	Diff line
		@@ -70,11 +70,9 @@
		package ca.nrc.cadc.ac.admin;

		import java.security.AccessControlException;
		import java.security.Principal;
		import java.util.Date;
		import java.util.IllegalFormatException;
		import java.util.Properties;
		import java.util.Set;

		import javax.mail.Address;
		import javax.mail.Message;
		@@ -86,7 +84,6 @@ import javax.security.auth.x500.X500Principal;

		import org.apache.log4j.Logger;

		import ca.nrc.cadc.ac.PersonalDetails;
		import ca.nrc.cadc.ac.User;
		import ca.nrc.cadc.ac.UserNotFoundException;
		import ca.nrc.cadc.auth.HttpPrincipal;
		@@ -151,7 +148,7 @@ public class ApproveUser extends AbstractUserCommand
		return;
		}

		User<Principal> user = null;
		User user = null;
		try
		{
		user = this.getUserPersistence().getUser(this.getPrincipal());
		@@ -176,7 +173,7 @@ public class ApproveUser extends AbstractUserCommand

		}

		private void emailUser(User<Principal> user)
		private void emailUser(User user)
		{
		try
		{
		@@ -202,12 +199,10 @@ public class ApproveUser extends AbstractUserCommand
		return;
		}

		Set<PersonalDetails> pds = user.getDetails(PersonalDetails.class);
		String recipient = null;
		if (pds != null && !pds.isEmpty())
		if (user.personalDetails != null)
		{
		PersonalDetails pd = pds.iterator().next();
		recipient = pd.email;
		recipient = user.personalDetails.email;
		}
		if (recipient == null)
		{

+2 −2

Original line number	Diff line number	Diff line
		@@ -92,11 +92,11 @@ public class CommandRunner
		{
		private final static Logger LOGGER = Logger.getLogger(CommandRunner.class);
		private final CmdLineParser commandLineParser;
		private final UserPersistence<Principal> userPersistence;
		private final UserPersistence userPersistence;


		public CommandRunner(final CmdLineParser commandLineParser,
		final UserPersistence<Principal> userPersistence)
		final UserPersistence userPersistence)
		{
		this.commandLineParser = commandLineParser;
		this.userPersistence = userPersistence;

+4 −5

Original line number	Diff line number	Diff line
		@@ -70,7 +70,6 @@
		package ca.nrc.cadc.ac.admin;

		import java.security.AccessControlException;
		import java.security.Principal;
		import java.util.Collection;

		import org.apache.log4j.Logger;
		@@ -88,7 +87,7 @@ public class ListActiveUsers extends AbstractListUsers
		{
		private static final Logger log = Logger.getLogger(ListActiveUsers.class);

		protected Collection<User<Principal>> getUsers()
		protected Collection<User> getUsers()
		throws AccessControlException, TransientException
		{
		return this.getUserPersistence().getUsers();

+5 −6

Original line number	Diff line number	Diff line
		@@ -70,7 +70,6 @@
		package ca.nrc.cadc.ac.admin;

		import java.security.AccessControlException;
		import java.security.Principal;
		import java.util.Collection;

		import org.apache.log4j.Logger;
		@@ -88,7 +87,7 @@ public class ListPendingUsers extends AbstractListUsers
		{
		private static final Logger log = Logger.getLogger(ListPendingUsers.class);

		protected Collection<User<Principal>> getUsers()
		protected Collection<User> getUsers()
		throws AccessControlException, TransientException
		{
		return this.getUserPersistence().getPendingUsers();