lxbfYeaa9897955
/
SIPRP
forked from Coded/SIPRP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: https://svn.coded.pt/svn/SIPRP@1540 bb69d46d-e84e-40c8-a05a-06db0d633741

Browse Source
lxbfYeaa
Diogo Neves 15 years ago
parent 835704810c
commit d4c7594a3c
28 changed files with 120 additions and 356 deletions
Show Stats Download Patch File Download Diff File

6
trunk/AnaliseAcidentesTrabalho/nbproject/faces-config.NavData
Unescape View File

@ -10,20 +10,20 @@
<Node id="Erro.jsp" x="650" y="450" zoom="true"/>
<Node id="FormRH.jsp" x="400" y="150" zoom="true"/>
<Node id="EstatisticasProcesso.jsp" x="150" y="900" zoom="true"/>
<Node id="AnaliseAcidenteTrabalho.jsp" x="150" y="300" zoom="true"/>
<Node id="FormSeguranca.jsp" x="1150" y="300" zoom="true"/>
<Node id="AnaliseAcidenteTrabalho.jsp" x="150" y="300" zoom="true"/>
<Node id="NovoUtilizador.jsp" x="150" y="450" zoom="true"/>
<Node id="FormDirSiprp.jsp" x="650" y="150" zoom="true"/>
<Node id="FichaUtilizador.jsp" x="1400" y="150" zoom="true"/>
<Node id="FormMedico.jsp" x="650" y="600" zoom="true"/>
<Node id="FormHS.jsp" x="900" y="450" zoom="true"/>
<Node id="FormMedico.jsp" x="650" y="600" zoom="true"/>
<Node id="EnviarCorrecao.jsp" x="400" y="450" zoom="true"/>
<Node id="UtilizadorFields.jsp" x="150" y="600" zoom="true"/>
<Node id="ConfirmarDesactivar.jsp" x="1650" y="150" zoom="true"/>
<Node id="Dummy.jsp" x="150" y="750" zoom="true"/>
<Node id="LoadImage.jsp" x="400" y="600" zoom="true"/>
<Node id="Login.jsp" x="400" y="300" zoom="true"/>
<Node id="ViewAnaliseAcidenteTrabalho.jsp" x="650" y="300" zoom="true"/>
<Node id="Login.jsp" x="400" y="300" zoom="true"/>
</Scope>
<Scope Scope="All Faces Configurations"/>
</Scene>

9
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Acesso.java
Unescape View File

@ -108,13 +108,6 @@ public class Acesso extends AbstractPageBean {
// Perform application initialization that must complete
// *after* managed components are initialized
// TODO - add your own initialization code here
if (!getSessionBean1().isLoggedIn()) {
try {
getExternalContext().redirect("Login.jsp");
} catch(Exception e) {
// . . . handle exception . . .
}
}
}
/**
@ -214,7 +207,7 @@ public class Acesso extends AbstractPageBean {
FacesContext fc = getFacesContext();
try
{
JSFUtils.logout( fc );
JSFUtils.logout( fc, false );
}
catch(Exception ex)
{

20
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/AnaliseAcidenteTrabalho.java
Unescape View File

@ -6931,27 +6931,9 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
public String lnkLogout_action()
{
// TODO: Replace with your code
getSessionBean1().setIeBug( true );
try
{
javax.servlet.http.HttpSession session =
(javax.servlet.http.HttpSession) getExternalContext().getSession( true );
session.invalidate();
Utils.doLogout();
}
catch ( Exception ex )
{
}
Utils.doLogout( getExternalContext(), true );
try
{
getExternalContext().redirect("Login.jsp");
}
catch( Exception e )
{
}
//return "login";
return null;
}

12
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/ConfirmarDesactivar.java
Unescape View File

@ -245,18 +245,8 @@ public class ConfirmarDesactivar extends AbstractPageBean
public String lnkLogout_action()
{
try
{
javax.servlet.http.HttpSession session = ( javax.servlet.http.HttpSession ) getExternalContext().getSession( true );
session.invalidate();
Utils.doLogout();
Utils.doLogout( getExternalContext(), true );
getExternalContext().redirect( "Login.jsp" );
}
catch( Exception ex )
{
}
return null;
}

6
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Dummy.java
Unescape View File

@ -299,9 +299,9 @@ public class Dummy extends AbstractPageBean {
return null;
}
public String lnkLogout_action() {
// TODO: Replace with your code
Utils.doLogout();
public String lnkLogout_action()
{
Utils.doLogout( getExternalContext(), false );
return null;
}

21
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/EnviarCorrecao.java
Unescape View File

@ -483,26 +483,7 @@ public class EnviarCorrecao extends AbstractPageBean {
public String lnkLogout_action()
{
try
{
javax.servlet.http.HttpSession session =
(javax.servlet.http.HttpSession) getExternalContext().getSession(true);
session.invalidate();
Utils.doLogout();
}
catch ( Exception ex )
{
}
try
{
getExternalContext().redirect( "Login.jsp" );
}
catch ( Exception e )
{
}
//return "login";
Utils.doLogout( getExternalContext(), true );
return null;
}

12
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/EstatisticasProcesso.java
Unescape View File

@ -382,18 +382,8 @@ public class EstatisticasProcesso extends AbstractPageBean
public String lnkLogout_action()
{
try
{
javax.servlet.http.HttpSession session = ( javax.servlet.http.HttpSession ) getExternalContext().getSession( true );
session.invalidate();
Utils.doLogout();
getExternalContext().redirect( "Login.jsp" );
}
catch( Exception ex )
{
Utils.doLogout( getExternalContext(), true );
}
return null;
}

21
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FichaUtilizador.java
Unescape View File

@ -973,27 +973,8 @@ public class FichaUtilizador extends AbstractPageBean {
public String lnkLogout_action()
{
try
{
javax.servlet.http.HttpSession session =
(javax.servlet.http.HttpSession) getExternalContext().getSession(true);
session.invalidate();
Utils.doLogout();
}
catch ( Exception ex )
{
Utils.doLogout( getExternalContext(), true );
}
try
{
getExternalContext().redirect( "Login.jsp" );
}
catch ( Exception e )
{
ErrorLogger.logException( e );
}
//return "login";
return null;
}

22
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirGerRh.java
Unescape View File

@ -1092,27 +1092,7 @@ public class FormDirGerRh extends AbstractPageBean {
public String lnkLogout_action()
{
try
{
javax.servlet.http.HttpSession session =
(javax.servlet.http.HttpSession) getExternalContext().getSession(true);
session.invalidate();
Utils.doLogout();
}
catch(Exception ex)
{
ErrorLogger.logException( ex );
}
try
{
getExternalContext().redirect("Login.jsp");
}
catch(Exception e)
{
ErrorLogger.logException( e );
}
//return "login";
Utils.doLogout( getExternalContext(), true );
return null;
}

34
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirSiprp.java
Unescape View File

@ -989,18 +989,6 @@ public class FormDirSiprp extends AbstractPageBean {
log("FormDirSiprp Initialization Failure", e);
throw e instanceof FacesException ? (FacesException) e: new FacesException(e);
}
if ( ! getSessionBean1().isLoggedIn() )
{
try
{
getExternalContext().redirect( "Login.jsp" );
}
catch ( Exception e )
{
// . . . handle exception . . .
}
}
}
@Override
@ -1106,27 +1094,7 @@ public class FormDirSiprp extends AbstractPageBean {
public String lnkLogout_action()
{
try
{
javax.servlet.http.HttpSession session =
(javax.servlet.http.HttpSession) getExternalContext().getSession(true);
session.invalidate();
Utils.doLogout();
}
catch(Exception ex)
{
ErrorLogger.logException( ex );
}
try
{
getExternalContext().redirect("Login.jsp");
}
catch(Exception e)
{
ErrorLogger.logException( e );
}
//return "login";
Utils.doLogout( getExternalContext(), true );
return null;
}

22
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormGestor.java
Unescape View File

@ -1160,27 +1160,7 @@ public class FormGestor extends AbstractPageBean {
public String lnkLogout_action()
{
try
{
javax.servlet.http.HttpSession session =
(javax.servlet.http.HttpSession) getExternalContext().getSession(true);
session.invalidate();
Utils.doLogout();
}
catch(Exception ex)
{
ErrorLogger.logException( ex );
}
try
{
getExternalContext().redirect("Login.jsp");
}
catch(Exception e)
{
ErrorLogger.logException( e );
}
//return "login";
Utils.doLogout( getExternalContext(), true );
return null;
}

22
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java
Unescape View File

@ -1412,27 +1412,7 @@ public class FormHS extends AbstractPageBean {
public String lnkLogout_action()
{
try
{
javax.servlet.http.HttpSession session =
(javax.servlet.http.HttpSession) getExternalContext().getSession(true);
session.invalidate();
Utils.doLogout();
}
catch(Exception ex)
{
ErrorLogger.logException( ex );
}
try
{
getExternalContext().redirect("Login.jsp");
}
catch(Exception e)
{
ErrorLogger.logException( e );
}
//return "login";
Utils.doLogout( getExternalContext(), true );
return null;
}

12
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormMedico.java
Unescape View File

@ -1329,17 +1329,7 @@ public class FormMedico extends AbstractPageBean {
public String lnkLogout_action()
{
try
{
javax.servlet.http.HttpSession session =
(javax.servlet.http.HttpSession) getExternalContext().getSession(true);
session.invalidate();
Utils.doLogout();
}
catch(Exception ex)
{
ErrorLogger.logException( ex );
}
Utils.doLogout( getExternalContext(), false );
return "login";
}

22
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormRH.java
Unescape View File

@ -1383,27 +1383,7 @@ public class FormRH extends AbstractPageBean {
public String lnkLogout_action()
{
try
{
javax.servlet.http.HttpSession session =
(javax.servlet.http.HttpSession) getExternalContext().getSession(true);
session.invalidate();
Utils.doLogout();
}
catch ( Exception ex )
{
ErrorLogger.logException( ex );
}
try
{
getExternalContext().redirect( "Login.jsp" );
}
catch ( Exception e )
{
ErrorLogger.logException( e );
}
//return "login";
Utils.doLogout( getExternalContext(), true );
return null;
}

22
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormSeguranca.java
Unescape View File

@ -1524,27 +1524,7 @@ public class FormSeguranca extends AbstractPageBean {
public String lnkLogout_action()
{
try
{
javax.servlet.http.HttpSession session =
(javax.servlet.http.HttpSession) getExternalContext().getSession(true);
session.invalidate();
Utils.doLogout();
}
catch(Exception ex)
{
ErrorLogger.logException( ex );
}
try
{
getExternalContext().redirect("Login.jsp");
}
catch(Exception e)
{
ErrorLogger.logException( e );
}
//return "login";
Utils.doLogout( getExternalContext(), true );
return null;
}

15
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/GestaoUtilizadores.java
Unescape View File

@ -892,20 +892,7 @@ public class GestaoUtilizadores extends AbstractPageBean {
public String lnkLogout_action()
{
javax.servlet.http.HttpSession session =
(javax.servlet.http.HttpSession) getExternalContext().getSession( true );
session.invalidate();
Utils.doLogout();
try
{
getExternalContext().redirect( "Login.jsp" );
}
catch ( Exception e )
{
ErrorLogger.logException( e );
}
//return "login";
Utils.doLogout( getExternalContext(), true );
return null;
}

2
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Header.java
Unescape View File

@ -124,7 +124,7 @@ public class Header extends AbstractFragmentBean {
public String lnkLogout_action()
{
Utils.doLogout();
Utils.doLogout( getExternalContext(), false );
return null;
}
}

2
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/LoadImage.java
Unescape View File

@ -335,7 +335,7 @@ public class LoadImage extends AbstractPageBean {
public String lnkLogout_action()
{
Utils.doLogout();
Utils.doLogout( getExternalContext(), false );
return null;
}

9
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Login.java
Unescape View File

@ -29,6 +29,9 @@ import java.util.Calendar;
import java.util.GregorianCalendar;
import javax.faces.FacesException;
import javax.faces.component.html.HtmlPanelGrid;
import javax.faces.context.ExternalContext;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpSession;
import utils.Utils;
/**
@ -369,7 +372,11 @@ public class Login extends AbstractPageBean {
{
//if(u.getOwner_id().intValue() == 0 )
Utils.doLogin( u );
Utils.doLogin( getExternalContext(), u );
//Login Ok !
// if(u.getPrimeiro_login().matches("y") || mustChangePassword(u))

23
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/NovoUtilizador.java
Unescape View File

@ -1193,29 +1193,8 @@ public class NovoUtilizador extends AbstractPageBean {
public String lnkLogout_action()
{
try
{
javax.servlet.http.HttpSession session =
(javax.servlet.http.HttpSession) getExternalContext().getSession(true);
session.invalidate();
Utils.doLogout();
}
catch ( Exception ex )
{
}
try
{
getExternalContext().redirect( "Login.jsp" );
}
catch ( Exception e )
{
}
//return "login";
Utils.doLogout( getExternalContext(), true );
return null;
}
public void drpTipo_processValueChange(ValueChangeEvent event) {

21
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/UtilizadorFields.java
Unescape View File

@ -906,25 +906,8 @@ public class UtilizadorFields extends AbstractPageBean {
public String lnkLogout_action()
{
try
{
javax.servlet.http.HttpSession session =
(javax.servlet.http.HttpSession) getExternalContext().getSession(true);
session.invalidate();
Utils.doLogout();
}
catch(Exception ex)
{
ErrorLogger.logException( ex );
}
try
{
getExternalContext().redirect("Login.jsp");
}
catch(Exception e)
{
ErrorLogger.logException( e );
}
Utils.doLogout( getExternalContext(), true );
return null;
}

23
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/ViewAnaliseAcidenteTrabalho.java
Unescape View File

@ -2323,28 +2323,7 @@ public class ViewAnaliseAcidenteTrabalho extends AbstractPageBean {
public String lnkLogout_action()
{
if ( getSessionBean1().isLoggedIn() )
{
try
{
javax.servlet.http.HttpSession session =
(javax.servlet.http.HttpSession) getExternalContext().getSession(true);
session.invalidate();
Utils.doLogout();
}
catch ( Exception ex )
{
}
}
try
{
getExternalContext().redirect( "Login.jsp" );
}
catch ( Exception e )
{
}
//return "login";
Utils.doLogout( getExternalContext(), true );
return null;
}

20
trunk/AnaliseAcidentesTrabalho/src/java/global/Global.java
Unescape View File

@ -181,25 +181,5 @@ public class Global {
}
}
}
// public static void redirectToPlanos( FacesContext fc, Utilizador currentUser )
// {
// String curUser = "?user=" + currentUser.getId().toString();
// String estab = "";
// if ( currentUser.getTipo().intValue() == Global.TIPO_UTILIZADOR_GESTOR )
// {
// estab = "&estab_gestor=" + currentUser.getEstabelecimento_gestor().intValue();
// }
// fc = fc.getCurrentInstance();
// try
// {
// JSFUtils.redirect(fc, Global.PLANOS_ACTUACAO_URL + curUser + estab);
// }
// catch(Exception ex)
// {
// ErrorLogger.logException( ex );
// }
// }
}

5
trunk/AnaliseAcidentesTrabalho/src/java/phaselistener/MainPhaseListener.java
Unescape View File

@ -60,14 +60,13 @@ public class MainPhaseListener implements PhaseListener
HttpServletRequest req = ( HttpServletRequest ) fc.getExternalContext().getRequest();
boolean sessionValid = req.isRequestedSessionIdValid();
System.out.println( "\tSessionValid : " + sessionValid );
UIViewRoot view = fc.getViewRoot();
System.out.println( "\tView : " + view );
String viewID = view.getViewId();
System.out.println( "\t\tView ID :" + viewID );
System.out.println( "\tView ID :" + viewID );
boolean loggedIn = session.isLoggedIn();
System.out.println( "\tSessionValid : " + sessionValid );
System.out.println( "\tLogged In : " + loggedIn );
if ( sessionValid && loggedIn )

33
trunk/AnaliseAcidentesTrabalho/src/java/phaselistener/SessionListener.java
Unescape View File

@ -0,0 +1,33 @@
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package phaselistener;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
/**
*
* @author dneves
*/
public class SessionListener implements HttpSessionListener
{
@Override
public void sessionCreated( HttpSessionEvent se )
{
HttpSession session = se.getSession();
System.out.println( "AnaliseAcidentesTrabalho : new Session Created : " + session.getId() );
}
@Override
public void sessionDestroyed( HttpSessionEvent se )
{
HttpSession session = se.getSession();
System.out.println( "AnaliseAcidentesTrabalho : session destroyed : " + session.getId() );
}
}

7
trunk/AnaliseAcidentesTrabalho/src/java/utils/JSFUtils.java
Unescape View File

@ -14,7 +14,6 @@ import javax.faces.context.FacesContext;
import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
/**
*
@ -89,12 +88,10 @@ public class JSFUtils {
// return false;
// }
public static void logout(FacesContext fc) throws Exception
public static void logout(FacesContext fc, boolean redirect ) throws Exception
{
ExternalContext ectx = fc.getCurrentInstance().getExternalContext();
HttpSession session = (HttpSession) ectx.getSession(false);
session.invalidate();
Utils.doLogout();
Utils.doLogout( ectx, redirect );
}
public static void navigateTo(FacesContext fc, String outcome)

49
trunk/AnaliseAcidentesTrabalho/src/java/utils/Utils.java
Unescape View File

@ -12,10 +12,16 @@ package utils;
import beans.Utilizador;
import com.evolute.utils.Singleton;
import com.evolute.utils.error.ErrorLogger;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.Map;
import javax.faces.context.ExternalContext;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpSession;
/**
*
@ -386,11 +392,21 @@ public class Utils {
}
public static void doLogin( Utilizador u )
public static void doLogin( ExternalContext ec, Utilizador u )
{
if ( u != null )
{
Singleton.setInstance( Singleton.USERNAME, u.getLogin() );
HttpSession session = ( HttpSession ) ec.getSession( true );
ServletContext thisContext = session.getServletContext().getContext( "/AnaliseAcidentesTrabalho" );
Map< String, Object > mapData = new HashMap< String, Object >();
mapData.put( "sessionID", session.getId() );
mapData.put( "userID", u.getId() );
mapData.put( "session", session );
thisContext.setAttribute( session.getId(), mapData );
}
else
{
@ -398,9 +414,38 @@ public class Utils {
}
}
public static void doLogout()
public static void doLogout( ExternalContext ec, boolean redirect )
{
Singleton.setInstance( Singleton.USERNAME, null );
HttpSession session = ( HttpSession ) ec.getSession( true );
String sessionID = session.getId();
ServletContext aatContext = session.getServletContext().getContext( "/AnaliseAcidentesTrabalho" );
ServletContext paContext = aatContext.getContext( "/PlanosActuacao" );
aatContext.removeAttribute( sessionID );
Map< String, Object > mapData = ( Map< String, Object > ) paContext.getAttribute( sessionID );
if ( mapData != null )
{
HttpSession paSession = ( HttpSession ) mapData.get( "session" );
paSession.invalidate();
}
paContext.removeAttribute( sessionID );
session.invalidate();
if ( redirect )
{
try
{
ec.redirect( "Login.jsp" );
}
catch ( IOException ex )
{
ErrorLogger.logException( ex );
}
}
}
}

4
trunk/AnaliseAcidentesTrabalho/web/WEB-INF/web.xml
Unescape View File

@ -103,9 +103,9 @@
</jsp-property-group>
</jsp-config>
<!-- <listener>
<listener>
<listener-class>phaselistener.SessionListener</listener-class>
</listener>-->
</listener>
<!-- <security-constraint>
<web-resource-collection>

Write Preview
Loading…
Cancel
Save