From e9ee33f8eb0dfbfd430b1566640a109cd7ffa38e Mon Sep 17 00:00:00 2001 From: Bojnourdi Date: Tue, 11 Aug 2015 10:23:04 +0200 Subject: [PATCH] - Start working on Study service --- .../GDE-ejb/nbproject/project.properties | 2 +- .../src/java/com/edf/gde/ejb/StudyEJB.java | 8 ++- .../src/java/com/edf/gde/entities/Study.java | 17 +++-- .../com/edf/gde/transferables/StudyTO.java | 32 +++++---- .../GDE-war/nbproject/project.properties | 2 +- .../com/edf/gde/services/StudyService.java | 68 +++++++++++++++++++ .../com/edf/gde/services/UserService.java | 32 +++++---- projects/GDE_App/nbproject/project.properties | 2 +- projects/GDE_App/src/GDE_DB_Init.sql | 3 +- 9 files changed, 129 insertions(+), 37 deletions(-) create mode 100644 projects/GDE_App/GDE-war/src/java/com/edf/gde/services/StudyService.java diff --git a/projects/GDE_App/GDE-ejb/nbproject/project.properties b/projects/GDE_App/GDE-ejb/nbproject/project.properties index 41ec3c9..8a9dc37 100644 --- a/projects/GDE_App/GDE-ejb/nbproject/project.properties +++ b/projects/GDE_App/GDE-ejb/nbproject/project.properties @@ -26,7 +26,7 @@ includes=** j2ee.compile.on.save=true j2ee.deploy.on.save=true j2ee.platform=1.7 -j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar +j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/StudyEJB.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/StudyEJB.java index 7a28660..b2496bd 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/StudyEJB.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/StudyEJB.java @@ -1,3 +1,6 @@ +/* + * (C) 2015 EDF + */ package com.edf.gde.ejb; import com.edf.gde.dao.StudyDao; @@ -63,5 +66,8 @@ public class StudyEJB { StudyDao dao = new StudyDao(em); return dao.findByDeletionDate(deletionDate); } - + public void setStudyState(long studyId, boolean state) { + StudyDao dao = new StudyDao(em); + dao.findById(studyId).setLocked(state); + } } diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Study.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Study.java index 6f5eea7..68687a2 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Study.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Study.java @@ -1,7 +1,5 @@ /* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. + * (C) 2015 EDF */ package com.edf.gde.entities; @@ -69,7 +67,8 @@ public class Study implements Serializable { private long attributeGroupId; @Column(name = "profile_id") private long profileId; - + @Column(name ="locked") + private boolean locked; public Study() { } @@ -149,6 +148,14 @@ public class Study implements Serializable { this.profileId = profileId; } + public boolean isLocked() { + return locked; + } + + public void setLocked(boolean locked) { + this.locked = locked; + } + public static Study fromStudyTO(StudyTO sto) { Study s = new Study(); s.creationDate = sto.getCreationDate(); @@ -160,6 +167,7 @@ public class Study implements Serializable { s.updateDate = sto.getUpdateDate(); s.valid = sto.getValid(); s.profileId = sto.getProfileId(); + s.locked = sto.isLocked(); return s; } @@ -174,6 +182,7 @@ public class Study implements Serializable { sto.setUpdateDate(this.updateDate); sto.setValid(this.valid); sto.setProfileId(this.profileId); + sto.setLocked(this.locked); return sto; } diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/StudyTO.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/StudyTO.java index edf2d66..36436ab 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/StudyTO.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/StudyTO.java @@ -1,12 +1,9 @@ /* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. + * (C) 2015 EDF */ package com.edf.gde.transferables; import java.io.Serializable; -import java.util.Collection; import java.util.Date; /** @@ -14,22 +11,23 @@ import java.util.Date; * @author F62173 */ public class StudyTO implements Serializable { - + private static final long serialVersionUID = 1L; private long id; private String name; private Date creationDate; private Date updateDate; - private Boolean valid; - private Boolean deleted; + private boolean valid; + private boolean deleted; private Date deletionDate; private long attributeGroupId; private long profileId; + private boolean locked; public StudyTO() { } - public StudyTO(long id, String name, Date creationDate, Date updateDate, Boolean valid, Boolean deleted, Date deletionDate, long attributeGroupId, long profileId) { + public StudyTO(long id, String name, Date creationDate, Date updateDate, boolean valid, boolean deleted, Date deletionDate, long attributeGroupId, long profileId) { this.id = id; this.name = name; this.creationDate = creationDate; @@ -73,19 +71,19 @@ public class StudyTO implements Serializable { this.updateDate = updateDate; } - public Boolean getValid() { + public boolean getValid() { return valid; } - public void setValid(Boolean valid) { + public void setValid(boolean valid) { this.valid = valid; } - public Boolean getDeleted() { + public boolean getDeleted() { return deleted; } - public void setDeleted(Boolean deleted) { + public void setDeleted(boolean deleted) { this.deleted = deleted; } @@ -112,5 +110,13 @@ public class StudyTO implements Serializable { public void setProfileId(long profileId) { this.profileId = profileId; } - + + public boolean isLocked() { + return locked; + } + + public void setLocked(boolean locked) { + this.locked = locked; + } + } diff --git a/projects/GDE_App/GDE-war/nbproject/project.properties b/projects/GDE_App/GDE-war/nbproject/project.properties index 3a43454..71d35c5 100644 --- a/projects/GDE_App/GDE-war/nbproject/project.properties +++ b/projects/GDE_App/GDE-war/nbproject/project.properties @@ -34,7 +34,7 @@ j2ee.compile.on.save=true j2ee.copy.static.files.on.save=true j2ee.deploy.on.save=true j2ee.platform=1.7-web -j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar +j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar diff --git a/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/StudyService.java b/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/StudyService.java new file mode 100644 index 0000000..57ce633 --- /dev/null +++ b/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/StudyService.java @@ -0,0 +1,68 @@ +/* + * (C) 2015 EDF + */ +package com.edf.gde.services; + +import com.edf.gde.ejb.PermissionsManagerEJB; +import com.edf.gde.ejb.StudyEJB; +import com.edf.gde.ejb.UserEJB; +import com.edf.gde.tools.Credentials; +import com.edf.gde.transferables.CommandTO; +import com.edf.gde.transferables.StudyTO; +import com.edf.gde.transferables.responses.CommandResultTO; +import java.util.logging.Logger; +import javax.ejb.EJB; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * + * @author mordicus + */ +public class StudyService extends BaseService { + + public static final String ServiceName = "StudyService"; + public static final int CREATESTUDY = 1; + public static final int SETSTUDYSTATE = 2; + + @EJB + private StudyEJB studyEjb; + @EJB + private UserEJB userEjb; + @EJB + private PermissionsManagerEJB pm; + + @Override + public void processRequest(HttpServletRequest request, HttpServletResponse response) { + Logger logger = Logger.getLogger(ServiceName); + CommandTO commandTO = getCommand(request); + CommandResultTO resultTO = new CommandResultTO(); + Credentials credentials = getCredentials(request); +// userEjb.checkPassword(credentials.getLogin(), credentials.getPassword()); +// pm.checkPermission(credentials.getLogin(), ServiceName, commandTO.getMethod()); + try { + switch (commandTO.getMethod()) { + case CREATESTUDY: { + StudyTO studyTO = fromJson(commandTO.getData(), StudyTO.class); + StudyTO newStudyTO = studyEjb.createStudy(studyTO); + resultTO.setData(toJson(newStudyTO)); + } + break; + case SETSTUDYSTATE: { + long studyId = commandTO.getLong("studyId"); + int lock = commandTO.getInt("lock"); + boolean status = (lock==1); + studyEjb.setStudyState(studyId, status); + } + break; + } + } catch (Exception ex) { + // Return error on any error... + resultTO.setCode(CommandResultTO.ERROR); + ex.printStackTrace(); + } finally { + send(resultTO, response); + } + } + +} diff --git a/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/UserService.java b/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/UserService.java index 546e513..7450a49 100644 --- a/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/UserService.java +++ b/projects/GDE_App/GDE-war/src/java/com/edf/gde/services/UserService.java @@ -9,7 +9,6 @@ import com.edf.gde.transferables.CommandTO; import com.edf.gde.transferables.GroupTO; import com.edf.gde.transferables.UserTO; import com.edf.gde.transferables.responses.CommandResultTO; -import java.util.logging.Level; import java.util.logging.Logger; import javax.ejb.EJB; import javax.servlet.http.HttpServletRequest; @@ -32,9 +31,9 @@ public class UserService extends BaseService { public static final int FINDGROUP = 8; @EJB - UserEJB userDao; + private UserEJB userEjb; @EJB - PermissionsManagerEJB pm; + private PermissionsManagerEJB pm; @Override public void processRequest(HttpServletRequest request, HttpServletResponse response) { @@ -43,13 +42,12 @@ public class UserService extends BaseService { CommandTO commandTO = getCommand(request); CommandResultTO resultTO = new CommandResultTO(); Credentials credentials = getCredentials(request); - userDao.checkPassword(credentials.getLogin(), credentials.getPassword()); - pm.checkPermission(credentials.getLogin(), "UserService", commandTO.getMethod()); + userEjb.checkPassword(credentials.getLogin(), credentials.getPassword()); + pm.checkPermission(credentials.getLogin(), ServiceName, commandTO.getMethod()); try { switch (commandTO.getMethod()) { case CREATEUSER: { UserTO userTO = createUser(fromJson(commandTO.getData(), UserTO.class)); - logger.log(Level.INFO, "User id : " + userTO.getId()); setResult(resultTO, userTO); } break; @@ -70,7 +68,7 @@ public class UserService extends BaseService { case REMOVEFROMGROUP: { long groupId = commandTO.getLong("groupId"); long userId = commandTO.getLong("userId"); - userDao.removeFromGroup(groupId, userId); + userEjb.removeFromGroup(groupId, userId); } break; case FINDUSER: { @@ -86,7 +84,7 @@ public class UserService extends BaseService { break; case DELETEGROUP: { long groupId = commandTO.getLong("id"); - userDao.deleteGroup(groupId); + userEjb.deleteGroup(groupId); } break; case ADDTOGROUP: { @@ -95,6 +93,10 @@ public class UserService extends BaseService { addToGroup(groupId, userId); } break; + default:{ + resultTO.setMsg("Not method specified or invalid method index"); + resultTO.setCode(CommandResultTO.ERROR); + } } } catch (RuntimeException ex) { // Return error on any error... @@ -110,36 +112,36 @@ public class UserService extends BaseService { } protected void addToGroup(long groupId, long userId) { - userDao.addToGroup(groupId, userId); + userEjb.addToGroup(groupId, userId); } protected GroupTO createGroup(String groupName) { - Group group = userDao.createGroup(groupName); + Group group = userEjb.createGroup(groupName); return group.toGroupTO(); } protected UserTO createUser(UserTO userTO) { - User user = userDao.createUser(userTO.getName(), userTO.getPassword()); + User user = userEjb.createUser(userTO.getName(), userTO.getPassword()); return user.toUserTO(); } protected boolean deleteUser(long userId) { - return userDao.deleteUser(userId); + return userEjb.deleteUser(userId); } protected UserTO findUser(String userName) { - User user = userDao.findUser(userName); + User user = userEjb.findUser(userName); UserTO userTO = user.toUserTO(); userTO.setPassword(null); return userTO; } protected GroupTO findGroup(String groupName) { - Group group = userDao.findGroup(groupName); + Group group = userEjb.findGroup(groupName); return group.toGroupTO(); } protected boolean deleteGroup(long id) { - return userDao.deleteGroup(id); + return userEjb.deleteGroup(id); } } diff --git a/projects/GDE_App/nbproject/project.properties b/projects/GDE_App/nbproject/project.properties index 8118174..cd4eff4 100644 --- a/projects/GDE_App/nbproject/project.properties +++ b/projects/GDE_App/nbproject/project.properties @@ -13,7 +13,7 @@ j2ee.appclient.mainclass.args=${j2ee.appclient.tool.args} j2ee.compile.on.save=true j2ee.deploy.on.save=false j2ee.platform=1.7 -j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar +j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar diff --git a/projects/GDE_App/src/GDE_DB_Init.sql b/projects/GDE_App/src/GDE_DB_Init.sql index cbe52a7..96c5cdd 100644 --- a/projects/GDE_App/src/GDE_DB_Init.sql +++ b/projects/GDE_App/src/GDE_DB_Init.sql @@ -90,7 +90,8 @@ CREATE TABLE study ( deleted boolean, deletion_date timestamp, attribute_group_id bigint REFERENCES attribute_group (id), - profile_id bigint REFERENCES profile (id) + profile_id bigint REFERENCES profile (id), + locked boolean ); /* PROFILES */ -- 2.39.2