Created Local interfaces for few facades. Fixed PlaceMap Servlet to use the Loca…

…l interfaces instead of the beans

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/EventChildGenericFacade.java

@@ -6,7 +6,7 @@ import fi.insomnia.bortal.model.EventPk;
 /**
  * Session Bean implementation class GenericFacade
  */
-public abstract class EventChildGenericFacade<T extends EventChildInterface> extends GenericFacade<EventPk,T> {
+public abstract class EventChildGenericFacade<T extends EventChildInterface> extends GenericFacade<EventPk,T> implements EventChildGenericFacadeLocal<T>{
 
     public EventChildGenericFacade(Class<T> entityClass) {
         super(entityClass);

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/UserFacade.java

@@ -10,7 +10,7 @@ import fi.insomnia.bortal.model.User;
 
 @Stateless
 @LocalBean
-public class UserFacade extends GenericFacade<Integer, User> {
+public class UserFacade extends GenericFacade<Integer, User> implements UserFacadeLocal{
 
     public static final String DEFAULT_USER_LOGIN = "ANONYMOUS";
 

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/facade/EventChildGenericFacadeLocal.java

+package fi.insomnia.bortal.facade;
+
+import fi.insomnia.bortal.model.EventChildInterface;
+import fi.insomnia.bortal.model.EventPk;
+
+public interface EventChildGenericFacadeLocal<T extends EventChildInterface> extends GenericFacadeLocal<EventPk,T>{
+
+}

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/facade/EventFacadeLocal.java

+package fi.insomnia.bortal.facade;
+
+import fi.insomnia.bortal.model.Event;
+
+public interface EventFacadeLocal extends GenericFacadeLocal<Integer, Event> {
+
+}

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/facade/EventMapFacadeLocal.java

+package fi.insomnia.bortal.facade;
+
+import fi.insomnia.bortal.model.EventMap;
+
+public interface EventMapFacadeLocal extends EventChildGenericFacadeLocal<EventMap> {
+
+}

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/facade/PlaceFacadeLocal.java

+package fi.insomnia.bortal.facade;
+
+import fi.insomnia.bortal.model.Place;
+
+public interface PlaceFacadeLocal extends EventChildGenericFacadeLocal<Place> {
+
+}

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/facade/UserFacadeLocal.java

+package fi.insomnia.bortal.facade;
+
+import fi.insomnia.bortal.model.User;
+
+public interface UserFacadeLocal extends GenericFacadeLocal<Integer,User> {
+
+}

code/LanBortalWeb/src/fi/insomnia/bortal/servlet/PlaceMap.java

@@ -4,9 +4,10 @@
  */
 package fi.insomnia.bortal.servlet;
 
-import fi.insomnia.bortal.facade.EventMapFacade;
-import fi.insomnia.bortal.facade.PlaceFacade;
-import fi.insomnia.bortal.facade.UserFacade;
+
+import fi.insomnia.bortal.facade.EventMapFacadeLocal;
+import fi.insomnia.bortal.facade.PlaceFacadeLocal;
+import fi.insomnia.bortal.facade.UserFacadeLocal;
 import fi.insomnia.bortal.model.EventMap;
 import fi.insomnia.bortal.model.EventPk;
 import fi.insomnia.bortal.model.Place;
@@ -27,16 +28,20 @@ import javax.servlet.http.HttpServletResponse;
  */
 public class PlaceMap extends HttpServlet {
 
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 8769688627918936258L;
     public static final String PARAMETER_EVENT_MAP_ID = "mapid";
     public static final String PARAMETER_SELECTED_PLACE_ID = "placeid";
     public static final String PARAMETER_CURRENT_USER_ID = "userid";
     public static final String PARAMETER_EVENT_ID = "eventid";
     @EJB
-    private PlaceFacade placeFacade;
+    private PlaceFacadeLocal placeFacade;
     @EJB
-    private EventMapFacade eventMapFacade;
+    private EventMapFacadeLocal eventMapFacade;
     @EJB
-    private UserFacade userFacade;
+    private UserFacadeLocal userFacade;
 
     /** 
      * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
@@ -74,7 +79,7 @@ public class PlaceMap extends HttpServlet {
                 pk.setEventId(eventId);
                 pk.setId(mapId);
 
-                map = getEventMapFacade().find(pk);
+                map =eventMapFacade.find(pk);
             }
 
             BufferedImage image = map.getMapWithPlaces();
@@ -169,45 +174,4 @@ public class PlaceMap extends HttpServlet {
         return "Short description";
     }// </editor-fold>
 
-    /**
-     * @return the placeFacade
-     */
-    public PlaceFacade getPlaceFacade() {
-        return placeFacade;
-    }
-
-    /**
-     * @param placeFacade the placeFacade to set
-     */
-    public void setPlaceFacade(PlaceFacade placeFacade) {
-        this.placeFacade = placeFacade;
-    }
-
-    /**
-     * @return the eventMapFacade
-     */
-    public EventMapFacade getEventMapFacade() {
-        return eventMapFacade;
-    }
-
-    /**
-     * @param eventMapFacade the eventMapFacade to set
-     */
-    public void setEventMapFacade(EventMapFacade eventMapFacade) {
-        this.eventMapFacade = eventMapFacade;
-    }
-
-    /**
-     * @return the userFacade
-     */
-    public UserFacade getUserFacade() {
-        return userFacade;
-    }
-
-    /**
-     * @param userFacade the userFacade to set
-     */
-    public void setUserFacade(UserFacade userFacade) {
-        this.userFacade = userFacade;
-    }
 }

code/LanBortalWeb/src/fi/insomnia/bortal/view/TestDataView.java

@@ -4,12 +4,6 @@
  */
 package fi.insomnia.bortal.view;
 
-import fi.insomnia.bortal.facade.EventFacade;
-import fi.insomnia.bortal.facade.EventMapFacade;
-import fi.insomnia.bortal.facade.PlaceFacade;
-import fi.insomnia.bortal.model.Event;
-import fi.insomnia.bortal.model.EventMap;
-import fi.insomnia.bortal.model.Place;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -21,6 +15,13 @@ import javax.ejb.EJB;
 import javax.faces.bean.ManagedBean;
 import javax.faces.bean.RequestScoped;
 
+import fi.insomnia.bortal.facade.EventFacadeLocal;
+import fi.insomnia.bortal.facade.EventMapFacadeLocal;
+import fi.insomnia.bortal.facade.PlaceFacadeLocal;
+import fi.insomnia.bortal.model.Event;
+import fi.insomnia.bortal.model.EventMap;
+import fi.insomnia.bortal.model.Place;
+
 /**
  *
  * @author tuukka
@@ -31,11 +32,11 @@ public class TestDataView {
 
     public static final String TEST_MAP_IMAGE_NAME = "testmap.png";
     @EJB
-    private EventMapFacade eventMapFacade;
+    private EventMapFacadeLocal eventMapFacade;
     @EJB
-    private EventFacade eventFacade;
+    private EventFacadeLocal eventFacade;
 
-    private PlaceFacade placeFacade;
+    private PlaceFacadeLocal placeFacade;
 
     public void generateData() {
         Event event = generateMetaData();
@@ -116,45 +117,5 @@ public class TestDataView {
     public TestDataView() {
     }
 
-    /**
-     * @return the eventMapFacade
-     */
-    public EventMapFacade getEventMapFacade() {
-        return eventMapFacade;
-    }
-
-    /**
-     * @param eventMapFacade the eventMapFacade to set
-     */
-    public void setEventMapFacade(EventMapFacade eventMapFacade) {
-        this.eventMapFacade = eventMapFacade;
-    }
-
-    /**
-     * @return the eventFacade
-     */
-    public EventFacade getEventFacade() {
-        return eventFacade;
-    }
-
-    /**
-     * @param eventFacade the eventFacade to set
-     */
-    public void setEventFacade(EventFacade eventFacade) {
-        this.eventFacade = eventFacade;
-    }
-
-    /**
-     * @return the placeFacade
-     */
-    public PlaceFacade getPlaceFacade() {
-        return placeFacade;
-    }
-
-    /**
-     * @param placeFacade the placeFacade to set
-     */
-    public void setPlaceFacade(PlaceFacade placeFacade) {
-        this.placeFacade = placeFacade;
-    }
+   
 }