Skip to content

Codecrew / Moya

Go to a project
Commit e56e038e by Tuomas Riihimäki
Options

Debuggia

1 parent 60250406
Inline Side-by-side
Showing with 60 additions and 61 deletions
code/LanBortal/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<runtime name="GlassFish v3 Java EE 6"/>
<fixed facet="jst.ear"/>
<installed facet="jst.ear" version="5.0"/>
<installed facet="sun.facet" version="9"/>
......
code/LanBortalBeans/.classpath
......@@ -2,17 +2,14 @@
<classpath>
<classpathentry kind="src" path="ejbModule"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish v3 Java EE 6">
<attributes>
<attribute name="owner.project.facets" value="jst.ejb;#system#"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish v3 Java EE 6"/>
<classpathentry kind="lib" path="libs/PDFjet.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6">
<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 combineaccessrules="false" kind="src" path="/LanBortalAuthModule"/>
<classpathentry combineaccessrules="false" kind="src" path="/LanBortalBeansClient"/>
<classpathentry combineaccessrules="false" kind="src" path="/LanBortalAuthModuleClient"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
code/LanBortalBeans/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<runtime name="GlassFish v3 Java EE 6"/>
<fixed facet="jst.ejb"/>
<fixed facet="jst.java"/>
<installed facet="jst.java" version="6.0"/>
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/PlaceMapBean.java
......@@ -49,23 +49,28 @@ public class PlaceMapBean implements PlaceMapBeanLocal {
public void printPlaceMapToStream(OutputStream outputStream, String filetype, Event event, Integer mapId, Integer userId, List<Integer> placeIds) throws IOException {
long begin = new Date().getTime();
Integer eventId = event.getId();
List<Place> selectedPlaceList = new ArrayList<Place>();
EventMap map = null;
for (Integer id : placeIds) {
selectedPlaceList.add(placeFacade.find(eventId, id));
}
logger.debug("Fetching map for event {}", event);
logger.info("Got mapid {}, time {}", mapId, new Date().getTime() - begin);
logger.debug("SelectedPlaceList: {}, size {}", selectedPlaceList, selectedPlaceList.size());
if (selectedPlaceList.size() > 0) {
map = selectedPlaceList.get(0).getMap();
Place selPlace = selectedPlaceList.get(0);
logger.debug("Selected place: {}", selPlace);
map = selPlace.getMap();
} else {
logger.debug("Fetching from EventMapFacade with eventid {}, mapid {}", eventId,mapId);
map = eventMapFacade.find(eventId, mapId);
}
logger.debug("Got map object {}", map);
List<Place> places = map.getPlaces();
logger.info("Places: from map {}, time {}", places.size(), new Date().getTime() - begin);
......@@ -106,7 +111,7 @@ public class PlaceMapBean implements PlaceMapBeanLocal {
}
if (parameters.endsWith(",")) {
parameters.substring(parameters.length() -1);
parameters.substring(parameters.length() - 1);
}
} else {
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/TestDataBean.java
......@@ -10,26 +10,23 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.annotation.security.DeclareRoles;
import javax.annotation.security.RolesAllowed;
import javax.ejb.EJB;
import javax.ejb.Stateless;
import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.enums.BeanRole;
import fi.insomnia.bortal.facade.CompoEntryFacade;
import fi.insomnia.bortal.facade.CompoFacade;
import fi.insomnia.bortal.facade.BillFacade;
import fi.insomnia.bortal.facade.BillLineFacade;
import fi.insomnia.bortal.facade.CompoEntryFacade;
import fi.insomnia.bortal.facade.CompoFacade;
import fi.insomnia.bortal.facade.EventMapFacade;
import fi.insomnia.bortal.facade.EventOrganiserFacade;
import fi.insomnia.bortal.facade.PlaceFacade;
import fi.insomnia.bortal.facade.UserFacade;
import fi.insomnia.bortal.model.Compo;
import fi.insomnia.bortal.model.CompoEntry;
import fi.insomnia.bortal.model.Bill;
import fi.insomnia.bortal.model.BillLine;
import fi.insomnia.bortal.model.Compo;
import fi.insomnia.bortal.model.CompoEntry;
import fi.insomnia.bortal.model.Event;
import fi.insomnia.bortal.model.EventMap;
import fi.insomnia.bortal.model.Place;
......@@ -258,8 +255,9 @@ public class TestDataBean implements TestDataBeanLocal {
}
public void printPlacesInfo() {
logger.debug("Fetching places");
List<Place> places = placeFacade.findAll();
logger.debug("Got places: {}", places);
logger.info("Printing info from places");
for (Place place : places) {
logger.info("Place id: {}. Event Map id: {}.", place.getId().getId(), place.getMap().getId().getId());
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/EventChildGenericFacade.java
package fi.insomnia.bortal.facade;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.model.EventChildInterface;
import fi.insomnia.bortal.model.EventPk;
......@@ -13,9 +16,14 @@ public abstract class EventChildGenericFacade<T extends EventChildInterface> ext
}
private static final Logger logger = LoggerFactory.getLogger(EventChildGenericFacade.class);
public T find(Integer eventId, Integer id) {
EventPk pk = new EventPk(eventId);
pk.setId(id);
logger.debug("Fetching object {} with key {}", this.getEntityClass(), pk);
return find(pk);
}
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/GenericFacade.java
......@@ -8,6 +8,9 @@ import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.model.ModelInterface;
/**
......@@ -15,6 +18,8 @@ import fi.insomnia.bortal.model.ModelInterface;
*/
public abstract class GenericFacade<PK,T extends ModelInterface<PK>>{
private static final Logger logger =LoggerFactory.getLogger(GenericFacade.class);
private Class<T> entClass;
public GenericFacade(Class<T>entityClass)
{
......@@ -42,6 +47,7 @@ public abstract class GenericFacade<PK,T extends ModelInterface<PK>>{
}
public T find(PK id) {
logger.debug("Fetching from em: {}, entityclass {}, id {}", new String[]{getEm().toString(), getEntityClass().toString(), id.toString()});
return getEm().find(getEntityClass(), id);
}
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/ProductFacade.java
......@@ -5,7 +5,6 @@ import javax.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import sun.reflect.generics.reflectiveObjects.NotImplementedException;
import fi.insomnia.bortal.model.Product;
@Stateless
......@@ -24,7 +23,7 @@ public class ProductFacade extends EventChildGenericFacade<Product> {
}
public Product getCreditProduct() {
throw new NotImplementedException();
throw new RuntimeException();
}
}
code/LanBortalBeansClient/.classpath
......@@ -2,16 +2,12 @@
<classpath>
<classpathentry kind="src" path="ejbModule"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish v3 Java EE 6">
<attributes>
<attribute name="owner.project.facets" value="#system#;jst.utility"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="/LanBortalAuthModule"/>
<classpathentry combineaccessrules="false" kind="src" path="/LanBortalAuthModuleClient"/>
<classpathentry kind="output" path="ejbModule"/>
</classpath>
code/LanBortalBeansClient/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<runtime name="GlassFish v3 Java EE 6"/>
<fixed facet="jst.utility"/>
<fixed facet="jst.java"/>
<installed facet="jst.java" version="5.0"/>
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccessRight.java
......@@ -30,6 +30,7 @@ import javax.persistence.Version;
public class AccessRight implements ModelInterface<Integer> {
private static final long serialVersionUID = 1L;
/**
* AccessRight is global entity, and thus does not have a reference to
* Event.
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent.java
......@@ -39,6 +39,7 @@ import javax.persistence.Version;
public class AccountEvent implements EventChildInterface {
private static final long serialVersionUID = 1L;
@EmbeddedId
private EventPk id;
......
code/LanBortalUtilities/.classpath
......@@ -2,15 +2,11 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish v3 Java EE 6">
<attributes>
<attribute name="owner.project.facets" value="jst.utility"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6">
<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="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish v3 Java EE 6"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
code/LanBortalUtilities/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<runtime name="GlassFish v3 Java EE 6"/>
<fixed facet="jst.java"/>
<fixed facet="jst.utility"/>
<installed facet="jst.java" version="6.0"/>
......
code/LanBortalUtilities/src/fi/insomnia/bortal/utilities/PasswordFunctions.java
......@@ -8,13 +8,11 @@ import java.util.Random;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sun.misc.BASE64Decoder;
import sun.misc.BASE64Encoder;
import com.sun.jersey.core.util.Base64;
public class PasswordFunctions {
private static BASE64Decoder decoder = new BASE64Decoder();
private static BASE64Encoder encoder = new BASE64Encoder();
public class PasswordFunctions {
private static final Logger logger = LoggerFactory
.getLogger(PasswordFunctions.class);
......@@ -37,7 +35,7 @@ public class PasswordFunctions {
String hashed = new String(algo.digest((password + salt).getBytes()));
String both = hashed + salt;
String base64Str = encoder.encode(both.getBytes());
String base64Str = Base64.encode(both.getBytes()).toString();
return base64Str;
}
......@@ -47,16 +45,10 @@ public class PasswordFunctions {
String oldBase64 = saltedPassword.substring("{SSHA}".length());
String decodedHashedAndSalt;
try {
decodedHashedAndSalt = new String(decoder.decodeBuffer(oldBase64));
decodedHashedAndSalt = new String(Base64.base64Decode(oldBase64));
logger.debug("HashAndSalt: {}", decodedHashedAndSalt);
} catch (IOException e) {
logger.error("Something awful happened...", e);
return false;
}
String salt = decodedHashedAndSalt.substring(decodedHashedAndSalt
.length()
String salt = decodedHashedAndSalt.substring(decodedHashedAndSalt.length()
- getSaltLenght(), decodedHashedAndSalt.length());
String newBase64 = shaWithSaltToBase64(plainPassword, salt);
......
code/LanBortalWeb/.classpath
......@@ -3,12 +3,8 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish v3 Java EE 6">
<attributes>
<attribute name="owner.project.facets" value="#system#;jst.web"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 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="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>
......
code/LanBortalWeb/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<runtime name="GlassFish v3 Java EE 6"/>
<fixed facet="jst.web"/>
<fixed facet="jst.java"/>
<installed facet="jst.java" version="6.0"/>
......
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/PlaceMap.java
......@@ -58,7 +58,9 @@ public class PlaceMap extends HttpServlet {
*/
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
logger.debug("Begin processing request");
response.setContentType("text/html;charset=UTF-8");
// PrintWriter out = response.getWriter();
ServletOutputStream ostream = response.getOutputStream();
try {
......@@ -66,6 +68,7 @@ public class PlaceMap extends HttpServlet {
List<Integer> placeIds = getIntegerParameters(request, PARAMETER_SELECTED_PLACE_ID);
Integer mapId = getIntegerParameter(request, PARAMETER_EVENT_MAP_ID);
Integer userId = getIntegerParameter(request, PARAMETER_CURRENT_USER_ID);
logger.debug("Mapid: {}", mapId);
response.setContentType("image/jpeg");
......
code/LanBortalWeb/src/fi/insomnia/bortal/view/MapView.java
......@@ -69,17 +69,22 @@ public class MapView {
placeBean.mergeChanges(place);
}
}
logger.debug("Done calling PlaceSelectActionListener");
}
public String getSelectPlaceMapUrl() {
User user = sessionHandler.getUser();
logger.debug("Select map got user: {}", user );
EventMap map = getActiveMap();
logger.debug("Select map got active map: {}", map );
if (map == null) {
return "";
}
return placeMapBean.getSelectPlaceMapUrl(getActiveMap(), selectedPlaces, user);
String ret = placeMapBean.getSelectPlaceMapUrl(getActiveMap(), selectedPlaces, user);
logger.debug("Returning placemapUrl: {}", ret);
return ret;
}
/**
......
code/LanBortalWeb/src/fi/insomnia/bortal/view/TestDataView.java
......@@ -40,6 +40,7 @@ public class TestDataView {
testdatabean.createBill(event, user);
EventMap map = testdatabean.generateTestMap(event);
testdatabean.generateTestPlaces(map);
// testdatabean.generateTestCompos(event);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!