WebSVN - bacoAlunos - Path Comparison - / Rev 115 and / Rev 127

Ignore whitespace Rev 115 → Rev 127

 /impl/conf/language/MessageResourcesAnnouncements.properties
 ,7 → 4,7
 #
 ################################################################################
 module.Announcements=Anúncios
+a
 announcement.title=Titulo
 announcement.text=Texto
 announcement.startDate=Data de Aparecimento
 ,7 → 14,8
 announcement.typeAnnouncement=Tipo
 announcement.sendAnnouncementLike=Enviar como
 announcement.priorityAnnouncement=Prioridade
-announcement.linkAnnouncement=Url
+announcement.linkAnnouncement=URL
+announcement.internalLinkAnnouncement=URL interno do sistema
 announcement.target.roles=Pessoas a quem destina
 announcement.created.success=Anúncio criado com sucesso
 announcement.edited.success=Anúncio alterado com sucesso
 ,3 → 32,12
 announcements.loading=carregando anúncio...
+announcement.style.img.left=Imagem à esquerda
+announcement.style.img.right=Imagem à direita
+announcement.style.img.top=Imagem em cima
+announcement.internal.url.include.yes=Incluir o conteudo
+announcement.internal.url.include.no=Referênciar o conteudo
+announcement.image.style=Estilo visual

 /impl/conf/app.properties
 ,7 → 2,7
 use.ldap=@use.ldap@
 system.language=pt
 #Session Settings
-user.session.timeout.minutes=15
+user.session.timeout.minutes=30
 email.server=mail.estgp.pt
 email.user=
 ,5 → 141,11
 search.best.fragments.max.fragments=3
+#########################################################################
+# Imports SIGoES
+#
+siges.institution.code=1

 /impl/conf/berserk/sd.xml
 ,6 → 223,38
         </filterChains>
     </service>
+    <!--Import Services-->
+    <service>
+        <name>ImportCourseServices</name>
+        <implementationClass>pt.estgp.estgweb.services.sigesimports.ImportCourseService</implementationClass>
+        <description>Service to call SiGesWEB Service and import Courses and Course Units</description>
+        <isTransactional>true</isTransactional>
+        <filterChains>
+            <chain name="Logger"/>
+            <chain name="Supers"/>
+        </filterChains>
+    </service>
+    <service>
+        <name>ImportStudentServices</name>
+        <implementationClass>pt.estgp.estgweb.services.sigesimports.ImportStudentService</implementationClass>
+        <description>Service to call SiGesWEB Service and import Students and Course Units</description>
+        <isTransactional>true</isTransactional>
+        <filterChains>
+            <chain name="Logger"/>
+            <chain name="Supers"/>
+        </filterChains>
+    </service>
+    <service>
+        <name>ImportTeacherServices</name>
+        <implementationClass>pt.estgp.estgweb.services.sigesimports.ImportTeachersService</implementationClass>
+        <description>Service to call SiGesWEB Service and import Teachers and Course Units</description>
+        <isTransactional>true</isTransactional>
+        <filterChains>
+            <chain name="Logger"/>
+            <chain name="Supers"/>
+        </filterChains>
+    </service>
     <!--ProfileServices-->
     <service>
         <name>LoadUserById</name>
 ,6 → 264,7
         <filterChains>
             <chain name="Logger"/>
             <chain name="Session"/>
+            <chain name="OwnerLoadProfile"/>
         </filterChains>
     </service>
     <service>
 ,6 → 275,7
         <filterChains>
             <chain name="Logger"/>
             <chain name="Session"/>
+            <chain name="OwnerUpdateProfile"/>
         </filterChains>
     </service>
     <service>

 /impl/conf/berserk/fcd.xml
 ,6 → 27,13
                 <invocationTiming>1</invocationTiming>
                 <filterClass>pt.estgp.estgweb.filters.chains.AdminControlFilter</filterClass>
         </filterChain>
+    <filterChain>
+                <name>Supers</name>
+                <expression>AuthenticatedUsers &amp;&amp; RoleUsers("super")</expression>
+                <description>Super Users Control Chain</description>
+                <invocationTiming>1</invocationTiming>
+                <filterClass>pt.estgp.estgweb.filters.chains.AdminControlFilter</filterClass>
+        </filterChain>
     <!--Generic Owners: need object in service paramenters-->
     <filterChain>
 ,4 → 95,24
                 <invocationTiming>1</invocationTiming>
                 <filterClass>pt.estgp.estgweb.filters.chains.ContextControlFilter</filterClass>
         </filterChain>
+    <!--Profile-->
+    <filterChain>
+        <name>OwnerLoadProfile</name>
+        <expression>OwnerUsersClass("serializable","pt.estgp.estgweb.domain.User")</expression>
+        <description>Owner of an object Control Chain</description>
+        <invocationTiming>1</invocationTiming>
+        <filterClass>pt.estgp.estgweb.filters.chains.LoadControlFilter</filterClass>
+    </filterChain>
+    <filterChain>
+        <name>OwnerUpdateProfile</name>
+        <expression>OwnerUsersClass("object.serializable","pt.estgp.estgweb.domain.User")</expression>
+        <description>Owner of an object Control Chain</description>
+        <invocationTiming>1</invocationTiming>
+        <filterClass>pt.estgp.estgweb.filters.chains.LoadControlFilter</filterClass>
+    </filterChain>
 </filterChainsDefinitions>

/impl/src/java/pt/estgp/estgweb/Globals.java
3,6 → 3,7
import pt.estgp.estgweb.utils.ConfigProperties;

import java.util.List;
import java.math.BigDecimal;

/**
* @author Jorge Machado
37,5 → 38,6

public static final String STUDENT_ROLE = ConfigProperties.getProperty("role.student");
public static final String TEACHER_ROLE = ConfigProperties.getProperty("role.teacher");
public static final BigDecimal SIGES_INSTITUTION_CODE = new BigDecimal(ConfigProperties.getIntProperty("siges.institution.code"));

}

 /impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportStudentService.java
 New file
 ,0 → 1,26
+package pt.estgp.estgweb.services.sigesimports;
+import org.apache.log4j.Logger;
+import pt.estgp.estgweb.services.expceptions.ServiceException;
+import pt.utl.ist.berserk.logic.serviceManager.IService;
+/**
+ * @author Jorge Machado
+ * @date 11/May/2008
+ * @time 12:51:32
+ * @see pt.estgp.estgweb
+ */
+public class ImportStudentService implements IService
+{
+    private static final Logger logger = Logger.getLogger(ImportStudentService.class);
+    public void run() throws ServiceException {
+    }
+}

 /impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportTeachersService.java
 New file
 ,0 → 1,97
+package pt.estgp.estgweb.services.sigesimports;
+import pt.utl.ist.berserk.logic.serviceManager.IService;
+import pt.estgp.estgweb.services.expceptions.ServiceException;
+import pt.estgp.estgweb.Globals;
+import pt.estgp.estgweb.domain.dao.DaoFactory;
+import pt.estgp.estgweb.domain.Teacher;
+import pt.estgp.estgweb.domain.DomainObjectFactory;
+import pt.estgp.estgweb.domain.CourseUnit;
+import pt.ipportalegre.siges.web.services.*;
+import org.apache.log4j.Logger;
+import java.util.*;
+import java.math.BigDecimal;
+import jomm.dao.impl.AbstractDao;
+/**
+ * @author Jorge Machado
+ * @date 11/May/2008
+ * @time 12:51:32
+ * @see pt.estgp.estgweb
+ */
+public class ImportTeachersService implements IService
+{
+    private static final Logger logger = Logger.getLogger(ImportTeachersService.class);
+    public void run() throws ServiceException
+    {
+        //todo passar para um utilitario que cria automaticamente o ano lectivo
+        String year = "200708";
+        SiGesWEB service = new SiGesWEB();
+        ArrayOfDecimal codigosDocentes = service.getSiGesWEBSoap().getCodigosDocentesInscritosDaInstituicao(Globals.SIGES_INSTITUTION_CODE,year);
+        List<BigDecimal> codigos = codigosDocentes.getDecimal();
+        for(BigDecimal c: codigos)
+        {
+            Docente d = service.getSiGesWEBSoap().getDocente(c,Globals.SIGES_INSTITUTION_CODE,year);
+            Teacher t = DaoFactory.getTeacherDaoImpl().loadBySigesCode(d.getCodigoFuncionario().intValue());
+            if(t == null)
+            {
+                t = DomainObjectFactory.createTeacherImpl();
+                DaoFactory.getTeacherDaoImpl().save(t);
+            }
+            persist(d,t);
+        }
+    }
+    /**
+     * Nao esta testado
+     * jm
+     * @param d docente
+     * @param t teacher
+     */
+    private void persist(Docente d, Teacher t)
+    {
+        t.setName(d.getNomeFuncionarioInt());
+        t.setEmail(d.getEmail());
+        t.setSigesCode(d.getCodigoFuncionario().intValue());
+        t.setAddress(d.getMorada());
+        t.setZip(""+d.getCodigoPostal().intValue());
+        t.setBi(d.getNumeroBi());
+        t.setEmployerName(d.getNomeFuncionario());
+        t.setAcademicName(d.getNomeAcademico());
+        t.setBirthDate(d.getDataNascimento().toGregorianCalendar().getTime());
+        //Desta forma as relacoes antigas sao ignoradas cria-se uma lista nova e atribui-se ao Teacher, o Hibernate faz resto e apaga as chaves estrangeiras antigas
+        if(d.getDisciplinas() == null || d.getDisciplinas().getDecimal() == null || d.getDisciplinas().getDecimal().size() == 0)
+            logger.warn("ATENTION TEACHER WITH ZERO UNITS: codigoFuncionario " + d.getCodigoFuncionario());
+        else
+        {
+            Set<CourseUnit> units = new HashSet<CourseUnit>();
+            for(BigDecimal unitCode: d.getDisciplinas().getDecimal())
+            {
+                CourseUnit c = DaoFactory.getCourseUnitDaoImpl().loadBySigesCode("" + unitCode.intValue());
+                if(c != null)
+                    units.add(c);
+                else
+                    logger.warn("ATENTION SIGES COURSE UNIT NOT FOUND IN BACO STORAGE: curseUnit " + unitCode.intValue());
+            }
+            t.setTeachedUnits(units);
+        }
+    }
+    /**
+     * Testar por aqui poi requer Super Role e assim e' autmatico
+     * @param args of main
+     * @throws ServiceException on error
+     */
+    public static void main(String[]args) throws ServiceException
+    {
+        AbstractDao.getCurrentSession().beginTransaction();
+        new ImportTeachersService().run();
+        AbstractDao.getCurrentSession().getTransaction().commit();
+    }
+}

 /impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportCourseService.java
 ,6 → 6,8
 import pt.estgp.estgweb.domain.views.BlogView;
 import pt.estgp.estgweb.domain.Blog;
 import pt.estgp.estgweb.domain.UserSession;
+import pt.estgp.estgweb.domain.CourseUnit;
+import pt.estgp.estgweb.domain.DomainObjectFactory;
 import pt.estgp.estgweb.domain.dao.DaoFactory;
 import pt.estgp.estgweb.Globals;
 import pt.ipportalegre.siges.web.services.*;
 ,6 → 16,8
 import java.util.*;
 import java.math.BigDecimal;
+import jomm.dao.impl.AbstractDao;
 /*
  * @author Goncalo Luiz gedl [AT] rnl [DOT] ist [DOT] utl [DOT] pt
  *
 ,7 → 48,15
             disciplinasMap.put(d.getCodigo().intValue(),d);
             cursosMap.put(d.getCodigoCurso().intValue(),d);
             System.out.println(d.getNome() + " " + d.getNomeCurso());
+            CourseUnit c = DomainObjectFactory.createCourseUnitImpl();
+            c.setName(d.getNome());
+            c.setInstitutionCode(""+Globals.SIGES_INSTITUTION_CODE);
+            c.setCode("" + d.getCodigo().intValue());
+            c.setCourseCode(""+d.getCodigoCurso());
+            c.setCourseName("" + d.getNomeCurso());
+            DaoFactory.getCourseUnitDaoImpl().save(c);
         }
         Set<Map.Entry<Integer,Disciplina>> set = disciplinasMap.entrySet();
 ,11 → 93,16
     }
     public static void main(String[]args) throws ServiceException {
+        AbstractDao.getCurrentSession().beginTransaction();
         new ImportCourseService().run();
+        AbstractDao.getCurrentSession().getTransaction().commit();
     }

 /impl/src/java/pt/estgp/estgweb/domain/UserManagedRoleImpl.java
 ,11 → 12,11
     }
-    public UserManagedRoleImpl(Date saveDate, boolean superuser, String name, String username, String password, String roles, String address, String zip, String country, String email, String phonenumber, Set<Group> groups, Set<CourseUserAssociation> courses) {
-        super(saveDate, superuser, name, username, password, roles, address, zip, country, email, phonenumber, groups, courses);
+    public UserManagedRoleImpl(Date saveDate, boolean superuser, String name, String username, String password, String roles, String address, String zip, String country, String email, String outEmail, String phonenumber, String sex, String bi, Date birthDate, Set<Group> groups, Set<CourseUserAssociation> courses)
+    {
+        super(saveDate, superuser, name, username, password, roles, address, zip, country, email, outEmail, phonenumber, sex, bi, birthDate,  groups,  courses);
     }
     /**
      *
      * @return the managed role of implementation object

 /impl/src/java/pt/estgp/estgweb/domain/UserImpl.java
 ,11 → 2,10
 import pt.estgp.estgweb.utils.RoleManager;
+import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.Set;
-import java.io.Serializable;
 /**
  * @author Jorge Machado
 ,11 → 19,13
     public UserImpl()
     {}
-    public UserImpl(Date saveDate, boolean superuser, String name, String username, String password, String roles, String address, String zip, String country, String email, String phonenumber, Set<Group> groups, Set<CourseUserAssociation> courses) {
-        super(saveDate, superuser, name, username, password, roles, address, zip, country, email, phonenumber, groups, courses);
+    public UserImpl(Date saveDate, boolean superuser, String name, String username, String password, String roles, String address, String zip, String country, String email, String outEmail, String phonenumber, String sex, String bi, Date birthDate, Set<Group> groups, Set<CourseUserAssociation> courses)
+    {
+        super(saveDate, superuser, name, username, password, roles, address, zip, country, email, outEmail, phonenumber, sex, bi, birthDate,  groups,  courses);
     }
     public boolean isNewUser() {
         return newUser;
     }
 ,4 → 85,9
     {
         return getId();
     }
+    public User getOwner()
+    {
+        return this;
+    }
 }

 /impl/src/java/pt/estgp/estgweb/domain/enums/AnnoucementStyleEnum.java
 New file
 ,0 → 1,37
+package pt.estgp.estgweb.domain.enums;
+/**
+ * Created by IntelliJ IDEA.
+ * User: Jorge Machado
+ * Date: 14/Mai/2008
+ * Time: 12:24:35
+ * To change this template use File | Settings | File Templates.
+ */
+public enum AnnoucementStyleEnum {
+    imgLeft("announcement.style.img.left"),
+    imgRight("announcement.style.img.right"),
+    imgTop("announcement.style.img.top");
+    private String messageKey;
+    private AnnoucementStyleEnum(String messageKey)
+    {
+        this.messageKey = messageKey;
+    }
+    public String getMessageKey()
+    {
+        return messageKey;
+    }
+    public static AnnoucementStyleEnum parse(String type)
+    {
+        for(AnnoucementStyleEnum styleEnum: values())
+        {
+            if(styleEnum.getMessageKey().equals(type))
+                return styleEnum;
+        }
+        return null;
+    }
+}

 /impl/src/java/pt/estgp/estgweb/domain/views/AnnouncementView.java
 ,6 → 35,10
     private Integer counter;
     private boolean status;
     private long ownerID;
+    private String style;
+    private String internalUrlServer;
+    private String internalUrlPath;
+    private boolean internalUrlInclude;
     public AnnouncementView()
     {}
 ,6 → 61,10
         this.expireDate = announcement.getExpireDate();
         this.choosedOwnerRole = announcement.getChoosedOwnerRole();
         this.ownerID=announcement.getOwner().getId();
+        this.internalUrlServer = announcement.getInternalUrlServer();
+        this.internalUrlPath = announcement.getInternalUrlPath();
+        this.style = announcement.getStyle();
+        this.internalUrlInclude = announcement.isInternalUrlInclude();
     }
     public void persistViewInObject(Announcement announcement)
 ,9 → 81,45
         announcement.setStatus(status);
         announcement.setCounter(counter);
         announcement.setChoosedOwnerRole(choosedOwnerRole);
+        announcement.setInternalUrlServer(internalUrlServer);
+        announcement.setInternalUrlPath(internalUrlPath);
+        announcement.setStyle(style);
+        announcement.setInternalUrlInclude(internalUrlInclude);
     }
+    public boolean isInternalUrlInclude() {
+        return internalUrlInclude;
+    }
+    public void setInternalUrlInclude(boolean internalUrlInclude) {
+        this.internalUrlInclude = internalUrlInclude;
+    }
+    public String getStyle() {
+        return style;
+    }
+    public void setStyle(String style) {
+        this.style = style;
+    }
+    public String getInternalUrlPath() {
+        return internalUrlPath;
+    }
+    public void setInternalUrlPath(String internalUrlPath) {
+        this.internalUrlPath = internalUrlPath;
+    }
+    public String getInternalUrlServer() {
+        return internalUrlServer;
+    }
+    public void setInternalUrlServer(String internalUrlServer) {
+        this.internalUrlServer = internalUrlServer;
+    }
     public String getChoosedOwnerRole() {
         return choosedOwnerRole;
     }
 ,6 → 260,25
         return getText();
     }
+    public String getFormatedText()
+    {
+        if(text == null | text.trim().length() == 0)
+            return "";
+        String formatedText = text.replace(" ","&nbsp;");
+        StringBuilder finalFormatedText = new StringBuilder();
+        for(int i =0;i<formatedText.length();i++)
+        {
+            if(formatedText.charAt(i) == '\n')
+                finalFormatedText.append("<br>");
+            else if(formatedText.charAt(i) == '\t')
+                finalFormatedText.append("&nbsp;&nbsp;&nbsp;&nbsp;");
+            else
+                finalFormatedText.append(formatedText.charAt(i));
+        }
+        return finalFormatedText.toString();
+    }
     public Boolean getHaveAllText()
     {
         if(getType().equals("top.flash.news"))

 /impl/src/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitDaoImpl.java
 ,5 → 1,11
 package pt.estgp.estgweb.domain.dao.impl;
+import pt.estgp.estgweb.domain.CourseUnit;
+import static org.hibernate.criterion.Restrictions.*;
+import java.util.List;
+import java.util.Set;
 /**
  * @author Jorge Machado
  * @date 28/Fev/2008
 ,4 → 26,9
         return (CourseUnitDaoImpl) myInstance;
     }
+    public List<CourseUnit> loadBySigesCode(String sigesCode)
+    {
+        return  createCriteria().add(eq("code",sigesCode)).list();
+    }
 }

 /impl/src/java/pt/estgp/estgweb/domain/dao/impl/TeacherDaoImpl.java
 ,5 → 1,7
 package pt.estgp.estgweb.domain.dao.impl;
+import pt.estgp.estgweb.domain.Teacher;
+import static org.hibernate.criterion.Restrictions.*;
 /**
  * @author Jorge Machado
  * @date 28/Fev/2008
 ,6 → 19,10
         return (TeacherDaoImpl) myInstance;
     }
+    public Teacher loadBySigesCode(int sigesCode)
+    {
+        return (Teacher) createCriteria().add(eq("sigesCode",sigesCode)).uniqueResult();
+    }
 }

 /impl/src/java/pt/estgp/estgweb/domain/dao/impl/StudentDaoImpl.java
 ,5 → 1,8
 package pt.estgp.estgweb.domain.dao.impl;
+import pt.estgp.estgweb.domain.Student;
+import static org.hibernate.criterion.Restrictions.*;
 /**
  * @author Jorge Machado
  * @date 28/Fev/2008
 ,6 → 20,10
         return (StudentDaoImpl) myInstance;
     }
+    public Student loadBySigesCode(int sigesCode)
+    {
+        return (Student) createCriteria().add(eq("sigesCode",sigesCode)).uniqueResult();
+    }
 }

/impl/src/doc/questionarios/questionarios.EAP
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+ application/octet-stream

 /impl/src/hbm/pt/estgp/estgweb/domain/GenericUser.hbm.xml
 ,7 → 32,11
             <property name="zip" type="string"/>
             <property name="country" type="string"/>
             <property name="email" type="string"/>
+            <property name="outEmail" type="string"/>
             <property name="phonenumber" type="string"/>
+            <property name="sex" type="string"/>
+            <property name="bi" type="string"/>
+            <property name="birthDate" type="date"/>
             <set name="groups" table="group_users">
                 <key column="user_id"/>
                 <many-to-many column="group_id" class="pt.estgp.estgweb.domain.Group"/>
 ,6 → 50,8
                     <subclass name="pt.estgp.estgweb.domain.Student">
                         <meta attribute="extends">pt.estgp.estgweb.domain.UserManagedRoleImpl</meta>
                         <meta attribute="scope-class">public abstract</meta>
+                        <property name="sigesCode" type="int"/>
+                        <property name="userNameNetpa" type="string"/>
                         <set name="subscribedUnits" lazy="true">
                             <key column="studentId"/>
                             <many-to-many class="pt.estgp.estgweb.domain.CourseUnit" column="courseUnitId"/>
 ,6 → 61,10
                     <subclass name="pt.estgp.estgweb.domain.Teacher">
                         <meta attribute="extends">pt.estgp.estgweb.domain.UserManagedRoleImpl</meta>
                         <meta attribute="scope-class">public abstract</meta>
+                        <property name="sigesCode" type="int"/>
+                        <property name="userNameNetpa" type="string"/>
+                        <property name="academicName" type="string"/>
+                        <property name="employerName" type="string"/>
                         <set name="teachedUnits" lazy="true">
                             <key column="studentId"/>
                             <many-to-many class="pt.estgp.estgweb.domain.CourseUnit" column="courseUnitId"/>

 /impl/src/hbm/pt/estgp/estgweb/domain/Announcement.hbm.xml
 ,6 → 22,10
         <property name="targetRoles" type="text"/>
         <property name="type" type="string" />
         <property name="url" type="string"/>
+        <property name="internalUrlPath" type="string"/>
+        <property name="internalUrlServer" type="string"/>
+        <property name="internalUrlInclude" type="boolean"/>
+        <property name="style" type="string"/>
         <property name="status" type="boolean" />
         <property name="counter" type="integer" />
         <many-to-one name="bigImage" column="bigImage" class="pt.estgp.estgweb.domain.Image" lazy="no-proxy" outer-join="false" cascade="all" />

 /impl/src/web/admin/profile/findUser.jsp
 New file
 ,0 → 1,43
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld"  prefix="bean" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld"  prefix="logic" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-html.tld"  prefix="html" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-nested.tld"  prefix="nested" %>
+<%@ taglib uri="/WEB-INF/tlds/jomm.tld"  prefix="jomm" %>
+<jsp:useBean id="ProfileForm" class="pt.estgp.estgweb.web.form.profile.ProfileForm"/>
+<jomm:messages/>
+<html:form action="/profile">
+    <input type="hidden" name="dispatch" value="search">
+    <html:hidden property="userView.id"/>
+    <html:hidden property="userView.userRoles"/>
+    <table class="form">
+        <tr>
+            <th>
+                <bean:message key="profile.search.user"/>
+            </th>
+            <td>
+                <html:text property="textToSearch" maxlength="50"/>
+            </td>
+            <td>
+                <input type="button" onclick="set(this.form,'search');this.form.submit()"  value="<bean:message key="search"/>">
+            </td>
+            <td>
+                <logic:present name="ProfileForm" property="usersFind">
+                    <logic:iterate id="item" name="ProfileForm" property="usersFind">
+                        <jomm:option itemName="item" comparableObjectName="ProfileForm" comparableObjectProperty="userView.name">
+                            <bean:message key="${item}"/>
+                        </jomm:option>
+                    </logic:iterate>
+                </logic:present>
+            </td>
+        </tr>
+    </table>
+    <logic:iterate id="userView" name="ProfileForm" property="usersFind" type="pt.estgp.estgweb.domain.views.UserView">
+       ${userView.name}<br/>
+    </logic:iterate>
+</html:form>

 /impl/src/web/admin/profile/profile.jsp
 New file
 ,0 → 1,56
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld"  prefix="bean" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld"  prefix="logic" %>
+<%@ taglib uri="/WEB-INF/tlds/struts-html.tld"  prefix="html" %>
+<%@ taglib uri="/WEB-INF/tlds/jomm.tld"  prefix="jomm" %>
+<jomm:messages/>
+<html:form action="/profile">
+    <input type="hidden" name="dispatch" value="editUser">
+    <html:hidden property="userView.id"/>
+    <html:hidden property="userView.userRoles"/>
+    <bean:message key="profile.edit"/>
+    <table class="form">
+        <tr>
+            <th><bean:message key="login.firts.time.name"/></th>
+            <td>
+                <html:text property="userView.name" maxlength="250"/>
+            </td>
+        </tr>
+        <tr>
+            <th><bean:message key="login.first.time.address"/></th>
+            <td>
+                <html:text property="userView.address" maxlength="250"/>
+            </td>
+        </tr>
+        <tr>
+            <th><bean:message key="login.first.time.zip"/></th>
+            <td>
+                <html:text property="userView.zip" maxlength="8"/>
+            </td>
+        </tr>
+        <tr>
+            <th><bean:message key="login.first.time.country"/></th>
+            <td>
+                <html:text property="userView.country" maxlength="100"/>
+            </td>
+        </tr>
+        <tr>
+            <th><bean:message key="login.first.time.email"/></th>
+            <td>
+                <html:text property="userView.email" maxlength="250"/>
+            </td>
+        </tr>
+        <tr>
+            <th><bean:message key="login.first.time.phone.number"/></th>
+            <td>
+                <html:text property="userView.phonenumber" maxlength="250"/>
+            </td>
+        </tr>
+        <tr class="buttons">
+            <td colspan="2">
+                <input type="button" onclick="set(this.form,'editUser');this.form.submit()" value="<bean:message key="confirm"/>"/>
+            </td>
+        </tr>
+    </table>
+</html:form>

 /impl/src/web/admin/announcements/submitAnnouncement.jsp
 ,6 → 148,20
 <tr>
     <th>
+        <bean:message key="announcement.image.style"/>
+    </th>
+    <td>
+        <html:select property="announcementView.style">
+            <html:option value="announcement.style.img.left"><bean:message key="announcement.style.img.left"/></html:option>
+            <html:option value="announcement.style.img.right"><bean:message key="announcement.style.img.right"/></html:option>
+            <html:option value="announcement.style.img.top"><bean:message key="announcement.style.img.top"/></html:option>
+        </html:select>
+    </td>
+</tr>
+<tr>
+    <th>
         <bean:message key="announcement.linkAnnouncement"/>
     </th>
     <td>
 ,8 → 173,27
         <html:text property="url" maxlength="250"/>
     </td>
 </tr>
 <tr>
     <th>
+        <bean:message key="announcement.internalLinkAnnouncement"/>
+    </th>
+    <td>
+        <html:select property="announcementView.internalUrlServer">
+            <html:option value="true"><bean:message key="announcement.internal.url.include.yes"/></html:option>
+            <html:option value="false"><bean:message key="announcement.internal.url.include.no"/></html:option>
+        </html:select>
+        <html:text property="announcementView.internalUrlPath"/>
+        <html:select property="announcementView.internalUrlServer">
+            <html:option value="estg">ESTG</html:option>
+            <html:option value="ionline">IONLINE</html:option>
+        </html:select>
+    </td>
+</tr>
+<tr>
+    <th>
         <bean:message key="announcement.text"/>
     </th>
     <td>

 /impl/src/web/public/announcements/loadAnnouncement.jsp
 ,7 → 34,7
     <%
         }
     %>
-    ${Announcement.text}
+    ${Announcement.formatedText}
     <%
         if(Announcement.getUrl()!=null)
         {

/impl/gen/java/pt/estgp/estgweb/domain/Course.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/CourseUnit.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/UrlStatMonth.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/UrlStatDayId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9

/impl/gen/java/pt/estgp/estgweb/domain/SessionObject.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/GenericUser.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /impl/gen/java/pt/estgp/estgweb/domain/Teacher.java
 ,5 → 1,5
 package pt.estgp.estgweb.domain;
-// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
+// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
 import java.util.Date;
 ,16 → 12,52
 public abstract class Teacher extends pt.estgp.estgweb.domain.UserManagedRoleImpl implements java.io.Serializable {
+     private int sigesCode;
+     private String userNameNetpa;
+     private String academicName;
+     private String employerName;
      private Set<CourseUnit> teachedUnits = new HashSet<CourseUnit>(0);
     public Teacher() {
     }
-    public Teacher(Date saveDate, boolean superuser, String name, String username, String password, String roles, String address, String zip, String country, String email, String phonenumber, Set<Group> groups, Set<CourseUserAssociation> courses, Set<CourseUnit> teachedUnits) {
-        super(saveDate, superuser, name, username, password, roles, address, zip, country, email, phonenumber, groups, courses);
+    public Teacher(Date saveDate, boolean superuser, String name, String username, String password, String roles, String address, String zip, String country, String email, String outEmail, String phonenumber, String sex, String bi, Date birthDate, Set<Group> groups, Set<CourseUserAssociation> courses, int sigesCode, String userNameNetpa, String academicName, String employerName, Set<CourseUnit> teachedUnits) {
+        super(saveDate, superuser, name, username, password, roles, address, zip, country, email, outEmail, phonenumber, sex, bi, birthDate, groups, courses);
+       this.sigesCode = sigesCode;
+       this.userNameNetpa = userNameNetpa;
+       this.academicName = academicName;
+       this.employerName = employerName;
        this.teachedUnits = teachedUnits;
     }
+    public int getSigesCode() {
+        return this.sigesCode;
+    }
+    public void setSigesCode(int sigesCode) {
+        this.sigesCode = sigesCode;
+    }
+    public String getUserNameNetpa() {
+        return this.userNameNetpa;
+    }
+    public void setUserNameNetpa(String userNameNetpa) {
+        this.userNameNetpa = userNameNetpa;
+    }
+    public String getAcademicName() {
+        return this.academicName;
+    }
+    public void setAcademicName(String academicName) {
+        this.academicName = academicName;
+    }
+    public String getEmployerName() {
+        return this.employerName;
+    }
+    public void setEmployerName(String employerName) {
+        this.employerName = employerName;
+    }
     public Set<CourseUnit> getTeachedUnits() {
         return this.teachedUnits;
     }

 /impl/gen/java/pt/estgp/estgweb/domain/User.java
 ,5 → 1,5
 package pt.estgp.estgweb.domain;
-// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
+// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
 import java.util.Date;
 ,14 → 19,18
      private String zip;
      private String country;
      private String email;
+     private String outEmail;
      private String phonenumber;
+     private String sex;
+     private String bi;
+     private Date birthDate;
      private Set<Group> groups = new HashSet<Group>(0);
      private Set<CourseUserAssociation> courses = new HashSet<CourseUserAssociation>(0);
     public User() {
     }
-    public User(Date saveDate, boolean superuser, String name, String username, String password, String roles, String address, String zip, String country, String email, String phonenumber, Set<Group> groups, Set<CourseUserAssociation> courses) {
+    public User(Date saveDate, boolean superuser, String name, String username, String password, String roles, String address, String zip, String country, String email, String outEmail, String phonenumber, String sex, String bi, Date birthDate, Set<Group> groups, Set<CourseUserAssociation> courses) {
         super(saveDate, superuser, name);
        this.username = username;
        this.password = password;
 ,7 → 39,11
        this.zip = zip;
        this.country = country;
        this.email = email;
+       this.outEmail = outEmail;
        this.phonenumber = phonenumber;
+       this.sex = sex;
+       this.bi = bi;
+       this.birthDate = birthDate;
        this.groups = groups;
        this.courses = courses;
     }
 ,6 → 97,13
     public void setEmail(String email) {
         this.email = email;
     }
+    public String getOutEmail() {
+        return this.outEmail;
+    }
+    public void setOutEmail(String outEmail) {
+        this.outEmail = outEmail;
+    }
     public String getPhonenumber() {
         return this.phonenumber;
     }
 ,6 → 111,27
     public void setPhonenumber(String phonenumber) {
         this.phonenumber = phonenumber;
     }
+    public String getSex() {
+        return this.sex;
+    }
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getBi() {
+        return this.bi;
+    }
+    public void setBi(String bi) {
+        this.bi = bi;
+    }
+    public Date getBirthDate() {
+        return this.birthDate;
+    }
+    public void setBirthDate(Date birthDate) {
+        this.birthDate = birthDate;
+    }
     public Set<Group> getGroups() {
         return this.groups;
     }

/impl/gen/java/pt/estgp/estgweb/domain/UrlStatYear.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/UrlStatMonthId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9

/impl/gen/java/pt/estgp/estgweb/domain/UserSession.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/Image.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/GenericUserDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/TeacherDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UserDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatYearDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatMonthIdDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UserSessionDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/ImageDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BlogDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/TesteDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/StudentDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SessionObjectIdDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/BlogPostDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/AnnouncementDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUserAssociationDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/GroupDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatDayDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatYearIdDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatMonthDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/UrlStatDayIdDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/dao/impl/SessionObjectDao.java
1,5 → 1,5
package pt.estgp.estgweb.domain.dao.impl;
// Generated 11/Mai/2008 15:29:44 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:39 by Hibernate Tools 3.2.0.b9


import org.apache.log4j.Logger;

/impl/gen/java/pt/estgp/estgweb/domain/Blog.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/Teste.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /impl/gen/java/pt/estgp/estgweb/domain/Student.java
 ,5 → 1,5
 package pt.estgp.estgweb.domain;
-// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
+// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
 import java.util.Date;
 ,16 → 12,34
 public abstract class Student extends pt.estgp.estgweb.domain.UserManagedRoleImpl implements java.io.Serializable {
-    private Set<CourseUnit> subscribedUnits = new HashSet<CourseUnit>(0);
+     private int sigesCode;
+     private String userNameNetpa;
+     private Set<CourseUnit> subscribedUnits = new HashSet<CourseUnit>(0);
     public Student() {
     }
-    public Student(Date saveDate, boolean superuser, String name, String username, String password, String roles, String address, String zip, String country, String email, String phonenumber, Set<Group> groups, Set<CourseUserAssociation> courses, Set<CourseUnit> subscribedUnits) {
-        super(saveDate, superuser, name, username, password, roles, address, zip, country, email, phonenumber, groups, courses);
+    public Student(Date saveDate, boolean superuser, String name, String username, String password, String roles, String address, String zip, String country, String email, String outEmail, String phonenumber, String sex, String bi, Date birthDate, Set<Group> groups, Set<CourseUserAssociation> courses, int sigesCode, String userNameNetpa, Set<CourseUnit> subscribedUnits) {
+        super(saveDate, superuser, name, username, password, roles, address, zip, country, email, outEmail, phonenumber, sex, bi, birthDate, groups, courses);
+       this.sigesCode = sigesCode;
+       this.userNameNetpa = userNameNetpa;
        this.subscribedUnits = subscribedUnits;
     }
+    public int getSigesCode() {
+        return this.sigesCode;
+    }
+    public void setSigesCode(int sigesCode) {
+        this.sigesCode = sigesCode;
+    }
+    public String getUserNameNetpa() {
+        return this.userNameNetpa;
+    }
+    public void setUserNameNetpa(String userNameNetpa) {
+        this.userNameNetpa = userNameNetpa;
+    }
     public Set<CourseUnit> getSubscribedUnits() {
         return this.subscribedUnits;
     }

/impl/gen/java/pt/estgp/estgweb/domain/SessionObjectId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9

/impl/gen/java/pt/estgp/estgweb/domain/BlogPost.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /impl/gen/java/pt/estgp/estgweb/domain/Announcement.java
 ,5 → 1,5
 package pt.estgp.estgweb.domain;
-// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
+// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9
 import java.util.Date;
 ,6 → 22,10
      private String targetRoles;
      private String type;
      private String url;
+     private String internalUrlPath;
+     private String internalUrlServer;
+     private boolean internalUrlInclude;
+     private String style;
      private boolean status;
      private Integer counter;
      private Image bigImage;
 ,7 → 35,7
     public Announcement() {
     }
-    public Announcement(Date saveDate, Date startDate, Date expireDate, String subTargets, String title, String choosedOwnerRole, String text, String targetRoles, String type, String url, boolean status, Integer counter, Image bigImage, Image smallImage, GenericUser owner) {
+    public Announcement(Date saveDate, Date startDate, Date expireDate, String subTargets, String title, String choosedOwnerRole, String text, String targetRoles, String type, String url, String internalUrlPath, String internalUrlServer, boolean internalUrlInclude, String style, boolean status, Integer counter, Image bigImage, Image smallImage, GenericUser owner) {
        this.saveDate = saveDate;
        this.startDate = startDate;
        this.expireDate = expireDate;
 ,6 → 46,10
        this.targetRoles = targetRoles;
        this.type = type;
        this.url = url;
+       this.internalUrlPath = internalUrlPath;
+       this.internalUrlServer = internalUrlServer;
+       this.internalUrlInclude = internalUrlInclude;
+       this.style = style;
        this.status = status;
        this.counter = counter;
        this.bigImage = bigImage;
 ,6 → 141,34
     public void setUrl(String url) {
         this.url = url;
     }
+    public String getInternalUrlPath() {
+        return this.internalUrlPath;
+    }
+    public void setInternalUrlPath(String internalUrlPath) {
+        this.internalUrlPath = internalUrlPath;
+    }
+    public String getInternalUrlServer() {
+        return this.internalUrlServer;
+    }
+    public void setInternalUrlServer(String internalUrlServer) {
+        this.internalUrlServer = internalUrlServer;
+    }
+    public boolean isInternalUrlInclude() {
+        return this.internalUrlInclude;
+    }
+    public void setInternalUrlInclude(boolean internalUrlInclude) {
+        this.internalUrlInclude = internalUrlInclude;
+    }
+    public String getStyle() {
+        return this.style;
+    }
+    public void setStyle(String style) {
+        this.style = style;
+    }
     public boolean isStatus() {
         return this.status;
     }

/impl/gen/java/pt/estgp/estgweb/domain/UrlStatDay.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/Group.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/CourseUserAssociation.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/gen/java/pt/estgp/estgweb/domain/UrlStatYearId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9

/impl/gen/java/pt/estgp/estgweb/domain/UrlStat.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 11/Mai/2008 16:10:05 by Hibernate Tools 3.2.0.b9
// Generated 14/Mai/2008 12:49:22 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/impl/etc/bugs/waiting/waiting.txt
--- impl/etc/bugs/resolved/resolved.txt (revision 0)
+++ impl/etc/bugs/resolved/resolved.txt (revision 127)
@@ -0,0 +1,34 @@
+2008-05-12 11:23:09,548 ERROR UserSessionFilter:doFilter():86 - java.lang.NullPointerException
+java.lang.NullPointerException
+ at pt.utl.ist.berserk.storage.FilterChainProxy.getExpression(FilterChainProxy.java:194)
+ at pt.utl.ist.berserk.logic.filterManager.FilterBroker.(FilterBroker.java:118)
+ at pt.utl.ist.berserk.logic.filterManager.FilterBrokerFactory.getFilterBroker(FilterBrokerFactory.java:171)
+ at pt.utl.ist.berserk.logic.serviceManager.ServiceManager$ServiceConfiguration.(ServiceManager.java:118)
+ at pt.utl.ist.berserk.logic.serviceManager.ServiceManager.registerService(ServiceManager.java:188)
+ at pt.utl.ist.berserk.logic.serviceManager.ServiceManager.registerServices(ServiceManager.java:171)
+ at pt.utl.ist.berserk.logic.serviceManager.ServiceManager.(ServiceManager.java:179)
+ at pt.utl.ist.berserk.logic.serviceManager.ServiceManager.getInstance(ServiceManager.java:199)
+ at pt.estgp.estgweb.web.UserSessionProxy.loadUserSession(UserSessionProxy.java:65)
+ at pt.estgp.estgweb.web.filters.UserSessionFilter.doFilter(UserSessionFilter.java:53)
+ at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215)
+ at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188)
+ at jomm.web.filter.SetCharacterEncodingFilter.doFilter(SetCharacterEncodingFilter.java:49)
+ at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215)
+ at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188)
+ at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:213)
+ at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:174)
+ at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:127)
+ at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:117)
+ at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:108)
+ at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:151)
+ at org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:874)
+ at org.apache.coyote.http11.Http11BaseProtocol$Http11ConnectionHandler.processConnection(Http11BaseProtocol.java:665)
+ at org.apache.tomcat.util.net.PoolTcpEndpoint.processSocket(PoolTcpEndpoint.java:528)
+ at org.apache.tomcat.util.net.LeaderFollowerWorkerThread.runIt(LeaderFollowerWorkerThread.java:81)
+ at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:689)
+ at java.lang.Thread.run(Thread.java:595)
+
+Resolu��o:
+Filter Chain com nome diferente do especificado no servi�o
+
+#########################################################################################################################################
\ No newline at end of file

Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 115 → Rev 127