Skip to content

Linnea Samila / Moya

Go to a project
Commit 92d6f142 by Tuomas Riihimäki
Options

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

2 parents e5f5f9ab 4aaf0244
Inline Side-by-side
Showing with 14 additions and 75 deletions
code/LanBortal/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs deleted 100644 → 0
#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 deleted 100644 → 0
#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 { ...@@ -79,16 +79,17 @@ public class BortalLoginModule extends AppservPasswordLoginModule {
RealmBeanRemote authbean = BortalRealm.getAuthBean(); RealmBeanRemote authbean = BortalRealm.getAuthBean();
if (authbean == null) { if (authbean == null) {
throw new LoginException("Error. Could not get authentication bean!"); throw new LoginException(
"Error. Could not get authentication bean!");
} }
// Authenticate User // Authenticate User
BortalRealm samplerealm = (BortalRealm) _currentRealm; BortalRealm samplerealm = (BortalRealm) _currentRealm;
if (!authbean.authenticate(_username, new String(_password))) { if (!authbean.authenticate(_username, new String(_passwd))) {
// Login fails // Login fails
throw new LoginException((new StringBuilder()) throw new LoginException((new StringBuilder())
.append("customrealm:Login Failed for user ") .append("customrealm:Login Failed for user ")
.append(_username).toString()); .append(_username).toString());
} }
// Login succeeds // Login succeeds
...@@ -100,15 +101,17 @@ public class BortalLoginModule extends AppservPasswordLoginModule { ...@@ -100,15 +101,17 @@ public class BortalLoginModule extends AppservPasswordLoginModule {
try { try {
enumeration = samplerealm.getGroupNames(_username); enumeration = samplerealm.getGroupNames(_username);
} catch (InvalidOperationException invalidoperationexception) { } catch (InvalidOperationException invalidoperationexception) {
throw new LoginException((new StringBuilder()) throw new LoginException(
.append("An InvalidOperationException was thrown " + (new StringBuilder())
" while calling getGroupNames() on the SampleRealm ") .append("An InvalidOperationException was thrown "
.append(invalidoperationexception).toString()); + " while calling getGroupNames() on the SampleRealm ")
.append(invalidoperationexception).toString());
} catch (NoSuchUserException nosuchuserexception) { } catch (NoSuchUserException nosuchuserexception) {
throw new LoginException((new StringBuilder()) throw new LoginException(
.append("A NoSuchUserException was thrown " + (new StringBuilder())
" while calling getGroupNames() on the SampleRealm ") .append("A NoSuchUserException was thrown "
.append(nosuchuserexception).toString()); + " while calling getGroupNames() on the SampleRealm ")
.append(nosuchuserexception).toString());
} }
ArrayList<String> authenticatedGroups = new ArrayList<String>(); ArrayList<String> authenticatedGroups = new ArrayList<String>();
......
code/LanBortalAuthModuleClient/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs deleted 100644 → 0
#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 deleted 100644 → 0
#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 @@ ...@@ -9,10 +9,5 @@
<attribute name="owner.project.facets" value="jst.utility;#system#"/> <attribute name="owner.project.facets" value="jst.utility;#system#"/>
</attributes> </attributes>
</classpathentry> </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"/> <classpathentry kind="output" path="ejbModule"/>
</classpath> </classpath>
code/LanBortalBeansClient/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs deleted 100644 → 0
#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 deleted 100644 → 0
#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 deleted 100644 → 0
#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 @@ ...@@ -9,10 +9,5 @@
<attribute name="owner.project.facets" value="jst.utility;#system#"/> <attribute name="owner.project.facets" value="jst.utility;#system#"/>
</attributes> </attributes>
</classpathentry> </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"/> <classpathentry kind="output" path="build/classes"/>
</classpath> </classpath>
code/LanBortalUtilities/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs deleted 100644 → 0
#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 deleted 100644 → 0
#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
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!