Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 7031e766 by Tuukka Kivilahti
Options

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

Conflicts:
	code/LanBortalWeb/WebContent/WEB-INF/web.xml
2 parents 39dabd6b 5da87cc4
Inline Side-by-side
Showing with 745 additions and 134 deletions
code/Autentikaation asennus glassfishiin. 0 → 100644
bortal realmin lisääminen glassfishiin.
1. Lisää code/LanBortalAuthModule.jar tiedosto hakemistoon glassfish/glassfish/lib/
2. lisää tiedostoon glassfish/glassfish/domains/domain1/config/login.conf tiedostoon:
bortalRealm {
fi.insomnia.bortal.BortalLoginModule required;
};
3. suorita seuraava komento hakemistossa glassfish/glassfish/bin/
./asadmin create-auth-realm --classname fi.insomnia.bortal.BortalRealm --property jaas-context=bortalRealm omniarealm
code/LanBortalAuthModule.jar 0 → 100644
No preview for this file type
code/LanBortalAuthModule/.classpath 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/LanBortalBeansClient"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish v3 Java EE 6"/>
<classpathentry kind="output" path="bin"/>
</classpath>
code/LanBortalAuthModule/.project 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>LanBortalAuthModule</name>
<comment></comment>
<projects>
<project>LanBortalBeansClient</project>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
code/LanBortalAuthModule/.settings/org.eclipse.jdt.core.prefs 0 → 100644
#Sat Apr 17 01:39:34 EEST 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
code/LanBortalAuthModule/src/fi/insomnia/bortal/BortalLoginModule.java 0 → 100644
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
* and Distribution License("CDDL") (collectively, the "License"). You
* may not use this file except in compliance with the License. You can obtain
* a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
* or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
* language governing permissions and limitations under the License.
*
* When distributing the software, include this License Header Notice in each
* file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
* Sun designates this particular file as subject to the "Classpath" exception
* as provided by Sun in the GPL Version 2 section of the License file that
* accompanied this code. If applicable, add the following below the License
* Header, with the fields enclosed by brackets [] replaced by your own
* identifying information: "Portions Copyrighted [year]
* [name of copyright owner]"
*
* Contributor(s):
*
* If you wish your version of this file to be governed by only the CDDL or
* only the GPL Version 2, indicate your decision by adding "[Contributor]
* elects to include this software in this distribution under the [CDDL or GPL
* Version 2] license." If you don't indicate a single choice of license, a
* recipient has the option to distribute your version of this file under
* either the CDDL, the GPL Version 2 or to extend the choice of license to
* its licensees as provided above. However, if you add GPL Version 2 code
* and therefore, elected the GPL Version 2 license, then the option applies
* only if the new code is made subject to such option by the copyright
* holder.
*/
package fi.insomnia.bortal;
import java.util.Enumeration;
import javax.security.auth.login.LoginException;
import com.sun.appserv.security.AppservPasswordLoginModule;
import com.sun.enterprise.security.auth.realm.InvalidOperationException;
import com.sun.enterprise.security.auth.realm.NoSuchUserException;
import fi.insomnia.bortal.beans.SessionHandlerBeanRemote;
/**
*
* @author nithyasubramanian SampleLoginModule - extends
* AppservPasswordLoginModule Sample class to be referenced by the
* SampleRealm class . Overrides the authenticateUser() method that
* authenticates the user using user-password information and calls
* commitUserAuthentication
*/
public class BortalLoginModule extends AppservPasswordLoginModule {
// private static final org.slf4j.Logger logger = LoggerFactory.getLogger(BortalLoginModule.class);
/**
* Overrides the authenticateUser() method in AppservPasswordLoginModule
* Performs authentication of user
*
* @throws javax.security.auth.login.LoginException
*/
protected void authenticateUser() throws LoginException {
log((new StringBuilder()).append("CustomRealm Auth Info:_username:")
.append(_username).append(";_password:").append(_password)
.append(";_currentrealm:").append(_currentRealm).toString());
// Check if the given realm is SampleRealm
if (!(_currentRealm instanceof BortalRealm)) {
throw new LoginException("Realm not SampleRealm");
}
SessionHandlerBeanRemote authbean = BortalRealm.getAuthBean();
if (authbean == null) {
throw new LoginException("Error. Could not get authentication bean!");
}
// Authenticate User
BortalRealm samplerealm = (BortalRealm) _currentRealm;
if (!authbean.authenticate(_username, _password)) {
// Login fails
throw new LoginException((new StringBuilder())
.append("customrealm:Login Failed for user ")
.append(_username).toString());
}
// Login succeeds
log((new StringBuilder()).append("SimpleRealm:login succeeded for ")
.append(_username).toString());
// Get group names for the authenticated user from the Realm class
Enumeration<String> enumeration = null;
String authenticatedGroups[] = new String[2];
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());
} catch (NoSuchUserException nosuchuserexception) {
throw new LoginException((new StringBuilder())
.append("A NoSuchUserException was thrown " +
" while calling getGroupNames() on the SampleRealm ")
.append(nosuchuserexception).toString());
}
for (int i = 0; enumeration != null && enumeration.hasMoreElements(); i++)
authenticatedGroups[i] = (String) enumeration.nextElement();
// Call commitUserAuthentication with the groupNames the user belongs to
commitUserAuthentication(authenticatedGroups);
}
private void log(String s) {
System.out.println((new StringBuilder())
.append("SimpleCustomLoginModule::").append(s).toString());
}
}
code/LanBortalAuthModule/src/fi/insomnia/bortal/BortalRealm.java 0 → 100644
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
* and Distribution License("CDDL") (collectively, the "License"). You
* may not use this file except in compliance with the License. You can obtain
* a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
* or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
* language governing permissions and limitations under the License.
*
* When distributing the software, include this License Header Notice in each
* file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
* Sun designates this particular file as subject to the "Classpath" exception
* as provided by Sun in the GPL Version 2 section of the License file that
* accompanied this code. If applicable, add the following below the License
* Header, with the fields enclosed by brackets [] replaced by your own
* identifying information: "Portions Copyrighted [year]
* [name of copyright owner]"
*
* Contributor(s):
*
* If you wish your version of this file to be governed by only the CDDL or
* only the GPL Version 2, indicate your decision by adding "[Contributor]
* elects to include this software in this distribution under the [CDDL or GPL
* Version 2] license." If you don't indicate a single choice of license, a
* recipient has the option to distribute your version of this file under
* either the CDDL, the GPL Version 2 or to extend the choice of license to
* its licensees as provided above. However, if you add GPL Version 2 code
* and therefore, elected the GPL Version 2 license, then the option applies
* only if the new code is made subject to such option by the copyright
* holder.
*/
package fi.insomnia.bortal;
import java.util.Enumeration;
import java.util.Properties;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import com.sun.appserv.security.AppservRealm;
import com.sun.enterprise.security.auth.realm.BadRealmException;
import com.sun.enterprise.security.auth.realm.InvalidOperationException;
import com.sun.enterprise.security.auth.realm.NoSuchRealmException;
import com.sun.enterprise.security.auth.realm.NoSuchUserException;
import fi.insomnia.bortal.beans.SessionHandlerBeanRemote;
/**
*
* @author nithyasubramanian SampleRealm - class extending AppservRealm Sample
* Custom Realm Class that stores user-group information
*/
public class BortalRealm extends AppservRealm {
// private static final Logger logger = LoggerFactory.getLogger(BortalRealm.class);
/**
* Initialization - set the jaas-context property, Set UserA to devGroup and
* user B to testGroup
*
* @param properties
* - Key-Value pairs defined in the Realm
* @throws com.sun.enterprise.security.auth.realm.BadRealmException
* @throws com.sun.enterprise.security.auth.realm.NoSuchRealmException
*/
public void init(Properties properties)
throws BadRealmException, NoSuchRealmException {
super.init(properties);
log("Init SampleRealm");
String propJaasContext = properties.getProperty(JAAS_CONTEXT_PARAM);
if (propJaasContext != null) {
setProperty(JAAS_CONTEXT_PARAM, propJaasContext);
}
}
/**
*
* @return authType
*/
public String getAuthType() {
return "Omnia Lan system authentication Realm";
}
/**
*
* @param user
* @return Enumeration - List of groups to which user belongs
* @throws com.sun.enterprise.security.auth.realm.InvalidOperationException
* @throws com.sun.enterprise.security.auth.realm.NoSuchUserException
*/
public Enumeration<String> getGroupNames(String user)
throws InvalidOperationException, NoSuchUserException {
return getAuthBean().getGroupNames(user);
}
private static void log(String s) {
System.out.println((new StringBuilder()).append("BortalRealm::").
append(s).toString());
}
public static SessionHandlerBeanRemote getAuthBean() {
Object beanObj = null;
try {
beanObj = new InitialContext().lookup("java:global/LanBortal/LanBortalBeans/SessionHandlerBean!fi.insomnia.bortal.beans.SessionHandlerBeanRemote");
} catch (NamingException e) {
log("Error fetching LoginHandlerRemote bean from initial context");
e.printStackTrace();
return null;
}
if (beanObj instanceof SessionHandlerBeanRemote) {
return (SessionHandlerBeanRemote) beanObj;
}
return null;
}
}
code/LanBortalBeans/ejbModule/META-INF/sun-ejb-jar.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 EJB 3.0//EN" "http://www.sun.com/software/appserver/dtds/sun-ejb-jar_3_0-0.dtd"> <!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 EJB 3.0//EN" "http://www.sun.com/software/appserver/dtds/sun-ejb-jar_3_0-0.dtd">
<sun-ejb-jar> <sun-ejb-jar>
<enterprise-beans/> <enterprise-beans />
</sun-ejb-jar> </sun-ejb-jar>
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/ProductBean.java 0 → 100644
package fi.insomnia.bortal.beans;
import java.util.List;
import javax.ejb.EJB;
import javax.ejb.Stateless;
import fi.insomnia.bortal.facade.ProductFacade;
import fi.insomnia.bortal.model.Product;
/**
* Session Bean implementation class ProductBean
*/
@Stateless
public class ProductBean implements ProductBeanLocal {
@EJB
ProductFacade productFacade;
/**
* Default constructor.
*/
public ProductBean() {
// TODO Auto-generated constructor stub
}
@Override
public List<Product> listUserShoppableProducts() {
// XXX: Only user shoppable products
return productFacade.findAll();
}
}
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/SessionHandlerBean.java
package fi.insomnia.bortal.beans; package fi.insomnia.bortal.beans;
import java.security.Principal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.Vector;
import javax.annotation.Resource;
import javax.annotation.security.DeclareRoles;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.ejb.SessionContext;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -22,7 +28,8 @@ import fi.insomnia.bortal.model.User; ...@@ -22,7 +28,8 @@ import fi.insomnia.bortal.model.User;
* Session Bean implementation class SessionHandlerBean * Session Bean implementation class SessionHandlerBean
*/ */
@Stateless @Stateless
public class SessionHandlerBean implements SessionHandlerBeanLocal { @DeclareRoles("admin")
public class SessionHandlerBean implements SessionHandlerBeanLocal, SessionHandlerBeanRemote{
private static final Logger logger = LoggerFactory.getLogger(SessionHandlerBean.class); private static final Logger logger = LoggerFactory.getLogger(SessionHandlerBean.class);
@EJB @EJB
...@@ -31,7 +38,10 @@ public class SessionHandlerBean implements SessionHandlerBeanLocal { ...@@ -31,7 +38,10 @@ public class SessionHandlerBean implements SessionHandlerBeanLocal {
private AccessRightFacade accessRightFacade; private AccessRightFacade accessRightFacade;
@EJB @EJB
private RoleFacade roleFacade; private RoleFacade roleFacade;
@Resource
SessionContext context;
/** /**
* Default constructor. * Default constructor.
*/ */
...@@ -118,4 +128,24 @@ public class SessionHandlerBean implements SessionHandlerBeanLocal { ...@@ -118,4 +128,24 @@ public class SessionHandlerBean implements SessionHandlerBeanLocal {
} }
return defaultUser; return defaultUser;
} }
public void testing()
{
Principal principal = context.getCallerPrincipal();
logger.warn("principal {}",principal.getName());
logger.warn("Principal in admin: {}",context.isCallerInRole("admin"));
}
@Override
public boolean authenticate(String username, String password) {
return (tryLogin(username,password) != null);
}
@Override
public Enumeration<String> getGroupNames(String user) {
Vector<String> foo = new Vector<String>();
foo.add("admin");
return foo.elements();
}
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UserBean.java
...@@ -35,12 +35,10 @@ public class UserBean implements UserBeanLocal { ...@@ -35,12 +35,10 @@ public class UserBean implements UserBeanLocal {
} }
@Override @Override
public User createNewUser(String nick, String password) { public User createNewUser(String login, String password) {
User returnUser = new User(); User returnUser = new User();
returnUser.setNick(nick); returnUser.setLogin(login);
returnUser.resetPassword(password);
// TODO: Hash function....
returnUser.setPassword(password);
// Tallennetaan olio kantaan... // Tallennetaan olio kantaan...
userFacade.create(returnUser); userFacade.create(returnUser);
return returnUser; return returnUser;
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/EventFacade.java
...@@ -8,7 +8,7 @@ import fi.insomnia.bortal.model.Event; ...@@ -8,7 +8,7 @@ import fi.insomnia.bortal.model.Event;
@Stateless @Stateless
@LocalBean @LocalBean
public class EventFacade extends IntegerPkGenericFacade<Event> { public class EventFacade extends GenericFacade<Integer, Event> {
@PersistenceContext @PersistenceContext
private EntityManager em; private EntityManager em;
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/EventSettingsFacade.java
...@@ -8,7 +8,7 @@ import fi.insomnia.bortal.model.EventSettings; ...@@ -8,7 +8,7 @@ import fi.insomnia.bortal.model.EventSettings;
@Stateless @Stateless
@LocalBean @LocalBean
public class EventSettingsFacade extends EventChildGenericFacade<EventSettings> { public class EventSettingsFacade extends GenericFacade<Integer, EventSettings> {
@PersistenceContext @PersistenceContext
private EntityManager em; private EntityManager em;
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/EventStatusFacade.java
...@@ -8,7 +8,7 @@ import fi.insomnia.bortal.model.EventStatus; ...@@ -8,7 +8,7 @@ import fi.insomnia.bortal.model.EventStatus;
@Stateless @Stateless
@LocalBean @LocalBean
public class EventStatusFacade extends EventChildGenericFacade<EventStatus> { public class EventStatusFacade extends GenericFacade<Integer, EventStatus> {
@PersistenceContext @PersistenceContext
private EntityManager em; private EntityManager em;
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/GenericFacade.java
...@@ -12,7 +12,7 @@ import fi.insomnia.bortal.model.ModelInterface; ...@@ -12,7 +12,7 @@ import fi.insomnia.bortal.model.ModelInterface;
/** /**
* Session Bean implementation class GenericFacade * Session Bean implementation class GenericFacade
*/ */
public abstract class GenericFacade<PK,T extends ModelInterface<PK>> implements GenericFacadeLocal<PK,T> { public abstract class GenericFacade<PK,T extends ModelInterface<PK>> implements GenericFacadeLocal<PK,T> {
private Class<T> entClass; private Class<T> entClass;
public GenericFacade(Class<T>entityClass) public GenericFacade(Class<T>entityClass)
...@@ -26,19 +26,21 @@ public abstract class GenericFacade<PK,T extends ModelInterface<PK>> implements ...@@ -26,19 +26,21 @@ public abstract class GenericFacade<PK,T extends ModelInterface<PK>> implements
protected abstract EntityManager getEm(); protected abstract EntityManager getEm();
@Override
public void create(T entity) { public void create(T entity) {
getEm().persist(entity); getEm().persist(entity);
} }
@Override
public void remove(T entity) { public void remove(T entity) {
getEm().remove(entity); getEm().remove(entity);
} }
@Override
public T merge(T entity) { public T merge(T entity) {
return getEm().merge(entity); return getEm().merge(entity);
} }
public T find(Object id) { public T find(PK id) {
return getEm().find(getEntityClass(), id); return getEm().find(getEntityClass(), id);
} }
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/UserFacade.java
...@@ -4,13 +4,14 @@ import javax.ejb.LocalBean; ...@@ -4,13 +4,14 @@ import javax.ejb.LocalBean;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext; import javax.persistence.PersistenceContext;
import javax.persistence.Query;
import javax.persistence.TypedQuery; import javax.persistence.TypedQuery;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
@Stateless @Stateless
@LocalBean @LocalBean
public class UserFacade extends IntegerPkGenericFacade<User> { public class UserFacade extends GenericFacade<Integer, User> {
public static final String DEFAULT_USER_LOGIN = "default"; public static final String DEFAULT_USER_LOGIN = "default";
...@@ -26,9 +27,14 @@ public class UserFacade extends IntegerPkGenericFacade<User> { ...@@ -26,9 +27,14 @@ public class UserFacade extends IntegerPkGenericFacade<User> {
} }
public User findByLogin(String login) { public User findByLogin(String login) {
TypedQuery<User> q = em.createNamedQuery("User.findByLogin", User.class); // TODO: Bug in glassfish.... change when fixed...
// TypedQuery<User> q = em.createNamedQuery("User.findByLogin",
// User.class);
// q.setParameter("login", login);
// return q.getSingleResult();
TypedQuery<User> q = em.createQuery("SELECT u FROM User u WHERE u.login = :login", User.class);
q.setParameter("login", login); q.setParameter("login", login);
return q.getSingleResult(); return (User) q.getSingleResult();
} }
public User getOrCreateDefaultUser() { public User getOrCreateDefaultUser() {
......
code/LanBortalBeansClient/UserBeanLocal.java → code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/ProductBeanLocal.java
package fi.insomnia.bortal.beans; package fi.insomnia.bortal.beans;
import java.util.List;
import javax.ejb.Local; import javax.ejb.Local;
import fi.insomnia.bortal.model.Product;
@Local @Local
public interface UserBeanLocal { public interface ProductBeanLocal {
List<Product> listUserShoppableProducts();
} }
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/RoleBeanLocal.java
...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.beans; ...@@ -7,6 +7,7 @@ package fi.insomnia.bortal.beans;
import fi.insomnia.bortal.model.Role; import fi.insomnia.bortal.model.Role;
import java.util.List; import java.util.List;
import javax.ejb.Local; import javax.ejb.Local;
/** /**
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/SessionHandlerBeanLocal.java
...@@ -3,7 +3,7 @@ import javax.ejb.Local; ...@@ -3,7 +3,7 @@ import javax.ejb.Local;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
@Local @Local
public interface SessionHandlerBeanLocal { public interface SessionHandlerBeanLocal {
...@@ -18,4 +18,6 @@ public interface SessionHandlerBeanLocal { ...@@ -18,4 +18,6 @@ public interface SessionHandlerBeanLocal {
User tryLogin(String username, String password); User tryLogin(String username, String password);
User getDefaultUser(); User getDefaultUser();
void testing();
} }
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/SessionHandlerBeanRemote.java 0 → 100644
package fi.insomnia.bortal.beans;
import java.util.Enumeration;
import javax.ejb.Remote;
@Remote
public interface SessionHandlerBeanRemote {
boolean authenticate(String username, String password);
Enumeration<String> getGroupNames(String user);
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Event.java
...@@ -59,23 +59,17 @@ public class Event implements ModelInterface<Integer> { ...@@ -59,23 +59,17 @@ public class Event implements ModelInterface<Integer> {
@Column(name = "referer") @Column(name = "referer")
private String referer; private String referer;
@JoinColumns({ @JoinColumn(name = "event_settings_id", referencedColumnName = "event_settings_id", nullable = false, updatable = false)
@JoinColumn(name = "event_id", referencedColumnName = "entity_id", nullable = false, updatable = false, insertable = false),
@JoinColumn(name="event_event_id",referencedColumnName = "events_pk_id", nullable = false, updatable = false, insertable = false)
})
@ManyToOne(optional = false) @ManyToOne(optional = false)
private EventSettings settings; private EventSettings settings;
@JoinColumns({
@JoinColumn(name = "event_status_id", referencedColumnName = "entity_id", nullable = false, updatable = false, insertable = false), @JoinColumn(name = "event_status_id", referencedColumnName = "event_status_id", nullable = false)
@JoinColumn(name="event_status_event_id",referencedColumnName = "events_pk_id", nullable = false, updatable = false, insertable = false)
})
@ManyToOne(optional = false) @ManyToOne(optional = false)
private EventStatus status; private EventStatus status;
@JoinColumns({ @JoinColumns( {
@JoinColumn(name = "default_role_id", referencedColumnName = "entity_id", nullable = false, updatable = false, insertable = false), @JoinColumn(name = "default_role_id", referencedColumnName = "id"),
@JoinColumn(name="default_role_event_id",referencedColumnName = "events_pk_id", nullable = false, updatable = false, insertable = false) @JoinColumn(name = "events_id", referencedColumnName = "events_pk_id", nullable = false, updatable = false, insertable = false) })
})
@OneToOne @OneToOne
private Role defaultRole; private Role defaultRole;
...@@ -94,10 +88,10 @@ public class Event implements ModelInterface<Integer> { ...@@ -94,10 +88,10 @@ public class Event implements ModelInterface<Integer> {
@Version @Version
@Column(nullable = false) @Column(nullable = false)
private int jpaVersionField; private int jpaVersionField;
@OneToMany(mappedBy = "event") @OneToMany(mappedBy = "event")
private List<Bill> bills; private List<Bill> bills;
@OneToMany(mappedBy = "event") @OneToMany(mappedBy = "event")
private List<Reader> readers; private List<Reader> readers;
...@@ -270,7 +264,8 @@ public class Event implements ModelInterface<Integer> { ...@@ -270,7 +264,8 @@ public class Event implements ModelInterface<Integer> {
} }
/** /**
* @param bills the bills to set * @param bills
* the bills to set
*/ */
public void setBills(List<Bill> bills) { public void setBills(List<Bill> bills) {
this.bills = bills; this.bills = bills;
...@@ -284,7 +279,8 @@ public class Event implements ModelInterface<Integer> { ...@@ -284,7 +279,8 @@ public class Event implements ModelInterface<Integer> {
} }
/** /**
* @param readers the readers to set * @param readers
* the readers to set
*/ */
public void setReaders(List<Reader> readers) { public void setReaders(List<Reader> readers) {
this.readers = readers; this.readers = readers;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventPk.java
...@@ -11,12 +11,11 @@ import javax.persistence.*; ...@@ -11,12 +11,11 @@ import javax.persistence.*;
public class EventPk implements Serializable { public class EventPk implements Serializable {
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "entity_id", nullable = false) @Column(name = "id", nullable = false)
private Integer id; private Integer id;
@Column(name = "events_pk_id", nullable = false, updatable = false) @Column(name = "events_pk_id", nullable = false, updatable = false)
private Integer eventId; private Integer eventId;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -24,8 +23,6 @@ public class EventPk implements Serializable { ...@@ -24,8 +23,6 @@ public class EventPk implements Serializable {
super(); super();
} }
public void setId(Integer id) { public void setId(Integer id) {
this.id = id; this.id = id;
} }
...@@ -34,30 +31,27 @@ public class EventPk implements Serializable { ...@@ -34,30 +31,27 @@ public class EventPk implements Serializable {
return id; return id;
} }
public void setEventId(Integer eventId) { public void setEventId(Integer eventId) {
this.eventId = eventId; this.eventId = eventId;
} }
public Integer getEventId() { public Integer getEventId() {
return eventId; return eventId;
} }
public int hashCode() { public int hashCode() {
return id.hashCode()+eventId.hashCode(); return id.hashCode() + eventId.hashCode();
} }
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj == null) return false; if (obj == null)
if (obj == this) return true; return false;
if (!(obj instanceof EventPk)) return false; if (obj == this)
return true;
if (!(obj instanceof EventPk))
return false;
EventPk pk = (EventPk) obj; EventPk pk = (EventPk) obj;
return pk.id == this.id && pk.eventId == this.eventId; return pk.id == this.id && pk.eventId == this.eventId;
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventSettings.java
...@@ -10,6 +10,9 @@ import javax.persistence.CascadeType; ...@@ -10,6 +10,9 @@ import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.EmbeddedId; import javax.persistence.EmbeddedId;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries; import javax.persistence.NamedQueries;
...@@ -25,13 +28,14 @@ import javax.persistence.Version; ...@@ -25,13 +28,14 @@ import javax.persistence.Version;
@Table(name = "event_settings") @Table(name = "event_settings")
@NamedQueries( { @NamedQueries( {
@NamedQuery(name = "EventSettings.findAll", query = "SELECT e FROM EventSettings e"), @NamedQuery(name = "EventSettings.findAll", query = "SELECT e FROM EventSettings e"),
@NamedQuery(name = "EventSettings.findByBundleCountry", query = "SELECT e FROM EventSettings e WHERE e.bundleCountry = :bundleCountry") @NamedQuery(name = "EventSettings.findByBundleCountry", query = "SELECT e FROM EventSettings e WHERE e.bundleCountry = :bundleCountry") })
}) public class EventSettings implements ModelInterface<Integer> {
public class EventSettings implements EventChildInterface{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@EmbeddedId @Id
private EventPk id; @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "event_settings_id", nullable = false)
private Integer id;
@Column(name = "organisation") @Column(name = "organisation")
private String organisation; private String organisation;
...@@ -42,7 +46,6 @@ public class EventSettings implements EventChildInterface{ ...@@ -42,7 +46,6 @@ public class EventSettings implements EventChildInterface{
@OneToMany(cascade = CascadeType.ALL, mappedBy = "settings") @OneToMany(cascade = CascadeType.ALL, mappedBy = "settings")
private List<Event> events; private List<Event> events;
@ManyToOne @ManyToOne
@JoinColumn(name = "users_id", referencedColumnName = "users_id", nullable = false) @JoinColumn(name = "users_id", referencedColumnName = "users_id", nullable = false)
private User admin; private User admin;
...@@ -54,10 +57,6 @@ public class EventSettings implements EventChildInterface{ ...@@ -54,10 +57,6 @@ public class EventSettings implements EventChildInterface{
public EventSettings() { public EventSettings() {
} }
public EventSettings(EventPk eventSettingsId) {
this.id = eventSettingsId;
}
public List<Event> getEvents() { public List<Event> getEvents() {
return events; return events;
} }
...@@ -97,7 +96,7 @@ public class EventSettings implements EventChildInterface{ ...@@ -97,7 +96,7 @@ public class EventSettings implements EventChildInterface{
* @return the id * @return the id
*/ */
@Override @Override
public EventPk getId() { public Integer getId() {
return id; return id;
} }
...@@ -106,7 +105,7 @@ public class EventSettings implements EventChildInterface{ ...@@ -106,7 +105,7 @@ public class EventSettings implements EventChildInterface{
* the id to set * the id to set
*/ */
@Override @Override
public void setId(EventPk id) { public void setId(Integer id) {
this.id = id; this.id = id;
} }
...@@ -135,7 +134,8 @@ public class EventSettings implements EventChildInterface{ ...@@ -135,7 +134,8 @@ public class EventSettings implements EventChildInterface{
} }
/** /**
* @param organisation the organisation to set * @param organisation
* the organisation to set
*/ */
public void setOrganisation(String organisation) { public void setOrganisation(String organisation) {
this.organisation = organisation; this.organisation = organisation;
...@@ -149,7 +149,8 @@ public class EventSettings implements EventChildInterface{ ...@@ -149,7 +149,8 @@ public class EventSettings implements EventChildInterface{
} }
/** /**
* @param bundleCountry the bundleCountry to set * @param bundleCountry
* the bundleCountry to set
*/ */
public void setBundleCountry(String bundleCountry) { public void setBundleCountry(String bundleCountry) {
this.bundleCountry = bundleCountry; this.bundleCountry = bundleCountry;
...@@ -163,7 +164,8 @@ public class EventSettings implements EventChildInterface{ ...@@ -163,7 +164,8 @@ public class EventSettings implements EventChildInterface{
} }
/** /**
* @param admin the admin to set * @param admin
* the admin to set
*/ */
public void setAdmin(User admin) { public void setAdmin(User admin) {
this.admin = admin; this.admin = admin;
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventStatus.java
...@@ -10,6 +10,9 @@ import javax.persistence.CascadeType; ...@@ -10,6 +10,9 @@ import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.EmbeddedId; import javax.persistence.EmbeddedId;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQueries; import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery; import javax.persistence.NamedQuery;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
...@@ -26,12 +29,14 @@ import javax.persistence.Version; ...@@ -26,12 +29,14 @@ import javax.persistence.Version;
@NamedQuery(name = "EventStatus.findAll", query = "SELECT e FROM EventStatus e"), @NamedQuery(name = "EventStatus.findAll", query = "SELECT e FROM EventStatus e"),
@NamedQuery(name = "EventStatus.findByStatusName", query = "SELECT e FROM EventStatus e WHERE e.statusName = :statusName") }) @NamedQuery(name = "EventStatus.findByStatusName", query = "SELECT e FROM EventStatus e WHERE e.statusName = :statusName") })
public class EventStatus implements EventChildInterface{ public class EventStatus implements ModelInterface<Integer> {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@EmbeddedId @Id
private EventPk id; @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "event_status_id", nullable = false)
private Integer id;
@Column(name = "status_name", nullable = false) @Column(name = "status_name", nullable = false)
private String statusName; private String statusName;
...@@ -46,12 +51,7 @@ public class EventStatus implements EventChildInterface{ ...@@ -46,12 +51,7 @@ public class EventStatus implements EventChildInterface{
public EventStatus() { public EventStatus() {
} }
public EventStatus(EventPk eventStatusId) { public EventStatus(String statusName) {
this.id = eventStatusId;
}
public EventStatus(EventPk eventStatusId, String statusName) {
this.id = eventStatusId;
this.statusName = statusName; this.statusName = statusName;
} }
...@@ -102,7 +102,7 @@ public class EventStatus implements EventChildInterface{ ...@@ -102,7 +102,7 @@ public class EventStatus implements EventChildInterface{
* @return the id * @return the id
*/ */
@Override @Override
public EventPk getId() { public Integer getId() {
return id; return id;
} }
...@@ -111,7 +111,7 @@ public class EventStatus implements EventChildInterface{ ...@@ -111,7 +111,7 @@ public class EventStatus implements EventChildInterface{
* the id to set * the id to set
*/ */
@Override @Override
public void setId(EventPk id) { public void setId(Integer id) {
this.id = id; this.id = id;
} }
......
code/LanBortalUtilities/src/fi/insomnia/bortal/utilities/PasswordFunctions.java
...@@ -44,10 +44,12 @@ public class PasswordFunctions { ...@@ -44,10 +44,12 @@ public class PasswordFunctions {
public static boolean checkPlainPassword(String plainPassword, public static boolean checkPlainPassword(String plainPassword,
String saltedPassword) { String saltedPassword) {
String oldBase64 = saltedPassword.substring("{SSHA}".length()); String oldBase64 = saltedPassword.substring("{SSHA}".length());
String decodedHashedAndSalt; String decodedHashedAndSalt;
try { try {
decodedHashedAndSalt = new String(decoder.decodeBuffer(oldBase64)); decodedHashedAndSalt = new String(decoder.decodeBuffer(oldBase64));
logger.debug("HashAndSalt: {}", decodedHashedAndSalt);
} catch (IOException e) { } catch (IOException e) {
logger.error("Something awful happened...", e); logger.error("Something awful happened...", e);
return false; return false;
...@@ -64,7 +66,7 @@ public class PasswordFunctions { ...@@ -64,7 +66,7 @@ public class PasswordFunctions {
} }
private static int getSaltLenght() { private static int getSaltLenght() {
return 8; return 4;
} }
private static String generateSalt() { private static String generateSalt() {
......
code/LanBortalWeb/WebContent/WEB-INF/sun-web.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd"> <!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd">
<sun-web-app error-url=""> <sun-web-app error-url="">
<context-root>/LanBortalWeb</context-root> <context-root>/LanBortalWeb</context-root>
<class-loader delegate="true"/> <security-role-mapping>
<jsp-config> <role-name>admin</role-name>
<property name="keepgenerated" value="true"> <group-name>admin</group-name>
<description>Keep a copy of the generated servlet class java code.</description> </security-role-mapping>
</property> <security-role-mapping>
</jsp-config> <role-name>user</role-name>
<group-name>user</group-name>
</security-role-mapping>
<class-loader delegate="true" />
<jsp-config>
<property name="keepgenerated" value="true">
<description>Keep a copy of the generated servlet class java code.</description>
</property>
</jsp-config>
</sun-web-app> </sun-web-app>
code/LanBortalWeb/WebContent/WEB-INF/web.xml
...@@ -9,39 +9,56 @@ ...@@ -9,39 +9,56 @@
<servlet-name>PlaceMap</servlet-name> <servlet-name>PlaceMap</servlet-name>
<url-pattern>/PlaceMap</url-pattern> <url-pattern>/PlaceMap</url-pattern>
</servlet-mapping> </servlet-mapping>
<welcome-file-list>
<welcome-file>index.html</welcome-file> <welcome-file-list>
<welcome-file>index.jsf</welcome-file> <welcome-file>index.html</welcome-file>
<welcome-file>index.jsp</welcome-file> <welcome-file>index.jsf</welcome-file>
</welcome-file-list> <welcome-file>index.jsp</welcome-file>
<servlet> </welcome-file-list>
<servlet-name>Faces Servlet</servlet-name> <servlet>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class> <servlet-name>Faces Servlet</servlet-name>
</servlet> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
<servlet> </servlet>
<servlet-name>PlaceMap</servlet-name> <servlet-mapping>
<servlet-class>fi.insomnia.bortal.servlet.PlaceMap</servlet-class> <servlet-name>Faces Servlet</servlet-name>
</servlet> <url-pattern>*.jsf</url-pattern>
<servlet-mapping> </servlet-mapping>
<servlet-name>Faces Servlet</servlet-name>
<url-pattern>*.jsf</url-pattern> <filter>
</servlet-mapping> <display-name>HostnameFilter</display-name>
<filter> <filter-name>HostnameFilter</filter-name>
<display-name>HostnameFilter</display-name> <filter-class>fi.insomnia.bortal.HostnameFilter</filter-class>
<filter-name>HostnameFilter</filter-name> </filter>
<filter-class>fi.insomnia.bortal.HostnameFilter</filter-class> <filter-mapping>
</filter> <filter-name>HostnameFilter</filter-name>
<filter-mapping> <servlet-name>Faces Servlet</servlet-name>
<filter-name>HostnameFilter</filter-name> </filter-mapping>
<servlet-name>Faces Servlet</servlet-name>
</filter-mapping> <login-config>
<security-constraint> <auth-method>FORM</auth-method>
<web-resource-collection> <realm-name>omniarealm</realm-name>
<web-resource-name>forbidden</web-resource-name> <form-login-config>
<url-pattern>*.xhtml</url-pattern> <form-login-page>/auth/login.jsf</form-login-page>
</web-resource-collection> <form-error-page>/auth/loginError.jsf</form-error-page>
<auth-constraint> </form-login-config>
<description>asdasd</description> </login-config>
</auth-constraint> <security-role>
</security-constraint> <role-name>admin</role-name>
</security-role>
<security-role>
<role-name>user</role-name>
</security-role>
<security-constraint>
<web-resource-collection>
<web-resource-name>forbidden</web-resource-name>
<url-pattern>*.xhtml</url-pattern>
</web-resource-collection>
<auth-constraint>
<description>Thou shall not read the sources..</description>
</auth-constraint>
</security-constraint>
</web-app> </web-app>
code/LanBortalWeb/WebContent/auth/login.xhtml 0 → 100644
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
<h:head>
<title></title>
</h:head>
<h:body>
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">CreateUser</ui:define>
<ui:define name="header">Add new user</ui:define>
<ui:define name="content">
<
<form method="post" action="j_security_check">
<table border="0">
<tr>
<td>#{i18n['login.username']}</td>
<td><input type="text" name="j_username" /></td>
</tr>
<tr>
<td>#{i18n['login.password']}</td>
<td><input type="password" name="j_password" /></td>
</tr>
</table>
<input type="submit" value="#{i18n['login.submit']}" />
</form>
</ui:define>
<ui:define name="footer">footer</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/auth/logout.xhtml 0 → 100644
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
<h:head>
<title></title>
</h:head>
<h:body>
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">CreateUser</ui:define>
<ui:define name="header">Add new user</ui:define>
<ui:define name="content">
Logged out.${userView.logout() }
</ui:define>
<ui:define name="footer">footer</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/resources/tools/shop/productlist.xhtml 0 → 100644
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core" xmlns:composite="http://java.sun.com/jsf/composite"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:tools="http://java.sun.com/jsf/composite/tools">
<composite:interface>
</composite:interface>
<composite:implementation>
<h:form>
<h:dataTable border="1" id="productListTable"
value="#{productView.userShoppableProducts}"
var="product">
<h:column>
<f:facet name="header">
<h:outputText value="#" />
</f:facet>
<h:outputText value="#{product.id}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{i18n['product.name']}" />
</f:facet>
<h:outputText value="#{product.name}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{i18n['product.price']}" />
</f:facet>
<h:outputText value="#{product.price}" />
</h:column>
</h:dataTable>
</h:form>
</composite:implementation>
</html>
code/LanBortalWeb/WebContent/shop.xhtml 0 → 100644
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:shop="http://java.sun.com/jsf/composite/tools/shop"
>
<h:head>
<title></title>
</h:head>
<h:body>
<ui:composition template="/layout/default-template.xhtml">
<ui:define name="title">Omnia</ui:define>
<ui:define name="header">Lippukauppa</ui:define>
<ui:define name="content">
<shop:productlist />
</ui:define>
<ui:define name="footer">Osta liput</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/user/create.xhtml
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<h:form> <h:form>
<h:panelGrid columns="2"> <h:panelGrid columns="2">
<h:outputLabel value="Nick:" /><h:inputText value="#{userView.nick}" /> <h:outputLabel value="Login name:" /><h:inputText value="#{userView.login}" />
<h:outputLabel value="Password:" /><h:inputSecret value="#{userView.password}" /> <h:outputLabel value="Password:" /><h:inputSecret value="#{userView.password}" />
<h:commandButton action="#{userView.createUser()}" value="Create" /> <h:commandButton action="#{userView.createUser()}" value="Create" />
</h:panelGrid> </h:panelGrid>
......
code/LanBortalWeb/WebContent/user/list.xhtml
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<ui:define name="header">Edit user</ui:define> <ui:define name="header">Edit user</ui:define>
<ui:define name="content"> <ui:define name="content">
<h:outputText value="productlist"/>
<users:list /> <users:list />
</ui:define> </ui:define>
......
code/LanBortalWeb/src/fi/insomnia/bortal/I18n.java 0 → 100644
package fi.insomnia.bortal;
import java.util.ResourceBundle;
import javax.faces.application.Application;
import javax.faces.context.FacesContext;
/***
* Access i18n localisations from Java code. Feel free to make up a better way.
* @author jkj
*
*/
public class I18n {
public static ResourceBundle GetResourceBundle()
{
FacesContext facesContext = FacesContext.getCurrentInstance();
Application app = facesContext.getApplication();
ResourceBundle bundle = app.getResourceBundle(facesContext, "i18n");
return bundle;
}
public static String Get(String key)
{
String value = GetResourceBundle().getString(key);
if(key==null) {
return "########";
}
return value;
}
}
code/LanBortalWeb/src/fi/insomnia/bortal/view/ProductView.java 0 → 100644
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package fi.insomnia.bortal.view;
import fi.insomnia.bortal.beans.ProductBeanLocal;
import fi.insomnia.bortal.beans.RoleBeanLocal;
import fi.insomnia.bortal.beans.SecurityBeanLocal;
import fi.insomnia.bortal.exceptions.PermissionDeniedException;
import fi.insomnia.bortal.handler.SessionHandler;
import fi.insomnia.bortal.model.Product;
import fi.insomnia.bortal.model.Role;
import java.util.List;
import javax.ejb.EJB;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.ManagedProperty;
import javax.faces.bean.SessionScoped;
import javax.faces.model.DataModel;
import javax.faces.model.ListDataModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
*
* @author jkj
*/
@ManagedBean(name = "productView")
@SessionScoped
public class ProductView {
@EJB
private ProductBeanLocal productBean;
private static final Logger logger = LoggerFactory.getLogger(ProductView.class);
@EJB
private SecurityBeanLocal securitybean;
public DataModel<Product> getUserShoppableProducts() {
ListDataModel<Product> items = new ListDataModel<Product>(productBean.listUserShoppableProducts());
logger.info("Fetching products. Found {}", items.getRowCount());
return items;
}
}
code/LanBortalWeb/src/fi/insomnia/bortal/view/UserView.java
...@@ -24,10 +24,10 @@ import fi.insomnia.bortal.model.User; ...@@ -24,10 +24,10 @@ import fi.insomnia.bortal.model.User;
@ManagedBean(name = "userView") @ManagedBean(name = "userView")
@SessionScoped @SessionScoped
public class UserView { public class UserView {
@ManagedProperty("#{sessionHandler}") @ManagedProperty("#{sessionHandler}")
private SessionHandler sessionhandler; private SessionHandler sessionhandler;
@EJB @EJB
private SessionHandlerBeanLocal sessionbean; private SessionHandlerBeanLocal sessionbean;
...@@ -36,7 +36,7 @@ public class UserView { ...@@ -36,7 +36,7 @@ public class UserView {
private static final Logger logger = LoggerFactory.getLogger(UserView.class); private static final Logger logger = LoggerFactory.getLogger(UserView.class);
private User user; private User user;
private ListDataModel<User> items; private ListDataModel<User> items;
private String nick; private String login;
private String password; private String password;
@EJB @EJB
private SecurityBeanLocal securitybean; private SecurityBeanLocal securitybean;
...@@ -46,8 +46,6 @@ public class UserView { ...@@ -46,8 +46,6 @@ public class UserView {
return "userEdit"; return "userEdit";
} }
public String getLocale() { public String getLocale() {
return "en_ST_v7"; return "en_ST_v7";
} }
...@@ -59,11 +57,11 @@ public class UserView { ...@@ -59,11 +57,11 @@ public class UserView {
} }
logger.info("Saving user"); logger.info("Saving user");
// Luodaan uusi kÔøΩyttÔøΩjÔøΩ UserBeanin funktiolla createNewUser jolle // Luodaan uusi käyttäjä UserBeanin funktiolla createNewUser jolle
// annetaan parametrina pakolliset tiedot ( nick ja salasana ) // annetaan parametrina pakolliset tiedot ( login ja salasana )
// Paluuarvona saadaan uusi uljas k�ytt�j�-olio. // Paluuarvona saadaan uusi uljas käyttäjä-olio.
setUser(userBean.createNewUser(nick, password)); setUser(userBean.createNewUser(login, password));
nick = ""; login = "";
password = ""; password = "";
if (getUser() == null) { if (getUser() == null) {
logger.warn("Could not create user. function returned null!"); logger.warn("Could not create user. function returned null!");
...@@ -88,12 +86,12 @@ public class UserView { ...@@ -88,12 +86,12 @@ public class UserView {
} }
// Getters and setters... // Getters and setters...
public String getNick() { public String getLogin() {
return nick; return login;
} }
public void setNick(String nick) { public void setLogin(String login) {
this.nick = nick; this.login = login;
} }
public String getPassword() { public String getPassword() {
...@@ -111,6 +109,7 @@ public class UserView { ...@@ -111,6 +109,7 @@ public class UserView {
public User getUser() { public User getUser() {
return user; return user;
} }
public void setSessionhandler(SessionHandler sessionhandler) { public void setSessionhandler(SessionHandler sessionhandler) {
this.sessionhandler = sessionhandler; this.sessionhandler = sessionhandler;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!