WebSVN - bacoAlunos - Path Comparison - / Rev 1782 and / Rev 1785

Ignore whitespace Rev 1782 → Rev 1785

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/courses/CoursesService.java
 ,7 → 1,7
 package pt.estgp.estgweb.services.courses;
 import com.owlike.genson.Genson;
+import com.owlike.genson.GensonBuilder;
 import com.owlike.genson.reflect.VisibilityFilter;
 import jomm.dao.impl.AbstractDao;
 import jomm.utils.BytesUtils;
 ,7 → 418,7
     private static Genson getGensonPlanoEstudos(){
-        Genson genson = new Genson.Builder()
+        Genson genson = new GensonBuilder()
                 .exclude("class")
                 .exclude("siges", Curso.class)
                 .exclude("nome",Curso.class)
 ,7 → 436,7
     private static Genson getGensonCourse(){
-        Genson genson = new Genson.Builder()
+        Genson genson = new GensonBuilder()
                 .exclude(Object.class)
                 .useFields(false)
                 .useMethods(true)

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/courses/xsd/CursoImpl.java
 ,7 → 28,7
     static Genson genson;
     static {
-        GensonBuilder gensonBuilder =  new Genson.Builder()
+        GensonBuilder gensonBuilder =  new GensonBuilder()
                 .exclude(Object.class)
                 .include(Boolean.class)

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/data/repositorydocuments/interfaces/RepositoryInterface.java
 ,7 → 76,7
     static Genson genson;
     static {
-        GensonBuilder gensonBuilder =  new Genson.Builder()
+        GensonBuilder gensonBuilder =  new GensonBuilder()
                 .exclude(Object.class)
                 .include(Boolean.class)
                 .include(Integer.class)

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/data/repositorydocuments/DocumentPersons.java
 ,6 → 1,7
 package pt.estgp.estgweb.services.data.repositorydocuments;
 import com.owlike.genson.Genson;
+import com.owlike.genson.GensonBuilder;
 import org.apache.log4j.Logger;
 import pt.estgp.estgweb.services.bpmnprocess.types.BacoDataAbstractType;
 ,7 → 42,7
         return persons != null ? persons.hashCode() : 0;
     }
-    static Genson genson = new Genson.Builder()
+    static Genson genson = new GensonBuilder()
             .include(DocumentPersons.class)
             .include(DocumentPerson.class)
             .create();

 /branches/v3/impl/src/java/pt/estgp/estgweb/services/entity/EntityServiceJson.java
 ,6 → 1,7
 package pt.estgp.estgweb.services.entity;
 import com.owlike.genson.Genson;
+import com.owlike.genson.GensonBuilder;
 import pt.estgp.estgweb.domain.*;
 import pt.estgp.estgweb.domain.dao.DaoFactory;
 import pt.utl.ist.berserk.logic.serviceManager.IService;
 ,7 → 15,7
  */
 public class EntityServiceJson implements IService
 {
-    static Genson courseUnitGenson = new Genson.Builder()
+    static Genson courseUnitGenson = new GensonBuilder()
             .exclude(Object.class)
             .include(Boolean.class)
             .include(Integer.class)
 ,7 → 31,7
             .include("importYear", CourseUnit.class)
             .create();
-    static Genson userGenson = new Genson.Builder()
+    static Genson userGenson = new GensonBuilder()
             .exclude(Object.class)
             .exclude(User.class)
             .exclude(GenericUser.class)

/branches/v3/impl/src/java/pt/estgp/estgweb/domain/bpmn/Operation.java
New file
0,0 → 1,7
package pt.estgp.estgweb.domain.bpmn;

/**
* Created by jorgemachado on 20/06/17.
*/
public abstract class Operation extends Todo {
}

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/bpmn/TodosEnhancedType.java
 New file
 ,0 → 1,27
+package pt.estgp.estgweb.domain.bpmn;
+import pt.estgp.estgweb.services.bpmnprocess.types.AbstractStringEnhancedType;
+import pt.estgp.estgweb.services.bpmnprocess.types.BacoDataAbstractType;
+/**
+ * Created by jorgemachado on 20/06/17.
+ */
+public class TodosEnhancedType extends AbstractStringEnhancedType
+{
+    @Override
+    public Object fromXMLString(String xmlValue) {
+        return Todos.fromString(xmlValue);
+    }
+    @Override
+    public Class returnedClass() {
+        return Todos.class;
+    }
+    @Override
+    public BacoDataAbstractType fromString(String name)
+    {
+        return Todos.fromString(name);
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/bpmn/OperationAtribution.java
 New file
 ,0 → 1,35
+package pt.estgp.estgweb.domain.bpmn;
+/**
+ * Created by jorgemachado on 20/06/17.
+ */
+public class OperationAtribution extends Operation
+{
+    private String copyFromBean;
+    private String copyFromProperty;
+    private String copyToBean;
+    public String getCopyFromBean() {
+        return copyFromBean;
+    }
+    public void setCopyFromBean(String copyFromBean) {
+        this.copyFromBean = copyFromBean;
+    }
+    public String getCopyFromProperty() {
+        return copyFromProperty;
+    }
+    public void setCopyFromProperty(String copyFromProperty) {
+        this.copyFromProperty = copyFromProperty;
+    }
+    public String getCopyToBean() {
+        return copyToBean;
+    }
+    public void setCopyToBean(String copyToBean) {
+        this.copyToBean = copyToBean;
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/bpmn/Argument.java
 New file
 ,0 → 1,17
+package pt.estgp.estgweb.domain.bpmn;
+/**
+ * Created by jorgemachado on 20/06/17.
+ */
+public class Argument {
+    private String name;
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/bpmn/Todo.java
 New file
 ,0 → 1,8
+package pt.estgp.estgweb.domain.bpmn;
+/**
+ * Created by jorgemachado on 20/06/17.
+ */
+public abstract class Todo
+{
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/bpmn/VariableType.java
 New file
 ,0 → 1,15
+package pt.estgp.estgweb.domain.bpmn;
+/**
+ * Created by jorgemachado on 20/06/17.
+ */
+public enum VariableType
+{
+    Integer,
+    Long,
+    String,
+    Boolean,
+    JsonVar,
+    DomainObjectVar
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/bpmn/TestTodos.java
 New file
 ,0 → 1,100
+package pt.estgp.estgweb.domain.bpmn;
+import jomm.dao.impl.AbstractDao;
+import junit.framework.TestCase;
+import pt.estgp.estgweb.domain.BpmnFlowComponentTaskActor;
+import pt.estgp.estgweb.domain.BpmnFlowComponentTaskActorImpl;
+import pt.estgp.estgweb.domain.dao.DaoFactory;
+/**
+ * Created by jorgemachado on 20/06/17.
+ */
+public class TestTodos extends TestCase
+{
+    public void testTodos()
+    {
+        Todos todos = new Todos();
+        ConnectorSOA connectorSOA1 = new ConnectorSOA();
+        OperationAtribution operation1 = new OperationAtribution();
+        todos.getTodos().add(connectorSOA1);
+        todos.getTodos().add(operation1);
+        connectorSOA1.setLocalObjectHolderName("soa1ReturnVar");
+        connectorSOA1.setMethodName("soa1Method");
+        connectorSOA1.setServiceName("soa1Service");
+        Argument argSoa1_1 = new Argument();
+        Argument argSoa1_2 = new Argument();
+        argSoa1_1.setName("argSoa1_1");
+        argSoa1_2.setName("argSoa1_2");
+        connectorSOA1.getArgs().add(argSoa1_1);
+        connectorSOA1.getArgs().add(argSoa1_2);
+        operation1.setCopyFromBean("setCopyFromBean1");
+        operation1.setCopyFromProperty("setCopyFromProperty1");
+        operation1.setCopyToBean("setCopyToBean1");
+        Todos afterUserTodos = new Todos();
+        ConnectorSOA connectorSOA2 = new ConnectorSOA();
+        OperationAtribution operation2 = new OperationAtribution();
+        afterUserTodos.getTodos().add(operation2);//TROCADO EM RELACAO AO ANTERIOR OPERATION PRIMEIRO
+        afterUserTodos.getTodos().add(connectorSOA2);
+        Argument argSoa2_1 = new Argument();
+        Argument argSoa2_2 = new Argument();
+        argSoa2_1.setName("argSoa2_1");
+        argSoa2_2.setName("argSoa2_2");
+        connectorSOA2.getArgs().add(argSoa2_1);
+        connectorSOA2.getArgs().add(argSoa2_2);
+        operation2.setCopyFromBean("setCopyFromBean2");
+        operation2.setCopyFromProperty("setCopyFromProperty2");
+        operation2.setCopyToBean("setCopyToBean2");
+        BpmnFlowComponentTaskActor task = new BpmnFlowComponentTaskActorImpl();
+        task.setTodos(todos);
+        task.setAfterUserTodos(afterUserTodos);
+        AbstractDao.getCurrentSession().beginTransaction();
+        DaoFactory.getBpmnFlowComponentTaskActorDaoImpl().save(task);
+        AbstractDao.getCurrentSession().getTransaction().commit();
+        AbstractDao.getCurrentSession().beginTransaction();
+        BpmnFlowComponentTaskActor taskLoaded = DaoFactory.getBpmnFlowComponentTaskActorDaoImpl().get(task.getId());
+        assertTrue(taskLoaded.getTodos().getTodos().size() == 2);
+        assertTrue(taskLoaded.getAfterUserTodos().getTodos().size() == 2);
+        assertTrue(((ConnectorSOA)taskLoaded.getTodos().getTodos().get(0)).getLocalObjectHolderName().equals(connectorSOA1.getLocalObjectHolderName()));
+        assertTrue(((ConnectorSOA)taskLoaded.getTodos().getTodos().get(0)).getMethodName().equals(connectorSOA1.getMethodName()));
+        assertTrue(((ConnectorSOA)taskLoaded.getTodos().getTodos().get(0)).getServiceName().equals(connectorSOA1.getServiceName()));
+        assertTrue(((ConnectorSOA)taskLoaded.getTodos().getTodos().get(0)).getArgs().size() == connectorSOA1.getArgs().size());
+        assertTrue(((ConnectorSOA)taskLoaded.getTodos().getTodos().get(0)).getArgs().get(0).getName().equals(connectorSOA1.getArgs().get(0).getName()));
+        assertTrue(((ConnectorSOA)taskLoaded.getTodos().getTodos().get(0)).getArgs().get(1).getName().equals(connectorSOA1.getArgs().get(1).getName()));
+        assertTrue(((ConnectorSOA)taskLoaded.getAfterUserTodos().getTodos().get(1)).getLocalObjectHolderName().equals(connectorSOA2.getLocalObjectHolderName()));
+        assertTrue(((ConnectorSOA)taskLoaded.getAfterUserTodos().getTodos().get(1)).getMethodName().equals(connectorSOA2.getMethodName()));
+        assertTrue(((ConnectorSOA)taskLoaded.getAfterUserTodos().getTodos().get(1)).getServiceName().equals(connectorSOA2.getServiceName()));
+        assertTrue(((ConnectorSOA)taskLoaded.getAfterUserTodos().getTodos().get(1)).getArgs().size() == connectorSOA2.getArgs().size());
+        assertTrue(((ConnectorSOA)taskLoaded.getAfterUserTodos().getTodos().get(1)).getArgs().get(0).getName().equals(connectorSOA2.getArgs().get(0).getName()));
+        assertTrue(((ConnectorSOA)taskLoaded.getAfterUserTodos().getTodos().get(1)).getArgs().get(1).getName().equals(connectorSOA2.getArgs().get(1).getName()));
+        assertTrue(((OperationAtribution)taskLoaded.getTodos().getTodos().get(1)).getCopyFromBean().equals(operation1.getCopyFromBean()));
+        assertTrue(((OperationAtribution)taskLoaded.getTodos().getTodos().get(1)).getCopyFromProperty().equals(operation1.getCopyFromProperty()));
+        assertTrue(((OperationAtribution)taskLoaded.getTodos().getTodos().get(1)).getCopyToBean().equals(operation1.getCopyToBean()));
+        assertTrue(((OperationAtribution)taskLoaded.getAfterUserTodos().getTodos().get(0)).getCopyFromBean().equals(operation2.getCopyFromBean()));
+        assertTrue(((OperationAtribution)taskLoaded.getAfterUserTodos().getTodos().get(0)).getCopyFromProperty().equals(operation2.getCopyFromProperty()));
+        assertTrue(((OperationAtribution)taskLoaded.getAfterUserTodos().getTodos().get(0)).getCopyToBean().equals(operation2.getCopyToBean()));
+        assertTrue(taskLoaded.getAfterUserTodos().getTodos().size() == 2);
+        DaoFactory.getBpmnFlowComponentTaskActorDaoImpl().delete(taskLoaded);
+        AbstractDao.getCurrentSession().getTransaction().commit();
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/bpmn/Todos.java
 New file
 ,0 → 1,56
+package pt.estgp.estgweb.domain.bpmn;
+import com.owlike.genson.Genson;
+import com.owlike.genson.GensonBuilder;
+import pt.estgp.estgweb.services.bpmnprocess.types.BacoDataAbstractType;
+import java.util.ArrayList;
+import java.util.List;
+/**
+ * Created by jorgemachado on 20/06/17.
+ */
+public class Todos extends BacoDataAbstractType
+{
+    static Genson genson;
+    static
+    {
+        genson = new GensonBuilder()
+                .useClassMetadata(true)
+                .useFields(false)
+                .useMethods(true)
+                .useRuntimeType(true)
+                .create();
+    }
+    private List<Todo> todos = new ArrayList<Todo>();
+    public List<Todo> getTodos()
+    {
+        return todos;
+    }
+    public void setTodos(List<Todo> todos) {
+        this.todos = todos;
+    }
+    @Override
+    public String toString()
+    {
+        return genson.serialize(this);
+    }
+    @Override
+    public int hashCode()
+    {
+        return toString().hashCode();
+    }
+    public static Todos fromString(String todosjson)
+    {
+        if(todosjson == null)
+            return null;
+        return genson.deserialize(todosjson,Todos.class);
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/bpmn/ConnectorSOA.java
 New file
 ,0 → 1,47
+package pt.estgp.estgweb.domain.bpmn;
+import java.util.ArrayList;
+import java.util.List;
+/**
+ * Created by jorgemachado on 20/06/17.
+ */
+public class ConnectorSOA extends Todo
+{
+    private String localObjectHolderName = "";
+    private String methodName = "";
+    private String serviceName = "";
+    List<Argument> args = new ArrayList<Argument>();
+    public String getLocalObjectHolderName() {
+        return localObjectHolderName;
+    }
+    public void setLocalObjectHolderName(String localObjectHolderName) {
+        this.localObjectHolderName = localObjectHolderName;
+    }
+    public String getMethodName() {
+        return methodName;
+    }
+    public void setMethodName(String methodName) {
+        this.methodName = methodName;
+    }
+    public String getServiceName() {
+        return serviceName;
+    }
+    public void setServiceName(String serviceName) {
+        this.serviceName = serviceName;
+    }
+    public List<Argument> getArgs() {
+        return args;
+    }
+    public void setArgs(List<Argument> args) {
+        this.args = args;
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/RepositoryDocumentCollectionImpl.java
 ,7 → 28,7
     static Genson gensonSimpleFields;
     static {
-        GensonBuilder gensonBuilder =  new Genson.Builder()
+        GensonBuilder gensonBuilder =  new GensonBuilder()
             .exclude(Object.class)
             .useMethods(false)
             .include(Boolean.class)
 ,7 → 52,7
         genson = gensonBuilder.create();
-        GensonBuilder gensonBuilderSimpleFields =  new Genson.Builder()
+        GensonBuilder gensonBuilderSimpleFields =  new GensonBuilder()
                 .exclude(Object.class)
                 .include(Boolean.class)
                 .include(Integer.class)

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/BpmnFlowConnectorImpl.java
 ,8 → 20,11
     public void setFlowComponentId(Long id)
     {
-        setFlowComponent(new BpmnFlowComponentImpl());
-        getFlowComponent().setId(id);
+        if(id != null)
+        {
+            setFlowComponent(new BpmnFlowComponentImpl());
+            getFlowComponent().setId(id);
+        }
     }
     @Override

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/CourseUnitImpl.java
 ,6 → 1,7
 package pt.estgp.estgweb.domain;
 import com.owlike.genson.Genson;
+import com.owlike.genson.GensonBuilder;
 import org.apache.log4j.Logger;
 import pt.estgp.estgweb.Globals;
 import pt.estgp.estgweb.domain.dao.DaoFactory;
 ,17 → 678,23
         protected String dsTipologia;
         protected Integer ocorrencias = 0; // apenas faz sentido nos sumarios. no horario ref nao.
+        protected boolean tdocturma = false;
+        //NOVO NESTE MOMENTO NAS TIPOLOGIAS APENAS O EXCLUDED É UTILIZADO
+        //O USE NAO É UTILIZADO, APENAS EM REAL TIME PARA VER SE SE USA OU NAO UMA TIPO
+        //NOS METODOS DE MERGE, POR EXEMPLO SO SE USAM AS QUE TEM SUMARIO, NAS SIMPES
+        //TODAS AS GERADAS SE USAM
+        //O MARKWARNING É USADO EM REAL TIME QUANDO UM AVISO É ENCONTRADO
+        //AS extras e as horarioRef são marcadas em tempo real caso estejam numa lista
+        //ou noutra assim como as tdocturma
+        protected boolean exclude = false;
         protected boolean use;   //campo auxiliar para marcar se vai ser ou não usada  nas afetacoes especificas
-                                //por omissão apenas as que têm sumários
         protected boolean markWarning; //campo auxiliar para marcar se vai ser ou não usada  nas afetacoes especificas
         protected boolean extra;
         protected boolean horRef;
-        protected boolean tdocturma = false;
-        //NOVO
-        protected boolean exclude = false;
         public boolean isTdocturma() {
             return tdocturma;
         }
 ,7 → 902,7
                 tipoExtra.cdTipologia = Globals.BACO_TIPOLOGIA_SIMPLES_VIRTUAL_CODE;
                 tipoExtra.dsTipologia = Globals.BACO_TIPOLOGIA_SIMPLES_DS;
                 tipoExtra.extra = true;
-                tipoExtra.exclude = true;
+                tipoExtra.exclude = excluded;
                 if(tipoClass.getTipologiasExtraAdicionadas() == null)
                     tipoClass.setTipologiasExtraAdicionadas(new ArrayList<Tipologia>());
                 tipoClass.getTipologiasExtraAdicionadas().add(tipoExtra);
 ,7 → 981,7
         public void setTipologiasMarcadas(ArrayList<Tipologia> tipologiasMarcadas) { this.tipologiasMarcadas = tipologiasMarcadas; }
         private static Genson getGenson(){
-            Genson genson = new Genson.Builder()
+            Genson genson = new GensonBuilder()
                     .exclude(Object.class)
                     .include(Boolean.class)
                     .include(Integer.class)
 ,6 → 1005,8
             return genson;
         }
+        /*
         private static Genson getGensonMergedTipologiasComplete(){
             Genson genson = new Genson.Builder()
                     .exclude(Object.class)
 ,7 → 1029,7
                     .include("markWarning", Tipologia.class)
                     .create();
             return genson;
-        }
+        }*/
         public String serialize() throws IOException
         {
 ,6 → 1052,7
             new TestCourseUnit().testTipologias();
         }
+        /* Metodos em plenos funcionamento mas não sao usados para simplificar revisões foram comentados
         public static String serializeMergedList(ArrayList<Tipologia> tipologias) throws IOException
         {
             MergedTipologias mergedTipologias = new MergedTipologias();
 ,6 → 1065,8
                 return genson.serialize(mergedTipologias);
         }
+        */
+        /*
         public static ArrayList<Tipologia> deserializeMergedTipologias(String serial) throws IOException
         {
             if(serial == null)
 ,10 → 1079,13
         }
+        */
+        /*
         public String obtainMergeTipologiasSerialized() throws IOException
         {
             return serializeMergedList(obtainMergeTipologias());
         }
+        */

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/DomainObject.java
 ,6 → 39,9
                 .useRuntimeType(true)
                 .useClassMetadata(true)
                 .useDateAsTimestamp(true)
+                .exclude(Date.class)
+                .exclude(java.sql.Timestamp.class)
+                .exclude(java.sql.Date.class)
                 .create();
     }

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/RepositoryDocumentImpl.java
 ,6 → 80,8
             //O sistema nao constroi o RepositoryFile a partir da classe
             //mas como guarda o stream quando serializar aparece outra vez o ficheiro
             .include("repositoryFile", RepositoryFileProxy.class) //DIFERENCA COM O ANTERIOR
+            .exclude("repositoryFileVersions",RepositoryFile.class)
+            .exclude("sourceModule",RepositoryFile.class)
             .create();

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/CourseSchoolImpl.java
 ,6 → 1,7
 package pt.estgp.estgweb.domain;
 import com.owlike.genson.Genson;
+import com.owlike.genson.GensonBuilder;
 import org.json.JSONException;
 import org.json.JSONObject;
 ,7 → 19,7
     }
-    static Genson courseSchoolGenson = new Genson.Builder()
+    static Genson courseSchoolGenson = new GensonBuilder()
             .exclude(Object.class)
             .useRuntimeType(true)
             .useMethods(true)

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/test/TestCourseUnit.java
 ,13 → 401,13
         t.setCdTurma("TINF");
         t.setCdDocente("20128");
         t.setCdTipologia("T");
-        t.setOcorrencias(10);
+        t.setOcorrenciasGetSetNormal(10);
         ts.getTipologiasSumarios().add(t);
         t = new Tipologia();
         t.setCdTurma("TINF");
         t.setCdDocente("20128");
         t.setCdTipologia("TP");
-        t.setOcorrencias(20);
+        t.setOcorrenciasGetSetNormal(20);
         ts.getTipologiasSumarios().add(t);
         */
 ,7 → 464,7
                     assertFalse(tipologia.isHorRef());
                     assertTrue(tipologia.isSumario());
                     assertFalse(tipologia.isExtra());
-                    assertTrue(tipologia.getOcorrencias() == 20);
+                    assertTrue(tipologia.getOcorrenciasGetSetNormal() == 20);
                     foundTP = true;
                 }*/
             }
 ,13 → 509,13
         t.setCdTurma("TINF2");
         t.setCdDocente("20128");
         t.setCdTipologia("OT");
-        t.setOcorrencias(null);
+        t.setOcorrenciasGetSetNormal(null);
         ts.getTipologiasExtraAdicionadas().add(t);
         t = new Tipologia();
         t.setCdTurma("TINF2");
         t.setCdDocente("20128");
         t.setCdTipologia("Sem");
-        t.setOcorrencias(null);
+        t.setOcorrenciasGetSetNormal(null);
         ts.getTipologiasExtraAdicionadas().add(t);
         */
 ,13 → 526,13
         t.setCdTurma("TINF");
         t.setCdDocente("20128");
         t.setCdTipologia("T");
-        t.setOcorrencias(10);
+        t.setOcorrenciasGetSetNormal(10);
         ts.getTipologiasSumarios().add(t);
         t = new Tipologia();
         t.setCdTurma("TINF");
         t.setCdDocente("20128");
         t.setCdTipologia("TP");
-        t.setOcorrencias(20);
+        t.setOcorrenciasGetSetNormal(20);
         ts.getTipologiasSumarios().add(t);
         */
 ,7 → 573,7
                     assertFalse(tipologia.isHorRef());
                     assertFalse(tipologia.isSumario());
                     assertTrue(tipologia.isExtra());
-                    assertTrue(tipologia.getOcorrencias() == null || tipologia.getOcorrencias() == 0);
+                    assertTrue(tipologia.getOcorrenciasGetSetNormal() == null || tipologia.getOcorrenciasGetSetNormal() == 0);
                     foundOT = true;
                 }
                 if(tipologia.getCdTipologia().equals("Sem"))
 ,7 → 581,7
                     assertFalse(tipologia.isHorRef());
                     assertFalse(tipologia.isSumario());
                     assertTrue(tipologia.isExtra());
-                    assertTrue(tipologia.getOcorrencias() == null || tipologia.getOcorrencias() == 0);
+                    assertTrue(tipologia.getOcorrenciasGetSetNormal() == null || tipologia.getOcorrenciasGetSetNormal() == 0);
                     foundSem = true;
                 }*/
                 /*if(tipologia.getCdTipologia().equals("TP"))
 ,7 → 589,7
                     assertFalse(tipologia.isHorRef());
                     assertTrue(tipologia.isSumario());
                     assertFalse(tipologia.isExtra());
-                    assertTrue(tipologia.getOcorrencias() == 20);
+                    assertTrue(tipologia.getOcorrenciasGetSetNormal() == 20);
                     foundTP = true;
                 }*/
             }
 ,13 → 620,13
         t.setCdTurma("TINF");
         t.setCdDocente("20128");
         t.setCdTipologia("T");
-        t.setOcorrencias(null);
+        t.setOcorrenciasGetSetNormal(null);
         ts.getTipologiasHorarioReferencia().add(t);
         t = new Tipologia();
         t.setCdTurma("TINF");
         t.setCdDocente("20128");
         t.setCdTipologia("PL");
-        t.setOcorrencias(null);
+        t.setOcorrenciasGetSetNormal(null);
         ts.getTipologiasHorarioReferencia().add(t);
 */
 ,13 → 635,13
         t.setCdTurma("TINF2");
         t.setCdDocente("20128");
         t.setCdTipologia("OT");
-        t.setOcorrencias(null);
+        t.setOcorrenciasGetSetNormal(null);
         ts.getTipologiasExtraAdicionadas().add(t);
         t = new Tipologia();
         t.setCdTurma("TINF2");
         t.setCdDocente("20128");
         t.setCdTipologia("Sem");
-        t.setOcorrencias(null);
+        t.setOcorrenciasGetSetNormal(null);
         ts.getTipologiasExtraAdicionadas().add(t);
         */
 ,13 → 652,13
         t.setCdTurma("TINF");
         t.setCdDocente("20128");
         t.setCdTipologia("T");
-        t.setOcorrencias(10);
+        t.setOcorrenciasGetSetNormal(10);
         ts.getTipologiasSumarios().add(t);
         t = new Tipologia();
         t.setCdTurma("TINF");
         t.setCdDocente("20128");
         t.setCdTipologia("TP");
-        t.setOcorrencias(20);
+        t.setOcorrenciasGetSetNormal(20);
         ts.getTipologiasSumarios().add(t);
         */
 ,7 → 684,7
                     assertTrue(tipologia.isHorRef());
                     assertTrue(tipologia.isSumario());
                     assertFalse(tipologia.isExtra());
-                    assertTrue(tipologia.getOcorrencias() == 10);
+                    assertTrue(tipologia.getOcorrenciasGetSetNormal() == 10);
                     foundT = true;
                 }
                 if(tipologia.getCdTipologia().equals("PL"))
 ,7 → 692,7
                     assertTrue(tipologia.isHorRef());
                     assertFalse(tipologia.isSumario());
                     assertFalse(tipologia.isExtra());
-                    assertTrue(tipologia.getOcorrencias() == null || tipologia.getOcorrencias() == 0);
+                    assertTrue(tipologia.getOcorrenciasGetSetNormal() == null || tipologia.getOcorrenciasGetSetNormal() == 0);
                     foundPL = true;
                 }
                 */
 ,7 → 701,7
                     assertFalse(tipologia.isHorRef());
                     assertFalse(tipologia.isSumario());
                     assertTrue(tipologia.isExtra());
-                    assertTrue(tipologia.getOcorrencias() == null || tipologia.getOcorrencias() == 0);
+                    assertTrue(tipologia.getOcorrenciasGetSetNormal() == null || tipologia.getOcorrenciasGetSetNormal() == 0);
                     foundOT = true;
                 }
                 if(tipologia.getCdTipologia().equals("Sem"))
 ,7 → 709,7
                     assertFalse(tipologia.isHorRef());
                     assertFalse(tipologia.isSumario());
                     assertTrue(tipologia.isExtra());
-                    assertTrue(tipologia.getOcorrencias() == null || tipologia.getOcorrencias() == 0);
+                    assertTrue(tipologia.getOcorrenciasGetSetNormal() == null || tipologia.getOcorrenciasGetSetNormal() == 0);
                     foundSem = true;
                 }*/
                 /*if(tipologia.getCdTipologia().equals("TP"))
 ,7 → 717,7
                     assertFalse(tipologia.isHorRef());
                     assertTrue(tipologia.isSumario());
                     assertFalse(tipologia.isExtra());
-                    assertTrue(tipologia.getOcorrencias() == 20);
+                    assertTrue(tipologia.getOcorrenciasGetSetNormal() == 20);
                     foundTP = true;
                 }*/
             }
 ,6 → 735,8
     }
+    /* Metodo Serialize Merge comentado porque o serializeMerge não era usado
+    Mas está em pleno funcionamento pode voltar a ser usado
     public void testSerializeMerge()
     {
 ,6 → 909,79
     }
+    */
+    public void testOnlySerialization() throws IOException {
+        ArrayList<Tipologia> ts = new ArrayList<Tipologia>();
+        Tipologia t = new Tipologia();
+        t.setCdTurma("1");
+        t.setDsTipologia("2");
+        t.setCdTipologia("3");
+        t.setCdDocente("4");
+        t.setOcorrencias(5);
+        t.setTdocturma(true);
+        t.setExclude(true);
+        //Estes campo nunca são serializados sao usados sim em tempo real
+        //O use por exemplo para quando faz merge perceber se usa ou não determinada
+        //Tipologia
+        t.setUse(true);
+        t.setMarkWarning(true);
+        //t.extra = ??
+        //t.horarioRef = ??
+        ts.add(t);
+        Tipologias tipologias = new Tipologias();
+        tipologias.setTipologiasSumarios(ts);
+        tipologias.setTipologiasExtraAdicionadas(ts);
+        tipologias.setTipologiasUsadas(ts);
+        tipologias.setTipologiasHorarioReferencia(ts);
+        tipologias.setTipologiasTdocTurma(ts);
+        tipologias.setTipologiasMarcadas(ts);
+        String json = tipologias.serialize();
+        Tipologias tipologias2 = Tipologias.deserialize(json);
+        Tipologia tipologiaOriginal = tipologias.getTipologiasSumarios().get(0);
+        Tipologia tipologiaObtida = tipologias2.getTipologiasSumarios().get(0);
+        checkFields(tipologiaOriginal, tipologiaObtida);
+        tipologiaObtida = tipologias2.getTipologiasExtraAdicionadas().get(0);
+        checkFields(tipologiaOriginal, tipologiaObtida);
+        tipologiaObtida = tipologias2.getTipologiasHorarioReferencia().get(0);
+        checkFields(tipologiaOriginal, tipologiaObtida);
+        tipologiaObtida = tipologias2.getTipologiasMarcadas().get(0);
+        checkFields(tipologiaOriginal, tipologiaObtida);
+        tipologiaObtida = tipologias2.getTipologiasTdocTurma().get(0);
+        checkFields(tipologiaOriginal, tipologiaObtida);
+        tipologiaObtida = tipologias2.getTipologiasUsadas().get(0);
+        checkFields(tipologiaOriginal, tipologiaObtida);
+    }
+    private void checkFields(Tipologia tipologiaOriginal, Tipologia tipologiaObtida) {
+        assertTrue(tipologiaOriginal.getCdTurma().equals(tipologiaObtida.getCdTurma()));
+        assertTrue(tipologiaOriginal.getDsTipologia().equals(tipologiaObtida.getDsTipologia()));
+        assertTrue(tipologiaOriginal.getCdTipologia().equals(tipologiaObtida.getCdTipologia()));
+        assertTrue(tipologiaOriginal.getCdDocente().equals(tipologiaObtida.getCdDocente()));
+        assertTrue(tipologiaOriginal.getOcorrencias().intValue() == tipologiaObtida.getOcorrencias().intValue());
+        assertTrue(tipologiaOriginal.isTdocturma() == tipologiaObtida.isTdocturma());
+        assertTrue(tipologiaOriginal.isExclude() == tipologiaObtida.isExclude());
+    }
 }

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/test/genson/TestFieldsAndMethodsTogether.java
 New file
 ,0 → 1,303
+package pt.estgp.estgweb.domain.test.genson;
+import com.owlike.genson.Genson;
+import com.owlike.genson.GensonBuilder;
+import junit.framework.TestCase;
+import org.json.JSONException;
+import org.json.JSONObject;
+import java.util.Date;
+/**
+ * Created by jorgemachado on 19/06/17.
+ */
+public class TestFieldsAndMethodsTogether extends TestCase
+{
+    private Date saveDate;
+    public Date getSaveDate() {
+        return saveDate;
+    }
+    public void setSaveDate(Date saveDate) {
+        this.saveDate = saveDate;
+    }
+    private int ocorrenciasGetAdulteradoSet;
+    public int getOcorrenciasGetAdulteradoSet() {
+        return 3000;
+    }
+    public void setOcorrenciasGetAdulteradoSet(int ocorrenciasGetAdulteradoSet) {
+        this.ocorrenciasGetAdulteradoSet = ocorrenciasGetAdulteradoSet;
+    }
+    private int ocorrenciasGetSetNormal;
+    private int ocorrenciasComGetSemSetUsaMetodoNaoTemSetNaoCopia;
+    private int ocorrenciasSemGetNemSetUsaFieldNaoCopiaPrivados;
+    private int ocorrenciasGetNormalSetUsaValorDiferenteFicaComoDoSet;
+    private boolean valorDevolvidoTrue;
+    private boolean valorDevolvidoFalse;
+    public boolean isValorDevolvidoTrue() {
+        return valorDevolvidoTrue;
+    }
+    public boolean isValorDevolvidoFalse() {
+        return valorDevolvidoFalse;
+    }
+    public int getOcorrenciasGetNormalSetUsaValorDiferenteFicaComoDoSet() {
+        return ocorrenciasGetNormalSetUsaValorDiferenteFicaComoDoSet;
+    }
+    public void setOcorrenciasGetNormalSetUsaValorDiferenteFicaComoDoSet(int ocorrenciasGetNormalSetUsaValorDiferenteFicaComoDoSet) {
+        this.ocorrenciasGetNormalSetUsaValorDiferenteFicaComoDoSet = 100;
+    }
+    public int getOcorrenciasGetSetNormal()
+    {
+        return ocorrenciasGetSetNormal;
+    }
+    public void setOcorrenciasGetSetNormal(int o)
+    {
+         ocorrenciasGetSetNormal = o;
+    }
+    public int getOcorrenciasComGetSemSetUsaMetodoNaoTemSetNaoCopia() {
+        return ocorrenciasComGetSemSetUsaMetodoNaoTemSetNaoCopia;
+    }
+    private int campoOcultoSemGetNemSet;
+    private int campoOcultoSemGetNemSetNemComOutroNome;
+    public int getCampoInvisivel() {
+        return campoOcultoSemGetNemSet;
+    }
+    public void setCampoInvisivel(int campoInvisivel) {
+        this.campoOcultoSemGetNemSet = campoInvisivel;
+    }
+    public void testPriority() throws JSONException {
+        Genson genson = new GensonBuilder()
+                .include("ocorrenciasGetNormalSetUsaValorDiferenteFicaComoDoSet")
+                .include("ocorrenciasGetAdulteradoSet")
+                .create();
+        TestFieldsAndMethodsTogether t = new TestFieldsAndMethodsTogether();
+        t.ocorrenciasGetNormalSetUsaValorDiferenteFicaComoDoSet=1000;
+        t.ocorrenciasGetSetNormal = 10;
+        t.ocorrenciasComGetSemSetUsaMetodoNaoTemSetNaoCopia = 20;
+        t.ocorrenciasSemGetNemSetUsaFieldNaoCopiaPrivados = 30;
+        t.valorDevolvidoTrue = true;
+        t.valorDevolvidoFalse = false;
+        t.ocorrenciasGetAdulteradoSet = 1;//tem o get adulterado para devolver 3000
+        String json = genson.serialize(t);
+        JSONObject jsonParsed = new JSONObject(json);
+        int valor = jsonParsed.getInt("ocorrenciasGetAdulteradoSet");
+        //fica com o valor do set adulterado
+        assertEquals(valor,3000);
+        TestFieldsAndMethodsTogether t2 = genson.deserialize(json,TestFieldsAndMethodsTogether.class);
+        assertTrue(t2.ocorrenciasGetSetNormal == t.ocorrenciasGetSetNormal);
+        assertTrue(t2.ocorrenciasComGetSemSetUsaMetodoNaoTemSetNaoCopia == 0);
+        assertTrue(t2.ocorrenciasSemGetNemSetUsaFieldNaoCopiaPrivados == 0);
+        //METODO TEM PRIORIDADE
+        assertTrue(t2.ocorrenciasGetNormalSetUsaValorDiferenteFicaComoDoSet == 100);
+        Boolean lidoTrue = jsonParsed.getBoolean("valorDevolvidoTrue");
+        Boolean lidoFalse = jsonParsed.getBoolean("valorDevolvidoFalse");
+        assertTrue(lidoTrue);
+        assertFalse(lidoFalse);
+    }
+    public void testFields1() throws JSONException {
+        Genson genson = new GensonBuilder()
+                .useMethods(false)
+                //.exclude(Object.class)  resulta no mesmo porque os campos são privados
+                // logo estao automaticamente excluidos e' necessario incluir um a um
+                .include("ocorrenciasGetSetNormal", TestFieldsAndMethodsTogether.class)
+                .include("ocorrenciasComGetSemSetUsaMetodoNaoTemSetNaoCopia",TestFieldsAndMethodsTogether.class)
+                .include("ocorrenciasSemGetNemSetUsaFieldNaoCopiaPrivados",TestFieldsAndMethodsTogether.class)
+                .include("valorDevolvidoTrue",TestFieldsAndMethodsTogether.class)
+                .include("valorDevolvidoFalse",TestFieldsAndMethodsTogether.class)
+                .include("ocorrenciasGetNormalSetUsaValorDiferenteFicaComoDoSet",TestFieldsAndMethodsTogether.class)
+                .include("campoInvisivel",TestFieldsAndMethodsTogether.class)
+                .create();
+        TestFieldsAndMethodsTogether t = new TestFieldsAndMethodsTogether();
+        t.ocorrenciasGetSetNormal = 10;
+        t.ocorrenciasComGetSemSetUsaMetodoNaoTemSetNaoCopia = 20;
+        t.ocorrenciasSemGetNemSetUsaFieldNaoCopiaPrivados = 30;
+        t.valorDevolvidoTrue = true;
+        t.valorDevolvidoFalse = false;
+        t.ocorrenciasGetNormalSetUsaValorDiferenteFicaComoDoSet = 200;
+        t.campoOcultoSemGetNemSet = 400;
+        String json = genson.serialize(t);
+        JSONObject jsonParsed = new JSONObject(json);
+        TestFieldsAndMethodsTogether t2 = genson.deserialize(json,TestFieldsAndMethodsTogether.class);
+        assertTrue(t2.ocorrenciasGetSetNormal == t.ocorrenciasGetSetNormal);
+        //Neste caso como foi deliberadamente declarado o campo o sistema usa ou o metodo ou o campo para fazer a alteração
+        assertTrue(t2.ocorrenciasComGetSemSetUsaMetodoNaoTemSetNaoCopia == 20);
+        //Neste caso variaveis explicitamente declaradas o sistema deve copia-las
+        assertTrue(t2.ocorrenciasSemGetNemSetUsaFieldNaoCopiaPrivados == 30);
+        //NEste caso apesar do Set estar a colocar 100 vai usar o valor do campo privado
+        assertTrue(t2.ocorrenciasGetNormalSetUsaValorDiferenteFicaComoDoSet == 200);
+        Boolean lidoTrue = jsonParsed.getBoolean("valorDevolvidoTrue");
+        Boolean lidoFalse = jsonParsed.getBoolean("valorDevolvidoFalse");
+        //Os campos mesmo que tenham metodos e esses metodos sejam declarados
+        //No include do Genson, o include serve apenas para Campos e não para
+        //metodos, portanto o campo não é copiado se o use metodos estiver a false
+        //cs campos apenas são copiados se publicos ou incluidos especificamente
+        assertFalse(t2.campoOcultoSemGetNemSet == 400);
+        assertTrue(lidoTrue);
+        assertFalse(lidoFalse);
+    }
+    public void testFields() throws JSONException {
+        Genson genson = new GensonBuilder()
+                .useMethods(true) //O metodo do campoInvisivel que afeta este campo vai preenche-lo
+                .useFields(false)
+                .include("campoOcultoSemGetNemSetNemComOutroNome",TestFieldsAndMethodsTogether.class)
+                .create();
+        TestFieldsAndMethodsTogether t = new TestFieldsAndMethodsTogether();
+        t.campoOcultoSemGetNemSet = 400;
+        t.campoOcultoSemGetNemSetNemComOutroNome = 100;
+        String json = genson.serialize(t);
+        JSONObject jsonParsed = new JSONObject(json);
+        TestFieldsAndMethodsTogether t2 = genson.deserialize(json,TestFieldsAndMethodsTogether.class);
+        //Tem um metodo que usa o valor e o acerta
+        assertTrue(t2.campoOcultoSemGetNemSet == 400);
+        //Campos nunca são copiados com o Fields = false logo o valor não passa o assert e' false
+        assertTrue(t2.campoOcultoSemGetNemSetNemComOutroNome != 100);
+    }
+    public void testFields1Herancas() throws JSONException {
+        Genson genson = new GensonBuilder()
+                .useMethods(false)
+                .useClassMetadata(true)
+                .useRuntimeType(true)
+                        //.exclude(Object.class)  resulta no mesmo porque os campos são privados
+                        // logo estao automaticamente excluidos e' necessario incluir um a um
+                .include("ocorrenciasGetSetNormal", TestFieldsAndMethodsChild.class)
+                .create();
+        TestFieldsAndMethodsChild t = new TestFieldsAndMethodsChild();
+        t.setOcorrenciasGetSetNormal(10);
+        String json = genson.serialize(t);
+        JSONObject jsonParsed = new JSONObject(json);
+        TestFieldsAndMethodsTogether t2 = genson.deserialize(json,TestFieldsAndMethodsTogether.class);
+        assertTrue(t2.getOcorrenciasGetSetNormal() == t.getOcorrenciasGetSetNormal());
+        genson = new GensonBuilder()
+                .useMethods(false)
+                .include("ocorrenciasGetSetNormal", TestFieldsAndMethodsTogether.class)
+                .create();
+        t = new TestFieldsAndMethodsChild();
+        t.setOcorrenciasGetSetNormal(10);
+        json = genson.serialize(t);
+        jsonParsed = new JSONObject(json);
+        t2 = genson.deserialize(json,TestFieldsAndMethodsTogether.class);
+        assertTrue(t2.getOcorrenciasGetSetNormal() == t.getOcorrenciasGetSetNormal());
+    }
+    public void testFieldsDates() throws JSONException {
+        Genson genson = new GensonBuilder()
+                .useFields(true)
+                .useMethods(false)
+                .exclude("saveDate",TestFieldsAndMethodsTogether.class)
+                .include("dateStr", TestFieldsAndMethodsTogether.class)
+                .create();
+        TestFieldsAndMethodsChild t = new TestFieldsAndMethodsChild();
+        t.setSaveDate(new Date());
+        String json = genson.serialize(t);
+        TestFieldsAndMethodsChild t2 = genson.deserialize(json,TestFieldsAndMethodsChild.class);
+        //Tem um metodo que usa o valor e o acerta
+        assertEquals(t2.getDateStr(),t.getDateStr());
+    }
+    public void testMetodosIncludesEdates() throws JSONException {
+        Genson genson = new GensonBuilder()
+                .exclude(Object.class)
+                .useFields(false)
+                .useMethods(true)
+                .exclude("ocorrenciasGetSetNormal",TestFieldsAndMethodsTogether.class)
+                //VAR inexistente apenas existe o metodo
+                .include("dateStr2",TestFieldsAndMethodsChild.class)
+                .create();
+        TestFieldsAndMethodsChild t = new TestFieldsAndMethodsChild();
+        t.setSaveDate(new Date());
+        String json = genson.serialize(t);
+        TestFieldsAndMethodsChild t2 = genson.deserialize(json,TestFieldsAndMethodsChild.class);
+        //Um metodo pode ser excluido, nao pode é ser incluido
+        assertTrue(t2.getOcorrenciasGetSetNormal() == 0);
+        //Tem um metodo que usa o valor e o acerta
+        assertEquals(t2.getDateStr2(),t.getDateStr2());
+        assertEquals(t2.getSaveDate().getYear(),t.getSaveDate().getYear());
+        assertEquals(t2.getSaveDate().getMonth(),t.getSaveDate().getMonth());
+        assertEquals(t2.getSaveDate().getDay(),t.getSaveDate().getDay());
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/test/genson/TestFieldsAndMethodsChild.java
 New file
 ,0 → 1,41
+package pt.estgp.estgweb.domain.test.genson;
+import pt.estgp.estgweb.web.utils.DatesUtils;
+import java.util.Date;
+/**
+ * Created by jorgemachado on 19/06/17.
+ */
+public class TestFieldsAndMethodsChild extends TestFieldsAndMethodsTogether
+{
+    private String dateStr;
+    @Override
+    public void setSaveDate(Date saveDate) {
+        super.setSaveDate(saveDate);
+        dateStr = DatesUtils.getStringFromDate(saveDate);
+    }
+    public String getDateStr()
+    {
+        return dateStr;
+    }
+    public void setDateStr(String dateStr)
+    {
+        super.setSaveDate(DatesUtils.getDateFromString(dateStr));
+        this.dateStr = dateStr;
+    }
+    public String getDateStr2() {
+        return DatesUtils.getStringFromDate(getSaveDate());
+    }
+    public void setDateStr2(String dateStr2) {
+        super.setSaveDate(DatesUtils.getDateFromString(dateStr2));
+    }
+}

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/test/genson/NotasGensonProblemasEFeatures
 ,6 → 91,41
 Mesmo que seja incluida uma classe ele não inclui os metodos da classe
 inclui sim gets que devolvam essa classe
+Usar a primitiva useMethods(false) exclui todos os métodos,
+os campos serão todos usados mas se estiverem privados não são copiados
+mas se depois incluirmos os nomes dos campos mesmo que privados desejados
+( neste caso não importa se é ou nao na classe certa as heranças nao afetam a classe onde queremos ver o campo)
+ esses campos
+ .include("ocorrenciasGetSetNormal", TestFieldsAndMethodsTogether.class)
+ .include("ocorrenciasGetSetNormal", TestFieldsAndMethodsChild.class)
+ é igual
+ included são usados mas não outros, apenas os publicos  os incluidos
+s campos mesmo que tenham metodos e esses metodos sejam declarados
+  //No include do Genson, o include serve apenas para Campos e não para
+  //metodos, portanto o campo não é copiado se o use metodos estiver a false
+  //os campos apenas são copiados se publicos ou incluidos especificamente
+  Um metodo TEM PRIORIDADE EM RELACAO AO CAMPO
+  Mesmo que o campo seja incluido num include o metodo sobrepõe-se quer o GET quer o SET
+  e desde que o useMethods esteja a true, O CAMPO E COPIADO PRIMEIRO E O SET E FEITO DEPOIS
+  METODOS EXCLUIDO
+  Se usarmos metodos e nao campos e excluirmos um metodo, FUNCIONA
+  ou seja os includes apenas servem para campos
+  mas os excludes aplicam-se a geters e setters
+  Poderá funcionar também
+############PROCEDIMENTO ACONSELHADO###########################################
+  Se excluirmos o Object.cautomaticamente excluimos todo so Metodos
+  mesmo os simples, os Metodos podem ser incluidos e assim só ja temos os
+  metodos que queremos e não outros. Classe por classe.
+  Ou seja o include sempre funciona para metodos mas temos de os ter ligados
+  e com o Object Excluido para depois adiconar os metodos que queremos
+  # VER ESTE METODO
+  public void testMetodosIncludesEdates() throws JSONException {
 NOTA HERANCAS METODOS
 Os metodos a incluir devem ser incluidos na classe que os comporta e não nas
 classes descendentes, desse modo não funcionam
 ,7 → 145,18
 um formato de texto que depois não se consegue desserializar
 Não usar include(Date.class)
 nem include("updateDate")
+isto apenas funciona com o seMethods a true
+Se quisermos proteger os metodos e coloca-los a false necessitamos
+de ter um campo auxiliar numa bubclasse e altera-lo quando é feito o setUpdateDate
+na de cima fazendo override do campo
+Para desserializar esse auxiliar para o verdadeiro, como os metodos não estão a ser
+chamados pelo GENSON temos sempre de fazer a passagem à mão para o campo final
+Existe uma forma melhorada de proteger os metodos veja o ponto acima
+onde diz ###PROCEDIMENTO ACONSELHADO####
 NORMAS DE UTILIZACAO DO GENSON
 Usar sempre as seguintes diretivas
 ,7 → 174,11
 TODO
 VERIFCAR PLANOS DE ESTUDOS EM PARTICULAR OS ECTS eCTS eCts
 VERIFICAR INTERFACES DO REPOSITORIO JA ESTA BEM MAS NAO ESTA NORMALIZADO
+//VERIFICADO USA APENAS CAMPOS E OS TESTES ESTAO VALIDADOS FALTA TESTAR NAS ATRIBUICOES
 VERIFICAR QUESTIONARIOS QUESTÃO DAS TIPOLOGIAS
+//VERIFICADO
 VERIFICAR IMPORTACOES QUESTÃO DAS TIPOLOGIAS
+Verificar como são serializadas as ocorrencias nas tipologias porque não precisam de ser serializadas

 /branches/v3/impl/src/java/pt/estgp/estgweb/domain/CourseDepartmentImpl.java
 ,6 → 1,7
 package pt.estgp.estgweb.domain;
 import com.owlike.genson.Genson;
+import com.owlike.genson.GensonBuilder;
 import org.json.JSONException;
 import org.json.JSONObject;
 import pt.estgp.estgweb.utils.ConfigProperties;
 ,7 → 29,7
     }
-    static Genson courseDepartmentGenson = new Genson.Builder()
+    static Genson courseDepartmentGenson = new GensonBuilder()
             .exclude(Object.class)
             .include(CourseDepartmentImpl.class)
             .useRuntimeType(true)

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/bpmn/BpmnController.java
 ,24 → 76,8
         return processJson;
     }
-    public JSONObject updateProcess(ActionForm form,HttpServletRequest request, HttpServletResponse response) throws Throwable
-    {
-        BpmnProcessImpl view = BpmnProcessImpl.fromJson(request.getParameter("processJson"));
-        AbstractDao.getCurrentSession().beginTransaction();
-        BpmnProcessImpl persistent = (BpmnProcessImpl) DaoFactory.getBpmnProcessDaoImpl().get(view.getId());
-        persistent.setName(view.getName());
-        persistent.setActive(view.isActive());
-        JSONObject processJson = persistent.toJsonObject();
-        AbstractDao.getCurrentSession().getTransaction().commit();
-        return processJson;
-    }
     public JSONObject addActorPool(ActionForm form,HttpServletRequest request, HttpServletResponse response) throws Throwable
     {
 ,6 → 116,46
         return connectorJson;
     }
+    public JSONObject addTaskActor(ActionForm form,HttpServletRequest request, HttpServletResponse response) throws Throwable
+    {
+        Long poolId = Long.parseLong(request.getParameter("poolId"));
+        AbstractDao.getCurrentSession().beginTransaction();
+        BpmnActorPoolImpl persistent = (BpmnActorPoolImpl) DaoFactory.getBpmnActorPoolDaoImpl().get(poolId);
+        BpmnFlowComponentTaskActor taskActor = DomainObjectFactory.createBpmnFlowComponentTaskActorImpl();
+        taskActor.setActorPool(persistent);
+        persistent.getFlowComponents().add(taskActor);
+        DaoFactory.getBpmnFlowComponentTaskActorDaoImpl().save(taskActor);
+        JSONObject taskActorJson = taskActor.toJsonObject();
+        AbstractDao.getCurrentSession().getTransaction().commit();
+        return taskActorJson;
+    }
+    public JSONObject updateProcess(ActionForm form,HttpServletRequest request, HttpServletResponse response) throws Throwable
+    {
+        BpmnProcessImpl view = BpmnProcessImpl.fromJson(request.getParameter("processJson"));
+        AbstractDao.getCurrentSession().beginTransaction();
+        BpmnProcessImpl persistent = (BpmnProcessImpl) DaoFactory.getBpmnProcessDaoImpl().get(view.getId());
+        persistent.setName(view.getName());
+        persistent.setActive(view.isActive());
+        JSONObject processJson = persistent.toJsonObject();
+        AbstractDao.getCurrentSession().getTransaction().commit();
+        return processJson;
+    }
     public boolean updateTask(ActionForm form,HttpServletRequest request, HttpServletResponse response) throws Throwable
     {
 ,8 → 193,13
         persistent.setSendEmail(connectorView.isSendEmail());
         //todo faltam os holders e os target types
-        BpmnFlowComponent flowComponent = DaoFactory.getBpmnFlowComponentTaskDaoImpl().get(connectorView.getFlowComponentId());
-        persistent.setFlowComponent(flowComponent);
+        if(connectorView.getFlowComponentId() != null)
+        {
+            BpmnFlowComponent flowComponent = DaoFactory.getBpmnFlowComponentTaskDaoImpl().get(connectorView.getFlowComponentId());
+            persistent.setFlowComponent(flowComponent);
+        }
+        else
+            persistent.setFlowComponent(null);
         AbstractDao.getCurrentSession().getTransaction().commit();
 ,29 → 207,38
         return true;
     }
-    public JSONObject addTaskActor(ActionForm form,HttpServletRequest request, HttpServletResponse response) throws Throwable
+    public boolean removeActorPool(ActionForm form,HttpServletRequest request, HttpServletResponse response) throws Throwable
     {
+        //TODO NO SERVICO QUANDO HOUVER CHECK PROCESSOS ABERTOS INSTANCIAS
         Long poolId = Long.parseLong(request.getParameter("poolId"));
         AbstractDao.getCurrentSession().beginTransaction();
-        BpmnActorPoolImpl persistent = (BpmnActorPoolImpl) DaoFactory.getBpmnActorPoolDaoImpl().get(poolId);
-        BpmnFlowComponentTaskActor taskActor = DomainObjectFactory.createBpmnFlowComponentTaskActorImpl();
+        BpmnActorPool actorPool = DaoFactory.getBpmnActorPoolDaoImpl().get(poolId);
-        taskActor.setActorPool(persistent);
-        persistent.getFlowComponents().add(taskActor);
+        logger.warn("Removing bpmn pool: " + poolId + " " + actorPool.getName() + " from process " + actorPool.getProcess().getId() + " " + actorPool.getProcess().getName());
+        if(actorPool.getFlowComponents().size() > 0)
+        {
+            addErrorAsString(request,"Não pode remover uma pool com componentes de fluxo associados, remova os componentes primeiro");
+            AbstractDao.getCurrentSession().getTransaction().rollback();
+        }
+        else
+        {
+            DaoFactory.getBpmnActorPoolDaoImpl().delete(actorPool);
+            AbstractDao.getCurrentSession().getTransaction().commit();
+        }
-        DaoFactory.getBpmnFlowComponentTaskActorDaoImpl().save(taskActor);
-        JSONObject taskActorJson = taskActor.toJsonObject();
-        AbstractDao.getCurrentSession().getTransaction().commit();
-        return taskActorJson;
+        return true;
     }
     public boolean removeTask(ActionForm form,HttpServletRequest request, HttpServletResponse response) throws Throwable
     {
         //TODO NO SERVICO QUANDO HOUVER CHECK PROCESSOS ABERTOS INSTANCIAS nao deixar apagar
 ,7 → 258,7
                         .list();
         if(cons.size() > 0)
         {
-            addMessageAsString(request,"Nao pode apagar esta Tarefa porque existe um connector a apontar para ela: " + cons.get(0).getNameConnection());
+            addErrorAsString(request,"Nao pode apagar esta Tarefa porque existe um connector a apontar para ela: " + cons.get(0).getNameConnection());
             return false;
         }

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/utils/FilesUploadResult.java
 ,6 → 2,7
 import com.owlike.genson.Genson;
+import com.owlike.genson.GensonBuilder;
 import org.json.JSONException;
 import org.json.JSONObject;
 ,7 → 37,7
     public static Genson getGenson()
     {
-        return new Genson.Builder()
+        return new GensonBuilder()
                 .include(FilesUploadResult.class)
                 .include(FileUploaded.class)
                 .create();

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/utils/FileUploaded.java
 ,6 → 1,7
 package pt.estgp.estgweb.web.controllers.utils;
 import com.owlike.genson.Genson;
+import com.owlike.genson.GensonBuilder;
 import java.io.IOException;
 import java.io.Serializable;
 ,7 → 110,7
     public static Genson getGenson()
     {
-        return new Genson.Builder()
+        return new GensonBuilder()
                 .include(FileUploaded.class)
                 .create();
     }

 /branches/v3/impl/src/java/pt/estgp/estgweb/web/controllers/configuration/SchedullerTasksJson.java
 ,6 → 1,7
 package pt.estgp.estgweb.web.controllers.configuration;
 import com.owlike.genson.Genson;
+import com.owlike.genson.GensonBuilder;
 import jomm.dao.impl.AbstractDao;
 import org.apache.log4j.Logger;
 import pt.estgp.estgweb.domain.JobServiceTask;
 ,7 → 79,7
         {
             JobServiceTaskImpl j = (JobServiceTaskImpl) sm.execute(RequestUtils.getRequester(request, response), "LoadJobServiceTask", args, names);
-            Genson genson = new Genson.Builder()
+            Genson genson = new GensonBuilder()
                     .exclude(Object.class)
                     .include(Boolean.class)
                     .include(Integer.class)
 ,7 → 133,7
             List<JobServiceTaskScheduler> tasks = (List<JobServiceTaskScheduler>) sm.execute(RequestUtils.getRequester(request, response), "LoadJobServiceTaskSchedullers", args, names);
-            Genson genson = new Genson.Builder()
+            Genson genson = new GensonBuilder()
                     .exclude(Object.class)
                     .include(Boolean.class)
                     .include(Integer.class)
 ,7 → 181,7
             AbstractDao.getCurrentSession().getTransaction().commit();
-            Genson genson = new Genson.Builder()
+            Genson genson = new GensonBuilder()
                     .exclude(Object.class)
                     .include(Boolean.class)
                     .include(Integer.class)

/branches/v3/impl/src/doc/estgweb.eap
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

 /branches/v3/impl/src/hbm/pt/estgp/estgweb/domain/BpmnFramework.hbm.xml
 ,7 → 40,8
         </id>
         <discriminator column="discriminator"/>
         <property name="name" type="string"/>
-        <property name="type" type="string"/>
+        <property name="type" column="type" type="pt.estgp.estgweb.domain.bpmn.VariableType">
+        </property>
         <subclass name="pt.estgp.estgweb.domain.BpmnVariableImpl" discriminator-value="BpmnVariableImpl"/>
     </class>
 ,11 → 166,15
             <meta attribute="scope-class">public abstract</meta>
             <subclass name="pt.estgp.estgweb.domain.BpmnFlowComponentTask" abstract="true">
                 <meta attribute="scope-class">public abstract</meta>
-                <property name="targetService" type="string"/>
-                <property name="targetMethod" type="string"/>
+                <property name="todos" type="pt.estgp.estgweb.domain.bpmn.TodosEnhancedType">
+                    <column name="todos" sql-type="BLOB"/>
+                </property>
                 <subclass name="pt.estgp.estgweb.domain.BpmnFlowComponentTaskImpl">
                     <subclass name="pt.estgp.estgweb.domain.BpmnFlowComponentTaskActor" abstract="true">
                         <meta attribute="scope-class">public abstract</meta>
+                        <property name="afterUserTodos" type="pt.estgp.estgweb.domain.bpmn.TodosEnhancedType">
+                            <column name="afterUserTodos" sql-type="BLOB"/>
+                        </property>
                         <property name="interfacePlugin" type="string"/>
                         <subclass name="pt.estgp.estgweb.domain.BpmnFlowComponentTaskActorImpl" discriminator-value="BpmnFlowComponentTaskActorImpl"/>
                     </subclass>

 /branches/v3/impl/src/web/admin/bpmn/processEditor.jsp
 ,8 → 44,63
         border: 1px solid #a94442 !important;
     }
 </style>
 <script>
+var BacoJS = (function () {
+    //"private" variables:
+    var myPrivateVar = "I can be accessed only from within obj.";
+    //"private" method:
+    var orderKeys = function(obj, expected) {
+        var keys = Object.keys(obj).sort(function keyOrder(k1, k2)
+        {
+            if (k1 < k2) return -1;
+            else if (k1 > k2) return +1;
+            else return 0;
+        });
+        var i, after = {};
+        for (i = 0; i < keys.length; i++) {
+            after[keys[i]] = obj[keys[i]];
+            delete obj[keys[i]];
+        }
+        for (i = 0; i < keys.length; i++) {
+            obj[keys[i]] = after[keys[i]];
+        }
+        return obj;
+    }
+    var orderKeysRecur = function orderKeysRecur(obj, expected) {
+        for (var k in obj)
+        {
+            if (typeof obj[k] == "object" && obj[k] !== null)
+                orderKeysRecur(obj[k]);
+            else
+                orderKeys(obj, expected);
+        }
+    }
+    return {
+        stringifyOrdered: function(jsonObj)
+        {
+            return JSON.stringify(orderKeysRecur(jsonObj));
+        }
+    };
+})();
+//console.log(JSON.stringify(orderKeys(example)));
 //DECLARACAO DA APLICACAO LOCAL EM ANGULAR
 var processEditorModule = angular.module('processEditorModule', ['ui.tree']);
 GLOBAL_BacoAngularAppDependencies.push('processEditorModule');
 ,6 → 142,15
         );
     }
+    /*
+    * Variaveis e metodos auxiliares
+    * */
+    $scope.allFlowComponents = [];
+    $scope.autoSavesObjects = [];
+    $scope.idTemp = -1;
+    $scope.jsps = [];
     $scope.variaveisConstantes = [
         "Formulario",
         "Processo",
 ,8 → 161,26
     ];
-    $scope.allFlowComponents = [];
-    $scope.autoSavesObjects = [];
+    $scope.initBuilder = function()
+    {
+        $scope.initJsps();
+        $scope.inicializarSaves();
+        $scope.copiaFlowComponentsDasActorPools();
+    }
+    $scope.initJsps = function()
+    {
+        $scope.callService("loadJspsPlugins",{},function(interfaces)
+        {
+            $scope.jsps = interfaces.jsps;
+            $scope.$apply();
+            $(".angularChosen").chosen();
+        });
+    }
     $scope.inicializarSaves = function()
     {
         $interval($scope.autoSaves,2000);
 ,30 → 252,7
-    //$scope.files = {"service":"ok","uploadedFiles":[{fileName:"teste"}]};
-    $scope.idTemp = -1;
-    $scope.jsps = [];
-    $scope.initBuilder = function()
-    {
-        $scope.initJsps();
-        $scope.inicializarSaves();
-        $scope.copiaFlowComponentsDasActorPools();
-    }
-    $scope.initJsps = function()
-    {
-        $scope.callService("loadJspsPlugins",{},function(interfaces)
-        {
-            $scope.jsps = interfaces.jsps;
-            $scope.$apply();
-            $(".angularChosen").chosen();
-        });
-    }
     /** Funções que interagem com directiva reutilizavel **/
     $scope.save = function() {
         $scope.$broadcast('show-errors-check-validity');
 ,9 → 273,29
     /** Fim de Funções que interagem com directiva reutilizavel **/
+    /*
+    * Funcoes e variaveis especificas do Processo
+    *
+    * */
     $scope.process = <%=process.toJson()%>;
-    //todo remove do allComponennts
+    $scope.removeActorPool = function(poolId,$index)
+    {
+        var pool = $filter('filter')($scope.process.actorPools, {id: poolId })[0];
+        if(pool.flowComponents && pool.flowComponents.length > 0)
+        {
+            alert("Não pode apagar esta pool com atividades no seu interior");
+        }
+        else
+        {
+            $scope.callSimpleService("removeActorPool",{"poolId":pool.id},function()
+            {
+                $scope.process.actorPools.splice($index,1);
+            });
+        }
+    }
     $scope.removeTask = function (poolId,taskId,$index)
     {
         $scope.callSimpleService("removeTask",{"poolId":poolId,"taskId":taskId},function()
 ,7 → 308,7
         });
     }
-    $scope.removeConnector = function (taskId,connectorId,poolId,$index)
+    $scope.removeConnector = function (connectorId,taskId,poolId,$index)
     {
         $scope.callSimpleService("removeConnector",{"taskId":taskId,"connectorId":connectorId},function()
         {
 ,6 → 366,7
     {
         $scope.callService("addConnector",{"taskId":task.id},function(connector)
         {
+            //connector = orderKeys(connector);
             if(task.flowConnectors == null)
                 task.flowConnectors = [];
             task.flowConnectors.push(connector);
 ,6 → 375,16
         });
     }
+    $scope.orderConnector = function(connector)
+    {
+        orderKeys(connector);
+    }
+    $scope.orderKeysRecursive = function(object)
+    {
+        console.log(BacoJS.stringifyOrdered(object));
+    }
     $scope.newRoleForPool = function(item)
     {
         $scope.idTemp--;
 ,7 → 496,7
 <form  style="height: 80vh" class="row" name="processoForm">
     <div  style="height: 80vh;overflow-y: auto;" class="col-md-6 form-horizontal">
+        <button type="button" ng-click="orderKeysRecursive(process)">Ordena</button>
         <div class="panel panel-primary">
             <div class="panel-heading">
                 Identificação do Processo
 ,7 → 571,7
                 <div class="panel panel-default">
                     <div class="panel-heading clearfix">
                         <a class="pull-right btn btn-default btn-xs bpmnTask" data-nodrag ng-click="addTaskActor(a)" style="margin-right: 8px;">
-                            <span class="bpmn-icon-task"></span></a>
+                            <span class="glyphicon glyphicon-user"></span><span class="bpmn-icon-task"></span></a>
                         <a class="pull-right btn btn-default btn-xs bpmnGateway" data-nodrag ng-click="newFlowComponent('bpmnGateway')" style="margin-right: 8px;">
                             <span class="bpmn-icon-gateway-none"></span></a>
                         <a class="pull-right btn btn-default btn-xs bpmnEndEvent" data-nodrag ng-click="newFlowComponent('bpmnEndEvent')" style="margin-right: 8px;">
 ,8 → 612,8
                             </div>
                         </div>
                         <div class="col-md-1">
-                            <a class="pull-right btn btn-danger btn-xs" data-nodrag ng-click="process.actorPools.splice($index, 1)"><span
-                                    class="glyphicon glyphicon-remove"></span></a>
+                            <bacoTags:confirm  msg="Tem a certeza que deseja remover a pool {{a.name}}" targetFunction="angular.element($('#processEditorModule')).scope().removeActorPool({{a.id}},{{$index}});angular.element($('#processEditorModule')).scope().$apply();" btnClass="btn btn-danger btn-xs pull-right" icon="glyphicon glyphicon-remove"/>
                         </div>
                     </div>
                     <div class="panel-body">
 ,7 → 722,9
                 <tr>
                     <td><i class="glyphicon glyphicon-resize-vertical" ui-tree-handle></i></td>
                     <td>
-                        <span ng-if="node['@class'] == 'pt.estgp.estgweb.domain.BpmnFlowComponentTaskActorImpl'" class="bpmn-icon-task"></span>
+                        <span ng-if="node['@class'] == 'pt.estgp.estgweb.domain.BpmnFlowComponentTaskActorImpl'">
+                            <span class="glyphicon glyphicon-user"></span><span class="bpmn-icon-task"></span>
+                        </span>
                         <span ng-if="node.type == 'bpmnGateway'" class="bpmn-icon-gateway-none"></span>
                         <span ng-if="node.type == 'bpmnEndEvent'" class="bpmn-icon-end-event-none"></span>
                         <label ng-if="node['@class'] == 'pt.estgp.estgweb.domain.BpmnFlowComponentTaskActorImpl'" class="control-label">Tarefa Actor</label>
 ,8 → 763,8
         </div>
     </div>
-    <ol ui-tree-nodes="" data-nodrop-enabled="true" ng-model="node.flowConnectors" ng-class="{hidden: collapsed}">
-        <li ng-repeat="node in node.flowConnectors" ui-tree-node ng-include="'connector_renderer.html'" ng-init="task=node;pool=pool">
+    <ol ui-tree-nodes="" data-nodrop-enabled="true" ng-model="node.flowConnectors" ng-class="{hidden: collapsed}" ng-init="task=node">
+        <li ng-repeat="node in node.flowConnectors" ui-tree-node ng-include="'connector_renderer.html'">
         </li>
     </ol>
 </script>
 ,7 → 773,7
 <script type="text/ng-template" id="connector_renderer.html">
     <!-- Coloquei aqui o predicado no NGClass que quando existe uma property nodrop = true o angular coloca nodrop na class o que faz o elemento ficar a vermelho e nao permite drop-->
+    <button type="button" ng-click="orderConnector(node)">Ordena</button>
     <div ng-click="select(node)" class="panel panel-info panel-block tree-node tree-node-content bpmnConnector" data-nodrag ng-class="{dirty: node.dirty==true, selected: node.selected == true,nodrop: node.nodrop, nodrag: node.nodrag, moved: node.moved}">
         <div class="panel-heading clearfix" ng-class="node.type">
             <div class="row gutter-0">
 ,7 → 787,7
                             <input ng-keyup="setDirty(node)" data-nodrag class="form-control" ng-model="node.nameConnection">
                         </td>
                         <td>
-                            <bacoTags:confirm  msg="Tem a certeza que deseja remover o connector {{node.name}}" targetFunction="angular.element($('#processEditorModule')).scope().removeConnector({{task.id}},{{node.id}},{{pool.id}}{{$index}});angular.element($('#processEditorModule')).scope().$apply();" btnClass="btn btn-danger btn-xs pull-right" icon="glyphicon glyphicon-remove"/>
+                            <bacoTags:confirm  msg="Tem a certeza que deseja remover o connector {{node.name}}" targetFunction="angular.element($('#processEditorModule')).scope().removeConnector({{node.id}},{{task.id}},{{pool.id}},{{$index}});angular.element($('#processEditorModule')).scope().$apply();" btnClass="btn btn-danger btn-xs pull-right" icon="glyphicon glyphicon-remove"/>
                         </td>
                     </tr>
                 </table>
 ,7 → 799,7
                     <span class="glyphicon glyphicon-arrow-right"></span> Ligação
                 </div>
                 <div class="col-md-10">
-                    <select data-nodrag class="form-control" ng-model="node.flowComponentId"
+                    <select ng-change="setDirty(node)" data-nodrag class="form-control" ng-model="node.flowComponentId"
                             ng-options="f.id as f.title for f in allFlowComponents">
                     </select>
                 </div>
 ,7 → 809,7
                     <span class="glyphicon glyphicon-tag"></span> Chave
                 </div>
                 <div class="col-md-10">
-                    <input type="text" data-nodrag class="form-control" ng-model="node.keyValue">
+                    <input type="text" ng-keyup="setDirty(node)" data-nodrag class="form-control" ng-model="node.keyValue">
                 </div>
             </div>
             <div class="form-group">
 ,7 → 817,7
                     <span class="glyphicon glyphicon-envelope"></span> Enviar Emails
                 </div>
                 <div class="col-md-2">
-                    <select class="form-control chosenOff" ng-model="node.sendEmail" ng-options="o.v as o.n for o in [{ n: 'Sim', v: true }, { n: 'Não', v: false }]">
+                    <select class="form-control chosenOff" ng-change="setDirty(node)" ng-model="node.sendEmail" ng-options="o.v as o.n for o in [{ n: 'Sim', v: true }, { n: 'Não', v: false }]">
                     </select>
                 </div>
             </div>
 ,7 → 826,7
                     Mensagem
                 </div>
                 <div class="col-md-10">
-                    <textarea rows="3" class="form-control" ng-model="node.msgEmail"></textarea>
+                    <textarea ng-keyup="setDirty(node)" rows="3" class="form-control" ng-model="node.msgEmail"></textarea>
                 </div>
             </div>
         </div>

 /branches/v3/impl/src/web/user/repositoryDocuments/collectionsbrowser.jsp
 ,6 → 694,9
         <%--<div class="col-sm-12">
              <pre class="code">{{ checkedDocuments | json }}</pre>
          </div>--%>
+        <div class="col-sm-12">
+             <pre class="code">{{ data | json }}</pre>
+         </div>
     </div>

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoCursoAfeto.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Pagina.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.ArrayList;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitDeliverable.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioPergunta.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentTaskActorInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SurveyStatsGraphic.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/GenericUser.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/EventGeneric.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportFileGroupDocentesAno.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentTaskInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentGatewayExclusiveDecisionHolderInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnActorSelector.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitProgram.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ConfigurationSeparator.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportFileGroupCursosAno.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Announcement.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentEventEndMessageInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnActorPoolThreadInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Survey.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/RecordThesis.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/AssessmentQuestionPossibleAnswer.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/RepositoryDocumentInterface.java
 ,11 → 1,10
 package pt.estgp.estgweb.domain;
-// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
+// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9
+import java.util.Date;
 import pt.estgp.estgweb.services.data.repositorydocuments.interfaces.RepositoryInterface;
-import java.util.Date;
 /**
  * RepositoryDocumentInterface generated by hbm2java
  */

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/PageSection.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.ArrayList;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SurveyQuestionCandidateAnswer.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnActorPoolInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SruSourceCollection.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapStarFactQuestionarioAnswer.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/EventClass.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/RecordJob.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ConfigurationGradesStatusEpoca.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Teacher.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/PageRepositoryFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitSummary.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentGatewayInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Record.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnRoleSelector.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnTaskFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportDocenteFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseYear.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableDomainObject.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Blog.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentTaskActor.java
 ,7 → 1,8
 package pt.estgp.estgweb.domain;
-// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
+// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9
+import pt.estgp.estgweb.domain.bpmn.Todos;
 /**
  * BpmnFlowComponentTaskActor generated by hbm2java
 ,12 → 10,20
 public abstract class BpmnFlowComponentTaskActor extends pt.estgp.estgweb.domain.BpmnFlowComponentTaskImpl implements java.io.Serializable {
+     private Todos afterUserTodos;
      private String interfacePlugin;
     public BpmnFlowComponentTaskActor() {
     }
+    public Todos getAfterUserTodos() {
+        return this.afterUserTodos;
+    }
+    public void setAfterUserTodos(Todos afterUserTodos) {
+        this.afterUserTodos = afterUserTodos;
+    }
     public String getInterfacePlugin() {
         return this.interfacePlugin;
     }

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Assessment.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/RepositoryFileVersion.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UserRoleConfig.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SessionObjectId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentTask.java
 ,7 → 1,8
 package pt.estgp.estgweb.domain;
-// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
+// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9
+import pt.estgp.estgweb.domain.bpmn.Todos;
 /**
  * BpmnFlowComponentTask generated by hbm2java
 ,27 → 10,19
 public abstract class BpmnFlowComponentTask extends pt.estgp.estgweb.domain.BpmnFlowComponentImpl implements java.io.Serializable {
-     private String targetService;
-     private String targetMethod;
+     private Todos todos;
     public BpmnFlowComponentTask() {
     }
-    public String getTargetService() {
-        return this.targetService;
+    public Todos getTodos() {
+        return this.todos;
     }
-    public void setTargetService(String targetService) {
-        this.targetService = targetService;
+    public void setTodos(Todos todos) {
+        this.todos = todos;
     }
-    public String getTargetMethod() {
-        return this.targetMethod;
-    }
-    public void setTargetMethod(String targetMethod) {
-        this.targetMethod = targetMethod;
-    }

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/RepositoryDocumentCollection.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoUnidadeCurricularAfeta.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentGatewayExclusiveDecisionHolder.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableBoolean.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SurveyQuestionItem.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UrlStatMonth.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Page.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseStudiesPlan.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoAlunoRequisitado.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Process.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/AppUser.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnActorPool.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.ArrayList;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/PageText.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Questionario.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioPerguntaEsforco.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SurveyQuestion.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioUnidade.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapStarFactQuestionario.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentEventEndMessages.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import pt.estgp.estgweb.services.bpmnprocess.types.TargetActorType;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableString.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentGateway.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UrlStatYearId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableJson.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/AssessmentQuestionItem.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Group.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnit.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SurveyQuestionAnswer.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ConfigurationGradesEpocaAvaliacao.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioPedagogicoTipologiaRequisitada.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SigesUser.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitAnnouncement.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ManagedIdentifierCollection.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/AssessmentQuestion.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UrlStatYear.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/DigitalDeliveryCategory.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/RecordOther.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UrlStatMonthId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/DigitalDelivery.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UserSession.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitEvaluation.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportCursoFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportFileGroup.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/AssessmentQuestionAnswer.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentEventInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnActorSelectorCondicionado.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitProgramPart2.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapStarFactQuestionarioCurso.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioResposta.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioTipologia.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitBlog.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Reminder.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/RecordEventOrganization.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/RecordPaper.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentGatewayExclusiveInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Configuration.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/PageContent.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SessionObject.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.io.Serializable;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitBlogPost.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/JobParameter.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnProcessInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/EventFormacoes.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ComunicationFolder.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Student.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitQuestion.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionario.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UrlStatDay.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnUserSelector.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapStarFactQuestionarioTipologia.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariable.java
 ,7 → 1,8
 package pt.estgp.estgweb.domain;
-// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
+// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9
+import pt.estgp.estgweb.domain.bpmn.VariableType;
 /**
  * BpmnVariable generated by hbm2java
 ,7 → 12,7
      private long id;
      private String name;
-     private String type;
+     private VariableType type;
     public BpmnVariable() {
     }
 ,11 → 32,11
     public void setName(String name) {
         this.name = name;
     }
-    public String getType() {
+    public VariableType getType() {
         return this.type;
     }
-    public void setType(String type) {
+    public void setType(VariableType type) {
         this.type = type;
     }

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/RecordProject.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/PageExternalObject.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponent.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentEvent.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitTurma.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SurveyResponse.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/RepositoryFile.java
 ,12 → 1,11
 package pt.estgp.estgweb.domain;
-// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
+// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9
-import pt.estgp.estgweb.services.data.types.AbstractRepositorySourceModuleInterfacePlugin;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
+import pt.estgp.estgweb.services.data.types.AbstractRepositorySourceModuleInterfacePlugin;
 /**
  * RepositoryFile generated by hbm2java

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ProcessEventFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ProcessEvent.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapStarFactQuestionarioUnidade.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentGatewayExclusive.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnVariableLong.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowConnectorInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentEventEndInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BlogPost.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SruSource.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnProcess.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.ArrayList;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ManagedIdentifier.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Course.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/PageExternalUrl.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitGrade.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/AssessmentResponse.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UrlStatDayId.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportFileAno.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/JobServiceTask.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/RepositoryDocument.java
 ,12 → 1,11
 package pt.estgp.estgweb.domain;
-// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
+// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9
-import pt.estgp.estgweb.services.data.repositorydocuments.DocumentPersons;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
+import pt.estgp.estgweb.services.data.repositorydocuments.DocumentPersons;
 /**
  * RepositoryDocument generated by hbm2java

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/RepositoryDocumentFile.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/User.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/EventUser.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Image.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapHistoryDimension.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Teste.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapStarFactQuestionarioAnswerEsforco.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/DigitalDeliveryTarget.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnActorSelectorWithDomainObjectLoader.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioReportFileGroupAno.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioUser.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUserAssociation.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ConfigurationDirectory.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioHistoryDrive.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseUnitAssignement.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

 /branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowConnector.java
 ,11 → 1,10
 package pt.estgp.estgweb.domain;
-// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
+// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9
+import java.util.Date;
 import pt.estgp.estgweb.services.bpmnprocess.types.TargetActorType;
-import java.util.Date;
 /**
  * BpmnFlowConnector generated by hbm2java
  */

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/QuestionarioRespostaRequisitada.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowComponentEventEnd.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnFlowObjectInstance.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/OlapEntityQuestionarioCurso.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseSchool.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Job.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.io.Serializable;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/BpmnAbstractActorSelector.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/JobServiceTaskScheduler.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/EventGenericRecord.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/JobServiceTaskSchedulerParameter.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/JobServiceTaskParameter.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/CourseDepartment.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/MetaProcess.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/SurveyStructuralNode.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.HashSet;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/ConfigurationGrades.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/Seccao.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

/branches/v3/impl/gen/java/pt/estgp/estgweb/domain/UrlStat.java
1,5 → 1,5
package pt.estgp.estgweb.domain;
// Generated 17/Jun/2017 17:19:42 by Hibernate Tools 3.2.0.b9
// Generated 20/Jun/2017 16:24:02 by Hibernate Tools 3.2.0.b9


import java.util.Date;

Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1782 → Rev 1785