Merge branch 'master' of dev.insomnia.fi:/data/bortal

code/LanBortal/.settings/org.eclipse.core.resources.prefs

+eclipse.preferences.version=1
+encoding/<project>=UTF-8

code/LanBortalAuthModule/src/fi/insomnia/bortal/BortalLoginModule.java

@@ -38,6 +38,8 @@ package fi.insomnia.bortal;
 
 import java.util.ArrayList;
 import java.util.Enumeration;
+import java.util.List;
+import java.util.Set;
 
 import javax.security.auth.login.LoginException;
 
@@ -79,6 +81,9 @@ public class BortalLoginModule extends AppservPasswordLoginModule {
 			throw new LoginException("Realm not SampleRealm");
 		}
 
+		// find cert
+		log("Trying to find certificates");
+
 		RealmBeanRemote authbean = BortalRealm.getAuthBean();
 		if (authbean == null) {
 			throw new LoginException(
@@ -95,7 +100,7 @@ public class BortalLoginModule extends AppservPasswordLoginModule {
 		}
 
 		// Login succeeds
-		log((new StringBuilder()).append("SimpleRealm:login succeeded for  ")
+		log((new StringBuilder()).append("SimpleRealm:login succeeded for ")
 				.append(_username).toString());
 
 		// Get group names for the authenticated user from the Realm class
@@ -105,14 +110,14 @@ public class BortalLoginModule extends AppservPasswordLoginModule {
 		} catch (InvalidOperationException invalidoperationexception) {
 			throw new LoginException(
 					(new StringBuilder())
-							.append("An InvalidOperationException was thrown "
-							).append("   while calling getGroupNames() on the SampleRealm ")
+							.append("An InvalidOperationException was thrown ")
+							.append("   while calling getGroupNames() on the SampleRealm ")
 							.append(invalidoperationexception).toString());
 		} catch (NoSuchUserException nosuchuserexception) {
 			throw new LoginException(
 					(new StringBuilder())
-							.append("A NoSuchUserException was thrown "
-							).append("   while calling getGroupNames() on the SampleRealm ")
+							.append("A NoSuchUserException was thrown ")
+							.append("   while calling getGroupNames() on the SampleRealm ")
 							.append(nosuchuserexception).toString());
 		}
 		ArrayList<String> authenticatedGroups = new ArrayList<String>();
@@ -124,18 +129,18 @@ public class BortalLoginModule extends AppservPasswordLoginModule {
 		}
 
 		// Call commitUserAuthentication with the groupNames the user belongs to
-		String[] groups = authenticatedGroups.toArray(new String[authenticatedGroups.size()]);
+		String[] groups = authenticatedGroups
+				.toArray(new String[authenticatedGroups.size()]);
 		// System.out.println("groups: " + groups.length);
 		// for (String str : groups) {
 		// System.out.println("Str " + str);
 		// }
 		commitUserAuthentication(groups);
-
 	}
 
 	private void log(String s) {
-		System.out.println((new StringBuilder())
-				.append("BortalLoginModule::").append(s).toString());
+		System.out.println((new StringBuilder()).append("BortalLoginModule::")
+				.append(s).toString());
 	}
 
 }

code/LanBortalBeans/.settings/org.eclipse.core.resources.prefs

+eclipse.preferences.version=1
+encoding/<project>=UTF-8

code/LanBortalBeansClient/.settings/org.eclipse.core.resources.prefs

+eclipse.preferences.version=1
+encoding/<project>=UTF-8

code/LanBortalDatabase/src/META-INF/MANIFEST.MF

 Manifest-Version: 1.0
-Class-Path: lib/LanBortalUtilities.jar
+Class-Path: lib/LanBortalUtilities.jar 
+ bcprov-jdk16-146.jar 
+ bcmail-jdk16-146.jar
 

code/LanBortalWeb/.settings/org.eclipse.core.resources.prefs

+eclipse.preferences.version=1
+encoding/<project>=UTF-8

code/LanBortalWeb/WebContent/WEB-INF/web.xml

@@ -114,6 +114,9 @@
 		<auth-constraint>
 			<description>Thou shall not read the sources or use utils directly</description>
 		</auth-constraint>
+		<user-data-constraint>
+			<transport-guarantee>CONFIDENTIAL</transport-guarantee>
+		</user-data-constraint>
 	</security-constraint>
 	<servlet>
 		<description></description>

code/lib-AuthModule-depends/.settings/org.eclipse.core.resources.prefs

+eclipse.preferences.version=1
+encoding/<project>=UTF-8