WebSVN - bacoAlunos - Path Comparison - / Rev 223 and / Rev 226

Ignore whitespace Rev 223 → Rev 226

 /impl/local-exampleNotInUse.properties
 New file
 ,0 → 1,40
+##
+## Properties file to be used with ant build.xml
+##
+##database configuration
+database.host=localhost
+database.port=3306
+database.catalog=estgweb
+database.username=root
+database.password=
+hibernate.show.sql=false
+use.ldap=true
+#Paths configuration
+tomcat.home=C:/Servidores/apache-tomcat-6.0.16
+tomcat.libs.ant.home=${tomcat.home}/lib
+tomcat.libs.common.home=${tomcat.home}/lib
+tomcat.host=localhost
+tomcat.port=8080
+tomcat.url=http://${tomcat.host}:${tomcat.port}
+tomcat.manager=${tomcat.url}/manager
+tomcat.username=admin
+tomcat.password=admin
+#IF is ROOT use Nothing
+#example for ROOT:
+#        tomcat.context.path.install=/
+#        tomcat.context.path=
+#
+#example for /mitra:
+#        tomcat.context.path.install=/baco
+#        tomcat.context.path=/baco
+#
+tomcat.context.path.install=/baco
+tomcat.context.path=/baco
+tomcat.war.file=baco.war

 /impl/conf/language/MessageResourcesProfile.properties
 ,7 → 69,7
 profile.record.add.sucess=Registo adicionado com sucesso: {0}
 profile.record.deleted.sucess=Registo apagado com sucesso
 profile.email.change=*Para alterar o seu email dirija-se aos serviços centrais
+profile.record.confirm.delete=Tem a certeza que deseja apagar esta entrada do curriculum?
 #Dublin Core Fields
 profile.record.file=Ficheiro Electrónico
 profile.record.file.access=Acesso ao Ficheiro

/impl/conf/language/MessageResourcesAnnouncements.properties
8,6 → 8,7
module.Announcements=Anúncios
module.TodoAnnouncements=Urgentes

announcement.confirm.delete=Tem a certeza que deseja apagar este anúncio?


announcement.exceed.bigmage.max.size=Excedeu o tamanho maximo da imagem grande

 /impl/conf/WEB-INF/struts/tiles-courseunits.xml
 ,7 → 85,7
     <definition name="page.courseLayoutIOnline.proxy.ftp" extends="page.separators.home">
         <put name="title" value="Conteudos da Unidade Curricular"/>
         <put name="left" value="/user/courseunits/menu.jsp"/>
-        <put name="body" value="/user/courseunits/ftpclient.jsp"/>
+        <put name="body" value="/user/courseunits/ftpClient.jsp"/>
     </definition>
     <definition name="page.courseLayoutIOnlineContents.proxy.ftp" extends="page.courseLayoutIOnline.proxy.ftp">
         <put name="topnav" value="/user/home/topnavCourseUnitContents.jsp"/>

 /impl/conf/WEB-INF/struts/struts-profile.xml
 ,6 → 83,8
         <!-- Mudar o perfil pelo proprio utilizador -->
+        <action path="/user/startDeleteRecordProfile" forward="/user/profile.do?dispatch=deleteRecord"/>
+        <action path="/user/startChangeRecordProfile" forward="/user/profile.do?dispatch=loadEditRecord"/>
         <action path="/user/startCreateRecordProfile" forward="/user/profile.do?dispatch=createRecord"/>
         <action path="/user/startProfileFromHome" forward="/user/profile.do?dispatch=home&amp;from=Home"/>
         <action path="/user/startProfile" forward="/user/profile.do?dispatch=home&amp;from=Home"/>

 /impl/conf/WEB-INF/tlds/baco.tld
 ,6 → 107,20
         </attribute>
     </tag>
     <tag>
+        <name>isOwner</name>
+        <tagclass>pt.estgp.estgweb.web.tags.OwnerTag</tagclass>
+        <attribute>
+            <name>name</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>property</name>
+            <required>false</required>
+            <rtexprvalue>false</rtexprvalue>
+        </attribute>
+    </tag>
+    <tag>
         <name>isValid</name>
         <tagclass>pt.estgp.estgweb.web.tags.IsValidTag</tagclass>
         <attribute>

 /impl/conf/app.properties
 ,6 → 46,12
 estgweb.encoding=UTF-8
 estgp.encoding=UTF-8
+server.estgp2=http://www.estgp.pt/testes/nova_web
+#server.estgp=http://localhost:8080/estgweb
+estgp2.encoding=UTF-8
 ################################################
 ## Kinds of roles
 user.admin=admin

 /impl/conf/berserk/sd.xml
 ,8 → 100,6
     </service>
     <!--Announcements-->
     <service>
         <name>CreateAnnouncement</name>

 /impl/INSTALL
 New file
 ,0 → 1,113
+#########################################################################
+#
+# BACO is a LGPL project developed at ESTG / IPP Portalegre
+#  The main objective is to support school site and
+#  daily work and comunications between Teachers and Students
+#
+#
+# http://www.estgp.pt
+#
+# Preject Team Leader
+#
+#   Jorge Machado - jmachado AT estgp DOT pt
+#
+#########################################################################
+# Release 1.0 #
+SOFTWARE REQUIREMENTS
+JDK 5.0 or JDK 1.6.0_06 or superior (Middle versions between those two will bring problems in WEB SERVICES)
+Apache ANT to compile and build project
+MySql 4.1 or superior
+Tomcat 5.0 or Superior
+DOWNLOAD
+Download the last version from Site Project or from SVN http://deptal.estgp.pt:9090/svn/estgweb
+ANT CONFIGURATION
+Download and unzip ant for some local folder.
+Set Environement Variable ANT_HOME with that folder and add %ANT_HOME%/bin to PATH of your computer
+Test this instalation opening a shell pront and writing >ant If the command is recognized ANT is ready to run.
+It's natural system anwser you with:
+=============================================================================
+Buildfile: build.xml does not exist!
+Build failed
+=============================================================================
+This happens because you are not in a folder with a build.xml file
+TOMCAT CONFIGURATION
+Download and unzip tomcat in some folder. Go to conf/tomcat-users.xml and create role "manager" and a user with that role
+For example:
+=============================================================================
+<?xml version='1.0' encoding='utf-8'?>
+<tomcat-users>
+  <role rolename="manager"/>
+  <role rolename="tomcat"/>
+  <role rolename="role1"/>
+  <user username="tomcat" password="tomcat" roles="tomcat"/>
+  <user username="both" password="tomcat" roles="tomcat,role1"/>
+  <user username="admin" password="admin" roles="manager"/>
+</tomcat-users>
+=============================================================================
+If you are using not self install tomcat create a startup file like this:
+go to tomcat/bin
+=============================================================================
+set CATALINA_HOME=C:\Servidores\apache-tomcat-6.0.16
+set JAVA_OPTS=-Dfile.encoding=UTF-8 -Xmx512m -Xms128m -XX:NewRatio=1 -server
+set JAVA_OPTS=%JAVA_OPTS%
+startup.bat
+=============================================================================
+if you are running a self install server version after install tomcat as Service
+go to tomcat folder / bin and run tomcatXw.exe to set environement variables
+at JAVA_OPTS screen write:
+-Dfile.encoding=UTF-8
+and set min memory size to 128 and max memory size to 512
+INSTALL
+Place yourself in project dir / impl
+Copy and paste build.properties to local.properties, and change
+    - database configuration,
+    - tomcat location (in case of tomcat 5 carefully with libraries folders (see in build.properties) because are not the same in tomcat 6.0)
+See local-exampleNotInUse for example. Note that this is a minimal example. Some configurations will be takes by default.
+Do not include local.properties in SVN project
+Create a new Schema in MySql with the name used in local.properties and configure a user or let be root with no password
+At project/impl run
+>ant all
+If an error of log4j (No loggers found at routine generateHibernateDomain) appears to you stop and run it again
+IF build is a success run
+>ant build.war
+ And than
+>ant tomcat.deployContext
+If every thing goes well your system is running
+SYSTEM CONFIGURATION
+System configurations can be found at project/impl/conf/app.properties
+Web services configuration can be found in build.properties and you can override in local.properties
+SCRIPTS
+A set of schedulable scripts are created in build and placed in impl/build/ant/scripts.
+Some scripts are used to import CourseUnits, Students, Teachers and Grades from SIGES WEB-SERVICE
+There are a script to clean tmp. This script delete only old files with more than 24 hours, you can run it any time.

 /impl/src/java/jomm/utils/DosJarIncludePathGenerator.java
 ,17 → 21,30
     {
-        if(args == null || args.length != 3)
+        if(args == null || args.length != 4)
         {
-            System.out.println("USAGE: main <jarsStartDir> <targetDir> <targetFile>");
+            System.out.println("USAGE: main <jarsStartDir> <compiledClassesDir> <targetDir> <targetFile>");
             return;
         }
         String path = args[0];
-        String targetDir = args[1];
-        String targetFile = args[2];
-        String classpath = genDir(path,"");
+        String classesDir = args[1];
+        String targetDir = args[2];
+        String targetFile = args[3];
+        path = removeDotDot(path);
+        classesDir = removeDotDot(classesDir);
+        String classpath = classesDir + ";" + genDir(path,"");
+        System.out.println(classesDir);
+        System.out.println(classpath);
         new File(targetDir).mkdirs();
         FileWriter writer = new FileWriter(targetDir + SEPARATOR + targetFile);
+        writer.write("set " + BASE_ENV + "=" + path + "\n");
+        writer.write("set " + CLASSPATH_ENV + "=" + classpath + "\n");
+        writer.close();
+    }
+    public static String removeDotDot(String path)
+    {
         int dotdot = path.indexOf("..");
         if(dotdot >= 0)
         {
 ,9 → 53,7
             pathBeforeDotDot = pathBeforeDotDot.substring(0,lastIndexDotDotOfNewPath);
             path = pathBeforeDotDot + path.substring(dotdot + 2);
         }
-        writer.write("set " + BASE_ENV + "=" + path + "\n");
-        writer.write("set " + CLASSPATH_ENV + "=" + classpath + "\n");
-        writer.close();
+        return path;
     }
     private static String genDir(String path, String relative)

 /impl/src/java/pt/estgp/estgweb/services/courseunits/UsersUnitsService.java
 ,7 → 33,7
         {
             courseUnit.getTeachers().remove(t);
             courseUnit.getTeachers().add(t);
-            t.addUnitLocaly(courseUnitId);
+            t.addUnitLocaly(courseUnit);
             return loadCourseUnitService.run(courseUnitId,true,true,false,userSession);
         }
         else
 ,7 → 48,7
     {
         CourseUnit courseUnit = DaoFactory.getCourseUnitDaoImpl().get(courseUnitId);
         TeacherImpl t = (TeacherImpl) DaoFactory.getTeacherDaoImpl().get(teacherId);
-        t.removeUnitLocaly(courseUnitId);
+        t.removeUnitLocaly(courseUnit);
         courseUnit.getTeachers().remove(t);
         return loadCourseUnitService.run(courseUnitId,true,true,false,userSession);
     }
 ,7 → 61,7
         {
             courseUnit.getStudents().remove(s);
             courseUnit.getStudents().add(s);
-            s.addUnitLocaly(courseUnitId);
+            s.addUnitLocaly(courseUnit);
             return loadCourseUnitService.run(courseUnitId,true,true,false,userSession);
         }
         else
 ,7 → 77,7
         CourseUnit courseUnit = DaoFactory.getCourseUnitDaoImpl().get(courseUnitId);
         StudentImpl s = (StudentImpl) DaoFactory.getStudentDaoImpl().loadBySigesCode(code);
         courseUnit.getStudents().remove(s);
-        s.removeUnitLocaly(courseUnitId);
+        s.removeUnitLocaly(courseUnit);
         return loadCourseUnitService.run(courseUnitId,true,true,false,userSession);
     }
 }

 /impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportStudentsService.java
 ,9 → 13,7
 import pt.estgp.estgweb.services.logresults.LogMessageTypeEnum;
 import pt.estgp.estgweb.services.logresults.impl.DefaultLogMessages;
 import pt.estgp.estgweb.services.logresults.impl.DefaultLogMessage;
-import pt.ipportalegre.siges.web.services.Aluno;
-import pt.ipportalegre.siges.web.services.ArrayOfDecimal;
-import pt.ipportalegre.siges.web.services.SiGesWEB;
+import pt.ipportalegre.siges.web.services.*;
 import pt.utl.ist.berserk.logic.serviceManager.IService;
 import javax.xml.namespace.QName;
 ,24 → 129,28
         student.setUsername("a" + d.getCodigo().intValue());
         /*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.getDisciplinasInscrito() == null || d.getDisciplinasInscrito().getDecimal() == null || d.getDisciplinasInscrito().getDecimal().size() == 0)
+        if (d.getDisciplinasInscrito() == null || d.getDisciplinasInscrito().getDisciplina() == null || d.getDisciplinasInscrito().getDisciplina().size() == 0)
             logger.warn("ATENTION STUDENT WITH ZERO UNITS: codigo " + d.getCodigo());
         else
         {
             Set<CourseUnit> units = new HashSet<CourseUnit>();
-            for (BigDecimal unitCode : d.getDisciplinasInscrito().getDecimal())
+            ArrayOfDisciplina disciplinas = d.getDisciplinasInscrito();
+            for (Disciplina disciplina : disciplinas.getDisciplina())
             {
-                List<CourseUnit> l = DaoFactory.getCourseUnitDaoImpl().loadBySigesCode("" + unitCode.intValue());
-                if (l != null)
-                    units.addAll(l);
+                CourseUnit courseUnit = DaoFactory.getCourseUnitDaoImpl().loadBySigesCodeUnique("" + disciplina.getCodigo(),"" + disciplina.getCodigoCurso(),disciplina.getCdDuracao(),disciplina.getCdLectivo());
+                if(courseUnit == null)
+                {
+                    logger.warn("Unit not found: semestre:" + disciplina.getCdDuracao() + " codigo:" + disciplina.getCodigo() + " course:" + disciplina.getCodigoCurso() + " year:" + disciplina.getCdLectivo());
+                }
                 else
-                    logger.warn("ATENTION SIGES COURSE UNIT NOT FOUND IN BACO STORAGE: curseUnit " + unitCode.intValue());
+                    units.add(courseUnit);
             }
             Iterator<CourseUnit> iter = units.iterator();
             while (iter.hasNext())
             {
                 CourseUnit courseUnit = iter.next();
-                if(((StudentImpl)student).isLocalRemovedUnit(courseUnit.getId()))
+                if(((StudentImpl)student).isLocalRemovedUnit(courseUnit))
                     iter.remove();
             }
             student.setSubscribedUnits(units);

 /impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportTeachersService.java
 ,25 → 116,27
         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)
+        if (d.getDisciplinas() == null || d.getDisciplinas().getDisciplina() == null || d.getDisciplinas().getDisciplina().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())
+            for (Disciplina disciplina : d.getDisciplinas().getDisciplina())
             {
-                List<CourseUnit> l = DaoFactory.getCourseUnitDaoImpl().loadBySigesCode("" + unitCode.intValue());
+                CourseUnit courseUnit = DaoFactory.getCourseUnitDaoImpl().loadBySigesCodeUnique("" + disciplina.getCodigo(),"" + disciplina.getCodigoCurso(),"" + disciplina.getCdDuracao(),"" + disciplina.getCdLectivo());
-                if (l != null)
-                    units.addAll(l);
+                if(courseUnit == null)
+                {
+                    logger.warn("Unit not found: semestre:" + disciplina.getCdDuracao() + " codigo:" + disciplina.getCodigo() + " course:" + disciplina.getCodigoCurso() + " year:" + disciplina.getCdLectivo());
+                }
                 else
-                    logger.warn("ATENTION SIGES COURSE UNIT NOT FOUND IN BACO STORAGE: curseUnit " + unitCode.intValue());
+                    units.add(courseUnit);
             }
             Iterator<CourseUnit> iter = units.iterator();
             while (iter.hasNext())
             {
                 CourseUnit courseUnit = iter.next();
-                if(((TeacherImpl)t).isLocalRemovedUnit(courseUnit.getId()))
+                if(((TeacherImpl)t).isLocalRemovedUnit(courseUnit))
                     iter.remove();
             }
             t.setTeachedUnits(units);

 /impl/src/java/pt/estgp/estgweb/services/sigesimports/ImportCourseService.java
 ,10 → 143,12
         for (Map.Entry<String, Disciplina> entry : set)
         {
             Disciplina d = entry.getValue();
-            CourseUnit c = DaoFactory.getCourseUnitDaoImpl().loadBySigesCodeUnique("" + d.getCodigo(), "" + d.getCodigoCurso(), semestre);
+            CourseUnit c = DaoFactory.getCourseUnitDaoImpl().loadBySigesCodeUnique("" + d.getCodigo(), "" + d.getCodigoCurso(), semestre, year);
             if (c == null)
+            {
                 c = DomainObjectFactory.createCourseUnitImpl();
+                DaoFactory.getCourseUnitDaoImpl().save(c);DaoFactory.getCourseUnitDaoImpl().save(c);
+            }
             c.setName(d.getNome());
             c.setInstitutionCode("" + Globals.SIGES_INSTITUTION_CODE);
             c.setCode("" + d.getCodigo().intValue());
 ,7 → 158,7
             c.setImportYear(year);
             Course course = DaoFactory.getCourseDaoImpl().findCourseByCode(c.getCourseCode());
             c.setCourse(course);
-            DaoFactory.getCourseUnitDaoImpl().save(c);
         }
     }

 /impl/src/java/pt/estgp/estgweb/services/profile/CurriculumService.java
 ,9 → 40,13
     public UserView deleteRecord(long recordId, UserSession userSession) throws ServiceException
     {
         Record record = DaoFactory.getRecordDaoImpl().load(recordId);
-        RepositoryFile repositoryFile = DaoFactory.getRepositoryFileDaoImpl().loadByIdentifier(record.getRepositoryStream());
-        repositoryFile.setDeleted(true);
+        if(record.getRepositoryStream() != null && record.getRepositoryStream().length() > 0)
+        {
+            RepositoryFile repositoryFile = DaoFactory.getRepositoryFileDaoImpl().loadByIdentifier(record.getRepositoryStream());
+            repositoryFile.setDeleted(true);
+        }
         DaoFactory.getRecordDaoImpl().delete(record);
+        userSession.getUser().getCreatorRecords().remove(record);
         return loadUserViewWithRecords(record.getOwner().getId(),userSession);
     }
 ,7 → 55,7
         Record record = DaoFactory.getRecordDaoImpl().load(recordId);
         return new RecordView(record,true);
     }
     public UserView createRecord(RecordView recordView,InputStream file, String name, String contentType, int size, UserSession userSession) throws ServiceException
     {
         Record r;
 ,7 → 103,7
             return loadUserViewWithRecords(u.getId(),userSession);
         return null;
     }
     public UserView loadUserViewWithRecords(long id, UserSession userSession) throws ServiceException
     {
         User u;

 /impl/src/java/pt/estgp/estgweb/domain/StudentImpl.java
 ,7 → 95,7
         return hasCourseUnit(courseUnit.getId(),false);
     }
-    public boolean hasCourseUnit(long id, boolean transaction)
+    public boolean hasCourseUnit(long unitId, boolean transaction)
     {
         List<CourseUnit> cUnits;
         if(transaction)
 ,24 → 106,24
             return false;
         for(CourseUnit c: cUnits)
         {
-            if(c.getId() == id)
+            if(c.getId() == unitId)
                 return true;
         }
         return false;
     }
-    public void removeUnitLocaly(long id)
+    public void removeUnitLocaly(CourseUnit unit)
     {
-        setLocalRemovedSubscribedUnits(StringsUtils.addElement(getLocalRemovedSubscribedUnits(),"" + id,","));
+        setLocalRemovedSubscribedUnits(StringsUtils.addElement(getLocalRemovedSubscribedUnits(),"" + unit.getId(),","));
     }
-    public void addUnitLocaly(long id)
+    public void addUnitLocaly(CourseUnit unit)
     {
-        setLocalRemovedSubscribedUnits(StringsUtils.removeElement(getLocalRemovedSubscribedUnits(),"" + id,","));
+        setLocalRemovedSubscribedUnits(StringsUtils.removeElement(getLocalRemovedSubscribedUnits(),"" + unit.getId(),","));
     }
-    public boolean isLocalRemovedUnit(long id)
+    public boolean isLocalRemovedUnit(CourseUnit unit)
     {
-        return StringsUtils.hasElement(getLocalRemovedSubscribedUnits(),"" + id,",");
+        return StringsUtils.hasElement(getLocalRemovedSubscribedUnits(),"" + unit.getId(),",");
     }
 }

 /impl/src/java/pt/estgp/estgweb/domain/dao/impl/CourseUnitDaoImpl.java
 ,9 → 115,15
         return null;
     }
-    public CourseUnit loadBySigesCodeUnique(String sigesCode, String courseCode, String semestre)
+    public CourseUnit loadBySigesCodeUnique(String sigesCode, String courseCode, String semestre, String year)
     {
-        return (CourseUnit) createCriteria().add(eq("code", sigesCode)).add(eq("courseCode", courseCode)).add(eq("semestre", semestre)).uniqueResult();
+        return (CourseUnit)
+                createCriteria()
+                        .add(eq("code", sigesCode))
+                        .add(eq("courseCode", courseCode))
+                        .add(eq("semestre", semestre))
+                        .add(eq("importYear", year))
+                        .uniqueResult();
     }

 /impl/src/java/pt/estgp/estgweb/domain/TeacherImpl.java
 ,18 → 98,18
         return false;
     }
-    public void removeUnitLocaly(long id)
+    public void removeUnitLocaly(CourseUnit unit)
     {
-        setLocalRemovedTeachedUnits(StringsUtils.addElement(getLocalRemovedTeachedUnits(),"" + id,","));
+        setLocalRemovedTeachedUnits(StringsUtils.addElement(getLocalRemovedTeachedUnits(),"" + unit.getId(),","));
     }
-    public void addUnitLocaly(long id)
+    public void addUnitLocaly(CourseUnit unit)
     {
-        setLocalRemovedTeachedUnits(StringsUtils.removeElement(getLocalRemovedTeachedUnits(),"" + id,","));
+        setLocalRemovedTeachedUnits(StringsUtils.removeElement(getLocalRemovedTeachedUnits(),"" + unit.getId(),","));
     }
-    public boolean isLocalRemovedUnit(long id)
+    public boolean isLocalRemovedUnit(CourseUnit unit)
     {
-        return StringsUtils.hasElement(getLocalRemovedTeachedUnits(),"" + id,",");
+        return StringsUtils.hasElement(getLocalRemovedTeachedUnits(),"" + unit.getId(),",");
     }
 }

 /impl/src/java/pt/estgp/estgweb/domain/views/RecordView.java
 ,7 → 49,7
     public Class getReferenceClass()
     {
-        return CourseImpl.class;
+        return Record.class;
     }
     public Serializable getSerializable()

 /impl/src/java/pt/estgp/estgweb/web/tags/OwnerTag.java
 New file
 ,0 → 1,101
+package pt.estgp.estgweb.web.tags;
+import org.apache.log4j.Logger;
+import org.apache.struts.util.RequestUtils;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import pt.estgp.estgweb.domain.UserSessionImpl;
+import pt.estgp.estgweb.domain.IOwned;
+import pt.estgp.estgweb.domain.IInternal;
+import pt.estgp.estgweb.domain.IValid;
+import pt.estgp.estgweb.Globals;
+public class OwnerTag extends BodyTagSupport
+{
+    private static final Logger logger = Logger.getLogger(OwnerTag.class);
+    private String name;
+    private String property;
+    private String valid;
+    public String getName()
+    {
+        return name;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+    public String getProperty()
+    {
+        return property;
+    }
+    public void setProperty(String property)
+    {
+        this.property = property;
+    }
+    public String getValid()
+    {
+        return valid;
+    }
+    public void setValid(String valid)
+    {
+        this.valid = valid;
+    }
+    public int doStartTag() throws JspException
+    {
+        if (go())
+        {
+            return EVAL_BODY_TAG;
+        }
+        else
+            return SKIP_BODY;
+    }
+    public boolean go() throws JspException
+    {
+        UserSessionImpl userSession = (UserSessionImpl) pageContext.getRequest().getAttribute(Globals.USER_SESSION_KEY);
+        IOwned owned = (IOwned) RequestUtils.lookup(pageContext, name, property, null);
+        return owned != null && userSession.getUser() != null && (owned.isOwnedBy(userSession.getUser(),false) || (userSession.getUser()).isSuperuserOrAdmin());
+    }
+    public int doEndTag() throws JspException
+    {
+        if(go())
+        {
+            String toPage = bodyContent.getString().trim();
+            JspWriter writer = pageContext.getOut();
+            try
+            {
+                writer.write(toPage);
+            }
+            catch (Exception e)
+            {
+                logger.error(e, e);
+                throw new JspException(e);
+            }
+        }
+        // Continue processing this page
+        return EVAL_PAGE;
+    }
+}

 /impl/src/java/pt/estgp/estgweb/web/LayoutController.java
 ,12 → 54,14
         logger.info("requested path:" + path);
         logger.info("requested server:" + server);
         String startPath = (String) request.getAttribute("startPath");
-        if(startPath == null)
-            startPath = ConfigProperties.getProperty("server." + serverParameter + ".start.path");
-        else
-            startPath = ConfigProperties.getProperty("server." + serverParameter + ".start.path") + startPath;
-        path = startPath + path;
+        String confStartPath = ConfigProperties.getProperty("server." + serverParameter + ".start.path");
+        if(confStartPath != null)
+            if(startPath == null)
+                startPath = confStartPath;
+            else
+                startPath = confStartPath + startPath;
+        if(startPath != null)
+            path = startPath + path;
         request.setAttribute("path", path);
         request.setAttribute("server", server);

 /impl/src/java/pt/estgp/estgweb/web/controllers/profile/ProfileController.java
 ,9 → 411,9
             UserView userView;
                 if(profileForm.getRecordView().getId() > 0)
+                    userView = (UserView) sm.execute(RequestUtils.getRequester(request, response),"EditUserProfileRecord",args,names);
+                else
                     userView = (UserView) sm.execute(RequestUtils.getRequester(request, response),"CreateUserProfileRecord",args,names);
-                else
-                    userView = (UserView) sm.execute(RequestUtils.getRequester(request, response),"EditUserProfileRecord",args,names);
             addMessage(request,"profile.record.add.sucess",profileForm.getRecordView().getTitle());
             profileForm.setUserView(userView);

 /impl/src/java/pt/estgp/estgweb/web/controllers/courseunits/CourseUnitLayoutProxy.java
 ,7 → 54,10
             }
             else
                 startPath = "";
-            super.setQueryString("courseUnitView.id=" + request.getParameter("courseUnitView.id") + startPath,request);
+            String from = "";
+            if(request.getParameter("from") != null)
+                from = "&" + request.getParameter("from");
+            super.setQueryString("courseUnitView.id=" + request.getParameter("courseUnitView.id") + startPath + from,request);
             try
             {
                 CourseUnitView cV = (CourseUnitView) sm.execute(RequestUtils.getRequester(request, response), "LoadCourseUnit", args, names);

 /impl/src/java/pt/estgp/estgweb/web/controllers/courseunits/CourseUnitsController.java
 ,7 → 689,7
             ActionForward forward = new ActionForward();
             forward.setName("intranetCourseUnit");
-            forward.setPath("/courseunitproxy/" + layout + "/ionline" + "/" + path + "/?courseUnitView.id="+ cV.getId() + "&startPath=" + cV.getPathIntranet());
+            forward.setPath("/courseunitproxy/" + layout + "/ionline" + "/" + path + "/?courseUnitView.id="+ cV.getId() + "&startPath=" + cV.getPathIntranet() + "&from=" + request.getParameter("from"));
             forward.setRedirect(true);
             return forward;
         }

/impl/src/doc/siges/index.zip
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/CourseUnit.hbm.xml
 ,17 → 15,17
         <property name="saveDate" type="timestamp"/>
         <property name="semestre" type="string" index="semestreIndex"/>
         <property name="name" type="string" index="nameIndex"/>
-        <property name="code" type="string"/>
-        <property name="courseCode" type="string"/>
-        <property name="courseName" type="string"/>
-        <property name="courseYear" type="string"/>
+        <property name="code" type="string" index="codeIndex"/>
+        <property name="courseCode" type="string" index="courseCodeIndex"/>
+        <property name="courseName" type="string" index="courseNameIndex"/>
+        <property name="courseYear" type="string" index="courseYearIndex"/>
         <property name="importYear" type="string" index="importYearIndex"/>
-        <property name="institutionCode" type="string" />
+        <property name="institutionCode" type="string" index="institutionCodeIndex" />
         <property name="pathIntranet" type="string" />
         <property name="normalizedName" type="string" />
         <property name="objectives" type="text"/>
-        <property name="programStreamId" type="string"/>
-        <property name="status" type="boolean" />
+        <property name="programStreamId" type="string" index="programStreamIdIndex" />
+        <property name="status" type="boolean" index="statusIndex" />
         <many-to-one name="course" class="pt.estgp.estgweb.domain.Course" lazy="false" outer-join="true"/>
         <set name="blogs" cascade="delete" lazy="true" order-by="saveDate asc">
             <key column="courseUnit"/>
 ,4 → 130,28
         <subclass name="pt.estgp.estgweb.domain.CourseUnitGradeImpl" discriminator-value="CourseUnitGradeImpl"/>
     </class>
+    <!--<class name="pt.estgp.estgweb.domain.CourseUnit" table="courseUnitAssignement" abstract="true">-->
+        <!--<meta attribute="extends">pt.estgp.estgweb.domain.DomainSerializableObject</meta>-->
+        <!--<meta attribute="scope-class">public abstract</meta>-->
+        <!--<id name="id" type="long">-->
+            <!--<generator class="native"/>-->
+        <!--</id>-->
+        <!--<discriminator column="discrimitator"/>-->
+        <!--<timestamp name="updateDate" unsaved-value="null"/>-->
+        <!--<property name="saveDate" type="timestamp"/>-->
+        <!--<property name="deliverDate" type="timestamp"/>-->
+        <!--<property name="deliverType" type="string"/>-->
+        <!--<property name="lateDelivers" type="boolean"/>-->
+        <!--<property name="title" type="string"/>-->
+        <!--<property name="description" type="text"/>-->
+        <!--<property name="repositoryStream" type="string" index="repositoryStreamIndex"/>-->
+        <!--<property name="status" type="boolean"/>-->
+        <!--<many-to-one name="courseUnit" class="pt.estgp.estgweb.domain.CourseUnit" lazy="false" outer-join="true"/>-->
+        <!--<set name="deliverables" cascade="delete" lazy="true" order-by="deliverDate asc">-->
+            <!--<key column="courseUnitAssignement"/>-->
+            <!--<one-to-many class="pt.estgp.estgweb.domain.CourseUnitDeliverable"/>-->
+        <!--</set>-->
+        <!--<subclass name="pt.estgp.estgweb.domain.CourseUnitAssignementImpl" discriminator-value="CourseUnitAssignementImpl"/>-->
+    <!--</class>-->
 </hibernate-mapping>

/impl/src/scripts/importCourseUnits.bat
New file
0,0 → 1,3
call setenv.bat
java %JAVA_OPTS% -Dfile.encoding=UTF-8 -classpath "%LIBS%" pt.estgp.estgweb.services.sigesimports.ImportCourseService

/impl/src/scripts/tempCleaner.bat
New file
0,0 → 1,3
call setenv.bat
java %JAVA_OPTS% -Dfile.encoding=UTF-8 -classpath "%LIBS%" pt.estgp.estgweb.services.data.TmpCleaner

/impl/src/scripts/importGrades.bat
New file
0,0 → 1,3
call setenv.bat
java %JAVA_OPTS% -Dfile.encoding=UTF-8 -classpath "%LIBS%" pt.estgp.estgweb.services.sigesimports.ImportGradesService

/impl/src/scripts/importStudents.bat
New file
0,0 → 1,3
call setenv.bat
java %JAVA_OPTS% -Dfile.encoding=UTF-8 -classpath "%LIBS%" pt.estgp.estgweb.services.sigesimports.ImportStudentsService

 /impl/src/scripts/setenv.bat
 New file
 ,0 → 1,9
+SET TOMCAT_HOME=@tomcat.home@
+SET JAVA_OPTS=-Xmx1024m -Xms512m -XX:NewRatio=1
+call libs.bat

/impl/src/scripts/importTeachers.bat
New file
0,0 → 1,3
call setenv.bat
java %JAVA_OPTS% -Dfile.encoding=UTF-8 -classpath "%LIBS%" pt.estgp.estgweb.services.sigesimports.ImportTeachersService

/impl/src/web/admin/profile/profileCurriculum.jsp
26,6 → 26,7
%>
<html:form action="/user/profile" enctype="multipart/form-data">
<input type="hidden" name="dispatch" value="createRecord">
<html:hidden property="recordView.id"/>
<table class="form">
<tr>
<th>

 /impl/src/web/css/style.css
 ,8 → 396,6
 }
 #searchResults li .module {
-    position: absolute;
-    visibility: hidden;
     margin-left:5px;
 }

 /impl/src/web/public/profile/recordViews.jsp
 ,3 → 1,4
+<%@ page import="jomm.utils.MessageResources" %>
 <%@ 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" %>
 ,70 → 7,81
 <%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %>
 <%@ taglib uri="/WEB-INF/tlds/baco.tld" prefix="baco" %>
 <div class="listClean">
-<ul>
-    <logic:iterate id="recordView" name="RecordViews" type="pt.estgp.estgweb.domain.views.RecordView">
-        <li>
-            <table>
-                <logic:present name="recordView" property="title">
-                    <tr>
-                        <th><bean:message key="profile.record.title"/></th>
-                        <td>
-                            <logic:equal value="false" name="recordView" property="haveIdentifier">
-                                ${recordView.title}
-                                <logic:present name="recordView" property="subtitle">
-                                    - ${recordView.subtitle}
-                                </logic:present>
-                            </logic:equal>
-                            <logic:equal value="true" name="recordView" property="haveIdentifier">
-                                <a href="${recordView.identifier}">
+    <ul>
+        <logic:iterate id="recordView" name="RecordViews" type="pt.estgp.estgweb.domain.views.RecordView">
+            <li>
+                <table>
+                    <logic:present name="recordView" property="title">
+                        <tr>
+                            <th><bean:message key="profile.record.title"/></th>
+                            <td>
+                                <logic:equal value="false" name="recordView" property="haveIdentifier">
                                     ${recordView.title}
                                     <logic:present name="recordView" property="subtitle">
                                         - ${recordView.subtitle}
                                     </logic:present>
-                                </a>
-                            </logic:equal>
+                                </logic:equal>
+                                <logic:equal value="true" name="recordView" property="haveIdentifier">
+                                    <a href="${recordView.identifier}">
+                                            ${recordView.title}
+                                        <logic:present name="recordView" property="subtitle">
+                                            - ${recordView.subtitle}
+                                        </logic:present>
+                                    </a>
+                                </logic:equal>
+                                &nbsp;
+                                <baco:isOwner name="recordView">
+                                    <html:link action="/user/startChangeRecordProfile?recordView.id=${recordView.id}"><bean:message key="edit"/></html:link>
+                                    <%
+                                        String confirmDelete = MessageResources.getMessage(request, "profile.record.confirm.delete");
+                                        request.setAttribute("confirmDelete", confirmDelete);
+                                    %>
+                                    <html:link onclick="return confirm('${confirmDelete}')" action="/user/startDeleteRecordProfile?recordView.id=${recordView.id}">
+                                        <bean:message key="delete"/>
+                                    </html:link>
+                                </baco:isOwner>
+                            </td>
+                        </tr>
+                    </logic:present>
+                    <logic:present name="recordView" property="date">
+                        <tr>
+                            <th><bean:message key="profile.record.date"/></th>
+                            <td>${recordView.date}</td>
+                        </tr>
+                    </logic:present>
+                    <logic:present name="recordView" property="publisher">
+                        <tr>
+                            <th><bean:message key="profile.record.publisher"/></th>
+                            <td>${recordView.publisher}</td>
+                        </tr>
+                    </logic:present>
-                        </td>
-                    </tr>
-                </logic:present>
-                <logic:present name="recordView" property="date">
-                    <tr>
-                        <th><bean:message key="profile.record.date"/></th>
-                        <td>${recordView.date}</td>
-                    </tr>
-                </logic:present>
-                <logic:present name="recordView" property="publisher">
-                    <tr>
-                        <th><bean:message key="profile.record.publisher"/></th>
-                        <td>${recordView.publisher}</td>
-                    </tr>
-                </logic:present>
-                <logic:present name="recordView" property="copyright">
-                    <tr>
-                        <th><bean:message key="profile.record.copyright"/></th>
-                        <td>${recordView.copyright}</td>
-                    </tr>
-                </logic:present>
-                <logic:present name="recordView" property="description">
-                    <tr>
-                        <th><bean:message key="profile.record.description"/></th>
-                        <td>${recordView.description}</td>
-                    </tr>
-                </logic:present>
-                <logic:present name="recordView" property="repositoryStream">
-                    <tr>
-                        <th >
-                            <bean:message key="profile.record.file"/>
-                        </th>
-                        <td>
-                            <a target="blank" href="<%=request.getContextPath()%>/repositoryStream/${recordView.repositoryStream}">${recordView.repositoryFile.lastVersion.name}</a>
-                            (${recordView.repositoryFile.lastVersion.sizeKb} Kb)
-                        </td>
-                    </tr>
-                </logic:present>
-            </table>
-        </li>
-    </logic:iterate>
-</ul>
+                    <logic:present name="recordView" property="copyright">
+                        <tr>
+                            <th><bean:message key="profile.record.copyright"/></th>
+                            <td>${recordView.copyright}</td>
+                        </tr>
+                    </logic:present>
+                    <logic:present name="recordView" property="description">
+                        <tr>
+                            <th><bean:message key="profile.record.description"/></th>
+                            <td>${recordView.description}</td>
+                        </tr>
+                    </logic:present>
+                    <logic:present name="recordView" property="repositoryStream">
+                        <tr>
+                            <th >
+                                <bean:message key="profile.record.file"/>
+                            </th>
+                            <td>
+                                <a target="blank" href="<%=request.getContextPath()%>/repositoryStream/${recordView.repositoryStream}">${recordView.repositoryFile.lastVersion.name}</a>
+                                (${recordView.repositoryFile.lastVersion.sizeKb} Kb)
+                            </td>
+                        </tr>
+                    </logic:present>
+                </table>
+            </li>
+        </logic:iterate>
+    </ul>
 </div>

 /impl/src/web/public/search/searchResults.jsp
 ,7 → 15,7
             var moduleResults = <%=ICommonSearchResults.getTotalResults()%>;
             var query = '<%=ICommonSearchResults.getQuery()%>';
             var searchType = '<%=ICommonSearchResults.getSearchType()%>';
-             if (moduleResults == 0 )
+            if (moduleResults == 0 )
             {
                 window.location = "<%=request.getContextPath()%>/noresults.do?query=" + query + "&searchType=" + searchType;
             }
 ,11 → 154,9
                     <%
                         String visibility;
                         if (ICommonSearchResults.getSearchResults().size() == 1)
-                        {
                             visibility = Globals.VISIBLE;
-                        }
                         else
-                             visibility = Globals.HIDDEN;
+                            visibility = Globals.HIDDEN;
                     %>
                     <div class="module" id="<%=searchResults.getModule().getMessageKey()%>" style="<%=visibility%>">
                         <div id="${searchResults.module.messageKey}Results">

 /impl/src/web/public/announcements/loadAnnouncement.jsp
 ,6 → 2,7
 <%@ page import="pt.estgp.estgweb.domain.UserSessionImpl" %>
 <%@ page import="pt.estgp.estgweb.domain.enums.AnnouncementStyleEnum" %>
 <%@ page import="pt.estgp.estgweb.web.UserSessionProxy" %>
+<%@ page import="jomm.utils.MessageResources" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
 ,18 → 19,22
         <%
             String fromAction = "";
             String user = "";
-            if(request.getParameter("from")!=null)
+            if (request.getParameter("from") != null)
             {
                 user = "/user";
                 fromAction = "From" + request.getParameter("from");
             }
-            request.setAttribute("user",user);
-            request.setAttribute("fromAction",fromAction);
+            request.setAttribute("user", user);
+            request.setAttribute("fromAction", fromAction);
+            String confirmDelete = MessageResources.getMessage(request, "announcement.confirm.delete");
+            request.setAttribute("confirmDelete", confirmDelete);
         %>
         <html:link action="${user}/startEditAnnouncement${fromAction}?id=${Announcement.id}">
             <bean:message key="edit"/>
         </html:link>
-        <html:link action="${user}/startDeleteAnnouncement${fromAction}?id=${Announcement.id}">
+        <html:link onclick="return confirm('${confirmDelete}')" action="${user}/startDeleteAnnouncement${fromAction}?id=${Announcement.id}">
             <bean:message key="delete"/>
         </html:link>
     </baco:canManage>

 /impl/gen/java/pt/ipportalegre/siges/web/services/GetAulas.java
 New file
 ,0 → 1,146
+package pt.ipportalegre.siges.web.services;
+import java.math.BigDecimal;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+/**
+ * <p>Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="codigoInstituicao" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="anolectivo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="codigoUnidade" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="semestre" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "codigoInstituicao",
+    "anolectivo",
+    "codigoUnidade",
+    "semestre"
+})
+@XmlRootElement(name = "getAulas")
+public class GetAulas {
+    @XmlElement(required = true)
+    protected BigDecimal codigoInstituicao;
+    protected String anolectivo;
+    protected String codigoUnidade;
+    protected String semestre;
+    /**
+     * Gets the value of the codigoInstituicao property.
+     *
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     *
+     */
+    public BigDecimal getCodigoInstituicao() {
+        return codigoInstituicao;
+    }
+    /**
+     * Sets the value of the codigoInstituicao property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *
+     */
+    public void setCodigoInstituicao(BigDecimal value) {
+        this.codigoInstituicao = value;
+    }
+    /**
+     * Gets the value of the anolectivo property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getAnolectivo() {
+        return anolectivo;
+    }
+    /**
+     * Sets the value of the anolectivo property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setAnolectivo(String value) {
+        this.anolectivo = value;
+    }
+    /**
+     * Gets the value of the codigoUnidade property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getCodigoUnidade() {
+        return codigoUnidade;
+    }
+    /**
+     * Sets the value of the codigoUnidade property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setCodigoUnidade(String value) {
+        this.codigoUnidade = value;
+    }
+    /**
+     * Gets the value of the semestre property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getSemestre() {
+        return semestre;
+    }
+    /**
+     * Sets the value of the semestre property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setSemestre(String value) {
+        this.semestre = value;
+    }
+}

 /impl/gen/java/pt/ipportalegre/siges/web/services/ArrayOfAula.java
 New file
 ,0 → 1,69
+package pt.ipportalegre.siges.web.services;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+/**
+ * <p>Java class for ArrayOfAula complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType name="ArrayOfAula">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Aula" type="{http://www.ipportalegre.pt/siges/web/services}Aula" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ArrayOfAula", propOrder = {
+    "aula"
+})
+public class ArrayOfAula {
+    @XmlElement(name = "Aula", nillable = true)
+    protected List<Aula> aula;
+    /**
+     * Gets the value of the aula property.
+     *
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the aula property.
+     *
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAula().add(newItem);
+     * </pre>
+     *
+     *
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Aula }
+     *
+     *
+     */
+    public List<Aula> getAula() {
+        if (aula == null) {
+            aula = new ArrayList<Aula>();
+        }
+        return this.aula;
+    }
+}

 /impl/gen/java/pt/ipportalegre/siges/web/services/Disciplina.java
 ,9 → 19,12
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;sequence>
  *         &lt;element name="codigo" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="cdLectivo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="codigoCurso" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="cdDuracao" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         &lt;element name="codigoInstituicao" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="cdTurma" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         &lt;element name="nome" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="codigoCurso" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
  *         &lt;element name="nomeCurso" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         &lt;element name="grauCurso" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *       &lt;/sequence>
 ,9 → 38,12
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "Disciplina", propOrder = {
     "codigo",
+    "cdLectivo",
+    "codigoCurso",
+    "cdDuracao",
     "codigoInstituicao",
+    "cdTurma",
     "nome",
-    "codigoCurso",
     "nomeCurso",
     "grauCurso"
 })
 ,11 → 51,14
     @XmlElement(required = true)
     protected BigDecimal codigo;
+    protected String cdLectivo;
     @XmlElement(required = true)
+    protected BigDecimal codigoCurso;
+    protected String cdDuracao;
+    @XmlElement(required = true)
     protected BigDecimal codigoInstituicao;
+    protected String cdTurma;
     protected String nome;
-    @XmlElement(required = true)
-    protected BigDecimal codigoCurso;
     protected String nomeCurso;
     protected String grauCurso;
 ,6 → 87,78
     }
     /**
+     * Gets the value of the cdLectivo property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getCdLectivo() {
+        return cdLectivo;
+    }
+    /**
+     * Sets the value of the cdLectivo property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setCdLectivo(String value) {
+        this.cdLectivo = value;
+    }
+    /**
+     * Gets the value of the codigoCurso property.
+     *
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     *
+     */
+    public BigDecimal getCodigoCurso() {
+        return codigoCurso;
+    }
+    /**
+     * Sets the value of the codigoCurso property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *
+     */
+    public void setCodigoCurso(BigDecimal value) {
+        this.codigoCurso = value;
+    }
+    /**
+     * Gets the value of the cdDuracao property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getCdDuracao() {
+        return cdDuracao;
+    }
+    /**
+     * Sets the value of the cdDuracao property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setCdDuracao(String value) {
+        this.cdDuracao = value;
+    }
+    /**
      * Gets the value of the codigoInstituicao property.
      *
      * @return
 ,51 → 183,51
     }
     /**
-     * Gets the value of the nome property.
+     * Gets the value of the cdTurma property.
      *
      * @return
      *     possible object is
      *     {@link String }
      *
      */
-    public String getNome() {
-        return nome;
+    public String getCdTurma() {
+        return cdTurma;
     }
     /**
-     * Sets the value of the nome property.
+     * Sets the value of the cdTurma property.
      *
      * @param value
      *     allowed object is
      *     {@link String }
      *
      */
-    public void setNome(String value) {
-        this.nome = value;
+    public void setCdTurma(String value) {
+        this.cdTurma = value;
     }
     /**
-     * Gets the value of the codigoCurso property.
+     * Gets the value of the nome property.
      *
      * @return
      *     possible object is
-     *     {@link BigDecimal }
+     *     {@link String }
      *
      */
-    public BigDecimal getCodigoCurso() {
-        return codigoCurso;
+    public String getNome() {
+        return nome;
     }
     /**
-     * Sets the value of the codigoCurso property.
+     * Sets the value of the nome property.
      *
      * @param value
      *     allowed object is
-     *     {@link BigDecimal }
+     *     {@link String }
      *
      */
-    public void setCodigoCurso(BigDecimal value) {
-        this.codigoCurso = value;
+    public void setNome(String value) {
+        this.nome = value;
     }
     /**

 /impl/gen/java/pt/ipportalegre/siges/web/services/Docente.java
 ,7 → 32,7
  *         &lt;element name="email" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         &lt;element name="numeroBi" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         &lt;element name="usernameNetpa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="disciplinas" type="{http://www.ipportalegre.pt/siges/web/services}ArrayOfDecimal" minOccurs="0"/>
+ *         &lt;element name="disciplinas" type="{http://www.ipportalegre.pt/siges/web/services}ArrayOfDisciplina" minOccurs="0"/>
  *       &lt;/sequence>
  *     &lt;/restriction>
  *   &lt;/complexContent>
 ,7 → 76,7
     protected String email;
     protected String numeroBi;
     protected String usernameNetpa;
-    protected ArrayOfDecimal disciplinas;
+    protected ArrayOfDisciplina disciplinas;
     /**
      * Gets the value of the codigoFuncionario property.
 ,10 → 371,10
      *
      * @return
      *     possible object is
-     *     {@link ArrayOfDecimal }
+     *     {@link ArrayOfDisciplina }
      *
      */
-    public ArrayOfDecimal getDisciplinas() {
+    public ArrayOfDisciplina getDisciplinas() {
         return disciplinas;
     }
 ,10 → 383,10
      *
      * @param value
      *     allowed object is
-     *     {@link ArrayOfDecimal }
+     *     {@link ArrayOfDisciplina }
      *
      */
-    public void setDisciplinas(ArrayOfDecimal value) {
+    public void setDisciplinas(ArrayOfDisciplina value) {
         this.disciplinas = value;
     }

 /impl/gen/java/pt/ipportalegre/siges/web/services/Aula.java
 New file
 ,0 → 1,847
+package pt.ipportalegre.siges.web.services;
+import java.math.BigDecimal;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.datatype.XMLGregorianCalendar;
+/**
+ * <p>Java class for Aula complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType name="Aula">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="data" type="{http://www.w3.org/2001/XMLSchema}dateTime"/>
+ *         &lt;element name="numeroOcupacao" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="tipoOcupacao" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="duracao" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="numeroCelulas" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="observacoes" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="numeroAula" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="descricao" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="codigoSala" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="codigoResponsavel" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="codigoSituacao" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="codigoSumario" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="aula_codigoLectivo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="aula_codigoDisciplina" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="aula_codigoPeriodo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="aula_codigoTurma" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="aula_codigoDocente" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="aula_codigoSumario" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="aula_codigoSalaAula" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="sum_HoraInicial" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="sum_HoraFinal" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="sum_numeroAlunos" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="sum_numeroAula" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="sum_tipoAula" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="sum_titulo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="sum_descricao" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="sum_identificador" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="sum_cdEstado" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="sum_numeroPresencas" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Aula", propOrder = {
+    "data",
+    "numeroOcupacao",
+    "tipoOcupacao",
+    "duracao",
+    "numeroCelulas",
+    "observacoes",
+    "numeroAula",
+    "descricao",
+    "codigoSala",
+    "codigoResponsavel",
+    "codigoSituacao",
+    "codigoSumario",
+    "aulaCodigoLectivo",
+    "aulaCodigoDisciplina",
+    "aulaCodigoPeriodo",
+    "aulaCodigoTurma",
+    "aulaCodigoDocente",
+    "aulaCodigoSumario",
+    "aulaCodigoSalaAula",
+    "sumHoraInicial",
+    "sumHoraFinal",
+    "sumNumeroAlunos",
+    "sumNumeroAula",
+    "sumTipoAula",
+    "sumTitulo",
+    "sumDescricao",
+    "sumIdentificador",
+    "sumCdEstado",
+    "sumNumeroPresencas"
+})
+public class Aula {
+    @XmlElement(required = true)
+    @XmlSchemaType(name = "dateTime")
+    protected XMLGregorianCalendar data;
+    @XmlElement(required = true)
+    protected BigDecimal numeroOcupacao;
+    @XmlElement(required = true)
+    protected BigDecimal tipoOcupacao;
+    @XmlElement(required = true)
+    protected BigDecimal duracao;
+    @XmlElement(required = true)
+    protected BigDecimal numeroCelulas;
+    protected String observacoes;
+    @XmlElement(required = true)
+    protected BigDecimal numeroAula;
+    protected String descricao;
+    @XmlElement(required = true)
+    protected BigDecimal codigoSala;
+    @XmlElement(required = true)
+    protected BigDecimal codigoResponsavel;
+    protected String codigoSituacao;
+    @XmlElement(required = true)
+    protected BigDecimal codigoSumario;
+    @XmlElement(name = "aula_codigoLectivo")
+    protected String aulaCodigoLectivo;
+    @XmlElement(name = "aula_codigoDisciplina", required = true)
+    protected BigDecimal aulaCodigoDisciplina;
+    @XmlElement(name = "aula_codigoPeriodo")
+    protected String aulaCodigoPeriodo;
+    @XmlElement(name = "aula_codigoTurma")
+    protected String aulaCodigoTurma;
+    @XmlElement(name = "aula_codigoDocente", required = true)
+    protected BigDecimal aulaCodigoDocente;
+    @XmlElement(name = "aula_codigoSumario", required = true)
+    protected BigDecimal aulaCodigoSumario;
+    @XmlElement(name = "aula_codigoSalaAula", required = true)
+    protected BigDecimal aulaCodigoSalaAula;
+    @XmlElement(name = "sum_HoraInicial", required = true)
+    protected BigDecimal sumHoraInicial;
+    @XmlElement(name = "sum_HoraFinal", required = true)
+    protected BigDecimal sumHoraFinal;
+    @XmlElement(name = "sum_numeroAlunos", required = true)
+    protected BigDecimal sumNumeroAlunos;
+    @XmlElement(name = "sum_numeroAula", required = true)
+    protected BigDecimal sumNumeroAula;
+    @XmlElement(name = "sum_tipoAula")
+    protected String sumTipoAula;
+    @XmlElement(name = "sum_titulo")
+    protected String sumTitulo;
+    @XmlElement(name = "sum_descricao")
+    protected String sumDescricao;
+    @XmlElement(name = "sum_identificador")
+    protected String sumIdentificador;
+    @XmlElement(name = "sum_cdEstado", required = true)
+    protected BigDecimal sumCdEstado;
+    @XmlElement(name = "sum_numeroPresencas", required = true)
+    protected BigDecimal sumNumeroPresencas;
+    /**
+     * Gets the value of the data property.
+     *
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *
+     */
+    public XMLGregorianCalendar getData() {
+        return data;
+    }
+    /**
+     * Sets the value of the data property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *
+     */
+    public void setData(XMLGregorianCalendar value) {
+        this.data = value;
+    }
+    /**
+     * Gets the value of the numeroOcupacao property.
+     *
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     *
+     */
+    public BigDecimal getNumeroOcupacao() {
+        return numeroOcupacao;
+    }
+    /**
+     * Sets the value of the numeroOcupacao property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *
+     */
+    public void setNumeroOcupacao(BigDecimal value) {
+        this.numeroOcupacao = value;
+    }
+    /**
+     * Gets the value of the tipoOcupacao property.
+     *
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     *
+     */
+    public BigDecimal getTipoOcupacao() {
+        return tipoOcupacao;
+    }
+    /**
+     * Sets the value of the tipoOcupacao property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *
+     */
+    public void setTipoOcupacao(BigDecimal value) {
+        this.tipoOcupacao = value;
+    }
+    /**
+     * Gets the value of the duracao property.
+     *
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     *
+     */
+    public BigDecimal getDuracao() {
+        return duracao;
+    }
+    /**
+     * Sets the value of the duracao property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *
+     */
+    public void setDuracao(BigDecimal value) {
+        this.duracao = value;
+    }
+    /**
+     * Gets the value of the numeroCelulas property.
+     *
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     *
+     */
+    public BigDecimal getNumeroCelulas() {
+        return numeroCelulas;
+    }
+    /**
+     * Sets the value of the numeroCelulas property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *
+     */
+    public void setNumeroCelulas(BigDecimal value) {
+        this.numeroCelulas = value;
+    }
+    /**
+     * Gets the value of the observacoes property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getObservacoes() {
+        return observacoes;
+    }
+    /**
+     * Sets the value of the observacoes property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setObservacoes(String value) {
+        this.observacoes = value;
+    }
+    /**
+     * Gets the value of the numeroAula property.
+     *
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     *
+     */
+    public BigDecimal getNumeroAula() {
+        return numeroAula;
+    }
+    /**
+     * Sets the value of the numeroAula property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *
+     */
+    public void setNumeroAula(BigDecimal value) {
+        this.numeroAula = value;
+    }
+    /**
+     * Gets the value of the descricao property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getDescricao() {
+        return descricao;
+    }
+    /**
+     * Sets the value of the descricao property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setDescricao(String value) {
+        this.descricao = value;
+    }
+    /**
+     * Gets the value of the codigoSala property.
+     *
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     *
+     */
+    public BigDecimal getCodigoSala() {
+        return codigoSala;
+    }
+    /**
+     * Sets the value of the codigoSala property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *
+     */
+    public void setCodigoSala(BigDecimal value) {
+        this.codigoSala = value;
+    }
+    /**
+     * Gets the value of the codigoResponsavel property.
+     *
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     *
+     */
+    public BigDecimal getCodigoResponsavel() {
+        return codigoResponsavel;
+    }
+    /**
+     * Sets the value of the codigoResponsavel property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *
+     */
+    public void setCodigoResponsavel(BigDecimal value) {
+        this.codigoResponsavel = value;
+    }
+    /**
+     * Gets the value of the codigoSituacao property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getCodigoSituacao() {
+        return codigoSituacao;
+    }
+    /**
+     * Sets the value of the codigoSituacao property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setCodigoSituacao(String value) {
+        this.codigoSituacao = value;
+    }
+    /**
+     * Gets the value of the codigoSumario property.
+     *
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     *
+     */
+    public BigDecimal getCodigoSumario() {
+        return codigoSumario;
+    }
+    /**
+     * Sets the value of the codigoSumario property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *
+     */
+    public void setCodigoSumario(BigDecimal value) {
+        this.codigoSumario = value;
+    }
+    /**
+     * Gets the value of the aulaCodigoLectivo property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getAulaCodigoLectivo() {
+        return aulaCodigoLectivo;
+    }
+    /**
+     * Sets the value of the aulaCodigoLectivo property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setAulaCodigoLectivo(String value) {
+        this.aulaCodigoLectivo = value;
+    }
+    /**
+     * Gets the value of the aulaCodigoDisciplina property.
+     *
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     *
+     */
+    public BigDecimal getAulaCodigoDisciplina() {
+        return aulaCodigoDisciplina;
+    }
+    /**
+     * Sets the value of the aulaCodigoDisciplina property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *
+     */
+    public void setAulaCodigoDisciplina(BigDecimal value) {
+        this.aulaCodigoDisciplina = value;
+    }
+    /**
+     * Gets the value of the aulaCodigoPeriodo property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getAulaCodigoPeriodo() {
+        return aulaCodigoPeriodo;
+    }
+    /**
+     * Sets the value of the aulaCodigoPeriodo property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setAulaCodigoPeriodo(String value) {
+        this.aulaCodigoPeriodo = value;
+    }
+    /**
+     * Gets the value of the aulaCodigoTurma property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getAulaCodigoTurma() {
+        return aulaCodigoTurma;
+    }
+    /**
+     * Sets the value of the aulaCodigoTurma property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setAulaCodigoTurma(String value) {
+        this.aulaCodigoTurma = value;
+    }
+    /**
+     * Gets the value of the aulaCodigoDocente property.
+     *
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     *
+     */
+    public BigDecimal getAulaCodigoDocente() {
+        return aulaCodigoDocente;
+    }
+    /**
+     * Sets the value of the aulaCodigoDocente property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *
+     */
+    public void setAulaCodigoDocente(BigDecimal value) {
+        this.aulaCodigoDocente = value;
+    }
+    /**
+     * Gets the value of the aulaCodigoSumario property.
+     *
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     *
+     */
+    public BigDecimal getAulaCodigoSumario() {
+        return aulaCodigoSumario;
+    }
+    /**
+     * Sets the value of the aulaCodigoSumario property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *
+     */
+    public void setAulaCodigoSumario(BigDecimal value) {
+        this.aulaCodigoSumario = value;
+    }
+    /**
+     * Gets the value of the aulaCodigoSalaAula property.
+     *
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     *
+     */
+    public BigDecimal getAulaCodigoSalaAula() {
+        return aulaCodigoSalaAula;
+    }
+    /**
+     * Sets the value of the aulaCodigoSalaAula property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *
+     */
+    public void setAulaCodigoSalaAula(BigDecimal value) {
+        this.aulaCodigoSalaAula = value;
+    }
+    /**
+     * Gets the value of the sumHoraInicial property.
+     *
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     *
+     */
+    public BigDecimal getSumHoraInicial() {
+        return sumHoraInicial;
+    }
+    /**
+     * Sets the value of the sumHoraInicial property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *
+     */
+    public void setSumHoraInicial(BigDecimal value) {
+        this.sumHoraInicial = value;
+    }
+    /**
+     * Gets the value of the sumHoraFinal property.
+     *
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     *
+     */
+    public BigDecimal getSumHoraFinal() {
+        return sumHoraFinal;
+    }
+    /**
+     * Sets the value of the sumHoraFinal property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *
+     */
+    public void setSumHoraFinal(BigDecimal value) {
+        this.sumHoraFinal = value;
+    }
+    /**
+     * Gets the value of the sumNumeroAlunos property.
+     *
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     *
+     */
+    public BigDecimal getSumNumeroAlunos() {
+        return sumNumeroAlunos;
+    }
+    /**
+     * Sets the value of the sumNumeroAlunos property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *
+     */
+    public void setSumNumeroAlunos(BigDecimal value) {
+        this.sumNumeroAlunos = value;
+    }
+    /**
+     * Gets the value of the sumNumeroAula property.
+     *
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     *
+     */
+    public BigDecimal getSumNumeroAula() {
+        return sumNumeroAula;
+    }
+    /**
+     * Sets the value of the sumNumeroAula property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *
+     */
+    public void setSumNumeroAula(BigDecimal value) {
+        this.sumNumeroAula = value;
+    }
+    /**
+     * Gets the value of the sumTipoAula property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getSumTipoAula() {
+        return sumTipoAula;
+    }
+    /**
+     * Sets the value of the sumTipoAula property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setSumTipoAula(String value) {
+        this.sumTipoAula = value;
+    }
+    /**
+     * Gets the value of the sumTitulo property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getSumTitulo() {
+        return sumTitulo;
+    }
+    /**
+     * Sets the value of the sumTitulo property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setSumTitulo(String value) {
+        this.sumTitulo = value;
+    }
+    /**
+     * Gets the value of the sumDescricao property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getSumDescricao() {
+        return sumDescricao;
+    }
+    /**
+     * Sets the value of the sumDescricao property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setSumDescricao(String value) {
+        this.sumDescricao = value;
+    }
+    /**
+     * Gets the value of the sumIdentificador property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getSumIdentificador() {
+        return sumIdentificador;
+    }
+    /**
+     * Sets the value of the sumIdentificador property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setSumIdentificador(String value) {
+        this.sumIdentificador = value;
+    }
+    /**
+     * Gets the value of the sumCdEstado property.
+     *
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     *
+     */
+    public BigDecimal getSumCdEstado() {
+        return sumCdEstado;
+    }
+    /**
+     * Sets the value of the sumCdEstado property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *
+     */
+    public void setSumCdEstado(BigDecimal value) {
+        this.sumCdEstado = value;
+    }
+    /**
+     * Gets the value of the sumNumeroPresencas property.
+     *
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     *
+     */
+    public BigDecimal getSumNumeroPresencas() {
+        return sumNumeroPresencas;
+    }
+    /**
+     * Sets the value of the sumNumeroPresencas property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *
+     */
+    public void setSumNumeroPresencas(BigDecimal value) {
+        this.sumNumeroPresencas = value;
+    }
+}

 /impl/gen/java/pt/ipportalegre/siges/web/services/GetAulasResponse.java
 New file
 ,0 → 1,62
+package pt.ipportalegre.siges.web.services;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+/**
+ * <p>Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="getAulasResult" type="{http://www.ipportalegre.pt/siges/web/services}ArrayOfAula" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "getAulasResult"
+})
+@XmlRootElement(name = "getAulasResponse")
+public class GetAulasResponse {
+    protected ArrayOfAula getAulasResult;
+    /**
+     * Gets the value of the getAulasResult property.
+     *
+     * @return
+     *     possible object is
+     *     {@link ArrayOfAula }
+     *
+     */
+    public ArrayOfAula getGetAulasResult() {
+        return getAulasResult;
+    }
+    /**
+     * Sets the value of the getAulasResult property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link ArrayOfAula }
+     *
+     */
+    public void setGetAulasResult(ArrayOfAula value) {
+        this.getAulasResult = value;
+    }
+}

 /impl/gen/java/pt/ipportalegre/siges/web/services/SiGesWEBSoap.java
 ,6 → 191,29
     /**
      *
+     * @param codigoInstituicao
+     * @param anolectivo
+     * @param semestre
+     * @param codigoUnidade
+     * @return
+     *     returns pt.ipportalegre.siges.web.services.ArrayOfAula
+     */
+    @WebMethod(action = "http://www.ipportalegre.pt/siges/web/services/getAulas")
+    @WebResult(name = "getAulasResult", targetNamespace = "http://www.ipportalegre.pt/siges/web/services")
+    @RequestWrapper(localName = "getAulas", targetNamespace = "http://www.ipportalegre.pt/siges/web/services", className = "pt.ipportalegre.siges.web.services.GetAulas")
+    @ResponseWrapper(localName = "getAulasResponse", targetNamespace = "http://www.ipportalegre.pt/siges/web/services", className = "pt.ipportalegre.siges.web.services.GetAulasResponse")
+    public ArrayOfAula getAulas(
+        @WebParam(name = "codigoInstituicao", targetNamespace = "http://www.ipportalegre.pt/siges/web/services")
+        BigDecimal codigoInstituicao,
+        @WebParam(name = "anolectivo", targetNamespace = "http://www.ipportalegre.pt/siges/web/services")
+        String anolectivo,
+        @WebParam(name = "codigoUnidade", targetNamespace = "http://www.ipportalegre.pt/siges/web/services")
+        String codigoUnidade,
+        @WebParam(name = "semestre", targetNamespace = "http://www.ipportalegre.pt/siges/web/services")
+        String semestre);
+    /**
+     *
      * @param sPhones
      * @param message
      * @param secret

 /impl/gen/java/pt/ipportalegre/siges/web/services/ObjectFactory.java
 ,22 → 30,46
     }
     /**
-     * Create an instance of {@link GetDisciplinasDaInstituicaoSemestreResponse }
+     * Create an instance of {@link GetDisciplinasDaInstituicaoResponse }
      *
      */
-    public GetDisciplinasDaInstituicaoSemestreResponse createGetDisciplinasDaInstituicaoSemestreResponse() {
-        return new GetDisciplinasDaInstituicaoSemestreResponse();
+    public GetDisciplinasDaInstituicaoResponse createGetDisciplinasDaInstituicaoResponse() {
+        return new GetDisciplinasDaInstituicaoResponse();
     }
     /**
-     * Create an instance of {@link GetDisciplinasDaInstituicao }
+     * Create an instance of {@link SendSmsResponse }
      *
      */
-    public GetDisciplinasDaInstituicao createGetDisciplinasDaInstituicao() {
-        return new GetDisciplinasDaInstituicao();
+    public SendSmsResponse createSendSmsResponse() {
+        return new SendSmsResponse();
     }
     /**
+     * Create an instance of {@link Nota }
+     *
+     */
+    public Nota createNota() {
+        return new Nota();
+    }
+    /**
+     * Create an instance of {@link GetCodigosDisciplinasDaInstituicaoSemestre }
+     *
+     */
+    public GetCodigosDisciplinasDaInstituicaoSemestre createGetCodigosDisciplinasDaInstituicaoSemestre() {
+        return new GetCodigosDisciplinasDaInstituicaoSemestre();
+    }
+    /**
+     * Create an instance of {@link SendSms }
+     *
+     */
+    public SendSms createSendSms() {
+        return new SendSms();
+    }
+    /**
      * Create an instance of {@link GetAlunoInscrito }
      *
      */
 ,51 → 86,51
     }
     /**
-     * Create an instance of {@link GetCodigosAlunosInscritosDaInstituicaoResponse }
+     * Create an instance of {@link GetDocenteResponse }
      *
      */
-    public GetCodigosAlunosInscritosDaInstituicaoResponse createGetCodigosAlunosInscritosDaInstituicaoResponse() {
-        return new GetCodigosAlunosInscritosDaInstituicaoResponse();
+    public GetDocenteResponse createGetDocenteResponse() {
+        return new GetDocenteResponse();
     }
     /**
-     * Create an instance of {@link Aluno }
+     * Create an instance of {@link GetAulas }
      *
      */
-    public Aluno createAluno() {
-        return new Aluno();
+    public GetAulas createGetAulas() {
+        return new GetAulas();
     }
     /**
-     * Create an instance of {@link Docente }
+     * Create an instance of {@link ArrayOfDisciplina }
      *
      */
-    public Docente createDocente() {
-        return new Docente();
+    public ArrayOfDisciplina createArrayOfDisciplina() {
+        return new ArrayOfDisciplina();
     }
     /**
-     * Create an instance of {@link SendSmsS }
+     * Create an instance of {@link GetDisciplinasDaInstituicaoSemestre }
      *
      */
-    public SendSmsS createSendSmsS() {
-        return new SendSmsS();
+    public GetDisciplinasDaInstituicaoSemestre createGetDisciplinasDaInstituicaoSemestre() {
+        return new GetDisciplinasDaInstituicaoSemestre();
     }
     /**
-     * Create an instance of {@link GetDocenteResponse }
+     * Create an instance of {@link Disciplina }
      *
      */
-    public GetDocenteResponse createGetDocenteResponse() {
-        return new GetDocenteResponse();
+    public Disciplina createDisciplina() {
+        return new Disciplina();
     }
     /**
-     * Create an instance of {@link GetNotasResponse }
+     * Create an instance of {@link Docente }
      *
      */
-    public GetNotasResponse createGetNotasResponse() {
-        return new GetNotasResponse();
+    public Docente createDocente() {
+        return new Docente();
     }
     /**
 ,139 → 142,139
     }
     /**
-     * Create an instance of {@link ArrayOfNota }
+     * Create an instance of {@link ArrayOfAula }
      *
      */
-    public ArrayOfNota createArrayOfNota() {
-        return new ArrayOfNota();
+    public ArrayOfAula createArrayOfAula() {
+        return new ArrayOfAula();
     }
     /**
-     * Create an instance of {@link GetCodigosDisciplinasDaInstituicaoSemestreResponse }
+     * Create an instance of {@link ArrayOfNota }
      *
      */
-    public GetCodigosDisciplinasDaInstituicaoSemestreResponse createGetCodigosDisciplinasDaInstituicaoSemestreResponse() {
-        return new GetCodigosDisciplinasDaInstituicaoSemestreResponse();
+    public ArrayOfNota createArrayOfNota() {
+        return new ArrayOfNota();
     }
     /**
-     * Create an instance of {@link GetCodigosDisciplinasDaInstituicaoResponse }
+     * Create an instance of {@link GetAlunoInscritoResponse }
      *
      */
-    public GetCodigosDisciplinasDaInstituicaoResponse createGetCodigosDisciplinasDaInstituicaoResponse() {
-        return new GetCodigosDisciplinasDaInstituicaoResponse();
+    public GetAlunoInscritoResponse createGetAlunoInscritoResponse() {
+        return new GetAlunoInscritoResponse();
     }
     /**
-     * Create an instance of {@link GetCodigosDocentesInscritosDaInstituicao }
+     * Create an instance of {@link GetNotas }
      *
      */
-    public GetCodigosDocentesInscritosDaInstituicao createGetCodigosDocentesInscritosDaInstituicao() {
-        return new GetCodigosDocentesInscritosDaInstituicao();
+    public GetNotas createGetNotas() {
+        return new GetNotas();
     }
     /**
-     * Create an instance of {@link SendSms }
+     * Create an instance of {@link SendSmsS }
      *
      */
-    public SendSms createSendSms() {
-        return new SendSms();
+    public SendSmsS createSendSmsS() {
+        return new SendSmsS();
     }
     /**
-     * Create an instance of {@link GetCodigosAlunosInscritosDaInstituicao }
+     * Create an instance of {@link GetAulasResponse }
      *
      */
-    public GetCodigosAlunosInscritosDaInstituicao createGetCodigosAlunosInscritosDaInstituicao() {
-        return new GetCodigosAlunosInscritosDaInstituicao();
+    public GetAulasResponse createGetAulasResponse() {
+        return new GetAulasResponse();
     }
     /**
-     * Create an instance of {@link GetCodigosDisciplinasDaInstituicaoSemestre }
+     * Create an instance of {@link GetDocente }
      *
      */
-    public GetCodigosDisciplinasDaInstituicaoSemestre createGetCodigosDisciplinasDaInstituicaoSemestre() {
-        return new GetCodigosDisciplinasDaInstituicaoSemestre();
+    public GetDocente createGetDocente() {
+        return new GetDocente();
     }
     /**
-     * Create an instance of {@link SendSmsResponse }
+     * Create an instance of {@link GetNotasResponse }
      *
      */
-    public SendSmsResponse createSendSmsResponse() {
-        return new SendSmsResponse();
+    public GetNotasResponse createGetNotasResponse() {
+        return new GetNotasResponse();
     }
     /**
-     * Create an instance of {@link ArrayOfString }
+     * Create an instance of {@link GetDisciplinasDaInstituicao }
      *
      */
-    public ArrayOfString createArrayOfString() {
-        return new ArrayOfString();
+    public GetDisciplinasDaInstituicao createGetDisciplinasDaInstituicao() {
+        return new GetDisciplinasDaInstituicao();
     }
     /**
-     * Create an instance of {@link GetDisciplinasDaInstituicaoResponse }
+     * Create an instance of {@link GetCodigosAlunosInscritosDaInstituicao }
      *
      */
-    public GetDisciplinasDaInstituicaoResponse createGetDisciplinasDaInstituicaoResponse() {
-        return new GetDisciplinasDaInstituicaoResponse();
+    public GetCodigosAlunosInscritosDaInstituicao createGetCodigosAlunosInscritosDaInstituicao() {
+        return new GetCodigosAlunosInscritosDaInstituicao();
     }
     /**
-     * Create an instance of {@link GetAlunoInscritoResponse }
+     * Create an instance of {@link GetCodigosDocentesInscritosDaInstituicao }
      *
      */
-    public GetAlunoInscritoResponse createGetAlunoInscritoResponse() {
-        return new GetAlunoInscritoResponse();
+    public GetCodigosDocentesInscritosDaInstituicao createGetCodigosDocentesInscritosDaInstituicao() {
+        return new GetCodigosDocentesInscritosDaInstituicao();
     }
     /**
-     * Create an instance of {@link ArrayOfDisciplina }
+     * Create an instance of {@link ArrayOfString }
      *
      */
-    public ArrayOfDisciplina createArrayOfDisciplina() {
-        return new ArrayOfDisciplina();
+    public ArrayOfString createArrayOfString() {
+        return new ArrayOfString();
     }
     /**
-     * Create an instance of {@link GetDocente }
+     * Create an instance of {@link GetCodigosDisciplinasDaInstituicaoResponse }
      *
      */
-    public GetDocente createGetDocente() {
-        return new GetDocente();
+    public GetCodigosDisciplinasDaInstituicaoResponse createGetCodigosDisciplinasDaInstituicaoResponse() {
+        return new GetCodigosDisciplinasDaInstituicaoResponse();
     }
     /**
-     * Create an instance of {@link GetDisciplinasDaInstituicaoSemestre }
+     * Create an instance of {@link Aula }
      *
      */
-    public GetDisciplinasDaInstituicaoSemestre createGetDisciplinasDaInstituicaoSemestre() {
-        return new GetDisciplinasDaInstituicaoSemestre();
+    public Aula createAula() {
+        return new Aula();
     }
     /**
-     * Create an instance of {@link SendSmsSResponse }
+     * Create an instance of {@link GetCodigosDisciplinasDaInstituicaoSemestreResponse }
      *
      */
-    public SendSmsSResponse createSendSmsSResponse() {
-        return new SendSmsSResponse();
+    public GetCodigosDisciplinasDaInstituicaoSemestreResponse createGetCodigosDisciplinasDaInstituicaoSemestreResponse() {
+        return new GetCodigosDisciplinasDaInstituicaoSemestreResponse();
     }
     /**
-     * Create an instance of {@link Disciplina }
+     * Create an instance of {@link GetDisciplinasDaInstituicaoSemestreResponse }
      *
      */
-    public Disciplina createDisciplina() {
-        return new Disciplina();
+    public GetDisciplinasDaInstituicaoSemestreResponse createGetDisciplinasDaInstituicaoSemestreResponse() {
+        return new GetDisciplinasDaInstituicaoSemestreResponse();
     }
     /**
-     * Create an instance of {@link Nota }
+     * Create an instance of {@link SendSmsSResponse }
      *
      */
-    public Nota createNota() {
-        return new Nota();
+    public SendSmsSResponse createSendSmsSResponse() {
+        return new SendSmsSResponse();
     }
     /**
 ,11 → 286,19
     }
     /**
-     * Create an instance of {@link GetNotas }
+     * Create an instance of {@link Aluno }
      *
      */
-    public GetNotas createGetNotas() {
-        return new GetNotas();
+    public Aluno createAluno() {
+        return new Aluno();
     }
+    /**
+     * Create an instance of {@link GetCodigosAlunosInscritosDaInstituicaoResponse }
+     *
+     */
+    public GetCodigosAlunosInscritosDaInstituicaoResponse createGetCodigosAlunosInscritosDaInstituicaoResponse() {
+        return new GetCodigosAlunosInscritosDaInstituicaoResponse();
+    }
 }

 /impl/gen/java/pt/ipportalegre/siges/web/services/Nota.java
 ,6 → 20,9
  *   &lt;complexContent>
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;sequence>
+ *         &lt;element name="cd_duracao" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="codigoInstituicao" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="cd_lectivo" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         &lt;element name="codigo_disciplina" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
  *         &lt;element name="codigo_curso" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
  *         &lt;element name="status_epoca" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
 ,6 → 39,9
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "Nota", propOrder = {
+    "cdDuracao",
+    "codigoInstituicao",
+    "cdLectivo",
     "codigoDisciplina",
     "codigoCurso",
     "statusEpoca",
 ,6 → 51,12
 })
 public class Nota {
+    @XmlElement(name = "cd_duracao", required = true)
+    protected BigDecimal cdDuracao;
+    @XmlElement(required = true)
+    protected BigDecimal codigoInstituicao;
+    @XmlElement(name = "cd_lectivo")
+    protected String cdLectivo;
     @XmlElement(name = "codigo_disciplina", required = true)
     protected BigDecimal codigoDisciplina;
     @XmlElement(name = "codigo_curso", required = true)
 ,6 → 72,78
     protected BigDecimal nota;
     /**
+     * Gets the value of the cdDuracao property.
+     *
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     *
+     */
+    public BigDecimal getCdDuracao() {
+        return cdDuracao;
+    }
+    /**
+     * Sets the value of the cdDuracao property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *
+     */
+    public void setCdDuracao(BigDecimal value) {
+        this.cdDuracao = value;
+    }
+    /**
+     * Gets the value of the codigoInstituicao property.
+     *
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     *
+     */
+    public BigDecimal getCodigoInstituicao() {
+        return codigoInstituicao;
+    }
+    /**
+     * Sets the value of the codigoInstituicao property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *
+     */
+    public void setCodigoInstituicao(BigDecimal value) {
+        this.codigoInstituicao = value;
+    }
+    /**
+     * Gets the value of the cdLectivo property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getCdLectivo() {
+        return cdLectivo;
+    }
+    /**
+     * Sets the value of the cdLectivo property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setCdLectivo(String value) {
+        this.cdLectivo = value;
+    }
+    /**
      * Gets the value of the codigoDisciplina property.
      *
      * @return

 /impl/gen/java/pt/ipportalegre/siges/web/services/Aluno.java
 ,7 → 31,7
  *         &lt;element name="email" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         &lt;element name="numeroBi" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         &lt;element name="usernameNetpa" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="disciplinasInscrito" type="{http://www.ipportalegre.pt/siges/web/services}ArrayOfDecimal" minOccurs="0"/>
+ *         &lt;element name="disciplinasInscrito" type="{http://www.ipportalegre.pt/siges/web/services}ArrayOfDisciplina" minOccurs="0"/>
  *       &lt;/sequence>
  *     &lt;/restriction>
  *   &lt;/complexContent>
 ,7 → 73,7
     protected String email;
     protected String numeroBi;
     protected String usernameNetpa;
-    protected ArrayOfDecimal disciplinasInscrito;
+    protected ArrayOfDisciplina disciplinasInscrito;
     /**
      * Gets the value of the codigo property.
 ,10 → 344,10
      *
      * @return
      *     possible object is
-     *     {@link ArrayOfDecimal }
+     *     {@link ArrayOfDisciplina }
      *
      */
-    public ArrayOfDecimal getDisciplinasInscrito() {
+    public ArrayOfDisciplina getDisciplinasInscrito() {
         return disciplinasInscrito;
     }
 ,10 → 356,10
      *
      * @param value
      *     allowed object is
-     *     {@link ArrayOfDecimal }
+     *     {@link ArrayOfDisciplina }
      *
      */
-    public void setDisciplinasInscrito(ArrayOfDecimal value) {
+    public void setDisciplinasInscrito(ArrayOfDisciplina value) {
         this.disciplinasInscrito = value;
     }

 /impl/build.properties
 ,9 → 18,14
 #Paths configuration
 tomcat.home=C:/Servidores/tomcat
+#tomcat 5.5
 tomcat.libs.ant.home=${tomcat.home}/server/lib
 tomcat.libs.common.home=${tomcat.home}/common/lib
+#tomcat 6
+#tomcat.libs.ant.home=${tomcat.home}/lib
+#tomcat.libs.common.home=${tomcat.home}/lib
 tomcat.host=localhost
 tomcat.port=8080
 tomcat.url=http://${tomcat.host}:${tomcat.port}
 ,6 → 54,7
 lib.dir             =lib
 data.dir            =C:/Servidores/DATA/estgweb
 src.dir             =src/java
+src.scripts         =src/scripts
 hbm.dir             =src/hbm
 build.dir           =build/ant
 build.dir.classes   =${build.dir}/classes
 ,8 → 65,8
 dist.dir            =dist
 gen.dir             =gen
 gen.dir.java        =${gen.dir}/java
-scripts.source.dir  =etc/source_scripts
 intranet.setup.folders.filename=mkcursos.exe
 intranet.setup.folders.file.src=etc/data/intranet/${intranet.setup.folders.filename}
 build.dir.relative.intranet.setup.folders=/etc/data/intranet

 /impl/build.xml
 ,11 → 314,12
         <java classname="${scripts.buider.class}" classpath="${build.dir.classes}">
             <arg value="${basedir}\..\common"/>
+            <arg value="${basedir}\build\ant\classes"/>
             <arg value="${build.dir.scripts}"/>
             <arg value="${scripts.target.libs.file}"/>
         </java>
         <copy overwrite="true" todir="${build.dir.scripts}">
-            <fileset dir="${scripts.source.dir}" includes="*.*"/>
+            <fileset dir="${src.scripts}" includes="*.*"/>
         </copy>
     </target>

Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 223 → Rev 226