From abb32b04ccb0166da22a3d77ebd9f37e14008402 Mon Sep 17 00:00:00 2001 From: mordicus Date: Wed, 5 Aug 2015 22:20:45 +0200 Subject: [PATCH] - Code cleanup - Fix UserDao - Fix database sequence generator - Fix web.xml (added UserService) --- .../GDE-ejb/src/java/com/edf/gde/ejb/UserDAO.java | 1 + .../transferables/responses/CommandResultTO.java | 14 +++++++++++--- projects/GDE_App/GDE-war/web/WEB-INF/web.xml | 8 ++++++++ projects/GDE_App/GDE-war/web/index.html | 5 ----- projects/GDE_App/src/GDE_DB_Init.sql | 10 +++++----- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/UserDAO.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/UserDAO.java index 2f9b9df..a77fcbd 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/UserDAO.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/ejb/UserDAO.java @@ -144,6 +144,7 @@ public class UserDAO { */ public User findUser(String userName) { Query q = em.createNamedQuery("User.findByName"); + q.setParameter("username", userName); User user = null; try { user = (User) q.getSingleResult(); diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/responses/CommandResultTO.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/responses/CommandResultTO.java index fdb97f1..642177e 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/responses/CommandResultTO.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/transferables/responses/CommandResultTO.java @@ -2,7 +2,7 @@ package com.edf.gde.transferables.responses; /** * - * @author mordicus + * @author Kavoos */ public class CommandResultTO { public static final int OK = 1; @@ -10,7 +10,8 @@ public class CommandResultTO { private int code; private String msg; - + private String data; + public CommandResultTO() { code = OK; } @@ -30,6 +31,13 @@ public class CommandResultTO { public void setMsg(String msg) { this.msg = msg; } - + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } } diff --git a/projects/GDE_App/GDE-war/web/WEB-INF/web.xml b/projects/GDE_App/GDE-war/web/WEB-INF/web.xml index 3ad3731..bd50585 100644 --- a/projects/GDE_App/GDE-war/web/WEB-INF/web.xml +++ b/projects/GDE_App/GDE-war/web/WEB-INF/web.xml @@ -4,10 +4,18 @@ MetadataService com.edf.gde.services.ProfileService + + UserServce + com.edf.gde.services.UserService + MetadataService /MetadataService + + UserServce + /UserService + 30 diff --git a/projects/GDE_App/GDE-war/web/index.html b/projects/GDE_App/GDE-war/web/index.html index c627c24..6f542ae 100644 --- a/projects/GDE_App/GDE-war/web/index.html +++ b/projects/GDE_App/GDE-war/web/index.html @@ -1,9 +1,4 @@ - TODO supply a title diff --git a/projects/GDE_App/src/GDE_DB_Init.sql b/projects/GDE_App/src/GDE_DB_Init.sql index 1ac7016..809cb64 100644 --- a/projects/GDE_App/src/GDE_DB_Init.sql +++ b/projects/GDE_App/src/GDE_DB_Init.sql @@ -1,16 +1,16 @@ /* Unique Ids sequence generator */ drop sequence SEQ_GEN_SEQUENCE; -create sequence SEQ_GEN_SEQUENCE INCREMENT BY 50; +create sequence SEQ_GEN_SEQUENCE START WITH 50 INCREMENT BY 50; -DROP TABLE IF EXISTS GROUP_; +DROP TABLE IF EXISTS GROUP_ CASCADE; CREATE TABLE GROUP_ ( id bigint NOT NULL PRIMARY KEY, groupName varchar(255) NOT NULL ); -DROP TABLE IF EXISTS USERS; +DROP TABLE IF EXISTS USERS CASCADE; CREATE TABLE USERS ( id bigint NOT NULL PRIMARY KEY, userName varchar(255) not null, @@ -18,14 +18,14 @@ CREATE TABLE USERS ( ); CREATE INDEX users_username_index ON USERS(userName); -DROP TABLE IF EXISTS USERGROUP; +DROP TABLE IF EXISTS USERGROUP CASCADE; CREATE TABLE USERGROUP ( id bigint NOT NULL PRIMARY KEY, groupId bigint references GROUP_(id), userId bigint references USERS(id) ); -DROP TABLE IF EXISTS USERPERMISSIONS; +DROP TABLE IF EXISTS USERPERMISSIONS CASCADE; CREATE TABLE USERPERMISSIONS ( id bigint NOT NULL PRIMARY KEY, groupId bigint references GROUP_(id), -- 2.39.2