From 13bd4126aadc1ad20789d0ea2ef8f2da58d3a510 Mon Sep 17 00:00:00 2001 From: Kavoos Bojnourdi Date: Sun, 9 Aug 2015 16:02:21 +0200 Subject: [PATCH] - Fix unit test - Fix UserDao --- projects/GDE_App/GDE-ejb/nbproject/project.properties | 2 +- .../GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/UserEJB.java | 2 +- projects/GDE_App/GDE-war/nbproject/project.properties | 2 +- projects/GDE_App/GDE-war/test/com/edf/gde/dao/BaseDao.java | 6 +++--- .../GDE_App/GDE-war/test/com/edf/gde/dao/UserDaoClient.java | 2 +- .../GDE-war/test/{com/edf/gde/test => }/restapi/Base64.java | 2 +- .../edf/gde/test => }/restapi/DefaultResponseHandler.java | 2 +- .../{com/edf/gde/test => }/restapi/ResponseHandler.java | 2 +- .../test/{com/edf/gde/test => }/restapi/RestContext.java | 4 ++-- .../test/{com/edf/gde/test => }/restapi/SimpleRestApi.java | 4 ++-- .../test => }/restapi/exceptions/RestResponseException.java | 2 +- .../test => }/restapi/providers/CertificateProvider.java | 2 +- .../restapi/providers/FileCertificateProvider.java | 2 +- projects/GDE_App/nbproject/project.properties | 2 +- projects/GDE_App/src/GDE_DB_Init.sql | 3 ++- 15 files changed, 20 insertions(+), 19 deletions(-) rename projects/GDE_App/GDE-war/test/{com/edf/gde/test => }/restapi/Base64.java (99%) rename projects/GDE_App/GDE-war/test/{com/edf/gde/test => }/restapi/DefaultResponseHandler.java (90%) rename projects/GDE_App/GDE-war/test/{com/edf/gde/test => }/restapi/ResponseHandler.java (82%) rename projects/GDE_App/GDE-war/test/{com/edf/gde/test => }/restapi/RestContext.java (97%) rename projects/GDE_App/GDE-war/test/{com/edf/gde/test => }/restapi/SimpleRestApi.java (99%) rename projects/GDE_App/GDE-war/test/{com/edf/gde/test => }/restapi/exceptions/RestResponseException.java (91%) rename projects/GDE_App/GDE-war/test/{com/edf/gde/test => }/restapi/providers/CertificateProvider.java (87%) rename projects/GDE_App/GDE-war/test/{com/edf/gde/test => }/restapi/providers/FileCertificateProvider.java (97%) diff --git a/projects/GDE_App/GDE-ejb/nbproject/project.properties b/projects/GDE_App/GDE-ejb/nbproject/project.properties index 8a9dc37..41ec3c9 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/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.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.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/UserEJB.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/UserEJB.java index a72aa84..4cd9a5b 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/UserEJB.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/UserEJB.java @@ -148,6 +148,6 @@ public class UserEJB { */ public boolean deleteGroup(long groupId) { UserDao dao = new UserDao(em); - return deleteGroup(groupId); + return dao.deleteGroup(groupId); } } diff --git a/projects/GDE_App/GDE-war/nbproject/project.properties b/projects/GDE_App/GDE-war/nbproject/project.properties index 71d35c5..3a43454 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/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.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.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/test/com/edf/gde/dao/BaseDao.java b/projects/GDE_App/GDE-war/test/com/edf/gde/dao/BaseDao.java index eb25873..2b83f43 100644 --- a/projects/GDE_App/GDE-war/test/com/edf/gde/dao/BaseDao.java +++ b/projects/GDE_App/GDE-war/test/com/edf/gde/dao/BaseDao.java @@ -5,9 +5,9 @@ package com.edf.gde.dao; import com.edf.gde.transferables.CommandTO; import com.edf.gde.transferables.responses.CommandResultTO; -import gdetester.restapi.ResponseHandler; -import gdetester.restapi.RestContext; -import gdetester.restapi.SimpleRestApi; +import restapi.ResponseHandler; +import restapi.RestContext; +import restapi.SimpleRestApi; /** * diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/dao/UserDaoClient.java b/projects/GDE_App/GDE-war/test/com/edf/gde/dao/UserDaoClient.java index 10d5d10..fceaf3a 100644 --- a/projects/GDE_App/GDE-war/test/com/edf/gde/dao/UserDaoClient.java +++ b/projects/GDE_App/GDE-war/test/com/edf/gde/dao/UserDaoClient.java @@ -7,7 +7,7 @@ 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 gdetester.restapi.RestContext; +import restapi.RestContext; import java.io.IOException; /** diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/Base64.java b/projects/GDE_App/GDE-war/test/restapi/Base64.java similarity index 99% rename from projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/Base64.java rename to projects/GDE_App/GDE-war/test/restapi/Base64.java index 2581d5d..7f765b5 100644 --- a/projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/Base64.java +++ b/projects/GDE_App/GDE-war/test/restapi/Base64.java @@ -17,7 +17,7 @@ // // Project home page: www.source-code.biz/base64coder/java -package gdetester.restapi; +package restapi; /** * A Base64 encoder/decoder. diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/DefaultResponseHandler.java b/projects/GDE_App/GDE-war/test/restapi/DefaultResponseHandler.java similarity index 90% rename from projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/DefaultResponseHandler.java rename to projects/GDE_App/GDE-war/test/restapi/DefaultResponseHandler.java index 66de526..d6358c3 100644 --- a/projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/DefaultResponseHandler.java +++ b/projects/GDE_App/GDE-war/test/restapi/DefaultResponseHandler.java @@ -1,4 +1,4 @@ -package gdetester.restapi; +package restapi; /** * diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/ResponseHandler.java b/projects/GDE_App/GDE-war/test/restapi/ResponseHandler.java similarity index 82% rename from projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/ResponseHandler.java rename to projects/GDE_App/GDE-war/test/restapi/ResponseHandler.java index 8a9d9d7..bd5afa0 100644 --- a/projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/ResponseHandler.java +++ b/projects/GDE_App/GDE-war/test/restapi/ResponseHandler.java @@ -1,4 +1,4 @@ -package gdetester.restapi; +package restapi; /** * diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/RestContext.java b/projects/GDE_App/GDE-war/test/restapi/RestContext.java similarity index 97% rename from projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/RestContext.java rename to projects/GDE_App/GDE-war/test/restapi/RestContext.java index 5261002..97ab7bd 100644 --- a/projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/RestContext.java +++ b/projects/GDE_App/GDE-war/test/restapi/RestContext.java @@ -1,4 +1,4 @@ -package gdetester.restapi; +package restapi; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import gdetester.restapi.providers.CertificateProvider; +import restapi.providers.CertificateProvider; /** * diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/SimpleRestApi.java b/projects/GDE_App/GDE-war/test/restapi/SimpleRestApi.java similarity index 99% rename from projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/SimpleRestApi.java rename to projects/GDE_App/GDE-war/test/restapi/SimpleRestApi.java index 0ee4476..53a6859 100644 --- a/projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/SimpleRestApi.java +++ b/projects/GDE_App/GDE-war/test/restapi/SimpleRestApi.java @@ -1,4 +1,4 @@ -package gdetester.restapi; +package restapi; import com.google.gson.Gson; import java.io.BufferedOutputStream; @@ -30,7 +30,7 @@ import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSession; import javax.net.ssl.TrustManagerFactory; -import gdetester.restapi.providers.CertificateProvider; +import restapi.providers.CertificateProvider; /** * diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/exceptions/RestResponseException.java b/projects/GDE_App/GDE-war/test/restapi/exceptions/RestResponseException.java similarity index 91% rename from projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/exceptions/RestResponseException.java rename to projects/GDE_App/GDE-war/test/restapi/exceptions/RestResponseException.java index 48cdbde..7ae9462 100644 --- a/projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/exceptions/RestResponseException.java +++ b/projects/GDE_App/GDE-war/test/restapi/exceptions/RestResponseException.java @@ -1,4 +1,4 @@ -package gdetester.restapi.exceptions; +package restapi.exceptions; /** * diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/providers/CertificateProvider.java b/projects/GDE_App/GDE-war/test/restapi/providers/CertificateProvider.java similarity index 87% rename from projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/providers/CertificateProvider.java rename to projects/GDE_App/GDE-war/test/restapi/providers/CertificateProvider.java index 5f98153..f48cd8a 100644 --- a/projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/providers/CertificateProvider.java +++ b/projects/GDE_App/GDE-war/test/restapi/providers/CertificateProvider.java @@ -1,4 +1,4 @@ -package gdetester.restapi.providers; +package restapi.providers; import java.io.IOException; import java.security.cert.Certificate; diff --git a/projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/providers/FileCertificateProvider.java b/projects/GDE_App/GDE-war/test/restapi/providers/FileCertificateProvider.java similarity index 97% rename from projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/providers/FileCertificateProvider.java rename to projects/GDE_App/GDE-war/test/restapi/providers/FileCertificateProvider.java index 74e0387..4b92289 100644 --- a/projects/GDE_App/GDE-war/test/com/edf/gde/test/restapi/providers/FileCertificateProvider.java +++ b/projects/GDE_App/GDE-war/test/restapi/providers/FileCertificateProvider.java @@ -1,4 +1,4 @@ -package gdetester.restapi.providers; +package restapi.providers; import java.io.BufferedInputStream; import java.io.File; diff --git a/projects/GDE_App/nbproject/project.properties b/projects/GDE_App/nbproject/project.properties index cd4eff4..8118174 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/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.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.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 19c986d..72a1a3c 100644 --- a/projects/GDE_App/src/GDE_DB_Init.sql +++ b/projects/GDE_App/src/GDE_DB_Init.sql @@ -1,7 +1,7 @@ /* Unique Ids sequence generator */ drop sequence SEQ_GEN_SEQUENCE; -create sequence SEQ_GEN_SEQUENCE START WITH 50 INCREMENT BY 50; +create sequence SEQ_GEN_SEQUENCE START WITH 100 INCREMENT BY 50; DROP TABLE IF EXISTS GROUP_ CASCADE; @@ -109,3 +109,4 @@ CREATE TABLE profile_attribute ( mandatory boolean, profile_id bigint REFERENCES profile (id) ); + -- 2.30.2