diff --git a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml index 44954d9..3473dc6 100644 --- a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml +++ b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml @@ -1,9 +1,9 @@ - + 10.3.10 - MariaDB + MARIADB InnoDB lower/lower diff --git a/.idea/libraries/tomcat_lib.xml b/.idea/libraries/tomcat_lib.xml new file mode 100644 index 0000000..569121d --- /dev/null +++ b/.idea/libraries/tomcat_lib.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index df60b67..9486b47 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/GDMS.iml b/GDMS.iml index 629add7..b6ef183 100644 --- a/GDMS.iml +++ b/GDMS.iml @@ -17,18 +17,10 @@ - + - - - - - - - - - - + + \ No newline at end of file diff --git a/deployment/context.xml b/deployment/context.xml index 9e9d9af..70d970a 100644 --- a/deployment/context.xml +++ b/deployment/context.xml @@ -4,7 +4,7 @@ name="jdbc/gdms" factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" driverClassName="com.mysql.jdbc.Driver" - url="jdbc:mariadb://localhost:3306/gdms" + targetURL="jdbc:mariadb://localhost:3306/gdms" username="gdms" password="GDMS"/> diff --git a/documents/GDMS_DB_Design .txt b/documents/GDMS_DB_Design .txt index 5cc8f24..af8b8f1 100644 --- a/documents/GDMS_DB_Design .txt +++ b/documents/GDMS_DB_Design .txt @@ -3,7 +3,7 @@ password char 256 name varchar 50 e_mail_location varchar 50 phonenumber varchar 30 -url varchar 256 +targetURL varchar 256 administrator id diff --git a/documents/数据库.txt b/documents/数据库.txt index 635fa76..37f6ce0 100644 --- a/documents/数据库.txt +++ b/documents/数据库.txt @@ -3,7 +3,7 @@ password char 255//用户密码 name char 30//用户姓名 e_mail_location char 40//邮箱 phone_number char 20//电话号码 -url varchar 255//......路径 +targetURL varchar 255//......路径 administrator//管理员 id//管理员ID diff --git a/src/core/operation/UploadFileOperation.java b/src/core/operation/UploadFile.java similarity index 95% rename from src/core/operation/UploadFileOperation.java rename to src/core/operation/UploadFile.java index ff26329..b75dcfa 100644 --- a/src/core/operation/UploadFileOperation.java +++ b/src/core/operation/UploadFile.java @@ -11,7 +11,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class UploadFileOperation extends Operation { +public class UploadFile extends Operation { @Override public Map execute(User subject) throws Exception { File file = (File) this.getOptions().get("file"); diff --git a/src/core/operation/UploadFileOperation.json b/src/core/operation/UploadFile.json similarity index 100% rename from src/core/operation/UploadFileOperation.json rename to src/core/operation/UploadFile.json diff --git a/src/core/process/C_TeacherFillTopicInformation.java b/src/core/process/C_TeacherFillTopicInformation.java new file mode 100644 index 0000000..6d72cd4 --- /dev/null +++ b/src/core/process/C_TeacherFillTopicInformation.java @@ -0,0 +1,61 @@ +package core.process; + +import core.operation.FillInformation; +import error.GExcptInit; + +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +public class C_TeacherFillTopicInformation extends TempProcess{ + + String StudentId; + String mentor_opinion; + Date mentor_opinion_date; + + static String table="graduation_design_opening_report_opinion_record"; + + public void fillInformation() throws Exception{ + if(!check()) throw new GExcptInit("FillInformation Attrs init error!"); + FillInformation fillInformation=new FillInformation(); + fillInformation.setOptions(new HashMap<>()); + fillInformation.addOptions("table",table); + String date= mentor_opinion_date.toString(); + Map vMap=new HashMap<>(); + vMap.put("mentor_opinion_date",date); + vMap.put("mentor_opinion",this.getMentor_opinion()); + Maplimits = new HashMap<>(); + limits.put("id",this.getStudentId()); + fillInformation.addOptions("limits",limits); + fillInformation.execute(null); + + } + protected boolean check() { + if(this.getMentor_opinion()==null||this.getMentor_opinion_date()==null||this.getStudentId()==null) + return false; + return true; + } + public String getStudentId() { + return StudentId; + } + + public void setStudentId(String studentId) { + StudentId = studentId; + } + public String getMentor_opinion() { + return mentor_opinion; + } + + public void setMentor_opinion(String mentor_opinion) { + this.mentor_opinion = mentor_opinion; + } + + public Date getMentor_opinion_date() { + return mentor_opinion_date; + } + + public void setMentor_opinion_date(Date mentor_opinion_date) { + this.mentor_opinion_date = mentor_opinion_date; + } + +} diff --git a/src/core/process/C_TeacherSearchStudent.java b/src/core/process/C_TeacherSearchStudent.java index 4c1be5d..c915c93 100644 --- a/src/core/process/C_TeacherSearchStudent.java +++ b/src/core/process/C_TeacherSearchStudent.java @@ -13,9 +13,9 @@ public class C_TeacherSearchStudent extends TempProcess { static String table="student"; - Map StudentInfo=new HashMap(); public Map search() throws Exception{ if(!check()) throw new GExcptInit("studentId Attrs init error!"); + Map studentInfo =new HashMap<>(); Search search = new Search() ; search.setOptions(new HashMap<>()); search.addOptions("table",table); @@ -30,11 +30,37 @@ public class C_TeacherSearchStudent extends TempProcess { Map options = search.execute(null); List result = (List) options.get("result"); String[] s = result.get(0); - StudentInfo.put("id",s[0]); - StudentInfo.put("name",s[2]); - StudentInfo.put("e_mail_location",s[3]); - StudentInfo.put("phone_number",s[4]); - return StudentInfo; + studentInfo.put("id",s[0]); + studentInfo.put("name",s[2]); + studentInfo.put("e_mail_location",s[3]); + studentInfo.put("phone_number",s[4]); + return studentInfo; + } + public List> _search() throws Exception{ + if(!check()) throw new GExcptInit("studentId Attrs init error!"); + Search search = new Search() ; + search.setOptions(new HashMap<>()); + search.addOptions("table",table); + List fields = new ArrayList<>(); + fields.add("*"); + search.addOptions("field",fields); + Map limits = new HashMap<>(); + limits.put("id",this.getStudentId()); + search.addOptions("limits",limits); + search.addOptions("start",0); + search.addOptions("end",1); + Map options = search.execute(null); + List result = (List) options.get("result"); + List> studentsInfo = new ArrayList<>(); + for(String[] s:result){ + Map studentInfo = new HashMap<>(); + studentInfo.put("id",s[0]); + studentInfo.put("name",s[2]); + studentInfo.put("e_mail_location",s[3]); + studentInfo.put("phone_number",s[4]); + studentsInfo.add(studentInfo); + } + return studentsInfo; } protected boolean check() { if(this.getStudentId()==null) diff --git a/src/core/process/Process.java b/src/core/process/Process.java index 40d1081..91c5d63 100644 --- a/src/core/process/Process.java +++ b/src/core/process/Process.java @@ -4,12 +4,14 @@ import core.operation.Operation; public abstract class Process{ - private char status; + private String status; private String permission; private Operation operation; - private String buttonName; private String info; + private static String buttonName; + protected static String targetURL; + protected static String iconURL; protected abstract boolean check(); public String getPermission() { @@ -32,10 +34,6 @@ public abstract class Process{ return buttonName; } - public void setButtonName(String buttonName) { - this.buttonName = buttonName; - } - public String getInfo() { return info; } @@ -44,11 +42,19 @@ public abstract class Process{ this.info = info; } - public char getStatus() { + public String getStatus() { return status; } - public void setStatus(char status) { + public void setStatus(String status) { this.status = status; } + + public static String getTargetURL() { + return targetURL; + } + + public static String getIconURL() { + return iconURL; + } } diff --git a/src/core/process/ProcessManagement.java b/src/core/process/ProcessManagement.java index 7e9f354..ee0fae9 100644 --- a/src/core/process/ProcessManagement.java +++ b/src/core/process/ProcessManagement.java @@ -2,17 +2,19 @@ package core.process; import core.user.User; import dao.DBManagement; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; public class ProcessManagement { - public static Condition getCondition(User user) { - Map status = getStatus(user); + public static Condition getCondition(User user) throws Exception { + Map status = getStatus(user); return getCondition(user,status); } - public static Condition getCondition(User user, Map status){ + public static Condition getCondition(User user, Map status){ Condition condition = new Condition(); - for(Map.Entry entry:status.entrySet()){ + for(Map.Entry entry:status.entrySet()){ String[] s = entry.getKey().split("."); TempProcess tempProcess = (TempProcess) getProcess(s[1]); tempProcess.setGraduationDesignId(s[0]); @@ -28,17 +30,29 @@ public class ProcessManagement { } //Map - public static Map getStatus(User user){ - + public static Map getStatus(User user) throws Exception { + Map status = new HashMap<>(); Map userTables = DBManagement.getUserStatusTables(user.getType()); String graduationDesignId = null; for(Map.Entry entry:userTables.entrySet()){ String[] ti = entry.getKey().split("."); String[] ts = entry.getValue().split("."); + List ls = new ArrayList<>(); + ls.add("id"); + Map limits = new HashMap<>(); + limits.put(ti[1],user.getId()); + List resultLs = DBManagement.select(ls,ti[0],limits,0,1); + if(resultLs.size()==0) continue; + graduationDesignId = resultLs.get(0)[0]; + ls = new ArrayList<>(); + ls.add(ts[1]); + limits = new HashMap<>(); + limits.put("id",graduationDesignId); + resultLs = DBManagement.select(ls,ts[0],limits,0,1); + status.put(graduationDesignId+"."+ts[1],resultLs.get(0)[0]); } - - return null; + return status; } public static Process getProcess(String process){ return null; diff --git a/src/dao/DBManagement.java b/src/dao/DBManagement.java index 9af4d28..23c8ec5 100644 --- a/src/dao/DBManagement.java +++ b/src/dao/DBManagement.java @@ -59,19 +59,32 @@ public class DBManagement { public static Map graduationDesignStudentTables = new HashMap<>(){ { put("graduation_design.student_id","graduation_design.student_chooser_teacher_status"); - - - put("opening_report_secretary_team.leader_student_id",""); - put("opening_report_secretary_team.student1_id",""); - put("opening_report_secretary_team.student2_id",""); - put("reply_secretary_team.leader_student_id",""); - put("reply_secretary_team.student1_id",""); - put("reply_secretary_team.student2_id",""); + put("graduation_design.student_id","graduation_design_information.student_fill_graduation_design_information_status"); + put("graduation_design.student_id","graduation_design_opening_report.opening_report_status"); + put("opening_report_secretary_team.leader_student_id","graduation_design_opening_report_opinion_record.opening_report_secretary_record_status"); + put("opening_report_secretary_team.student1_id","graduation_design_opening_report_opinion_record.opening_report_secretary_record_status"); + put("opening_report_secretary_team.student2_id","graduation_design_opening_report_opinion_record.opening_report_secretary_record_status"); + put("graduation_design.student_id","graduation_design_finished_product.finished_product_status"); + put("reply_secretary_team.leader_student_id","graduation_design_reply_opinion_record_score.reply_ secretary_record_status"); + put("reply_secretary_team.teacher1_id","graduation_design_reply_opinion_record_score.reply_ secretary_record_status"); + put("reply_secretary_team.teacher2_id","graduation_design_reply_opinion_record_score.reply_ secretary_record_status"); } }; public static Map graduationDesignTeacherTables = new HashMap<>(){ { - put("",""); + put("graduation_design.teacher_id","graduation_design.teacher_choose_student_status"); + put("graduation_design.teacher_id","graduation_design_opening_report_opinion_record.opening_report_mentor_opinion_status"); + put("opening_report_teacher_team.leader_teacher_id","graduation_design_opening_report_opinion_record.opening_report_teacher_team_opinion_status"); + put("opening_report_teacher_team.teacher1_id","graduation_design_opening_report_opinion_record.opening_report_teacher_team_opinion_status"); + put("opening_report_teacher_team.teacher2_id","graduation_design_opening_report_opinion_record.opening_report_teacher_team_opinion_status"); + put("graduation_design_opening_report_opinion_record.opening_report_college_teacher_id","graduation_design_opening_report_opinion_record.opening_report_college_opinion_status"); + put("graduation_design.teacher_id","graduation_design_finished_product_mentor_score.finished_product_mentor_score_status"); + put("graduation_design_finished_product_reviewer_score.reviewer_teacher_id","graduation_design_finished_product_reviewer_score.finished_product_reviewer_score_status"); + put("reply_teacher_team.leader_teacher_id","graduation_design_reply_opinion_record_score.reply_ teacher_team_score_status"); + put("reply_teacher_team. teacher1_id","graduation_design_reply_opinion_record_score.reply_ teacher_team_score_status"); + put("reply_teacher_team. teacher2_id","graduation_design_reply_opinion_record_score.reply_ teacher_team_score_status"); + put("graduation_design_reply_opinion_record_score.reply_college_teacher_id","graduation_design_reply_opinion_record_score.reply_college_score_status"); + put("graduation_design_reply_opinion_record_score.reply_school_teacher_id","graduation_design_reply_opinion_record_score.reply_school_score_status"); } }; public static String driverClassName="org.mariadb.jdbc.Driver"; diff --git a/src/gdms/GDMS.java b/src/gdms/GDMS.java new file mode 100644 index 0000000..3a10322 --- /dev/null +++ b/src/gdms/GDMS.java @@ -0,0 +1,34 @@ +package gdms; + +import error.GExcptInit; + +import java.util.*; + +public class GDMS { + static Map schedules; + static String schedulePath = ""; + public static void init() throws GExcptInit { + initSchedule(); + Timer timer = new Timer(true); + for(Map.Entry schedule:schedules.entrySet()){ + timer.schedule(getTimerTask(schedule.getKey()),schedule.getValue()); + } + } + + private static TimerTask getTimerTask(String s) throws GExcptInit { + if(s==""){ + return new TimerTask() { + @Override + public void run() { + ; + } + }; + } + + throw new GExcptInit("GlobalTimePoint.json error"); + } + + private static void initSchedule() { + + } +} diff --git a/src/gdms/GlobalTimePoint.json b/src/gdms/GlobalTimePoint.json new file mode 100644 index 0000000..66e7376 --- /dev/null +++ b/src/gdms/GlobalTimePoint.json @@ -0,0 +1,3 @@ +{ + "":"" +} \ No newline at end of file diff --git a/src/gdms/main.java b/src/gdms/main.java deleted file mode 100644 index a6931aa..0000000 --- a/src/gdms/main.java +++ /dev/null @@ -1,18 +0,0 @@ -package gdms; - -public class main { - public static void check()throws Exception{ - checkJson(); - } - - private static void checkJson() throws Exception{ - //todo - } - - public static void init(){ - } - public static void run() throws Exception { - check(); - init(); - } -} diff --git a/src/servlet/Submit/S_StudentFillTopicInformation.java b/src/servlet/S_StudentFillTopicInformation.java similarity index 96% rename from src/servlet/Submit/S_StudentFillTopicInformation.java rename to src/servlet/S_StudentFillTopicInformation.java index a71f113..9de7b1e 100644 --- a/src/servlet/Submit/S_StudentFillTopicInformation.java +++ b/src/servlet/S_StudentFillTopicInformation.java @@ -1,4 +1,4 @@ -package servlet.Submit; +package servlet; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; diff --git a/src/servlet/Select/S_StudentSelectTeacher.java b/src/servlet/S_StudentSelectTeacher.java similarity index 74% rename from src/servlet/Select/S_StudentSelectTeacher.java rename to src/servlet/S_StudentSelectTeacher.java index 11ba9f3..bc76e6c 100644 --- a/src/servlet/Select/S_StudentSelectTeacher.java +++ b/src/servlet/S_StudentSelectTeacher.java @@ -1,4 +1,4 @@ -package servlet.Select; +package servlet; import core.process.C_StudentSearchTeacher; import core.process.C_StudentSelectTeacher; @@ -9,7 +9,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -@WebServlet("/studentselectteacher") +@WebServlet("/student-select-teacher") public class S_StudentSelectTeacher extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { super.doPost(request, response); @@ -17,11 +17,13 @@ public class S_StudentSelectTeacher extends HttpServlet { User user=(User)request.getSession().getAttribute("user"); String student_id=user.getId(); try { - C_StudentSelectTeacher test=new C_StudentSelectTeacher(); - test.setTeacherId(teacher_id); - test.setStudentId(student_id); + C_StudentSelectTeacher SST=new C_StudentSelectTeacher(); + SST.setTeacherId(teacher_id); + SST.setStudentId(student_id); + SST.select(); } catch (Exception e) { e.printStackTrace(); + response.sendRedirect("/op_fail.jsp"); } } } diff --git a/src/servlet/Submit/S_StudentUploadOpeningReport.java b/src/servlet/S_StudentUploadOpeningReport.java similarity index 92% rename from src/servlet/Submit/S_StudentUploadOpeningReport.java rename to src/servlet/S_StudentUploadOpeningReport.java index 8270f8d..44cc116 100644 --- a/src/servlet/Submit/S_StudentUploadOpeningReport.java +++ b/src/servlet/S_StudentUploadOpeningReport.java @@ -1,4 +1,4 @@ -package servlet.Submit; +package servlet; import core.process.C_StudentUploadOpeningReport; import core.user.User; @@ -14,7 +14,7 @@ import java.io.File; import java.io.IOException; import java.util.UUID; -@WebServlet("/upload") +@WebServlet("/student-upload-opening-report") @MultipartConfig //学生id+文件 public class S_StudentUploadOpeningReport extends HttpServlet { diff --git a/src/servlet/Select/S_TeacherSelectStudent.java b/src/servlet/S_TeacherSelectStudent.java similarity index 73% rename from src/servlet/Select/S_TeacherSelectStudent.java rename to src/servlet/S_TeacherSelectStudent.java index 0bd9ad4..fe20103 100644 --- a/src/servlet/Select/S_TeacherSelectStudent.java +++ b/src/servlet/S_TeacherSelectStudent.java @@ -1,4 +1,4 @@ -package servlet.Select; +package servlet; import core.process.C_TeacherSelectStudent; import core.user.User; @@ -9,7 +9,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -@WebServlet("/teacherselectstudent") +@WebServlet("/teacher-select-student") public class S_TeacherSelectStudent extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { super.doPost(request, response); @@ -17,11 +17,13 @@ public class S_TeacherSelectStudent extends HttpServlet { User user=(User)request.getSession().getAttribute("user"); String teacher_id=user.getId(); try { - C_TeacherSelectStudent test=new C_TeacherSelectStudent(); - test.setTeacherId(teacher_id); - test.setStudentId(student_id); + C_TeacherSelectStudent TSS=new C_TeacherSelectStudent(); + TSS.setTeacherId(teacher_id); + TSS.setStudentId(student_id); + TSS.select(); } catch (Exception e) { e.printStackTrace(); + response.sendRedirect("/op_fail.jsp"); } } } diff --git a/src/servlet/Submit/S_ScoreSubmit.java b/src/servlet/Submit/S_ScoreSubmit.java deleted file mode 100644 index 8e8a11c..0000000 --- a/src/servlet/Submit/S_ScoreSubmit.java +++ /dev/null @@ -1,15 +0,0 @@ -package servlet.Submit; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -public class S_ScoreSubmit extends HttpServlet { - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - super.doPost(request, response); - String score = request.getParameter("score"); - - } -} diff --git a/src/servlet/Submit/S_TextSubmit.java b/src/servlet/Submit/S_TextSubmit.java deleted file mode 100644 index f799e8a..0000000 --- a/src/servlet/Submit/S_TextSubmit.java +++ /dev/null @@ -1,23 +0,0 @@ -package servlet.Submit; - - -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -@WebServlet("/textsubmit") -public class S_TextSubmit extends HttpServlet { - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - super.doPost(request, response); - String content=new String(request.getParameter("text").getBytes("ISO8859-1"),"UTF-8"); - String score=request.getParameter("score"); - try { - - - } catch (Exception e) { - e.printStackTrace(); - } - } -} diff --git a/src/servlet/account/S_Login.java b/src/servlet/account/S_Login.java index c394db1..f7b9506 100644 --- a/src/servlet/account/S_Login.java +++ b/src/servlet/account/S_Login.java @@ -18,10 +18,10 @@ import error.GExcptSQL; @WebServlet("/login") public class S_Login extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws IOException { String id=request.getParameter("id"); String password=request.getParameter("password"); - User user = null; + User user; try { user = AccountManagement.login(id,password); } catch (GExcptSQL | SQLException gExcptSQL) { diff --git a/web/WEB-INF/tld/c-1_0-rt.tld b/web/WEB-INF/tld/c-1_0-rt.tld index 2203657..3700a9e 100644 --- a/web/WEB-INF/tld/c-1_0-rt.tld +++ b/web/WEB-INF/tld/c-1_0-rt.tld @@ -82,7 +82,7 @@ to either the page, a String in 'var', or a Reader in 'varReader'. - url + targetURL true true @@ -281,7 +281,7 @@ false - url + targetURL false true @@ -346,7 +346,7 @@ - url + targetURL org.apache.taglibs.standard.tag.rt.core.UrlTag JSP diff --git a/web/WEB-INF/tld/c-1_0.tld b/web/WEB-INF/tld/c-1_0.tld index ce80e8d..aea9d26 100644 --- a/web/WEB-INF/tld/c-1_0.tld +++ b/web/WEB-INF/tld/c-1_0.tld @@ -21,7 +21,7 @@ out:default out:escapeXml if:test - import:url + import:targetURL import:context import:charEncoding forEach:items @@ -36,12 +36,12 @@ param:name param:value redirect:context - redirect:url + redirect:targetURL set:property set:target set:value - url:context - url:value + targetURL:context + targetURL:value when:test @@ -139,7 +139,7 @@ to either the page, a String in 'var', or a Reader in 'varReader'. - url + targetURL true false @@ -304,7 +304,7 @@ false - url + targetURL true false @@ -369,7 +369,7 @@ - url + targetURL org.apache.taglibs.standard.tag.el.core.UrlTag JSP diff --git a/web/WEB-INF/tld/c.tld b/web/WEB-INF/tld/c.tld index 22698c9..5ae8dd8 100644 --- a/web/WEB-INF/tld/c.tld +++ b/web/WEB-INF/tld/c.tld @@ -103,7 +103,7 @@ Scope for var. The URL of the resource to import. - url + targetURL true true @@ -403,7 +403,7 @@ Value of the parameter. The URL of the resource to redirect to. - url + targetURL false true @@ -500,13 +500,13 @@ Scope for var. Creates a URL with optional query parameters. - url + targetURL org.apache.taglibs.standard.tag.rt.core.UrlTag JSP Name of the exported scoped variable for the -processed url. The type of the scoped variable is +processed targetURL. The type of the scoped variable is String. var diff --git a/web/WEB-INF/tld/sql-1_0-rt.tld b/web/WEB-INF/tld/sql-1_0-rt.tld index c2fe525..d1b895b 100644 --- a/web/WEB-INF/tld/sql-1_0-rt.tld +++ b/web/WEB-INF/tld/sql-1_0-rt.tld @@ -170,7 +170,7 @@ true - url + targetURL false true diff --git a/web/WEB-INF/tld/sql-1_0.tld b/web/WEB-INF/tld/sql-1_0.tld index 2f8a328..4cd3e3f 100644 --- a/web/WEB-INF/tld/sql-1_0.tld +++ b/web/WEB-INF/tld/sql-1_0.tld @@ -30,7 +30,7 @@ dateParam:type setDataSource:dataSource setDataSource:driver - setDataSource:url + setDataSource:targetURL setDataSource:user setDataSource:password @@ -195,7 +195,7 @@ ue. false - url + targetURL false false diff --git a/web/WEB-INF/tld/sql.tld b/web/WEB-INF/tld/sql.tld index e53445b..4f8e76b 100644 --- a/web/WEB-INF/tld/sql.tld +++ b/web/WEB-INF/tld/sql.tld @@ -263,7 +263,7 @@ JDBC parameter: driver class name. JDBC parameter: URL associated with the database. - url + targetURL false true