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

code/LanBortal/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs

-#Wed Oct 27 01:36:18 EEST 2010
-XDOCLETBUILDERACTIVE=true
-XDOCLETHOME=/Users/jkj/Projects/Omnima/lib/xdoclet-1.2.3
-XDOCLETUSEGLOBAL=true
-XDOCLETVERSION=1.2.3
-eclipse.preferences.version=1

code/LanBortalAuthModule/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs

-#Wed Oct 27 01:36:10 EEST 2010
-XDOCLETBUILDERACTIVE=true
-XDOCLETHOME=/Users/jkj/Projects/Omnima/lib/xdoclet-1.2.3
-XDOCLETUSEGLOBAL=true
-XDOCLETVERSION=1.2.3
-eclipse.preferences.version=1

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

@@ -79,16 +79,17 @@ public class BortalLoginModule extends AppservPasswordLoginModule {
 
 		RealmBeanRemote authbean = BortalRealm.getAuthBean();
 		if (authbean == null) {
-			throw new LoginException("Error. Could not get authentication bean!");
+			throw new LoginException(
+					"Error. Could not get authentication bean!");
 		}
 
 		// Authenticate User
 		BortalRealm samplerealm = (BortalRealm) _currentRealm;
-		if (!authbean.authenticate(_username, new String(_password))) {
+		if (!authbean.authenticate(_username, new String(_passwd))) {
 			// Login fails
 			throw new LoginException((new StringBuilder())
 					.append("customrealm:Login Failed for user  ")
-						.append(_username).toString());
+					.append(_username).toString());
 		}
 
 		// Login succeeds
@@ -100,15 +101,17 @@ public class BortalLoginModule extends AppservPasswordLoginModule {
 		try {
 			enumeration = samplerealm.getGroupNames(_username);
 		} catch (InvalidOperationException invalidoperationexception) {
-			throw new LoginException((new StringBuilder())
-					.append("An InvalidOperationException was thrown " +
-							"   while calling getGroupNames() on the SampleRealm ")
-						.append(invalidoperationexception).toString());
+			throw new LoginException(
+					(new StringBuilder())
+							.append("An InvalidOperationException was thrown "
+									+ "   while calling getGroupNames() on the SampleRealm ")
+							.append(invalidoperationexception).toString());
 		} catch (NoSuchUserException nosuchuserexception) {
-			throw new LoginException((new StringBuilder())
-					.append("A NoSuchUserException was thrown " +
-							"   while calling getGroupNames() on the SampleRealm ")
-						.append(nosuchuserexception).toString());
+			throw new LoginException(
+					(new StringBuilder())
+							.append("A NoSuchUserException was thrown "
+									+ "   while calling getGroupNames() on the SampleRealm ")
+							.append(nosuchuserexception).toString());
 		}
 		ArrayList<String> authenticatedGroups = new ArrayList<String>();
 

code/LanBortalAuthModuleClient/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs

-#Wed Oct 27 01:36:02 EEST 2010
-XDOCLETBUILDERACTIVE=true
-XDOCLETHOME=/Users/jkj/Projects/Omnima/lib/xdoclet-1.2.3
-XDOCLETUSEGLOBAL=true
-XDOCLETVERSION=1.2.3
-eclipse.preferences.version=1

code/LanBortalBeans/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs

-#Wed Oct 27 01:35:59 EEST 2010
-XDOCLETBUILDERACTIVE=true
-XDOCLETHOME=/Users/jkj/Projects/Omnima/lib/xdoclet-1.2.3
-XDOCLETUSEGLOBAL=true
-XDOCLETVERSION=1.2.3
-eclipse.preferences.version=1

code/LanBortalBeansClient/.classpath

@@ -9,10 +9,5 @@
 			<attribute name="owner.project.facets" value="jst.utility;#system#"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="ejbModule"/>
 </classpath>

code/LanBortalBeansClient/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs

-#Wed Oct 27 01:35:51 EEST 2010
-XDOCLETBUILDERACTIVE=true
-XDOCLETHOME=/Users/jkj/Projects/Omnima/lib/xdoclet-1.2.3
-XDOCLETUSEGLOBAL=true
-XDOCLETVERSION=1.2.3
-eclipse.preferences.version=1

code/LanBortalDatabase/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs

-#Wed Oct 27 01:35:48 EEST 2010
-XDOCLETBUILDERACTIVE=true
-XDOCLETHOME=/Users/jkj/Projects/Omnima/lib/xdoclet-1.2.3
-XDOCLETUSEGLOBAL=true
-XDOCLETVERSION=1.2.3
-eclipse.preferences.version=1

code/LanBortalFlash/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs

-#Wed Oct 27 01:35:14 EEST 2010
-XDOCLETBUILDERACTIVE=true
-XDOCLETHOME=/Users/jkj/Projects/Omnima/lib/xdoclet-1.2.3
-XDOCLETUSEGLOBAL=true
-XDOCLETVERSION=1.2.3
-eclipse.preferences.version=1

code/LanBortalUtilities/.classpath

@@ -9,10 +9,5 @@
 			<attribute name="owner.project.facets" value="jst.utility;#system#"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>

code/LanBortalUtilities/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs

-#Wed Oct 27 01:35:28 EEST 2010
-XDOCLETBUILDERACTIVE=true
-XDOCLETHOME=/Users/jkj/Projects/Omnima/lib/xdoclet-1.2.3
-XDOCLETUSEGLOBAL=true
-XDOCLETVERSION=1.2.3
-eclipse.preferences.version=1

code/LanBortalWeb/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs

-#Wed Oct 27 01:35:40 EEST 2010
-XDOCLETBUILDERACTIVE=true
-XDOCLETHOME=/Users/jkj/Projects/Omnima/lib/xdoclet-1.2.3
-XDOCLETUSEGLOBAL=true
-XDOCLETVERSION=1.2.3
-eclipse.preferences.version=1