Menu
▾
▴
unitime-cvs — CVS changes
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(275) |
Jul
(81) |
Aug
(19) |
Sep
(26) |
Oct
(190) |
Nov
(118) |
Dec
(16) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(9) |
Feb
(318) |
Mar
(251) |
Apr
(354) |
May
(209) |
Jun
(261) |
Jul
(226) |
Aug
(136) |
Sep
(156) |
Oct
(30) |
Nov
(5) |
Dec
(13) |
| 2009 |
Jan
(26) |
Feb
(35) |
Mar
(63) |
Apr
(21) |
May
(26) |
Jun
(33) |
Jul
(55) |
Aug
(71) |
Sep
(23) |
Oct
(40) |
Nov
(18) |
Dec
(13) |
| 2010 |
Jan
(17) |
Feb
(98) |
Mar
(39) |
Apr
(25) |
May
(107) |
Jun
(257) |
Jul
(270) |
Aug
(206) |
Sep
(237) |
Oct
(187) |
Nov
(302) |
Dec
(187) |
| 2011 |
Jan
(63) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Tomas M. <to...@us...> - 2010-12-01 17:43:55
|
Update of /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/queueprocessor/hibernate In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25281/JavaSource/org/unitime/banner/queueprocessor/hibernate Modified Files: HibernateUtil.java Log Message: License update Index: HibernateUtil.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/queueprocessor/hibernate/HibernateUtil.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** HibernateUtil.java 20 Jul 2010 03:28:10 -0000 1.1 --- HibernateUtil.java 1 Dec 2010 17:43:47 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ |
|
From: Tomas M. <to...@us...> - 2010-12-01 17:43:55
|
Update of /cvsroot/unitime/UniTimeBannerAddOn In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25281 Modified Files: build.properties build.xml Log Message: License update Index: build.xml =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/build.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** build.xml 1 Dec 2010 17:34:11 -0000 1.2 --- build.xml 1 Dec 2010 17:43:47 -0000 1.3 *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> <project name="timetabling" basedir="." default="build"> --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> <project name="timetabling" basedir="." default="build"> Index: build.properties =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/build.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** build.properties 20 Jul 2010 03:28:10 -0000 1.1 --- build.properties 1 Dec 2010 17:43:47 -0000 1.2 *************** *** 1,8 **** ! # UniTime 3.1 (University Timetabling Application) # Copyright (C) 2010, UniTime LLC # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # --- 1,8 ---- ! # UniTime 3.2 (University Timetabling Application) # Copyright (C) 2010, UniTime LLC # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # *************** *** 13,18 **** # # You should have received a copy of the GNU General Public License along ! # with this program; if not, write to the Free Software Foundation, Inc., ! # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ############################################################################# --- 13,18 ---- # # You should have received a copy of the GNU General Public License along ! # with this program. If not, see <http://www.gnu.org/licenses/>. ! # ############################################################################# |
|
From: Tomas M. <to...@us...> - 2010-12-01 17:43:55
|
Update of /cvsroot/unitime/UniTimeBannerAddOn/WebContent/WEB-INF In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25281/WebContent/WEB-INF Modified Files: struts-config.xml tiles-defs.xml web.xml Log Message: License update Index: struts-config.xml =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/WebContent/WEB-INF/struts-config.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** struts-config.xml 20 Jul 2010 03:28:10 -0000 1.1 --- struts-config.xml 1 Dec 2010 17:43:47 -0000 1.2 *************** *** 1,10 **** <?xml version="1.0" encoding="UTF-8"?> <!-- ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- <?xml version="1.0" encoding="UTF-8"?> <!-- ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> <struts-config> --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> <struts-config> Index: web.xml =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/WebContent/WEB-INF/web.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** web.xml 20 Jul 2010 03:28:10 -0000 1.1 --- web.xml 1 Dec 2010 17:43:47 -0000 1.2 *************** *** 1,10 **** <?xml version="1.0" encoding="UTF-8"?> <!-- ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- <?xml version="1.0" encoding="UTF-8"?> <!-- ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> <web-app --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> <web-app Index: tiles-defs.xml =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/WebContent/WEB-INF/tiles-defs.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tiles-defs.xml 20 Jul 2010 03:28:10 -0000 1.1 --- tiles-defs.xml 1 Dec 2010 17:43:47 -0000 1.2 *************** *** 1,10 **** <?xml version="1.0" encoding="UTF-8"?> <!-- ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,10 ---- <?xml version="1.0" encoding="UTF-8"?> <!-- ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> <tiles-definitions> --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> <tiles-definitions> |
Update of /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/util In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25281/JavaSource/org/unitime/banner/util Modified Files: DefaultExternalBannerSessionElementHelper.java BannerSessionRollForward.java BannerSectionCrosslistHelper.java BannerMessageIdGenerator.java DefaultExternalBannerCampusCodeElementHelper.java BannerSectionLinkageHelper.java SendBannerAuditXml.java BannerInstrOffrConfigChangeAction.java MeetingElement.java SampleExternalBannerCampusCodeElementHelper.java UpdateLinksForAllOfferings.java BannerExternalClassNameHelper.java ExportBannerAuditXmlFile.java BannerChangeAction.java SampleExternalBannerSessionElementHelper.java Log Message: License update Index: BannerInstrOffrConfigChangeAction.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/util/BannerInstrOffrConfigChangeAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerInstrOffrConfigChangeAction.java 20 Jul 2010 03:28:10 -0000 1.1 --- BannerInstrOffrConfigChangeAction.java 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: DefaultExternalBannerCampusCodeElementHelper.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/util/DefaultExternalBannerCampusCodeElementHelper.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DefaultExternalBannerCampusCodeElementHelper.java 20 Jul 2010 03:28:09 -0000 1.1 --- DefaultExternalBannerCampusCodeElementHelper.java 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: BannerExternalClassNameHelper.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/util/BannerExternalClassNameHelper.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerExternalClassNameHelper.java 20 Jul 2010 03:28:10 -0000 1.1 --- BannerExternalClassNameHelper.java 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: SendBannerAuditXml.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/util/SendBannerAuditXml.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SendBannerAuditXml.java 1 Dec 2010 17:34:11 -0000 1.4 --- SendBannerAuditXml.java 1 Dec 2010 17:43:46 -0000 1.5 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: DefaultExternalBannerSessionElementHelper.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/util/DefaultExternalBannerSessionElementHelper.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DefaultExternalBannerSessionElementHelper.java 20 Jul 2010 03:28:09 -0000 1.1 --- DefaultExternalBannerSessionElementHelper.java 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: MeetingElement.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/util/MeetingElement.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MeetingElement.java 1 Dec 2010 17:34:11 -0000 1.3 --- MeetingElement.java 1 Dec 2010 17:43:46 -0000 1.4 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: BannerSectionLinkageHelper.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/util/BannerSectionLinkageHelper.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerSectionLinkageHelper.java 20 Jul 2010 03:28:09 -0000 1.1 --- BannerSectionLinkageHelper.java 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: SampleExternalBannerSessionElementHelper.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/util/SampleExternalBannerSessionElementHelper.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SampleExternalBannerSessionElementHelper.java 20 Jul 2010 03:28:10 -0000 1.1 --- SampleExternalBannerSessionElementHelper.java 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: BannerChangeAction.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/util/BannerChangeAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BannerChangeAction.java 1 Dec 2010 17:34:11 -0000 1.2 --- BannerChangeAction.java 1 Dec 2010 17:43:46 -0000 1.3 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: UpdateLinksForAllOfferings.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/util/UpdateLinksForAllOfferings.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** UpdateLinksForAllOfferings.java 14 Oct 2010 10:42:22 -0000 1.2 --- UpdateLinksForAllOfferings.java 1 Dec 2010 17:43:46 -0000 1.3 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: BannerSectionCrosslistHelper.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/util/BannerSectionCrosslistHelper.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerSectionCrosslistHelper.java 20 Jul 2010 03:28:09 -0000 1.1 --- BannerSectionCrosslistHelper.java 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: BannerMessageIdGenerator.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/util/BannerMessageIdGenerator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerMessageIdGenerator.java 20 Jul 2010 03:28:09 -0000 1.1 --- BannerMessageIdGenerator.java 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.banner.util; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.banner.util; Index: BannerSessionRollForward.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/util/BannerSessionRollForward.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerSessionRollForward.java 20 Jul 2010 03:28:09 -0000 1.1 --- BannerSessionRollForward.java 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: SampleExternalBannerCampusCodeElementHelper.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/util/SampleExternalBannerCampusCodeElementHelper.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SampleExternalBannerCampusCodeElementHelper.java 20 Jul 2010 03:28:10 -0000 1.1 --- SampleExternalBannerCampusCodeElementHelper.java 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: ExportBannerAuditXmlFile.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/util/ExportBannerAuditXmlFile.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ExportBannerAuditXmlFile.java 14 Oct 2010 10:42:22 -0000 1.2 --- ExportBannerAuditXmlFile.java 1 Dec 2010 17:43:46 -0000 1.3 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ |
Update of /cvsroot/unitime/UniTimeBannerAddOn/Documentation/Database/Oracle/Changes In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25281/Documentation/Database/Oracle/Changes Modified Files: 02 Banner Response Indexes 03 Banner CRN Lookup Indexes.sql 01 Banner Add On Support Tables.sql 02 Banner Response Indexes.sql Log Message: License update Index: 03 Banner CRN Lookup Indexes.sql =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/Documentation/Database/Oracle/Changes/03 Banner CRN Lookup Indexes.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 03 Banner CRN Lookup Indexes.sql 1 Dec 2010 17:34:11 -0000 1.2 --- 03 Banner CRN Lookup Indexes.sql 1 Dec 2010 17:43:47 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ /* Index: 02 Banner Response Indexes =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/Documentation/Database/Oracle/Changes/02 Banner Response Indexes,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 02 Banner Response Indexes 21 Sep 2010 19:46:14 -0000 1.1 --- 02 Banner Response Indexes 1 Dec 2010 17:43:47 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ /* Index: 01 Banner Add On Support Tables.sql =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/Documentation/Database/Oracle/Changes/01 Banner Add On Support Tables.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 01 Banner Add On Support Tables.sql 20 Jul 2010 03:28:10 -0000 1.1 --- 01 Banner Add On Support Tables.sql 1 Dec 2010 17:43:47 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ /* Index: 02 Banner Response Indexes.sql =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/Documentation/Database/Oracle/Changes/02 Banner Response Indexes.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 02 Banner Response Indexes.sql 1 Dec 2010 17:34:11 -0000 1.2 --- 02 Banner Response Indexes.sql 1 Dec 2010 17:43:47 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ /* |
|
From: Tomas M. <to...@us...> - 2010-12-01 17:43:55
|
Update of /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/form In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25281/JavaSource/org/unitime/banner/form Modified Files: BannerSessionEditForm.java BannerTermCrnPropertiesEditForm.java BannerCourseListForm.java BannerTermCrnPropertiesListForm.java BannerOfferingModifyForm.java RollForwardBannerSessionForm.java BannerOfferingDetailForm.java BannerMessageResponsesForm.java BannerSessionListForm.java Log Message: License update Index: BannerTermCrnPropertiesListForm.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/form/BannerTermCrnPropertiesListForm.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerTermCrnPropertiesListForm.java 20 Jul 2010 03:28:10 -0000 1.1 --- BannerTermCrnPropertiesListForm.java 1 Dec 2010 17:43:47 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.banner.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.banner.form; Index: BannerSessionEditForm.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/form/BannerSessionEditForm.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerSessionEditForm.java 20 Jul 2010 03:28:10 -0000 1.1 --- BannerSessionEditForm.java 1 Dec 2010 17:43:47 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.banner.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.banner.form; Index: BannerOfferingModifyForm.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/form/BannerOfferingModifyForm.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BannerOfferingModifyForm.java 1 Dec 2010 17:34:11 -0000 1.2 --- BannerOfferingModifyForm.java 1 Dec 2010 17:43:47 -0000 1.3 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.banner.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.banner.form; Index: BannerMessageResponsesForm.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/form/BannerMessageResponsesForm.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerMessageResponsesForm.java 20 Jul 2010 03:28:10 -0000 1.1 --- BannerMessageResponsesForm.java 1 Dec 2010 17:43:47 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.banner.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.banner.form; Index: BannerTermCrnPropertiesEditForm.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/form/BannerTermCrnPropertiesEditForm.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerTermCrnPropertiesEditForm.java 20 Jul 2010 03:28:10 -0000 1.1 --- BannerTermCrnPropertiesEditForm.java 1 Dec 2010 17:43:47 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.banner.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.banner.form; Index: RollForwardBannerSessionForm.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/form/RollForwardBannerSessionForm.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RollForwardBannerSessionForm.java 20 Jul 2010 03:28:10 -0000 1.1 --- RollForwardBannerSessionForm.java 1 Dec 2010 17:43:47 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.banner.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.banner.form; Index: BannerOfferingDetailForm.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/form/BannerOfferingDetailForm.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerOfferingDetailForm.java 20 Jul 2010 03:28:10 -0000 1.1 --- BannerOfferingDetailForm.java 1 Dec 2010 17:43:47 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.banner.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.banner.form; Index: BannerSessionListForm.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/form/BannerSessionListForm.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerSessionListForm.java 20 Jul 2010 03:28:10 -0000 1.1 --- BannerSessionListForm.java 1 Dec 2010 17:43:47 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.banner.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.banner.form; Index: BannerCourseListForm.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/form/BannerCourseListForm.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BannerCourseListForm.java 1 Dec 2010 17:34:11 -0000 1.2 --- BannerCourseListForm.java 1 Dec 2010 17:43:47 -0000 1.3 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.banner.form; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.banner.form; |
Update of /cvsroot/unitime/UniTimeBannerAddOn/Documentation/Database/MySQL/Changes In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25281/Documentation/Database/MySQL/Changes Modified Files: 02 Banner Response Indexes 02 Banner Response Indexes.sql 01 Banner Add On Support Tables.sql 03 Banner CRN Lookup Indexes.sql Log Message: License update Index: 03 Banner CRN Lookup Indexes.sql =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/Documentation/Database/MySQL/Changes/03 Banner CRN Lookup Indexes.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 03 Banner CRN Lookup Indexes.sql 1 Dec 2010 17:34:10 -0000 1.2 --- 03 Banner CRN Lookup Indexes.sql 1 Dec 2010 17:43:47 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ /* Index: 02 Banner Response Indexes =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/Documentation/Database/MySQL/Changes/02 Banner Response Indexes,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 02 Banner Response Indexes 21 Sep 2010 19:46:14 -0000 1.1 --- 02 Banner Response Indexes 1 Dec 2010 17:43:47 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ /* Index: 01 Banner Add On Support Tables.sql =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/Documentation/Database/MySQL/Changes/01 Banner Add On Support Tables.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 01 Banner Add On Support Tables.sql 20 Jul 2010 03:28:10 -0000 1.1 --- 01 Banner Add On Support Tables.sql 1 Dec 2010 17:43:47 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ /* Index: 02 Banner Response Indexes.sql =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/Documentation/Database/MySQL/Changes/02 Banner Response Indexes.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 02 Banner Response Indexes.sql 1 Dec 2010 17:34:10 -0000 1.2 --- 02 Banner Response Indexes.sql 1 Dec 2010 17:43:47 -0000 1.3 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ /* |
|
From: Tomas M. <to...@us...> - 2010-12-01 17:43:55
|
Update of /cvsroot/unitime/UniTimeBannerAddOn/JavaSource In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25281/JavaSource Modified Files: BannerSection.hbm.xml Queue.hbm.xml BannerSectionToClass.hbm.xml BannerTermCrnProperties.hbm.xml BannerResponse.hbm.xml hibernate.cfg.xml BannerSession.hbm.xml BannerConfig.hbm.xml BannerCourse.hbm.xml bannerdbupdate.xml custom.properties menu-custom.xml QueueError.hbm.xml Log Message: License update Index: BannerConfig.hbm.xml =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/BannerConfig.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerConfig.hbm.xml 20 Jul 2010 03:28:09 -0000 1.1 --- BannerConfig.hbm.xml 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: menu-custom.xml =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/menu-custom.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** menu-custom.xml 1 Dec 2010 17:34:11 -0000 1.2 --- menu-custom.xml 1 Dec 2010 17:43:46 -0000 1.3 *************** *** 1,3 **** --- 1,21 ---- <?xml version="1.0"?> + <!-- + * UniTime 3.2 (University Timetabling Application) + * Copyright (C) 2010, UniTime LLC + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + * + --> <unitime-menu> <menu name="Courses"> Index: custom.properties =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/custom.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** custom.properties 1 Dec 2010 17:34:11 -0000 1.2 --- custom.properties 1 Dec 2010 17:43:46 -0000 1.3 *************** *** 1,8 **** ! # UniTime 3.1 (University Timetabling Application) # Copyright (C) 2010, UniTime LLC # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # --- 1,8 ---- ! # UniTime 3.2 (University Timetabling Application) # Copyright (C) 2010, UniTime LLC # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # *************** *** 13,18 **** # # You should have received a copy of the GNU General Public License along ! # with this program; if not, write to the Free Software Foundation, Inc., ! # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ############################################################################# --- 13,18 ---- # # You should have received a copy of the GNU General Public License along ! # with this program. If not, see <http://www.gnu.org/licenses/>. ! # ############################################################################# Index: BannerSection.hbm.xml =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/BannerSection.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerSection.hbm.xml 20 Jul 2010 03:28:09 -0000 1.1 --- BannerSection.hbm.xml 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: BannerSectionToClass.hbm.xml =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/BannerSectionToClass.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerSectionToClass.hbm.xml 20 Jul 2010 03:28:09 -0000 1.1 --- BannerSectionToClass.hbm.xml 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: BannerCourse.hbm.xml =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/BannerCourse.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerCourse.hbm.xml 20 Jul 2010 03:28:09 -0000 1.1 --- BannerCourse.hbm.xml 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: BannerSession.hbm.xml =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/BannerSession.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerSession.hbm.xml 20 Jul 2010 03:28:09 -0000 1.1 --- BannerSession.hbm.xml 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: hibernate.cfg.xml =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/hibernate.cfg.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** hibernate.cfg.xml 20 Jul 2010 03:28:09 -0000 1.1 --- hibernate.cfg.xml 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: BannerTermCrnProperties.hbm.xml =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/BannerTermCrnProperties.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerTermCrnProperties.hbm.xml 20 Jul 2010 03:28:09 -0000 1.1 --- BannerTermCrnProperties.hbm.xml 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: Queue.hbm.xml =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/Queue.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Queue.hbm.xml 1 Dec 2010 17:34:11 -0000 1.2 --- Queue.hbm.xml 1 Dec 2010 17:43:46 -0000 1.3 *************** *** 4,13 **** <!-- ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 4,13 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 18,23 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 18,23 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: BannerResponse.hbm.xml =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/BannerResponse.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerResponse.hbm.xml 20 Jul 2010 03:28:09 -0000 1.1 --- BannerResponse.hbm.xml 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 4,13 **** <!-- ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 4,13 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 18,23 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> <!-- based on code contributed by Dagmar Murray --> --- 18,23 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> <!-- based on code contributed by Dagmar Murray --> Index: QueueError.hbm.xml =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/QueueError.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** QueueError.hbm.xml 1 Dec 2010 17:34:11 -0000 1.2 --- QueueError.hbm.xml 1 Dec 2010 17:43:46 -0000 1.3 *************** *** 3,12 **** <!-- ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 3,12 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 17,22 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 17,22 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: bannerdbupdate.xml =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/bannerdbupdate.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** bannerdbupdate.xml 1 Dec 2010 17:34:11 -0000 1.3 --- bannerdbupdate.xml 1 Dec 2010 17:43:46 -0000 1.4 *************** *** 2,11 **** <!-- ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 2,11 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 16,21 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> <dbupdate> --- 16,21 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> <dbupdate> |
|
From: Tomas M. <to...@us...> - 2010-12-01 17:43:54
|
Update of /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/commons/hibernate/util In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25281/JavaSource/org/unitime/banner/commons/hibernate/util Modified Files: BannerUpdateListener.java BannerAddOnDatabaseUpdate.java Log Message: License update Index: BannerUpdateListener.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/commons/hibernate/util/BannerUpdateListener.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BannerUpdateListener.java 1 Dec 2010 17:34:10 -0000 1.3 --- BannerUpdateListener.java 1 Dec 2010 17:43:46 -0000 1.4 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ Index: BannerAddOnDatabaseUpdate.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/commons/hibernate/util/BannerAddOnDatabaseUpdate.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerAddOnDatabaseUpdate.java 20 Jul 2010 03:28:09 -0000 1.1 --- BannerAddOnDatabaseUpdate.java 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.banner.commons.hibernate.util; --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ package org.unitime.banner.commons.hibernate.util; |
|
From: Tomas M. <to...@us...> - 2010-12-01 17:43:54
|
Update of /cvsroot/unitime/UniTimeBannerAddOn/Documentation/Database/AuditSqls In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25281/Documentation/Database/AuditSqls Modified Files: ListOfCrossListedCourses.sql ValidateNestingOfAnItype.sql ListCoursesThatRequireSpecialItypes.sql ValidateCoursesWithMultipleConfigs.sql duplicate_crn_check.sql Log Message: License update Index: ValidateNestingOfAnItype.sql =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/Documentation/Database/AuditSqls/ValidateNestingOfAnItype.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ValidateNestingOfAnItype.sql 20 Jul 2010 03:28:09 -0000 1.1 --- ValidateNestingOfAnItype.sql 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ /* Index: ListCoursesThatRequireSpecialItypes.sql =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/Documentation/Database/AuditSqls/ListCoursesThatRequireSpecialItypes.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ListCoursesThatRequireSpecialItypes.sql 20 Jul 2010 03:28:09 -0000 1.1 --- ListCoursesThatRequireSpecialItypes.sql 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ /* Index: duplicate_crn_check.sql =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/Documentation/Database/AuditSqls/duplicate_crn_check.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** duplicate_crn_check.sql 20 Jul 2010 03:28:09 -0000 1.1 --- duplicate_crn_check.sql 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ /* Index: ListOfCrossListedCourses.sql =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/Documentation/Database/AuditSqls/ListOfCrossListedCourses.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ListOfCrossListedCourses.sql 20 Jul 2010 03:28:09 -0000 1.1 --- ListOfCrossListedCourses.sql 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ /* Index: ValidateCoursesWithMultipleConfigs.sql =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/Documentation/Database/AuditSqls/ValidateCoursesWithMultipleConfigs.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ValidateCoursesWithMultipleConfigs.sql 20 Jul 2010 03:28:09 -0000 1.1 --- ValidateCoursesWithMultipleConfigs.sql 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 1,9 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ /* |
|
From: Tomas M. <to...@us...> - 2010-12-01 17:43:54
|
Update of /cvsroot/unitime/UniTimeBannerAddOn/Documentation/Interfaces In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25281/Documentation/Interfaces Modified Files: BannerCourseOfferingImport.dtd BannerStudentEnrollment.dtd BannerStudentUpdates.dtd Log Message: License update Index: BannerCourseOfferingImport.dtd =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/Documentation/Interfaces/BannerCourseOfferingImport.dtd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerCourseOfferingImport.dtd 20 Jul 2010 03:28:09 -0000 1.1 --- BannerCourseOfferingImport.dtd 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: BannerStudentUpdates.dtd =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/Documentation/Interfaces/BannerStudentUpdates.dtd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BannerStudentUpdates.dtd 1 Dec 2010 17:34:11 -0000 1.2 --- BannerStudentUpdates.dtd 1 Dec 2010 17:43:46 -0000 1.3 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> Index: BannerStudentEnrollment.dtd =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/Documentation/Interfaces/BannerStudentEnrollment.dtd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerStudentEnrollment.dtd 20 Jul 2010 03:28:09 -0000 1.1 --- BannerStudentEnrollment.dtd 1 Dec 2010 17:43:46 -0000 1.2 *************** *** 1,9 **** <!-- ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 1,9 ---- <!-- ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 14,19 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> --- 14,19 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * --> |
|
From: Tomas M. <to...@us...> - 2010-12-01 17:43:54
|
Update of /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/ant In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25281/JavaSource/org/unitime/banner/ant Modified Files: MergeXml.java Log Message: License update Index: MergeXml.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/ant/MergeXml.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MergeXml.java 20 Jul 2010 03:28:10 -0000 1.1 --- MergeXml.java 1 Dec 2010 17:43:47 -0000 1.2 *************** *** 1,4 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. --- 1,4 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. *************** *** 6,10 **** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * --- 6,10 ---- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * *************** *** 15,20 **** * * You should have received a copy of the GNU General Public License along ! * with this program; if not, write to the Free Software Foundation, Inc., ! * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ --- 15,20 ---- * * You should have received a copy of the GNU General Public License along ! * with this program. If not, see <http://www.gnu.org/licenses/>. ! * */ |
Update of /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/model/base In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22821/JavaSource/org/unitime/banner/model/base Modified Files: BaseBannerResponse.java BaseBannerSectionDAO.java BaseQueueOutDAO.java BaseBannerSection.java BaseQueueErrorDAO.java BaseBannerSessionDAO.java BaseQueueInDAO.java BaseQueueOut.java BaseBannerConfig.java BaseQueueIn.java BaseBannerSectionToClass.java BaseBannerTermCrnProperties.java BaseBannerResponseDAO.java BaseBannerTermCrnPropertiesDAO.java BaseQueue.java BaseBannerCourseDAO.java BaseBannerSession.java BaseQueueDAO.java BaseBannerConfigDAO.java BaseBannerSectionToClassDAO.java BaseBannerCourse.java BaseQueueError.java Removed Files: BaseQueueErrorId.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: BaseBannerSectionDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/model/base/BaseBannerSectionDAO.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BaseBannerSectionDAO.java 20 Jul 2010 03:28:09 -0000 1.1 --- BaseBannerSectionDAO.java 1 Dec 2010 17:34:10 -0000 1.2 *************** *** 1,7 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by --- 1,7 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 18,221 **** * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - package org.unitime.banner.model.base; ! import org.hibernate.Hibernate; ! import org.hibernate.Session; ! import org.hibernate.criterion.Order; ! import org.unitime.banner.model.dao.BannerSectionDAO; ! ! /** ! * This is an automatically generated DAO class which should not be edited. ! */ ! public abstract class BaseBannerSectionDAO extends org.unitime.banner.model.dao._RootDAO { ! ! // query name references ! ! ! public static BannerSectionDAO instance; ! ! /** ! * Return a singleton of the DAO ! */ ! public static BannerSectionDAO getInstance () { ! if (null == instance) instance = new BannerSectionDAO(); ! return instance; ! } ! ! public Class getReferenceClass () { ! return org.unitime.banner.model.BannerSection.class; ! } ! ! public Order getDefaultOrder () { ! return null; ! } ! ! /** ! * Cast the object as a org.unitime.banner.model.BannerSection ! */ ! public org.unitime.banner.model.BannerSection cast (Object object) { ! return (org.unitime.banner.model.BannerSection) object; ! } ! ! public org.unitime.banner.model.BannerSection get(java.lang.Long key) ! { ! return (org.unitime.banner.model.BannerSection) get(getReferenceClass(), key); ! } ! ! public org.unitime.banner.model.BannerSection get(java.lang.Long key, Session s) ! { ! return (org.unitime.banner.model.BannerSection) get(getReferenceClass(), key, s); ! } ! ! public org.unitime.banner.model.BannerSection load(java.lang.Long key) ! { ! return (org.unitime.banner.model.BannerSection) load(getReferenceClass(), key); ! } ! ! public org.unitime.banner.model.BannerSection load(java.lang.Long key, Session s) ! { ! return (org.unitime.banner.model.BannerSection) load(getReferenceClass(), key, s); ! } ! ! public org.unitime.banner.model.BannerSection loadInitialize(java.lang.Long key, Session s) ! { ! org.unitime.banner.model.BannerSection obj = load(key, s); ! if (!Hibernate.isInitialized(obj)) { ! Hibernate.initialize(obj); ! } ! return obj; ! } ! ! ! /** ! * Persist the given transient instance, first assigning a generated identifier. (Or using the current value ! * of the identifier property if the assigned generator is used.) ! * @param bannerSection a transient instance of a persistent class ! * @return the class identifier ! */ ! public java.lang.Long save(org.unitime.banner.model.BannerSection bannerSection) ! { ! return (java.lang.Long) super.save(bannerSection); ! } ! /** ! * Persist the given transient instance, first assigning a generated identifier. (Or using the current value ! * of the identifier property if the assigned generator is used.) ! * Use the Session given. ! * @param bannerSection a transient instance of a persistent class ! * @param s the Session ! * @return the class identifier ! */ ! public java.lang.Long save(org.unitime.banner.model.BannerSection bannerSection, Session s) ! { ! return (java.lang.Long) save((Object) bannerSection, s); ! } ! /** ! * Either save() or update() the given instance, depending upon the value of its identifier property. By default ! * the instance is always saved. This behaviour may be adjusted by specifying an unsaved-value attribute of the ! * identifier property mapping. ! * @param bannerSection a transient instance containing new or updated state ! */ ! public void saveOrUpdate(org.unitime.banner.model.BannerSection bannerSection) ! { ! saveOrUpdate((Object) bannerSection); ! } ! /** ! * Either save() or update() the given instance, depending upon the value of its identifier property. By default the ! * instance is always saved. This behaviour may be adjusted by specifying an unsaved-value attribute of the identifier ! * property mapping. ! * Use the Session given. ! * @param bannerSection a transient instance containing new or updated state. ! * @param s the Session. ! */ ! public void saveOrUpdate(org.unitime.banner.model.BannerSection bannerSection, Session s) ! { ! saveOrUpdate((Object) bannerSection, s); ! } ! /** ! * Update the persistent state associated with the given identifier. An exception is thrown if there is a persistent ! * instance with the same identifier in the current session. ! * @param bannerSection a transient instance containing updated state ! */ ! public void update(org.unitime.banner.model.BannerSection bannerSection) ! { ! update((Object) bannerSection); } ! /** ! * Update the persistent state associated with the given identifier. An exception is thrown if there is a persistent ! * instance with the same identifier in the current session. ! * Use the Session given. ! * @param bannerSection a transient instance containing updated state ! * @param the Session ! */ ! public void update(org.unitime.banner.model.BannerSection bannerSection, Session s) ! { ! update((Object) bannerSection, s); } ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * @param id the instance ID to be removed ! */ ! public void delete(java.lang.Long id) ! { ! delete((Object) load(id)); } ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * Use the Session given. ! * @param id the instance ID to be removed ! * @param s the Session ! */ ! public void delete(java.lang.Long id, Session s) ! { ! delete((Object) load(id, s), s); } ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * @param bannerSection the instance to be removed ! */ ! public void delete(org.unitime.banner.model.BannerSection bannerSection) ! { ! delete((Object) bannerSection); } ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * Use the Session given. ! * @param bannerSection the instance to be removed ! * @param s the Session ! */ ! public void delete(org.unitime.banner.model.BannerSection bannerSection, Session s) ! { ! delete((Object) bannerSection, s); ! } ! ! /** ! * Re-read the state of the given instance from the underlying database. It is inadvisable to use this to implement ! * long-running sessions that span many business tasks. This method is, however, useful in certain special circumstances. ! * For example ! * <ul> ! * <li>where a database trigger alters the object state upon insert or update</li> ! * <li>after executing direct SQL (eg. a mass update) in the same session</li> ! * <li>after inserting a Blob or Clob</li> ! * </ul> ! */ ! public void refresh (org.unitime.banner.model.BannerSection bannerSection, Session s) ! { ! refresh((Object) bannerSection, s); } ! ! ! } \ No newline at end of file --- 18,60 ---- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.banner.model.base; ! import java.util.List; ! import org.unitime.banner.model.BannerSection; ! import org.unitime.banner.model.dao._RootDAO; ! import org.unitime.banner.model.dao.BannerSectionDAO; ! public abstract class BaseBannerSectionDAO extends _RootDAO<BannerSection,Long> { ! private static BannerSectionDAO sInstance; ! public static BannerSectionDAO getInstance() { ! if (sInstance == null) sInstance = new BannerSectionDAO(); ! return sInstance; } ! public Class<BannerSection> getReferenceClass() { ! return BannerSection.class; } ! @SuppressWarnings("unchecked") ! public List<BannerSection> findByBannerConfig(org.hibernate.Session hibSession, Long bannerConfigId) { ! return hibSession.createQuery("from BannerSection x where x.bannerConfig.uniqueId = :bannerConfigId").setLong("bannerConfigId", bannerConfigId).list(); } ! @SuppressWarnings("unchecked") ! public List<BannerSection> findByConsentType(org.hibernate.Session hibSession, Long consentTypeId) { ! return hibSession.createQuery("from BannerSection x where x.consentType.uniqueId = :consentTypeId").setLong("consentTypeId", consentTypeId).list(); } ! @SuppressWarnings("unchecked") ! public List<BannerSection> findBySession(org.hibernate.Session hibSession, Long sessionId) { ! return hibSession.createQuery("from BannerSection x where x.session.uniqueId = :sessionId").setLong("sessionId", sessionId).list(); } ! @SuppressWarnings("unchecked") ! public List<BannerSection> findByParentBannerSection(org.hibernate.Session hibSession, Long parentBannerSectionId) { ! return hibSession.createQuery("from BannerSection x where x.parentBannerSection.uniqueId = :parentBannerSectionId").setLong("parentBannerSectionId", parentBannerSectionId).list(); } ! } Index: BaseBannerSessionDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/model/base/BaseBannerSessionDAO.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BaseBannerSessionDAO.java 20 Jul 2010 03:28:09 -0000 1.1 --- BaseBannerSessionDAO.java 1 Dec 2010 17:34:10 -0000 1.2 *************** *** 1,7 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by --- 1,7 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 18,221 **** * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - package org.unitime.banner.model.base; ! import org.hibernate.Hibernate; ! import org.hibernate.Session; ! import org.hibernate.criterion.Order; ! import org.unitime.banner.model.dao.BannerSessionDAO; ! ! /** ! * This is an automatically generated DAO class which should not be edited. ! */ ! public abstract class BaseBannerSessionDAO extends org.unitime.banner.model.dao._RootDAO { ! ! // query name references ! ! ! public static BannerSessionDAO instance; ! ! /** ! * Return a singleton of the DAO ! */ ! public static BannerSessionDAO getInstance () { ! if (null == instance) instance = new BannerSessionDAO(); ! return instance; ! } ! ! public Class getReferenceClass () { ! return org.unitime.banner.model.BannerSession.class; ! } ! ! public Order getDefaultOrder () { ! return null; ! } ! ! /** ! * Cast the object as a org.unitime.banner.model.BannerSession ! */ ! public org.unitime.banner.model.BannerSession cast (Object object) { ! return (org.unitime.banner.model.BannerSession) object; ! } ! ! public org.unitime.banner.model.BannerSession get(java.lang.Long key) ! { ! return (org.unitime.banner.model.BannerSession) get(getReferenceClass(), key); ! } ! ! public org.unitime.banner.model.BannerSession get(java.lang.Long key, Session s) ! { ! return (org.unitime.banner.model.BannerSession) get(getReferenceClass(), key, s); ! } ! ! public org.unitime.banner.model.BannerSession load(java.lang.Long key) ! { ! return (org.unitime.banner.model.BannerSession) load(getReferenceClass(), key); ! } ! ! public org.unitime.banner.model.BannerSession load(java.lang.Long key, Session s) ! { ! return (org.unitime.banner.model.BannerSession) load(getReferenceClass(), key, s); ! } ! ! public org.unitime.banner.model.BannerSession loadInitialize(java.lang.Long key, Session s) ! { ! org.unitime.banner.model.BannerSession obj = load(key, s); ! if (!Hibernate.isInitialized(obj)) { ! Hibernate.initialize(obj); ! } ! return obj; ! } ! ! ! /** ! * Persist the given transient instance, first assigning a generated identifier. (Or using the current value ! * of the identifier property if the assigned generator is used.) ! * @param bannerSession a transient instance of a persistent class ! * @return the class identifier ! */ ! public java.lang.Long save(org.unitime.banner.model.BannerSession bannerSession) ! { ! return (java.lang.Long) super.save(bannerSession); ! } ! ! /** ! * Persist the given transient instance, first assigning a generated identifier. (Or using the current value ! * of the identifier property if the assigned generator is used.) ! * Use the Session given. ! * @param bannerSession a transient instance of a persistent class ! * @param s the Session ! * @return the class identifier ! */ ! public java.lang.Long save(org.unitime.banner.model.BannerSession bannerSession, Session s) ! { ! return (java.lang.Long) save((Object) bannerSession, s); ! } ! ! /** ! * Either save() or update() the given instance, depending upon the value of its identifier property. By default ! * the instance is always saved. This behaviour may be adjusted by specifying an unsaved-value attribute of the ! * identifier property mapping. ! * @param bannerSession a transient instance containing new or updated state ! */ ! public void saveOrUpdate(org.unitime.banner.model.BannerSession bannerSession) ! { ! saveOrUpdate((Object) bannerSession); ! } ! ! /** ! * Either save() or update() the given instance, depending upon the value of its identifier property. By default the ! * instance is always saved. This behaviour may be adjusted by specifying an unsaved-value attribute of the identifier ! * property mapping. ! * Use the Session given. ! * @param bannerSession a transient instance containing new or updated state. ! * @param s the Session. ! */ ! public void saveOrUpdate(org.unitime.banner.model.BannerSession bannerSession, Session s) ! { ! saveOrUpdate((Object) bannerSession, s); ! } ! /** ! * Update the persistent state associated with the given identifier. An exception is thrown if there is a persistent ! * instance with the same identifier in the current session. ! * @param bannerSession a transient instance containing updated state ! */ ! public void update(org.unitime.banner.model.BannerSession bannerSession) ! { ! update((Object) bannerSession); ! } ! /** ! * Update the persistent state associated with the given identifier. An exception is thrown if there is a persistent ! * instance with the same identifier in the current session. ! * Use the Session given. ! * @param bannerSession a transient instance containing updated state ! * @param the Session ! */ ! public void update(org.unitime.banner.model.BannerSession bannerSession, Session s) ! { ! update((Object) bannerSession, s); ! } ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * @param id the instance ID to be removed ! */ ! public void delete(java.lang.Long id) ! { ! delete((Object) load(id)); ! } ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * Use the Session given. ! * @param id the instance ID to be removed ! * @param s the Session ! */ ! public void delete(java.lang.Long id, Session s) ! { ! delete((Object) load(id, s), s); } ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * @param bannerSession the instance to be removed ! */ ! public void delete(org.unitime.banner.model.BannerSession bannerSession) ! { ! delete((Object) bannerSession); } ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * Use the Session given. ! * @param bannerSession the instance to be removed ! * @param s the Session ! */ ! public void delete(org.unitime.banner.model.BannerSession bannerSession, Session s) ! { ! delete((Object) bannerSession, s); ! } ! ! /** ! * Re-read the state of the given instance from the underlying database. It is inadvisable to use this to implement ! * long-running sessions that span many business tasks. This method is, however, useful in certain special circumstances. ! * For example ! * <ul> ! * <li>where a database trigger alters the object state upon insert or update</li> ! * <li>after executing direct SQL (eg. a mass update) in the same session</li> ! * <li>after inserting a Blob or Clob</li> ! * </ul> ! */ ! public void refresh (org.unitime.banner.model.BannerSession bannerSession, Session s) ! { ! refresh((Object) bannerSession, s); } ! ! ! } \ No newline at end of file --- 18,45 ---- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.banner.model.base; ! import java.util.List; ! import org.unitime.banner.model.BannerSession; ! import org.unitime.banner.model.dao._RootDAO; ! import org.unitime.banner.model.dao.BannerSessionDAO; ! public abstract class BaseBannerSessionDAO extends _RootDAO<BannerSession,Long> { ! private static BannerSessionDAO sInstance; ! public static BannerSessionDAO getInstance() { ! if (sInstance == null) sInstance = new BannerSessionDAO(); ! return sInstance; } ! public Class<BannerSession> getReferenceClass() { ! return BannerSession.class; } ! @SuppressWarnings("unchecked") ! public List<BannerSession> findBySession(org.hibernate.Session hibSession, Long sessionId) { ! return hibSession.createQuery("from BannerSession x where x.session.uniqueId = :sessionId").setLong("sessionId", sessionId).list(); } ! } Index: BaseQueue.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/model/base/BaseQueue.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BaseQueue.java 20 Jul 2010 03:28:09 -0000 1.1 --- BaseQueue.java 1 Dec 2010 17:34:10 -0000 1.2 *************** *** 1,7 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by --- 1,7 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 18,207 **** * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - package org.unitime.banner.model.base; import java.io.Serializable; import org.dom4j.Document; ! /** ! * This is an object that contains data related to the table. ! * Do not modify this class because it will be overwritten if the configuration file ! * related to this class is modified. ! * ! * @hibernate.class ! * table="" ! */ - public abstract class BaseQueue implements Serializable { ! public static String REF = "Queue"; public static String PROP_XML = "xml"; public static String PROP_STATUS = "status"; ! public static String PROP_POST_DATE = "postDate"; ! public static String PROP_PROCESS_DATE = "processDate"; ! ! ! // constructors ! public BaseQueue () { ! initialize(); ! } ! /** ! * Constructor for primary key ! */ ! public BaseQueue (java.lang.Long uniqueId) { ! this.setUniqueId(uniqueId); initialize(); } ! /** ! * Constructor for required fields ! */ ! public BaseQueue ( ! java.lang.Long uniqueId, ! Document xml) { ! ! this.setUniqueId(uniqueId); ! this.setXml(xml); initialize(); } ! protected void initialize () {} ! ! ! ! private int hashCode = Integer.MIN_VALUE; ! ! // primary key ! private java.lang.Long uniqueId; ! ! // fields ! private Document xml; ! private java.lang.String status; ! private java.util.Date postDate; ! private java.util.Date processDate; ! ! ! ! /** ! * Return the unique identifier of this class ! * @hibernate.id ! * generator-class="increment" ! * column="UNIQUEID" ! */ ! public java.lang.Long getUniqueId () { ! return uniqueId; ! } ! ! /** ! * Set the unique identifier of this class ! * @param uniqueId the new ID ! */ ! public void setUniqueId (java.lang.Long uniqueId) { ! this.uniqueId = uniqueId; ! this.hashCode = Integer.MIN_VALUE; ! } ! ! ! ! ! /** ! * Return the value associated with the column: xml ! */ ! public Document getXml () { ! return xml; ! } ! ! /** ! * Set the value related to the column: xml ! * @param xml the xml value ! */ ! public void setXml (Document xml) { ! this.xml = xml; ! } ! ! ! ! /** ! * Return the value associated with the column: status ! */ ! public java.lang.String getStatus () { ! return status; ! } ! ! /** ! * Set the value related to the column: status ! * @param status the status value ! */ ! public void setStatus (java.lang.String status) { ! this.status = status; ! } ! ! ! /** ! * Return the value associated with the column: postdate ! */ ! public java.util.Date getPostDate () { ! return postDate; ! } ! /** ! * Set the value related to the column: postdate ! * @param postDate the postdate value ! */ ! public void setPostDate (java.util.Date postDate) { ! this.postDate = postDate; ! } ! /** ! * Return the value associated with the column: processdate ! */ ! public java.util.Date getProcessDate () { ! return processDate; ! } ! /** ! * Set the value related to the column: processdate ! * @param processDate the processdate value ! */ ! public void setProcessDate (java.util.Date processDate) { ! this.processDate = processDate; } ! ! ! ! ! public boolean equals (Object obj) { ! if (null == obj) return false; ! if (!(obj instanceof org.unitime.banner.model.Queue)) return false; ! else { ! org.unitime.banner.model.Queue queue = (org.unitime.banner.model.Queue) obj; ! if (null == this.getUniqueId() || null == queue.getUniqueId()) return false; ! else return (this.getUniqueId().equals(queue.getUniqueId())); ! } } ! public int hashCode () { ! if (Integer.MIN_VALUE == this.hashCode) { ! if (null == this.getUniqueId()) return super.hashCode(); ! else { ! String hashStr = this.getClass().getName() + ":" + this.getUniqueId().hashCode(); ! this.hashCode = hashStr.hashCode(); ! } ! } ! return this.hashCode; } ! ! public String toString () { ! return super.toString(); } ! ! ! } \ No newline at end of file --- 18,94 ---- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.banner.model.base; import java.io.Serializable; + import java.util.Date; import org.dom4j.Document; + import org.unitime.banner.model.Queue; + public abstract class BaseQueue implements Serializable { + private static final long serialVersionUID = 1L; ! private Long iUniqueId; ! private Document iXml; ! private String iStatus; ! private Date iPostDate; ! private Date iProcessDate; ! public static String PROP_UNIQUEID = "uniqueId"; public static String PROP_XML = "xml"; public static String PROP_STATUS = "status"; ! public static String PROP_POSTDATE = "postDate"; ! public static String PROP_PROCESSDATE = "processDate"; ! public BaseQueue() { initialize(); } ! public BaseQueue(Long uniqueId) { ! setUniqueId(uniqueId); initialize(); } ! protected void initialize() {} ! public Long getUniqueId() { return iUniqueId; } ! public void setUniqueId(Long uniqueId) { iUniqueId = uniqueId; } ! public Document getXml() { return iXml; } ! public void setXml(Document xml) { iXml = xml; } + public String getStatus() { return iStatus; } + public void setStatus(String status) { iStatus = status; } + public Date getPostDate() { return iPostDate; } + public void setPostDate(Date postDate) { iPostDate = postDate; } ! public Date getProcessDate() { return iProcessDate; } ! public void setProcessDate(Date processDate) { iProcessDate = processDate; } ! public boolean equals(Object o) { ! if (o == null || !(o instanceof Queue)) return false; ! if (getUniqueId() == null || ((Queue)o).getUniqueId() == null) return false; ! return getUniqueId().equals(((Queue)o).getUniqueId()); } ! public int hashCode() { ! if (getUniqueId() == null) return super.hashCode(); ! return getUniqueId().hashCode(); } ! public String toString() { ! return "Queue["+getUniqueId()+"]"; } ! public String toDebugString() { ! return "Queue[" + ! "\n PostDate: " + getPostDate() + ! "\n ProcessDate: " + getProcessDate() + ! "\n Status: " + getStatus() + ! "\n UniqueId: " + getUniqueId() + ! "\n Xml: " + getXml() + ! "]"; } ! } Index: BaseBannerSectionToClassDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/model/base/BaseBannerSectionToClassDAO.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BaseBannerSectionToClassDAO.java 20 Jul 2010 03:28:09 -0000 1.1 --- BaseBannerSectionToClassDAO.java 1 Dec 2010 17:34:10 -0000 1.2 *************** *** 1,7 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by --- 1,7 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 18,221 **** * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - package org.unitime.banner.model.base; ! import org.hibernate.Hibernate; ! import org.hibernate.Session; ! import org.hibernate.criterion.Order; ! import org.unitime.banner.model.dao.BannerSectionToClassDAO; ! ! /** ! * This is an automatically generated DAO class which should not be edited. ! */ ! public abstract class BaseBannerSectionToClassDAO extends org.unitime.banner.model.dao._RootDAO { ! ! // query name references ! ! ! public static BannerSectionToClassDAO instance; ! ! /** ! * Return a singleton of the DAO ! */ ! public static BannerSectionToClassDAO getInstance () { ! if (null == instance) instance = new BannerSectionToClassDAO(); ! return instance; ! } ! ! public Class getReferenceClass () { ! return org.unitime.banner.model.BannerSectionToClass.class; ! } ! ! public Order getDefaultOrder () { ! return null; ! } ! ! /** ! * Cast the object as a org.unitime.banner.model.BannerSectionToClass ! */ ! public org.unitime.banner.model.BannerSectionToClass cast (Object object) { ! return (org.unitime.banner.model.BannerSectionToClass) object; ! } ! ! public org.unitime.banner.model.BannerSectionToClass get(java.lang.Long key) ! { ! return (org.unitime.banner.model.BannerSectionToClass) get(getReferenceClass(), key); ! } ! ! public org.unitime.banner.model.BannerSectionToClass get(java.lang.Long key, Session s) ! { ! return (org.unitime.banner.model.BannerSectionToClass) get(getReferenceClass(), key, s); ! } ! ! public org.unitime.banner.model.BannerSectionToClass load(java.lang.Long key) ! { ! return (org.unitime.banner.model.BannerSectionToClass) load(getReferenceClass(), key); ! } ! ! public org.unitime.banner.model.BannerSectionToClass load(java.lang.Long key, Session s) ! { ! return (org.unitime.banner.model.BannerSectionToClass) load(getReferenceClass(), key, s); ! } ! ! public org.unitime.banner.model.BannerSectionToClass loadInitialize(java.lang.Long key, Session s) ! { ! org.unitime.banner.model.BannerSectionToClass obj = load(key, s); ! if (!Hibernate.isInitialized(obj)) { ! Hibernate.initialize(obj); ! } ! return obj; ! } ! ! ! /** ! * Persist the given transient instance, first assigning a generated identifier. (Or using the current value ! * of the identifier property if the assigned generator is used.) ! * @param bannerSectionToClass a transient instance of a persistent class ! * @return the class identifier ! */ ! public java.lang.Long save(org.unitime.banner.model.BannerSectionToClass bannerSectionToClass) ! { ! return (java.lang.Long) super.save(bannerSectionToClass); ! } ! ! /** ! * Persist the given transient instance, first assigning a generated identifier. (Or using the current value ! * of the identifier property if the assigned generator is used.) ! * Use the Session given. ! * @param bannerSectionToClass a transient instance of a persistent class ! * @param s the Session ! * @return the class identifier ! */ ! public java.lang.Long save(org.unitime.banner.model.BannerSectionToClass bannerSectionToClass, Session s) ! { ! return (java.lang.Long) save((Object) bannerSectionToClass, s); ! } ! ! /** ! * Either save() or update() the given instance, depending upon the value of its identifier property. By default ! * the instance is always saved. This behaviour may be adjusted by specifying an unsaved-value attribute of the ! * identifier property mapping. ! * @param bannerSectionToClass a transient instance containing new or updated state ! */ ! public void saveOrUpdate(org.unitime.banner.model.BannerSectionToClass bannerSectionToClass) ! { ! saveOrUpdate((Object) bannerSectionToClass); ! } ! ! /** ! * Either save() or update() the given instance, depending upon the value of its identifier property. By default the ! * instance is always saved. This behaviour may be adjusted by specifying an unsaved-value attribute of the identifier ! * property mapping. ! * Use the Session given. ! * @param bannerSectionToClass a transient instance containing new or updated state. ! * @param s the Session. ! */ ! public void saveOrUpdate(org.unitime.banner.model.BannerSectionToClass bannerSectionToClass, Session s) ! { ! saveOrUpdate((Object) bannerSectionToClass, s); ! } ! /** ! * Update the persistent state associated with the given identifier. An exception is thrown if there is a persistent ! * instance with the same identifier in the current session. ! * @param bannerSectionToClass a transient instance containing updated state ! */ ! public void update(org.unitime.banner.model.BannerSectionToClass bannerSectionToClass) ! { ! update((Object) bannerSectionToClass); ! } ! /** ! * Update the persistent state associated with the given identifier. An exception is thrown if there is a persistent ! * instance with the same identifier in the current session. ! * Use the Session given. ! * @param bannerSectionToClass a transient instance containing updated state ! * @param the Session ! */ ! public void update(org.unitime.banner.model.BannerSectionToClass bannerSectionToClass, Session s) ! { ! update((Object) bannerSectionToClass, s); ! } ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * @param id the instance ID to be removed ! */ ! public void delete(java.lang.Long id) ! { ! delete((Object) load(id)); ! } ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * Use the Session given. ! * @param id the instance ID to be removed ! * @param s the Session ! */ ! public void delete(java.lang.Long id, Session s) ! { ! delete((Object) load(id, s), s); } ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * @param bannerSectionToClass the instance to be removed ! */ ! public void delete(org.unitime.banner.model.BannerSectionToClass bannerSectionToClass) ! { ! delete((Object) bannerSectionToClass); } ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * Use the Session given. ! * @param bannerSectionToClass the instance to be removed ! * @param s the Session ! */ ! public void delete(org.unitime.banner.model.BannerSectionToClass bannerSectionToClass, Session s) ! { ! delete((Object) bannerSectionToClass, s); ! } ! ! /** ! * Re-read the state of the given instance from the underlying database. It is inadvisable to use this to implement ! * long-running sessions that span many business tasks. This method is, however, useful in certain special circumstances. ! * For example ! * <ul> ! * <li>where a database trigger alters the object state upon insert or update</li> ! * <li>after executing direct SQL (eg. a mass update) in the same session</li> ! * <li>after inserting a Blob or Clob</li> ! * </ul> ! */ ! public void refresh (org.unitime.banner.model.BannerSectionToClass bannerSectionToClass, Session s) ! { ! refresh((Object) bannerSectionToClass, s); } ! ! ! } \ No newline at end of file --- 18,45 ---- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.banner.model.base; ! import java.util.List; ! import org.unitime.banner.model.BannerSectionToClass; ! import org.unitime.banner.model.dao._RootDAO; ! import org.unitime.banner.model.dao.BannerSectionToClassDAO; ! public abstract class BaseBannerSectionToClassDAO extends _RootDAO<BannerSectionToClass,Long> { ! private static BannerSectionToClassDAO sInstance; ! public static BannerSectionToClassDAO getInstance() { ! if (sInstance == null) sInstance = new BannerSectionToClassDAO(); ! return sInstance; } ! public Class<BannerSectionToClass> getReferenceClass() { ! return BannerSectionToClass.class; } ! @SuppressWarnings("unchecked") ! public List<BannerSectionToClass> findByBannerSection(org.hibernate.Session hibSession, Long bannerSectionId) { ! return hibSession.createQuery("from BannerSectionToClass x where x.bannerSection.uniqueId = :bannerSectionId").setLong("bannerSectionId", bannerSectionId).list(); } ! } Index: BaseQueueOut.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/model/base/BaseQueueOut.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BaseQueueOut.java 20 Jul 2010 03:28:09 -0000 1.1 --- BaseQueueOut.java 1 Dec 2010 17:34:10 -0000 1.2 *************** *** 1,7 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by --- 1,7 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 18,112 **** * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - package org.unitime.banner.model.base; import java.io.Serializable; ! /** ! * This is an object that contains data related to the integrationqueueout table. ! * Do not modify this class because it will be overwritten if the configuration file ! * related to this class is modified. ! * ! * @hibernate.class ! * table="integrationqueueout" ! */ ! public abstract class BaseQueueOut extends org.unitime.banner.model.Queue implements Serializable { - public static String REF = "QueueOut"; - public static String PROP_PICKUP_DATE = "pickupDate"; ! // constructors ! public BaseQueueOut () { initialize(); } ! /** ! * Constructor for primary key ! */ ! public BaseQueueOut (java.lang.Long uniqueId) { ! super(uniqueId); } ! private int hashCode = Integer.MIN_VALUE; ! ! ! // fields ! private java.util.Date pickupDate; ! ! ! ! ! ! ! /** ! * Return the value associated with the column: pickupdate ! */ ! public java.util.Date getPickupDate () { ! return pickupDate; ! } ! ! /** ! * Set the value related to the column: pickupdate ! * @param pickupDate the pickupdate value ! */ ! public void setPickupDate (java.util.Date pickupDate) { ! this.pickupDate = pickupDate; } ! ! ! ! ! public boolean equals (Object obj) { ! if (null == obj) return false; ! if (!(obj instanceof org.unitime.banner.model.QueueOut)) return false; ! else { ! org.unitime.banner.model.QueueOut queueOut = (org.unitime.banner.model.QueueOut) obj; ! if (null == this.getUniqueId() || null == queueOut.getUniqueId()) return false; ! else return (this.getUniqueId().equals(queueOut.getUniqueId())); ! } } ! public int hashCode () { ! if (Integer.MIN_VALUE == this.hashCode) { ! if (null == this.getUniqueId()) return super.hashCode(); ! else { ! String hashStr = this.getClass().getName() + ":" + this.getUniqueId().hashCode(); ! this.hashCode = hashStr.hashCode(); ! } ! } ! return this.hashCode; } ! ! public String toString () { ! return super.toString(); } ! ! ! } \ No newline at end of file --- 18,75 ---- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.banner.model.base; import java.io.Serializable; + import java.util.Date; + import org.unitime.banner.model.Queue; + import org.unitime.banner.model.QueueOut; ! public abstract class BaseQueueOut extends Queue implements Serializable { ! private static final long serialVersionUID = 1L; ! private Date iPickupDate; + public static String PROP_PICKUPDATE = "pickupDate"; ! public BaseQueueOut() { initialize(); } ! public BaseQueueOut(Long uniqueId) { ! setUniqueId(uniqueId); ! initialize(); } + protected void initialize() {} + public Date getPickupDate() { return iPickupDate; } + public void setPickupDate(Date pickupDate) { iPickupDate = pickupDate; } ! public boolean equals(Object o) { ! if (o == null || !(o instanceof QueueOut)) return false; ! if (getUniqueId() == null || ((QueueOut)o).getUniqueId() == null) return false; ! return getUniqueId().equals(((QueueOut)o).getUniqueId()); } ! public int hashCode() { ! if (getUniqueId() == null) return super.hashCode(); ! return getUniqueId().hashCode(); } ! public String toString() { ! return "QueueOut["+getUniqueId()+"]"; } ! public String toDebugString() { ! return "QueueOut[" + ! "\n PickupDate: " + getPickupDate() + ! "\n PostDate: " + getPostDate() + ! "\n ProcessDate: " + getProcessDate() + ! "\n Status: " + getStatus() + ! "\n UniqueId: " + getUniqueId() + ! "\n Xml: " + getXml() + ! "]"; } ! } Index: BaseBannerCourseDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/model/base/BaseBannerCourseDAO.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BaseBannerCourseDAO.java 20 Jul 2010 03:28:09 -0000 1.1 --- BaseBannerCourseDAO.java 1 Dec 2010 17:34:10 -0000 1.2 *************** *** 1,7 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by --- 1,7 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 18,221 **** * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - package org.unitime.banner.model.base; ! import org.hibernate.Hibernate; ! import org.hibernate.Session; ! import org.hibernate.criterion.Order; import org.unitime.banner.model.dao.BannerCourseDAO; ! /** ! * This is an automatically generated DAO class which should not be edited. ! */ ! public abstract class BaseBannerCourseDAO extends org.unitime.banner.model.dao._RootDAO { ! ! // query name references ! ! ! public static BannerCourseDAO instance; ! ! /** ! * Return a singleton of the DAO ! */ ! public static BannerCourseDAO getInstance () { ! if (null == instance) instance = new BannerCourseDAO(); ! return instance; ! } ! ! public Class getReferenceClass () { ! return org.unitime.banner.model.BannerCourse.class; ! } ! ! public Order getDefaultOrder () { ! return null; ! } ! ! /** ! * Cast the object as a org.unitime.banner.model.BannerCourse ! */ ! public org.unitime.banner.model.BannerCourse cast (Object object) { ! return (org.unitime.banner.model.BannerCourse) object; ! } ! ! public org.unitime.banner.model.BannerCourse get(java.lang.Long key) ! { ! return (org.unitime.banner.model.BannerCourse) get(getReferenceClass(), key); ! } ! ! public org.unitime.banner.model.BannerCourse get(java.lang.Long key, Session s) ! { ! return (org.unitime.banner.model.BannerCourse) get(getReferenceClass(), key, s); ! } ! ! public org.unitime.banner.model.BannerCourse load(java.lang.Long key) ! { ! return (org.unitime.banner.model.BannerCourse) load(getReferenceClass(), key); ! } ! ! public org.unitime.banner.model.BannerCourse load(java.lang.Long key, Session s) ! { ! return (org.unitime.banner.model.BannerCourse) load(getReferenceClass(), key, s); ! } ! ! public org.unitime.banner.model.BannerCourse loadInitialize(java.lang.Long key, Session s) ! { ! org.unitime.banner.model.BannerCourse obj = load(key, s); ! if (!Hibernate.isInitialized(obj)) { ! Hibernate.initialize(obj); ! } ! return obj; ! } ! ! ! /** ! * Persist the given transient instance, first assigning a generated identifier. (Or using the current value ! * of the identifier property if the assigned generator is used.) ! * @param bannerCourse a transient instance of a persistent class ! * @return the class identifier ! */ ! public java.lang.Long save(org.unitime.banner.model.BannerCourse bannerCourse) ! { ! return (java.lang.Long) super.save(bannerCourse); ! } ! ! /** ! * Persist the given transient instance, first assigning a generated identifier. (Or using the current value ! * of the identifier property if the assigned generator is used.) ! * Use the Session given. ! * @param bannerCourse a transient instance of a persistent class ! * @param s the Session ! * @return the class identifier ! */ ! public java.lang.Long save(org.unitime.banner.model.BannerCourse bannerCourse, Session s) ! { ! return (java.lang.Long) save((Object) bannerCourse, s); ! } ! ! /** ! * Either save() or update() the given instance, depending upon the value of its identifier property. By default ! * the instance is always saved. This behaviour may be adjusted by specifying an unsaved-value attribute of the ! * identifier property mapping. ! * @param bannerCourse a transient instance containing new or updated state ! */ ! public void saveOrUpdate(org.unitime.banner.model.BannerCourse bannerCourse) ! { ! saveOrUpdate((Object) bannerCourse); ! } ! ! /** ! * Either save() or update() the given instance, depending upon the value of its identifier property. By default the ! * instance is always saved. This behaviour may be adjusted by specifying an unsaved-value attribute of the identifier ! * property mapping. ! * Use the Session given. ! * @param bannerCourse a transient instance containing new or updated state. ! * @param s the Session. ! */ ! public void saveOrUpdate(org.unitime.banner.model.BannerCourse bannerCourse, Session s) ! { ! saveOrUpdate((Object) bannerCourse, s); ! } ! ! /** ! * Update the persistent state associated with the given identifier. An exception is thrown if there is a persistent ! * instance with the same identifier in the current session. ! * @param bannerCourse a transient instance containing updated state ! */ ! public void update(org.unitime.banner.model.BannerCourse bannerCourse) ! { ! update((Object) bannerCourse); ! } ! ! /** ! * Update the persistent state associated with the given identifier. An exception is thrown if there is a persistent ! * instance with the same identifier in the current session. ! * Use the Session given. ! * @param bannerCourse a transient instance containing updated state ! * @param the Session ! */ ! public void update(org.unitime.banner.model.BannerCourse bannerCourse, Session s) ! { ! update((Object) bannerCourse, s); ! } ! ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * @param id the instance ID to be removed ! */ ! public void delete(java.lang.Long id) ! { ! delete((Object) load(id)); ! } ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * Use the Session given. ! * @param id the instance ID to be removed ! * @param s the Session ! */ ! public void delete(java.lang.Long id, Session s) ! { ! delete((Object) load(id, s), s); ! } ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * @param bannerCourse the instance to be removed ! */ ! public void delete(org.unitime.banner.model.BannerCourse bannerCourse) ! { ! delete((Object) bannerCourse); } ! /** ! * Remove a persistent instance from the datastore. The argument may be an instance associated with the receiving ! * Session or a transient instance with an identifier associated with existing persistent state. ! * Use the Session given. ! * @param bannerCourse the instance to be removed ! * @param s the Session ! */ ! public void delete(org.unitime.banner.model.BannerCourse bannerCourse, Session s) ! { ! delete((Object) bannerCourse, s); ! } ! ! /** ! * Re-read the state of the given instance from the underlying database. It is inadvisable to use this to implement ! * long-running sessions that span many business tasks. This method is, however, useful in certain special circumstances. ! * For example ! * <ul> ! * <li>where a database trigger alters the object state upon insert or update</li> ! * <li>after executing direct SQL (eg. a mass update) in the same session</li> ! * <li>after inserting a Blob or Clob</li> ! * </ul> ! */ ! public void refresh (org.unitime.banner.model.BannerCourse bannerCourse, Session s) ! { ! refresh((Object) bannerCourse, s); } ! ! ! } \ No newline at end of file --- 18,38 ---- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.banner.model.base; ! import org.unitime.banner.model.BannerCourse; ! import org.unitime.banner.model.dao._RootDAO; import org.unitime.banner.model.dao.BannerCourseDAO; ! public abstract class BaseBannerCourseDAO extends _RootDAO<BannerCourse,Long> { ! private static BannerCourseDAO sInstance; ! public static BannerCourseDAO getInstance() { ! if (sInstance == null) sInstance = new BannerCourseDAO(); ! return sInstance; } ! public Class<BannerCourse> getReferenceClass() { ! return BannerCourse.class; } ! } Index: BaseBannerCourse.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/model/base/BaseBannerCourse.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BaseBannerCourse.java 20 Jul 2010 03:28:09 -0000 1.1 --- BaseBannerCourse.java 1 Dec 2010 17:34:10 -0000 1.2 *************** *** 1,7 **** /* ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by --- 1,7 ---- /* ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. ! * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by *************** *** 18,192 **** * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - package org.unitime.banner.model.base; import java.io.Serializable; ! /** ! * This is an object that contains data related to the banner_course table. ! * Do not modify this class because it will be overwritten if the configuration file ! * related to this class is modified. ! * ! * @hibernate.class ! * table="banner_course" ! */ ! ! public abstract class BaseBannerCourse implements Serializable { ! public static String REF = "BannerCourse"; ! public static String PROP_COURSE_OFFERING_ID = "courseOfferingId"; ! public static String PROP_UNIQUE_ID_ROLLED_FORWARD_FROM = "uniqueIdRolledForwardFrom"; ! // constructors ! public BaseBannerCourse () { ! initialize(); ! } ! /** ! * Constructor for primary key ! */ ! public BaseBannerCourse (java.lang.Long uniqueId) { ! this.setUniqueId(uniqueId); initialize(); } ! /** ! * Constructor for required fields ! */ ! public BaseBannerCourse ( ! java.lang.Long uniqueId, ! java.lang.Long courseOfferingId) { ! ! this.setUniqueId(uniqueId); ! this.setCourseOfferingId(courseOfferingId); initialize(); } ! protected void initialize () {} ! ! ! ! private int hashCode = Integer.MIN_VALUE; ! ! // primary key ! private java.lang.Long uniqueId; ! ! // fields ! private java.lang.Long courseOfferingId; ! private java.lang.Long uniqueIdRolledForwardFrom; ! ! // collections ! private java.util.Set bannerConfigs; ! ! ! ! /** ! * Return the unique identifier of this class ! * @hibernate.id ! * generator-class="org.unitime.commons.hibernate.id.UniqueIdGenerator" ! * column="UNIQUEID" ! */ ! public java.lang.Long getUniqueId () { ! return uniqueId; ! } ! ! /** ! * Set the unique identifier of this class ! * @param uniqueId the new ID ! */ ! public void setUniqueId (java.lang.Long uniqueId) { ! this.uniqueId = uniqueId; ! this.hashCode = Integer.MIN_VALUE; ! } ! ! ! ! ! /** ! * Return the value associated with the column: course_offering_id ! */ ! public java.lang.Long getCourseOfferingId () { ! return courseOfferingId; ! } ! ! /** ! * Set the value related to the column: course_offering_id ! * @param courseOfferingId the course_offering_id value ! */ ! public void setCourseOfferingId (java.lang.Long courseOfferingId) { ! this.courseOfferingId = courseOfferingId; ! } ! ! ! ! /** ! * Return the value associated with the column: uid_rolled_fwd_from ! */ ! public java.lang.Long getUniqueIdRolledForwardFrom () { ! return uniqueIdRolledForwardFrom; ! } ! ! /** ! * Set the value related to the column: uid_rolled_fwd_from ! * @param uniqueIdRolledForwardFrom the uid_rolled_fwd_from value ! */ ! public void setUniqueIdRolledForwardFrom (java.lang.Long uniqueIdRolledForwardFrom) { ! this.uniqueIdRolledForwardFrom = uniqueIdRolledForwardFrom; ! } ! /** ! * Return the value associated with the column: bannerConfigs ! */ ! public java.util.Set getBannerConfigs () { ! return bannerConfigs; ! } ! /** ! * Set the value related to the column: bannerConfigs ! * @param bannerConfigs the bannerConfigs value ! */ ! public void setBannerConfigs (java.util.Set bannerConfigs) { ! this.bannerConfigs = bannerConfigs; } ! public void addTobannerConfigs (org.unitime.banner.model.BannerConfig bannerConfig) { ! if (null == getBannerConfigs()) setBannerConfigs(new java.util.HashSet()); ! getBannerConfigs().add(bannerConfig); } ! ! ! ! ! public boolean equals (Object obj) { ! if (null == obj) return false; ! if (!(obj instanceof org.unitime.banner.model.BannerCourse)) return false; ! else { ! org.unitime.banner.model.BannerCourse bannerCourse = (org.unitime.banner.model.BannerCourse) obj; ! if (null == this.getUniqueId() || null == bannerCourse.getUniqueId()) return false; ! else return (this.getUniqueId().equals(bannerCourse.getUniqueId())); ! } } ! public int hashCode () { ! if (Integer.MIN_VALUE == this.hashCode) { ! if (null == this.getUniqueId()) return super.hashCode(); ! else { ! String hashStr = this.getClass().getName() + ":" + this.getUniqueId().hashCode(); ! this.hashCode = hashStr.hashCode(); ! } ! } ! return this.hashCode; } ! ! public String toString () { ! return super.toString(); } ! ! ! } \ No newline at end of file --- 18,91 ---- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.banner.model.base; import java.io.Serializable; + import java.util.HashSet; + import java.util.Set; + import org.unitime.banner.model.BannerConfig; + import org.unitime.banner.model.BannerCourse; ! public abstract class BaseBannerCourse implements Serializable { ! private static final long serialVersionUID = 1L; ! private Long iUniqueId; ! private Long iCourseOfferingId; ! private Long iUniqueIdRolledForwardFrom; + private Set<BannerConfig> iBannerConfigs; ! public static String PROP_UNIQUEID = "uniqueId"; ! public static String PROP_COURSE_OFFERING_ID = "courseOfferingId"; ! public static String PROP_UID_ROLLED_FWD_FROM = "uniqueIdRolledForwardFrom"; ! public BaseBannerCourse() { initialize(); } ! public BaseBannerCourse(Long uniqueId) { ! setUniqueId(uniqueId); initialize(); } ! protected void initialize() {} + public Long getUniqueId() { return iUniqueId; } + public void setUniqueId(Long uniqueId) { iUniqueId = uniqueId; } + public Long getCourseOfferingId() { return iCourseOfferingId; } + public void setCourseOfferingId(Long courseOfferingId) { iCourseOfferingId = courseOfferingId; } ! public Long getUniqueIdRolledForwardFrom() { return iUniqueIdRolledForwardFrom; } ! public void setUniqueIdRolledForwardFrom(Long uniqueIdRolledForwardFrom) { iUniqueIdRolledForwardFrom = uniqueIdRolledForwardFrom; } ! public Set<BannerConfig> getBannerConfigs() { return iBannerConfigs; } ! public void setBannerConfigs(Set<BannerConfig> bannerConfigs) { iBannerConfigs = bannerConfigs; } ! public void addTobannerConfigs(BannerConfig bannerConfig) { ! if (iBannerConfigs == null) iBannerConfigs = new HashSet<BannerConfig>(); ! iBannerConfigs.add(bannerConfig); } ! public boolean equals(Object o) { ! if (o == null || !(o instanceof BannerCourse)) return false; ! if (getUniqueId() == null || ((BannerCourse)o).getUniqueId() == null) return false; ! return getUniqueId().equals(((BannerCourse)o).getUniqueId()); } ! public int hashCode() { ! if (getUniqueId() == null) return super.hashCode(); ! return getUniqueId().hashCode(); } ! public String toString() { ! return "BannerCourse["+getUniqueId()+"]"; } ! public String toDebugString() { ! return "BannerCourse[" + ! "\n CourseOfferingId: " + getCourseOfferingId() + ! "\n UniqueId: " + getUniqueId() + ! "\n UniqueIdRolledForwardFrom: " + getUniqueIdRolledForwardFrom() + ! "]"; } ! } Index: BaseBannerResponseDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/model/base/BaseBannerResponseDAO.java,v r... [truncated message content] |
|
From: Tomas M. <to...@us...> - 2010-12-01 17:34:20
|
Update of /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/dataexchange In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22821/JavaSource/org/unitime/banner/dataexchange Modified Files: BannerStudentEnrollmentImport.java BannerStudentEnrollmentMessage.java ReceiveBannerResponseMessage.java Added Files: BannerStudentDataUpdate.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: BannerStudentEnrollmentImport.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/dataexchange/BannerStudentEnrollmentImport.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerStudentEnrollmentImport.java 20 Jul 2010 03:28:10 -0000 1.1 --- BannerStudentEnrollmentImport.java 1 Dec 2010 17:34:11 -0000 1.2 *************** *** 21,27 **** package org.unitime.banner.dataexchange; import java.util.HashMap; import java.util.Iterator; ! import java.util.Vector; import org.dom4j.Element; --- 21,31 ---- package org.unitime.banner.dataexchange; + import java.util.ArrayList; import java.util.HashMap; + import java.util.HashSet; + import java.util.Hashtable; import java.util.Iterator; ! import java.util.List; ! import java.util.Set; import org.dom4j.Element; *************** *** 36,40 **** --- 40,46 ---- import org.unitime.timetable.model.Student; import org.unitime.timetable.model.StudentClassEnrollment; + import org.unitime.timetable.model.StudentSectioningQueue; import org.unitime.timetable.model.TimetableManager; + import org.unitime.timetable.model.dao.StudentDAO; import org.unitime.timetable.test.UpdateExamConflicts; *************** *** 45,52 **** */ public class BannerStudentEnrollmentImport extends BaseImport { - TimetableManager manager = null; - HashMap<Integer, Vector<Class_>> classes = new HashMap<Integer, Vector<Class_>>(); - HashMap<Integer, CourseOffering> courseOfferings = new HashMap<Integer, CourseOffering>(); - boolean trimLeadingZerosFromExternalId = false; public BannerStudentEnrollmentImport() { super(); --- 51,54 ---- *************** *** 55,70 **** @Override public void loadXml(Element rootElement) throws Exception { ! String rootElementName = "bannerStudentEnrollments"; ! String trimLeadingZeros = ! ApplicationProperties.getProperty("tmtbl.data.exchange.trim.externalId","false"); ! if (trimLeadingZeros.equals("true")){ ! trimLeadingZerosFromExternalId = true; ! } ! if (!rootElement.getName().equalsIgnoreCase(rootElementName)) { throw new Exception("Given XML file is not a Student Enrollments load file."); ! } ! Session session = null; try { String campus = rootElement.attributeValue("campus"); --- 57,69 ---- @Override public void loadXml(Element rootElement) throws Exception { ! boolean trimLeadingZerosFromExternalId = "true".equals(ApplicationProperties.getProperty("tmtbl.data.exchange.trim.externalId","false")); ! if (!rootElement.getName().equalsIgnoreCase("bannerStudentEnrollments")) throw new Exception("Given XML file is not a Student Enrollments load file."); ! Session session = null; + + Set<Long> updatedStudents = new HashSet<Long>(); + try { String campus = rootElement.attributeValue("campus"); *************** *** 72,133 **** String term = rootElement.attributeValue("term"); String created = rootElement.attributeValue("created"); ! beginTransaction(); session = Session.getSessionUsingInitiativeYearTerm(campus, year, term); ! if(session == null) { throw new Exception("No session found for the given campus, year, and term."); ! } ! loadClasses(session.getUniqueId()); info("classes loaded"); ! if (manager == null){ ! manager = findDefaultManager(); ! } ! if (created != null) { ! ChangeLog.addChange(getHibSession(), manager, session, session, created, ChangeLog.Source.DATA_IMPORT_STUDENT_ENROLLMENTS, ChangeLog.Operation.UPDATE, null, null); ! } ! /* ! * If some records of a table related to students need to be explicitly deleted, ! * hibernate can also be used to delete them. For instance, the following query ! * deletes all student class enrollments for given academic session: ! * ! * delete StudentClassEnrollment sce where sce.student.uniqueId in ! * (select s.uniqueId from Student s where s.session.uniqueId=:sessionId) ! */ ! ! getHibSession().createQuery("delete StudentClassEnrollment sce where sce.student.uniqueId in (select s.uniqueId from Student s where s.session.uniqueId=:sessionId)").setLong("sessionId", session.getUniqueId().longValue()).executeUpdate(); ! ! flush(true); ! String elementName = "student"; ! for ( Iterator<?> it = rootElement.elementIterator(); it.hasNext(); ) { ! Element studentElement = (Element) it.next(); ! String externalId = getRequiredStringAttribute(studentElement, "externalId", elementName); ! if (trimLeadingZerosFromExternalId){ ! while (externalId.startsWith("0")) externalId = externalId.substring(1); ! } ! Student student = fetchStudent(externalId, session.getUniqueId()); ! String firstName = getOptionalStringAttribute(studentElement, "firstName"); ! String lastName = getOptionalStringAttribute(studentElement, "lastName"); ! if (student == null){ student = new Student(); student.setSession(session); ! student.setFirstName(firstName==null?"Name":firstName); ! student.setMiddleName(getOptionalStringAttribute(studentElement, "middleName")); ! student.setLastName(lastName==null?"Unknown":lastName); ! student.setEmail(getOptionalStringAttribute(studentElement, "email")); student.setExternalUniqueId(externalId); ! student.setFreeTimeCategory(new Integer(0)); ! student.setSchedulePreference(new Integer(0)); } else { ! student.setFirstName(firstName==null?"Name":firstName); ! student.setMiddleName(getOptionalStringAttribute(studentElement, "middleName")); ! student.setLastName(lastName==null?"Unknown":lastName); } - elementSection(studentElement, student); - getHibSession().save(student); flushIfNeeded(true); } commitTransaction(); } catch (Exception e) { fatal("Exception: " + e.getMessage(), e); --- 71,207 ---- String term = rootElement.attributeValue("term"); String created = rootElement.attributeValue("created"); ! ! beginTransaction(); ! session = Session.getSessionUsingInitiativeYearTerm(campus, year, term); ! ! if(session == null) throw new Exception("No session found for the given campus, year, and term."); ! ! HashMap<Integer, List<Class_>> crn2classes = new HashMap<Integer, List<Class_>>(); ! HashMap<Integer, CourseOffering> crn2course = new HashMap<Integer, CourseOffering>(); ! HashMap<Long, CourseOffering> courses = new HashMap<Long, CourseOffering>(); ! for (Iterator<?> it = CourseOffering.findAll(session.getUniqueId()).iterator(); it.hasNext();){ ! CourseOffering co = (CourseOffering) it.next(); ! courses.put(co.getUniqueId(), co); ! } ! for (Iterator<?> it = BannerSection.findAll(session.getUniqueId()).iterator(); it.hasNext();) { ! BannerSection bs = (BannerSection) it.next(); ! if (bs.getCrn() == null) continue; ! Set<Class_> bsClasses = bs.getClasses(getHibSession()); ! if (bsClasses != null && !bsClasses.isEmpty()) { ! crn2classes.put(bs.getCrn(), new ArrayList<Class_>(bsClasses)); ! crn2course.put(bs.getCrn(), courses.get(bs.getBannerConfig().getBannerCourse().getCourseOfferingId())); ! } ! } info("classes loaded"); ! ! TimetableManager manger = getManager(); ! if (manger == null) ! manger = findDefaultManager(); ! ! if (created != null) ! ChangeLog.addChange(getHibSession(), manger, session, session, created, ChangeLog.Source.DATA_IMPORT_STUDENT_ENROLLMENTS, ChangeLog.Operation.UPDATE, null, null); ! Hashtable<String, Student> students = new Hashtable<String, Student>(); ! for (Student student: StudentDAO.getInstance().findBySession(getHibSession(), session.getUniqueId())) { ! if (student.getExternalUniqueId() != null) ! students.put(student.getExternalUniqueId(), student); ! } ! ! for (Iterator i = rootElement.elementIterator("student"); i.hasNext(); ) { ! Element studentElement = (Element) i.next(); ! ! String externalId = studentElement.attributeValue("externalId"); ! if (externalId == null) continue; ! while (trimLeadingZerosFromExternalId && externalId.startsWith("0")) externalId = externalId.substring(1); ! ! Student student = students.remove(externalId); ! if (student == null) { student = new Student(); student.setSession(session); ! student.setFirstName(studentElement.attributeValue("firstName", "Name")); ! student.setMiddleName(studentElement.attributeValue("middleName")); ! student.setLastName(studentElement.attributeValue("lastName", "Unknown")); ! student.setEmail(studentElement.attributeValue("email")); student.setExternalUniqueId(externalId); ! student.setFreeTimeCategory(0); ! student.setSchedulePreference(0); ! student.setClassEnrollments(new HashSet<StudentClassEnrollment>()); } else { ! student.setFirstName(studentElement.attributeValue("firstName", student.getFirstName())); ! student.setMiddleName(studentElement.attributeValue("middleName", student.getMiddleName())); ! student.setLastName(studentElement.attributeValue("lastName", student.getLastName())); ! } ! ! Hashtable<Long, StudentClassEnrollment> enrollments = new Hashtable<Long, StudentClassEnrollment>(); ! for (StudentClassEnrollment enrollment: student.getClassEnrollments()) { ! enrollments.put(enrollment.getClazz().getUniqueId(), enrollment); ! } ! ! for (Iterator j = studentElement.elementIterator("section"); j.hasNext(); ) { ! Element classElement = (Element) j.next(); ! ! Integer crn = null; ! try { ! crn = Integer.valueOf(classElement.attributeValue("crn")); ! } catch (NullPointerException e) { ! } catch (NumberFormatException e) { ! } ! ! List<Class_> classes = (crn == null ? null : crn2classes.get(crn)); ! if (classes == null) { ! warn("No classes for CRN " + crn + " found."); ! continue; ! } ! ! for (Class_ clazz: classes) { ! StudentClassEnrollment enrollment = enrollments.remove(clazz.getUniqueId()); ! if (enrollment != null) continue; // enrollment already exists ! ! enrollment = new StudentClassEnrollment(); ! enrollment.setStudent(student); ! enrollment.setClazz(clazz); ! enrollment.setCourseOffering(crn2course.get(crn)); ! enrollment.setTimestamp(new java.util.Date()); ! student.getClassEnrollments().add(enrollment); ! ! if (student.getUniqueId() != null) updatedStudents.add(student.getUniqueId()); ! } ! } ! ! if (!enrollments.isEmpty()) { ! for (StudentClassEnrollment enrollment: enrollments.values()) { ! student.getClassEnrollments().remove(enrollment); ! getHibSession().delete(enrollment); ! updatedStudents.add(student.getUniqueId()); ! } ! } ! ! if (student.getUniqueId() == null) { ! updatedStudents.add((Long)getHibSession().save(student)); ! } else { ! getHibSession().update(student); } flushIfNeeded(true); } + for (Student student: students.values()) { + for (Iterator<StudentClassEnrollment> i = student.getClassEnrollments().iterator(); i.hasNext(); ) { + StudentClassEnrollment enrollment = i.next(); + getHibSession().delete(enrollment); + i.remove(); + updatedStudents.add(student.getUniqueId()); + } + getHibSession().update(student); + } + + if (!updatedStudents.isEmpty()) + StudentSectioningQueue.studentChanged(getHibSession(), session.getUniqueId(), updatedStudents); + commitTransaction(); + + debug(updatedStudents.size() + " students changed"); } catch (Exception e) { fatal("Exception: " + e.getMessage(), e); *************** *** 135,138 **** --- 209,213 ---- throw e; } + if (session!=null && "true".equals(ApplicationProperties.getProperty("tmtbl.data.import.studentEnrl.finalExam.updateConflicts","false"))) { try { *************** *** 145,149 **** } } ! if (session!=null && "true".equals(ApplicationProperties.getProperty("tmtbl.data.import.studentEnrl.midtermExam.updateConflicts","false"))) { try { beginTransaction(); --- 220,225 ---- } } ! ! if (session!=null && "true".equals(ApplicationProperties.getProperty("tmtbl.data.import.studentEnrl.midtermExam.updateConflicts","false"))) { try { beginTransaction(); *************** *** 155,162 **** } } ! info("Application property: tmtbl.data.import.studentEnrl.class.updateEnrollments = " + ApplicationProperties.getProperty("tmtbl.data.import.studentEnrl.class.updateEnrollments","false")); if (session != null && "true".equals(ApplicationProperties.getProperty("tmtbl.data.import.studentEnrl.class.updateEnrollments","false"))){ try { - beginTransaction(); info(" Updating class enrollments..."); Class_.updateClassEnrollmentForSession(session, getHibSession()); --- 231,237 ---- } } ! if (session != null && "true".equals(ApplicationProperties.getProperty("tmtbl.data.import.studentEnrl.class.updateEnrollments","false"))){ try { info(" Updating class enrollments..."); Class_.updateClassEnrollmentForSession(session, getHibSession()); *************** *** 167,223 **** } } info(" Banner Student Enrollment Load Complete"); } - - private void elementSection(Element studentElement, Student student) throws Exception{ - String elementName = "section"; - - for ( Iterator<?> it = studentElement.elementIterator(); it.hasNext(); ) { - Element classElement = (Element) it.next(); - Integer crn = getRequiredIntegerAttribute(classElement, "crn", elementName); - Vector<Class_> clazzes = classes.get(crn); - if (clazzes != null){ - for(Iterator<?> cIt = clazzes.iterator(); cIt.hasNext();){ - Class_ clazz = (Class_) cIt.next(); - StudentClassEnrollment sce = new StudentClassEnrollment(); - sce.setStudent(student); - sce.setClazz(clazz); - sce.setCourseOffering(courseOfferings.get(crn)); - sce.setTimestamp(new java.util.Date()); - student.addToclassEnrollments(sce); - } - } - } - } - - Student fetchStudent(String externalId, Long sessionId) { - return (Student) this. - getHibSession(). - createQuery("select distinct a from Student as a where a.externalUniqueId=:externalId and a.session.uniqueId=:sessionId"). - setLong("sessionId", sessionId.longValue()). - setString("externalId", externalId). - setCacheable(true). - uniqueResult(); - } - - private void loadClasses(Long sessionId) throws Exception { - HashMap<Long, CourseOffering> baseCourseOfferings = new HashMap<Long, CourseOffering>(); - for (Iterator<?> it = CourseOffering.findAll(sessionId).iterator(); it.hasNext();){ - CourseOffering co = (CourseOffering) it.next(); - baseCourseOfferings.put(co.getUniqueId(), co); - } - for (Iterator<?> it = BannerSection.findAll(sessionId).iterator(); it.hasNext();) { - BannerSection bs = (BannerSection) it.next(); - if (bs.getCrn() != null && bs.getClasses(getHibSession()) != null && !bs.getClasses(getHibSession()).isEmpty()) { - Vector<Class_> cls = new Vector<Class_>(); - for (Iterator<?> cIt = bs.getClasses(getHibSession()).iterator(); cIt.hasNext();) { - Class_ c = (Class_) cIt.next(); - cls.add(c); - } - classes.put(bs.getCrn(), cls); - courseOfferings.put(bs.getCrn(), baseCourseOfferings.get(bs.getBannerConfig().getBannerCourse().getCourseOfferingId())); - } - } - } } --- 242,248 ---- } } + info(" Banner Student Enrollment Load Complete"); } } Index: BannerStudentEnrollmentMessage.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/dataexchange/BannerStudentEnrollmentMessage.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerStudentEnrollmentMessage.java 20 Jul 2010 03:28:10 -0000 1.1 --- BannerStudentEnrollmentMessage.java 1 Dec 2010 17:34:11 -0000 1.2 *************** *** 20,25 **** --- 20,29 ---- package org.unitime.banner.dataexchange; + import java.util.HashSet; + import java.util.Hashtable; import java.util.Iterator; import java.util.List; + import java.util.Map; + import java.util.Set; import java.util.Vector; *************** *** 33,36 **** --- 37,41 ---- import org.unitime.timetable.model.Student; import org.unitime.timetable.model.StudentClassEnrollment; + import org.unitime.timetable.model.StudentSectioningQueue; /** *************** *** 45,49 **** private static String expectedSource; private String messageDateTime; ! @Override public void loadXml(Element rootElement) throws Exception { --- 50,56 ---- private static String expectedSource; private String messageDateTime; ! ! private Hashtable<Long, Set<Long>> iUpdatedStudents = new Hashtable<Long, Set<Long>>(); ! @Override public void loadXml(Element rootElement) throws Exception { *************** *** 53,60 **** } beginTransaction(); propertiesElement(rootElement.element(propertiesElementName)); membershipElements(rootElement); ! commitTransaction(); ! } catch (Exception e) { fatal("Exception: " + e.getMessage(), e); --- 60,72 ---- } beginTransaction(); + propertiesElement(rootElement.element(propertiesElementName)); + membershipElements(rootElement); ! ! for (Map.Entry<Long, Set<Long>> entry: iUpdatedStudents.entrySet()) ! StudentSectioningQueue.studentChanged(getHibSession(), entry.getKey(), entry.getValue()); ! ! commitTransaction(); } catch (Exception e) { fatal("Exception: " + e.getMessage(), e); *************** *** 115,119 **** List classes = BannerSection.findAllClassesForCrnAndTermCode(crn, termCode); Session acadSession = courseOffering.getSubjectArea().getSession(); ! memberElements(membershipElement, acadSession, courseOffering, classes); flushIfNeeded(true); } --- 127,136 ---- List classes = BannerSection.findAllClassesForCrnAndTermCode(crn, termCode); Session acadSession = courseOffering.getSubjectArea().getSession(); ! Set<Long> updatedStudents = iUpdatedStudents.get(acadSession.getUniqueId()); ! if (updatedStudents == null) { ! updatedStudents = new HashSet<Long>(); ! iUpdatedStudents.put(acadSession.getUniqueId(), updatedStudents); ! } ! memberElements(membershipElement, acadSession, courseOffering, classes, updatedStudents); flushIfNeeded(true); } *************** *** 121,125 **** private void memberElements(Element membershipElement, Session acadSession, ! CourseOffering courseOffering, List classes) throws Exception { for (Element memberElement : (List<Element>)membershipElement.elements("member")){ String id = sourceIdElement(memberElement.element("sourceid")); --- 138,142 ---- private void memberElements(Element membershipElement, Session acadSession, ! CourseOffering courseOffering, List classes, Set<Long> updatedStudents) throws Exception { for (Element memberElement : (List<Element>)membershipElement.elements("member")){ String id = sourceIdElement(memberElement.element("sourceid")); *************** *** 132,135 **** --- 149,153 ---- } Student student = Student.findByExternalId(acadSession.getUniqueId(), id); + Long studentId = null; if (student == null){ student = new Student(); *************** *** 141,145 **** student.setFreeTimeCategory(new Integer(0)); student.setSchedulePreference(new Integer(0)); ! getHibSession().save(student); } Element roleElement = memberElement.element("role"); --- 159,165 ---- student.setFreeTimeCategory(new Integer(0)); student.setSchedulePreference(new Integer(0)); ! studentId = (Long)getHibSession().save(student); ! } else { ! studentId = student.getUniqueId(); } Element roleElement = memberElement.element("role"); *************** *** 149,155 **** String recStatus = getOptionalStringAttribute(roleElement, "recstatus"); if (recStatus != null && recStatus.equals("3")){ ! deleteEnrollment(student, courseOffering, classes); } else { ! addUpdateEnrollment(student, courseOffering, classes); } } --- 169,179 ---- String recStatus = getOptionalStringAttribute(roleElement, "recstatus"); if (recStatus != null && recStatus.equals("3")){ ! if (deleteEnrollment(student, courseOffering, classes)) { ! updatedStudents.add(studentId); ! } } else { ! if (addUpdateEnrollment(student, courseOffering, classes)) { ! updatedStudents.add(studentId); ! } } } *************** *** 184,188 **** } ! private void addUpdateEnrollment(Student student, CourseOffering courseOffering, List classes) { boolean changed = false; --- 208,212 ---- } ! private boolean addUpdateEnrollment(Student student, CourseOffering courseOffering, List classes) { boolean changed = false; *************** *** 206,212 **** updateOfferingEnrollment(courseOffering); } } ! private void deleteEnrollment(Student student, CourseOffering courseOffering, List classes) { boolean changed = false; Vector<StudentClassEnrollment> enrollments = findStudentClassEnrollments(student, classes); --- 230,237 ---- updateOfferingEnrollment(courseOffering); } + return changed; } ! private boolean deleteEnrollment(Student student, CourseOffering courseOffering, List classes) { boolean changed = false; Vector<StudentClassEnrollment> enrollments = findStudentClassEnrollments(student, classes); *************** *** 222,225 **** --- 247,251 ---- updateOfferingEnrollment(courseOffering); } + return changed; } Index: ReceiveBannerResponseMessage.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/dataexchange/ReceiveBannerResponseMessage.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ReceiveBannerResponseMessage.java 20 Jul 2010 03:28:10 -0000 1.1 --- ReceiveBannerResponseMessage.java 1 Dec 2010 17:34:11 -0000 1.2 *************** *** 103,108 **** resp.setAction(getOptionalStringAttribute(bannerResponseElement, "ACTION")); resp.setType(getOptionalStringAttribute(bannerResponseElement, "TYPE")); ! resp.setMessage(getOptionalStringAttribute(bannerResponseElement, "MESSAGE")); ! resp.setPacketId(getOptionalStringAttribute(bannerResponseElement, "PACKET_ID")); resp.setQueueId(queueId); getHibSession().save(resp); --- 103,108 ---- resp.setAction(getOptionalStringAttribute(bannerResponseElement, "ACTION")); resp.setType(getOptionalStringAttribute(bannerResponseElement, "TYPE")); ! resp.setMessage(getRequiredStringAttribute(bannerResponseElement, "MESSAGE", bannerResponseName)); ! resp.setPacketId(getRequiredStringAttribute(bannerResponseElement, "PACKET_ID", bannerResponseName)); resp.setQueueId(queueId); getHibSession().save(resp); --- NEW FILE: BannerStudentDataUpdate.java --- /* * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.banner.dataexchange; import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.Hashtable; import java.util.Iterator; import java.util.Vector; import org.dom4j.Element; import org.unitime.banner.model.BannerSection; import org.unitime.banner.model.BannerSession; import org.unitime.banner.model.Queue; import org.unitime.banner.model.QueueIn; import org.unitime.banner.model.dao.QueueInDAO; import org.unitime.banner.queueprocessor.exception.LoggableException; import org.unitime.timetable.ApplicationProperties; import org.unitime.timetable.dataexchange.BaseImport; import org.unitime.timetable.model.AcademicArea; import org.unitime.timetable.model.AcademicAreaClassification; import org.unitime.timetable.model.AcademicClassification; import org.unitime.timetable.model.Class_; import org.unitime.timetable.model.CourseOffering; import org.unitime.timetable.model.PosMajor; import org.unitime.timetable.model.Session; import org.unitime.timetable.model.Student; import org.unitime.timetable.model.StudentClassEnrollment; import org.unitime.timetable.model.StudentSectioningQueue; /** * @author says * */ public class BannerStudentDataUpdate extends BaseImport { private static String rootName = "studentUpdates"; private static String studentElementName = "student"; private static String enrollmentElementName = "enrollment"; private HashMap<Session,HashSet<Long>> studentIdsSucessfullyProcessed = new HashMap<Session, HashSet<Long>>(); private HashSet<String> studentIdsNotProcessed = new HashSet<String>(); private HashSet<String> studentIdsSucessfullyProcessedWithProblems = new HashSet<String>(); private HashSet<Long> classIdsTouched = new HashSet<Long>(); private HashSet<Long> courseIdsTouched = new HashSet<Long>(); private boolean trimLeadingZerosFromExternalId; private HashMap<String, Vector<Long>> bannerSessionIdMap = new HashMap<String, Vector<Long>>(); /** * */ public BannerStudentDataUpdate() { super(); } @Override public void loadXml(Element rootElement) throws Exception { Date start = new Date(); Date elementStart; Date elementEnd; long maxElementTime = Long.MIN_VALUE; long minElementTime = Long.MAX_VALUE; long elementCount = 0; long timeDiff; // TreeMap<Long, Long> timeMap = new TreeMap<Long, Long>(); trimLeadingZerosFromExternalId = "true".equals(ApplicationProperties.getProperty("tmtbl.data.exchange.trim.externalId","false")); if (rootElement.getName().equalsIgnoreCase(rootName)) { for (Iterator<?> eIt = rootElement.elementIterator(studentElementName); eIt.hasNext();) { elementStart = new Date(); Element studentElement = (Element) eIt.next(); processStudentElement(studentElement); elementEnd = new Date(); timeDiff = elementEnd.getTime() - elementStart.getTime(); if (timeDiff < minElementTime){ minElementTime = timeDiff; } if (timeDiff > maxElementTime){ maxElementTime = timeDiff; } // Long timeCount = timeMap.get(new Long(timeDiff)); // if (timeCount == null){ // timeCount = new Long(0); // } // timeMap.put(new Long(timeDiff), new Long(timeCount.longValue() + 1)); elementCount++; } beginTransaction(); info("Updating class enrollments."); updateEnrollmentForClassIds(); info("Updating course offering enrollments."); updateCourseOfferingEnrollmentCounts(); info("Done updating enrollments."); commitTransaction(); beginTransaction(); int studentCount = 0; for(Session session : studentIdsSucessfullyProcessed.keySet()){ HashSet<Long> updatedStudents = studentIdsSucessfullyProcessed.get(session); if (!updatedStudents.isEmpty()){ StudentSectioningQueue.studentChanged(getHibSession(), session.getUniqueId(), updatedStudents); studentCount += updatedStudents.size(); } } commitTransaction(); Date end = new Date(); info(Integer.toString(studentCount) + " student records updated in " + (end.getTime() - start.getTime())+ " milliseconds."); info(Integer.toString(studentIdsNotProcessed.size()) + " student records failed to update."); info(Integer.toString(studentIdsSucessfullyProcessedWithProblems.size()) + " student records were updated, but had problems."); info("Minimum milliseconds required to process a record = " + minElementTime); info("Maximum milliseconds required to process a record = " + maxElementTime); info("Average milliseconds required to process a record = " + ((end.getTime() - start.getTime())/elementCount)); // info("The distribution of time to process each record is as follows:"); // for(Long elapsedTime : timeMap.keySet()){ // info(" " + elapsedTime.toString() + ": " + timeMap.get(elapsedTime).toString()); // } if (!studentIdsNotProcessed.isEmpty()){ error("The following student ids were not successfully processed: "); for(String studentId : studentIdsNotProcessed){ error(" " + studentId); } } if (!studentIdsSucessfullyProcessedWithProblems.isEmpty()){ error("The following student ids were successfully processed, but may have had problems finding all classes the student was enrolled in: "); for(String studentId : studentIdsSucessfullyProcessedWithProblems){ error(" " + studentId); } } } } private void processStudentElement(Element studentElement) { String externalId = null; HashMap<Session, HashSet<Long>> studentUpdates = null; try { externalId = getRequiredStringAttribute(studentElement, "externalId", studentElementName); while (trimLeadingZerosFromExternalId && externalId.startsWith("0")) externalId = externalId.substring(1); } catch (Exception e) { error(e.getMessage()); return; } if (externalId.trim().length() == 0){ error("For element '" + studentElementName + "' an 'externalId' is required"); } String bannerSession = null; try { bannerSession = getRequiredStringAttribute(studentElement, "session", studentElementName); } catch (Exception e) { error(e.getMessage()); studentIdsNotProcessed.add(externalId); return; } beginTransaction(); HashSet<Student> studentRecords = new HashSet<Student>(); for(Long sessionId : getSessionIdsForBannerSession(bannerSession)){ Student s = Student.findByExternalId(sessionId, externalId); if (s != null){ studentRecords.add(s); } } String firstName = null; String lastName = null; String academicArea = null; String classification = null; String major = null; try { firstName = getRequiredStringAttribute(studentElement, "firstName", studentElementName); lastName = getRequiredStringAttribute(studentElement, "lastName", studentElementName); academicArea = getRequiredStringAttribute(studentElement, "academicArea", studentElementName); classification = getRequiredStringAttribute(studentElement, "classification", studentElementName); major = getRequiredStringAttribute(studentElement, "major", studentElementName); } catch (Exception e) { error(e.getMessage()); studentIdsNotProcessed.add(externalId); rollbackTransaction(); return; } String email = getOptionalStringAttribute(studentElement, "email"); String middleName = getOptionalStringAttribute(studentElement, "middleName"); HashMap<Session, HashMap<CourseOffering, Vector<Class_>>> classEnrollments = null; try { classEnrollments = processEnrollmentElements(studentElement, bannerSession, externalId); } catch (Exception e) { studentIdsNotProcessed.add(externalId); error(e.getMessage()); rollbackTransaction(); return; } try { studentUpdates = updateStudent(studentRecords, classEnrollments, externalId, firstName, middleName, lastName, academicArea, classification, major, email); } catch (Exception e) { studentIdsNotProcessed.add(externalId); error(e.getMessage()); rollbackTransaction(); return; } commitTransaction(); mergeSessionRecordLists(studentIdsSucessfullyProcessed, studentUpdates); } private void addSessionRecordToList(HashMap<Session, HashSet<Long>> processedList, Session session, Long uniqueId){ HashSet<Long> ids = processedList.get(session); if (ids == null){ ids = new HashSet<Long>(); processedList.put(session, ids); } ids.add(uniqueId); } private void mergeSessionRecordLists(HashMap<Session, HashSet<Long>> globalList, HashMap<Session, HashSet<Long>> studentList){ for(Session session : studentList.keySet()){ HashSet<Long> ids = studentList.get(session); HashSet<Long> globalIds = globalList.get(session); if (globalIds == null){ globalIds = new HashSet<Long>(); globalList.put(session, globalIds); } globalIds.addAll(ids); } } private HashMap<Session, HashSet<Long>> updateStudent(HashSet<Student> studentRecords, HashMap<Session, HashMap<CourseOffering,Vector<Class_>>> classEnrollments, String externalId, String firstName, String middleName, String lastName, String academicArea, String classification, String major, String email) { HashMap<Session, HashSet<Long>> recordsProcessed = new HashMap<Session, HashSet<Long>>(); if (classEnrollments.isEmpty()){ // If the student has no enrollments remove the student records found for(Student student : studentRecords){ addSessionRecordToList(recordsProcessed, student.getSession(), student.getUniqueId()); if (student.getClassEnrollments() != null && student.getClassEnrollments().size() > 0){ for(StudentClassEnrollment sce : student.getClassEnrollments()){ classIdsTouched.add(sce.getClazz().getUniqueId()); courseIdsTouched.add(sce.getCourseOffering().getUniqueId()); } } getHibSession().delete(student); } } else { // If the student has enrollments update the student's information in each session the student // has enrollments in and remove the student from any session the student no longer has enrollments in HashSet<Student> records = new HashSet<Student>(); records.addAll(studentRecords); for(Session session : classEnrollments.keySet()){ boolean changed = false; Student record = null; for(Student student : records){ if (student.getSession().getUniqueId().equals(session.getUniqueId())){ record = student; break; } } if (record == null){ record = new Student(); record.setExternalUniqueId(externalId); record.setSession(session); record.setFreeTimeCategory(0); record.setSchedulePreference(0); record.setClassEnrollments(new HashSet<StudentClassEnrollment>()); record.setAcademicAreaClassifications(new HashSet<AcademicAreaClassification>()); record.setPosMajors(new HashSet<PosMajor>()); changed = true; } else { records.remove(record); } if (record.getFirstName() == null || !record.getFirstName().equals(firstName)){ record.setFirstName(firstName); changed = true; } if (record.getMiddleName() == null || !record.getMiddleName().equals(middleName)){ record.setMiddleName(middleName); changed = true; } if (record.getLastName() == null || !record.getLastName().equals(lastName)){ record.setLastName(lastName); changed = true; } if (record.getEmail() == null || !record.getEmail().equals(email)){ record.setEmail(email); changed = true; } // This makes the assumption that when working with Banner students have only one AcademicAreaClassification AcademicAreaClassification aac = null; for(Iterator<?> it = record.getAcademicAreaClassifications().iterator(); it.hasNext();){ aac = (AcademicAreaClassification) it.next(); break; } if (aac == null || !((aac.getAcademicArea().getExternalUniqueId().equalsIgnoreCase(academicArea) || aac.getAcademicArea().getAcademicAreaAbbreviation().equalsIgnoreCase(academicArea)) && (aac.getAcademicClassification().getExternalUniqueId().equalsIgnoreCase(classification) || aac.getAcademicClassification().getCode().equalsIgnoreCase(classification)))) { record.getAcademicAreaClassifications().clear(); aac = new AcademicAreaClassification(); AcademicArea aa = AcademicArea.findByExternalId(session.getUniqueId(), academicArea); if (aa == null){ aa = AcademicArea.findByAbbv(session.getUniqueId(), academicArea); } if (aa == null){ aa = new AcademicArea(); aa.setAcademicAreaAbbreviation(academicArea); aa.setSession(session); aa.setExternalUniqueId(externalId); aa.setLongTitle(academicArea); aa.setShortTitle(academicArea); aa.setUniqueId((Long)getHibSession().save(aa)); info("Added Academic Area: " + academicArea); } aac.setAcademicArea(aa); AcademicClassification ac = AcademicClassification.findByExternalId(session.getUniqueId(), classification); if (ac == null){ ac = AcademicClassification.findByCode(session.getUniqueId(), classification); } if (ac == null){ ac = new AcademicClassification(); ac.setCode(classification); ac.setExternalUniqueId(classification); ac.setName(classification); ac.setSession(session); ac.setUniqueId((Long) getHibSession().save(ac)); info("Added Academic Classification: " + classification); } aac.setAcademicClassification(ac); aac.setStudent(record); record.getAcademicAreaClassifications().add(aac); changed = true; } //This makes the assumption that when working with Banner students have only one Major PosMajor m = null; for(Iterator<?> it = record.getPosMajors().iterator(); it.hasNext();){ m = (PosMajor) it.next(); } if (m == null || !(major.equalsIgnoreCase(m.getExternalUniqueId()) || major.equalsIgnoreCase(m.getCode()))){ record.getPosMajors().clear(); PosMajor posMajor = PosMajor.findByExternalId(session.getUniqueId(), major); if (posMajor == null){ posMajor = PosMajor.findByCode(session.getUniqueId(), major); } if (posMajor == null){ posMajor = new PosMajor(); posMajor.setCode(major); posMajor.setExternalUniqueId(major); posMajor.setName(major); posMajor.setSession(session); posMajor.setUniqueId((Long)getHibSession().save(posMajor)); info("Added Major: " + major); } record.addToposMajors(posMajor); changed = true; } Hashtable<Long, StudentClassEnrollment> enrollments = new Hashtable<Long, StudentClassEnrollment>(); if (record.getClassEnrollments() != null){ for (StudentClassEnrollment enrollment: record.getClassEnrollments()) { enrollments.put(enrollment.getClazz().getUniqueId(), enrollment); } } HashMap<CourseOffering, Vector<Class_>> courseToClassEnrollments = classEnrollments.get(session); for (CourseOffering co : courseToClassEnrollments.keySet()){ for (Class_ clazz: courseToClassEnrollments.get(co)) { StudentClassEnrollment enrollment = enrollments.remove(clazz.getUniqueId()); if (enrollment != null) continue; // enrollment already exists enrollment = new StudentClassEnrollment(); enrollment.setStudent(record); enrollment.setClazz(clazz); enrollment.setCourseOffering(co); enrollment.setTimestamp(new java.util.Date()); record.getClassEnrollments().add(enrollment); changed = true; classIdsTouched.add(clazz.getUniqueId()); courseIdsTouched.add(co.getUniqueId()); } } if (!enrollments.isEmpty()) { for (StudentClassEnrollment enrollment: enrollments.values()) { classIdsTouched.add(enrollment.getClazz().getUniqueId()); courseIdsTouched.add(enrollment.getCourseOffering().getUniqueId()); record.getClassEnrollments().remove(enrollment); getHibSession().delete(enrollment); } changed = true; } Long uid = record.getUniqueId(); if (uid == null){ uid = (Long) getHibSession().save(record); } else if (changed) { getHibSession().update(record); } addSessionRecordToList(recordsProcessed, session, uid); } if (!records.isEmpty()){ for(Student student : records){ addSessionRecordToList(recordsProcessed, student.getSession(), student.getUniqueId()); for(StudentClassEnrollment sce : student.getClassEnrollments()){ classIdsTouched.add(sce.getClazz().getUniqueId()); courseIdsTouched.add(sce.getCourseOffering().getUniqueId()); } getHibSession().delete(student); } } } return(recordsProcessed); } private HashMap<Session, HashMap<CourseOffering, Vector<Class_>>> processEnrollmentElements( Element studentElement, String bannerSession, String externalId) throws Exception { HashMap<Session, HashMap<CourseOffering, Vector<Class_>>> enrollments = new HashMap<Session, HashMap<CourseOffering,Vector<Class_>>>(); for (Iterator<?> eIt = studentElement.elementIterator(enrollmentElementName); eIt.hasNext();) { Element enrollmentElement = (Element) eIt.next(); Integer crn = getRequiredIntegerAttribute(enrollmentElement, "crn", enrollmentElementName); CourseOffering co = BannerSection.findCourseOfferingForCrnAndTermCode(crn, bannerSession); if (co == null){ studentIdsSucessfullyProcessedWithProblems.add(externalId); error("Course Offering not found for CRN = " + crn.toString() + ", banner session = " + bannerSession); continue; } boolean foundClasses = false; for(Iterator<?> it = BannerSection.findAllClassesForCrnAndTermCode(crn, bannerSession).iterator(); it.hasNext();){ Class_ c = (Class_) it.next(); foundClasses = true; HashMap<CourseOffering,Vector<Class_>> sessionCourseToClasses = enrollments.get(c.getSessionId()); if (sessionCourseToClasses == null){ sessionCourseToClasses = new HashMap<CourseOffering, Vector<Class_>>(); enrollments.put(c.getSession(), sessionCourseToClasses); } Vector<Class_> classes = sessionCourseToClasses.get(co); if (classes == null){ classes = new Vector<Class_>(); sessionCourseToClasses.put(co, classes); } classes.add(c); } if (!foundClasses){ studentIdsSucessfullyProcessedWithProblems.add(externalId); error("Classes not found for CRN = " + crn.toString() + ", banner session = " + bannerSession); } } return(enrollments); } private Vector<Long> getSessionIdsForBannerSession(String bannerSessionId) { if (bannerSessionIdMap.get(bannerSessionId) == null){ Vector<Long> sessionIds = new Vector<Long>(); bannerSessionIdMap.put(bannerSessionId, sessionIds); for (Iterator<?> it = getHibSession().createQuery("from BannerSession bs where bs.bannerTermCode = :termCode)").setString("termCode", bannerSessionId).list().iterator(); it.hasNext();){ BannerSession bs = (BannerSession) it.next(); sessionIds.add(bs.getSession().getUniqueId()); } } return(bannerSessionIdMap.get(bannerSessionId)); } public static void receiveResponseDocument(QueueIn queueIn) throws LoggableException { Element rootElement = queueIn.getXml().getRootElement(); if (rootElement.getName().equalsIgnoreCase(rootName)){ try { BannerStudentDataUpdate rbrm = new BannerStudentDataUpdate(); rbrm.loadXml(rootElement); queueIn.setProcessDate(new Date()); queueIn.setStatus(Queue.STATUS_PROCESSED); QueueInDAO.getInstance().getSession().update(queueIn); } catch (Exception e) { LoggableException le = new LoggableException(e, queueIn); le.logError(); throw le; } } } private void updateEnrollmentForClassIds(){ String ids = ""; int count = 0; for (Long id: classIdsTouched) { if (count > 0) ids += ","; ids += id; count ++; if (count == 1000) { getHibSession().createQuery("update Class_ c " + "set c.enrollment=(select count(distinct d.student) " + " from StudentClassEnrollment d " + " where d.clazz.uniqueId =c.uniqueId) " + " where c.uniqueId in (" + ids + ")").executeUpdate(); ids = ""; count = 0; } } if (count > 0) { getHibSession().createQuery("update Class_ c " + "set c.enrollment=(select count(distinct d.student) " + " from StudentClassEnrollment d " + " where d.clazz.uniqueId =c.uniqueId) " + " where c.uniqueId in (" + ids + ")").executeUpdate(); } } private void updateCourseOfferingEnrollmentCounts() { String ids = ""; int count = 0; for (Long id: courseIdsTouched) { if (count > 0) ids += ","; ids += id; count ++; if (count == 1000) { getHibSession().createQuery("update CourseOffering c " + "set c.enrollment=(select count(distinct d.student) " + " from StudentClassEnrollment d " + " where d.courseOffering.uniqueId =c.uniqueId) " + " where c.uniqueId in (" + ids + ")").executeUpdate(); ids = ""; count = 0; } } if (count > 0) { getHibSession().createQuery("update CourseOffering c " + "set c.enrollment=(select count(distinct d.student) " + " from StudentClassEnrollment d " + " where d.courseOffering.uniqueId =c.uniqueId) " + " where c.uniqueId in (" + ids + ")").executeUpdate(); } } } |
|
From: Tomas M. <to...@us...> - 2010-12-01 17:34:19
|
Update of /cvsroot/unitime/UniTimeBannerAddOn/JavaSource In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22821/JavaSource Modified Files: Queue.hbm.xml bannerdbupdate.xml custom.properties QueueError.hbm.xml Added Files: menu-custom.xml Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) --- NEW FILE: menu-custom.xml --- <?xml version="1.0"?> <unitime-menu> <menu name="Courses"> <menu name="Banner"> <item name="Message Responses" page="bannerMessageResponses.do"/> <item name="Banner Offerings" page="bannerOfferingShowSearch.do"/> </menu> </menu> <menu name="Administration"> <menu name="Other"> <item name="Users" page="userEdit.do"> <!-- Only when LDAP is not configured --> <condition> <propertyEquals name="tmtbl.authenticate.ldap.provider" value="" defaultValue=""/> </condition> </item> </menu> <menu name="Banner"> <item name="Manage Banner Sessions" page="bannerSessionList.do"/> <item name="Banner Term Crn Properties" page="bannerTermCrnPropertiesList.do"/> <item name="Roll Forward Banner Session" page="rollForwardBannerSession.do"/> </menu> </menu> </unitime-menu> Index: Queue.hbm.xml =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/Queue.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Queue.hbm.xml 20 Jul 2010 03:28:09 -0000 1.1 --- Queue.hbm.xml 1 Dec 2010 17:34:11 -0000 1.2 *************** *** 42,46 **** name="xml" column="xml" ! type="org.unitime.banner.commons.hibernate.clob.XmlClobType" not-null="true"/> --- 42,46 ---- name="xml" column="xml" ! type="org.unitime.commons.hibernate.blob.XmlClobType" not-null="true"/> Index: custom.properties =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/custom.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** custom.properties 20 Jul 2010 03:28:09 -0000 1.1 --- custom.properties 1 Dec 2010 17:34:11 -0000 1.2 *************** *** 50,54 **** #Set dialect remote solver servers (default is MySQLInnoDBDialect) # uncomment for Oracle ! #dialect=org.hibernate.dialect.OracleDialect #Set uniqueId generator for remote solver servers (default is TableHiLoGenerator) --- 50,54 ---- #Set dialect remote solver servers (default is MySQLInnoDBDialect) # uncomment for Oracle ! #dialect=org.hibernate.dialect.Oracle10gDialect #Set uniqueId generator for remote solver servers (default is TableHiLoGenerator) *************** *** 56,65 **** #tmtbl.uniqueid.generator=org.hibernate.id.SequenceGenerator - #Extra menu items - tmtbl.menu.admin.extra=leaf_item('Manage Banner Sessions','Manage Banner Session','bannerSessionList.do');leaf_item('Banner Term Crn Properties','Banner Term Crn Properties','bannerTermCrnPropertiesList.do');leaf_item('Roll Forward Banner Session','Roll Forward Banner Session','rollForwardBannerSession.do'); - tmtbl.menu.course_timetabling.extra=leaf_item('Banner Messages','Banner Message Responses','bannerMessageResponses.do'); leaf_item('Banner Offerings','Banner Offerings','bannerOfferingShowSearch.do'); - tmtbl.menu.course_timetabling.extra.label='Banner' - tmtbl.menu.course_timetabling.extra.hover='Banner Custom Pages' - #Exam Naming Convention #tmtbl.exam.name.maxLength=60 --- 56,59 ---- *************** *** 208,220 **** #banner.link_id.generator={?= call section_processor.get_link_identifier(?,?,?)} - - # Properties to define which side bar menu items are allowed to be displayed to non admin users - # by default these are true if they are not defined here - tmtbl.menu.display_course_timetabling=true - tmtbl.menu.display_student_sectioning=true - tmtbl.menu.display_exam_timetabling=true - tmtbl.menu.display_personal_schedule=true - tmtbl.menu.display_event_management=true - #If you are using UniTime in conjunction with an external system that identifies classes differently than UniTime # you can create a java class that implements the ExternalClassNameHelperInterface interface to create custom --- 202,205 ---- Index: bannerdbupdate.xml =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/bannerdbupdate.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** bannerdbupdate.xml 21 Sep 2010 19:46:14 -0000 1.2 --- bannerdbupdate.xml 1 Dec 2010 17:34:11 -0000 1.3 *************** *** 20,25 **** --- 20,32 ---- --> <dbupdate> + <dialect type="mysql">org.hibernate.dialect.MySQLDialect</dialect> <dialect type="mysql">org.hibernate.dialect.MySQLInnoDBDialect</dialect> + <dialect type="mysql">org.hibernate.dialect.MySQL5InnoDBDialect</dialect> + <dialect type="mysql">org.hibernate.dialect.MySQL5Dialect</dialect> <dialect type="plsql">org.hibernate.dialect.OracleDialect</dialect> + <dialect type="plsql">org.hibernate.dialect.Oracle8iDialect</dialect> + <dialect type="plsql">org.hibernate.dialect.Oracle9Dialect</dialect> + <dialect type="plsql">org.hibernate.dialect.Oracle9iDialect</dialect> + <dialect type="plsql">org.hibernate.dialect.Oracle10gDialect</dialect> <update version="2" date="21-Sep-2010" comment="Banner Response Indexes"> *************** *** 43,46 **** --- 50,67 ---- </mysql> </update> + <update version="3" date="05-Nov-2010" comment="Banner CRN Lookup Indexes"> + <plsql> + create index %SCHEMA%.idx_banner_section_sess_crn on %SCHEMA%.banner_section(session_id, crn) + </plsql> + <mysql> + create index idx_banner_section_sess_crn on %SCHEMA%.banner_section(session_id, crn) + </mysql> + <plsql> + create index %SCHEMA%.idx_banner_session_term_code on %SCHEMA%.banner_session(banner_term_code) + </plsql> + <mysql> + create index idx_banner_session_term_code on %SCHEMA%.banner_session(banner_term_code) + </mysql> + </update> </dbupdate> \ No newline at end of file Index: QueueError.hbm.xml =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/QueueError.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** QueueError.hbm.xml 20 Jul 2010 03:28:09 -0000 1.1 --- QueueError.hbm.xml 1 Dec 2010 17:34:11 -0000 1.2 *************** *** 25,33 **** table="integrationqueueerror"> ! <composite-id ! class="org.unitime.banner.model.QueueErrorId" ! mapped="false" ! name="id" ! unsaved-value="undefined"> <key-property name="queueId" type="java.lang.Long"> <column name="queueid" precision="22" scale="0"/> --- 25,29 ---- table="integrationqueueerror"> ! <composite-id> <key-property name="queueId" type="java.lang.Long"> <column name="queueid" precision="22" scale="0"/> |
|
From: Tomas M. <to...@us...> - 2010-12-01 17:34:19
|
Update of /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/queueprocessor In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22821/JavaSource/org/unitime/banner/queueprocessor Modified Files: QueuedItem.java ProcessQueue.java Added Files: BannerCaller.java PollStudentUpdates.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) --- NEW FILE: BannerCaller.java --- /* * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.banner.queueprocessor; import java.sql.Clob; import org.dom4j.Document; import org.unitime.banner.queueprocessor.oracle.OracleConnector; import org.unitime.banner.queueprocessor.util.ClobTools; import org.unitime.commons.Debug; import org.unitime.timetable.ApplicationProperties; /** * @author says * */ public abstract class BannerCaller { public BannerCaller() { super(); } public static String getBannerHost() throws Exception{ String bannerHost = ApplicationProperties.getProperty("banner.host"); if (bannerHost == null || bannerHost.trim().length() == 0){ throw new Exception("Missing required custom application property: 'banner.host', this property must be set to the host machine for the banner database."); } return bannerHost; } public static String getBannerPort() throws Exception{ String bannerPort = ApplicationProperties.getProperty("banner.port"); if (bannerPort == null || bannerPort.trim().length() == 0){ throw new Exception("Missing required custom application property: 'bannerPort', this property must be set to the port number used to connect to the banner database."); } return bannerPort; } public static String getBannerDatabase() throws Exception{ String bannerDatabase = ApplicationProperties.getProperty("banner.database"); if (bannerDatabase == null || bannerDatabase.trim().length() == 0){ throw new Exception("Missing required custom application property: 'bannerDatabase', this property must be set to the name of the database that hosts the banner schema."); } return bannerDatabase; } public static String getBannerUser() throws Exception{ String bannerUser = ApplicationProperties.getProperty("banner.user"); if (bannerUser == null || bannerUser.trim().length() == 0){ throw new Exception("Missing required custom application property: 'bannerUser', this property must be set to the name of the user used to access the banner schema."); } return bannerUser; } public static String getBannerPassword() throws Exception{ String bannerPassword = ApplicationProperties.getProperty("banner.password"); if (bannerPassword == null || bannerPassword.trim().length() == 0){ throw new Exception("Missing required custom application property: 'bannerPassword', this property must be set to the password of the user used to access the banner schema."); } return bannerPassword; } protected OracleConnector getJDBCconnection(){ OracleConnector jdbc = null; try { jdbc = new OracleConnector( QueuedItem.getBannerHost(), QueuedItem.getBannerDatabase(), QueuedItem.getBannerPort(), QueuedItem.getBannerUser(), QueuedItem.getBannerPassword()); } catch (Exception e) { Debug.info("*********************************************************************"); Debug.info("** Error setting up OracleConnector in in callOracleProcess *********"); Debug.info("*********************************************************************"); Debug.info(e.getMessage()); e.printStackTrace(); Debug.info("*********************************************************************"); } return(jdbc); } protected Document convertClobToDocument(Clob clob){ Document outDoc = null; try { outDoc = ClobTools.clobToDocument(clob); } catch (Exception ex) { Debug.info("***************************************"); Debug.info("** Error in callOracleProcess *********"); Debug.info("***************************************"); ex.printStackTrace(); Debug.info("***************************************"); } return(outDoc); } } Index: QueuedItem.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/queueprocessor/QueuedItem.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** QueuedItem.java 20 Jul 2010 03:28:10 -0000 1.1 --- QueuedItem.java 1 Dec 2010 17:34:11 -0000 1.2 *************** *** 28,34 **** import org.dom4j.Document; import org.dom4j.DocumentException; - import org.unitime.timetable.ApplicationProperties; - - import org.unitime.banner.dataexchange.ReceiveBannerResponseMessage; import org.unitime.banner.model.QueueIn; --- 28,31 ---- *************** *** 38,42 **** import org.unitime.banner.queueprocessor.exception.LoggableException; import org.unitime.banner.queueprocessor.oracle.OracleConnector; - import org.unitime.banner.queueprocessor.util.ClobTools; import org.unitime.commons.Debug; --- 35,38 ---- *************** *** 44,48 **** * based on code contributed by Aaron Tyler and Dagmar Murray */ ! public class QueuedItem { QueueOutDAO qod; --- 40,44 ---- * based on code contributed by Aaron Tyler and Dagmar Murray */ ! public class QueuedItem extends BannerCaller { QueueOutDAO qod; *************** *** 51,54 **** --- 47,51 ---- QueueOut item; + public QueuedItem(QueueOut item) { this.item = item; *************** *** 72,76 **** QueueInDAO qid = new QueueInDAO(); - //qid.save(qi); qi.setMatchId(item.getUniqueId()); --- 69,72 ---- *************** *** 83,91 **** ReceiveBannerResponseMessage.receiveResponseDocument(qi); - //Run the Comparator to insert log data into the ComparatorLogHtml table - // Removed 6/30 for revision to Banner Response strategy - //Thread t = new Thread(new Comparator(item, qi)); - //t.start(); - } catch (Exception ex) { LoggableException le = new LoggableException(ex, qi); --- 79,82 ---- *************** *** 120,150 **** DocumentException { ! Clob clob; ! Document outDoc = null; ! ! OracleConnector jdbc = new OracleConnector( ! ApplicationProperties.getProperty("banner.host"), ! ApplicationProperties.getProperty("banner.database"), ! ApplicationProperties.getProperty("banner.port"), ! ApplicationProperties.getProperty("banner.user"), ! ApplicationProperties.getProperty("banner.password")); ! ! Debug.info("\t" + item.getUniqueId() ! + ": Sending request to Banner..."); ! clob = jdbc.processUnitimePacket(xml); ! Debug.info("\t" + item.getUniqueId() ! + ": Response received from Banner."); ! try { ! outDoc = ClobTools.clobToDocument(clob); ! ! } catch (Exception ex) { ! Debug.info("***************************************"); ! Debug.info("** Error in callOracleProcess *********"); ! Debug.info("***************************************"); ! ex.printStackTrace(); ! Debug.info("***************************************"); ! } jdbc.cleanup(); --- 111,122 ---- DocumentException { ! OracleConnector jdbc = getJDBCconnection(); ! Debug.info("\t" + item.getUniqueId() + ": Sending request to Banner..."); ! Clob clob = jdbc.processUnitimePacket(xml); ! Debug.info("\t" + item.getUniqueId() + ": Response received from Banner."); + Document outDoc = convertClobToDocument(clob); + jdbc.cleanup(); *************** *** 153,162 **** } - // public void run() { - // - // Debug.info("\t" + item.getId() + ": Beginning Request..."); - // this.processItem(item); - // Debug.info("\t" + item.getId() + ": Finished with Request..."); - // - // } } --- 125,127 ---- --- NEW FILE: PollStudentUpdates.java --- /* * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC, and individual contributors * as indicated by the @authors tag. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ package org.unitime.banner.queueprocessor; import java.io.IOException; import java.sql.Clob; import java.sql.SQLException; import java.util.Date; import org.dom4j.Document; import org.dom4j.DocumentException; import org.unitime.banner.dataexchange.BannerStudentDataUpdate; import org.unitime.banner.model.QueueIn; import org.unitime.banner.model.dao.QueueInDAO; import org.unitime.banner.queueprocessor.exception.LoggableException; import org.unitime.banner.queueprocessor.oracle.OracleConnector; import org.unitime.commons.Debug; import org.unitime.timetable.ApplicationProperties; public class PollStudentUpdates extends BannerCaller { QueueInDAO qid; private boolean pollForStudentUpdates = false; public PollStudentUpdates() { super(); pollForStudentUpdates = "true".equalsIgnoreCase(ApplicationProperties.getProperty("banner.studentUpdates.pollBannerForUpdates", "false")); } public void poll() { if (!pollForStudentUpdates) return; try { Document result = callOracleProcess(); QueueIn qi = new QueueIn(); try { qi.setPostDate(new Date()); QueueInDAO qid = new QueueInDAO(); qi.setMatchId(null); qi.setStatus(QueueIn.STATUS_POSTED); qi.setXml(result); qid.save(qi); // Process in UniTime BannerStudentDataUpdate.receiveResponseDocument(qi); } catch (Exception ex) { LoggableException le = new LoggableException(ex, qi); le.logError(); throw le; } } catch(SQLException sqlEx) { LoggableException le = new LoggableException(sqlEx); le.logError(); } catch (Exception ex) { LoggableException le = new LoggableException(ex); le.logError(); } } private Document callOracleProcess() throws ClassNotFoundException, SQLException, IOException, DocumentException { OracleConnector jdbc = getJDBCconnection(); Debug.info("\tSending student update request to Banner..."); Clob clob = jdbc.requestEnrollmentChanges(); Debug.info("\tResponse received from Banner."); Document outDoc = convertClobToDocument(clob); jdbc.cleanup(); return outDoc; } } Index: ProcessQueue.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/queueprocessor/ProcessQueue.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ProcessQueue.java 20 Jul 2010 03:28:10 -0000 1.1 --- ProcessQueue.java 1 Dec 2010 17:34:11 -0000 1.2 *************** *** 46,64 **** private static long loop_times = -1; private static long error_sleep_interval = 300; // in seconds - private static String connectString = ""; private static String logfilename = "queueprocessor.log"; public static void main(String[] args) { ! String curDir = System.getProperty("user.dir"); ! ! ProcessQueue pq = new ProcessQueue(); Date lastRunTime = new Date(); - if (ApplicationProperties.getProperty("connection.url") != null) { - connectString = ApplicationProperties.getProperty("connection.url"); - } - if (ApplicationProperties.getProperty("queueprocessor.sleepinterval") != null) { sleep_interval = Integer.parseInt(ApplicationProperties.getProperty("queueprocessor.sleepinterval")); --- 46,58 ---- private static long loop_times = -1; private static long error_sleep_interval = 300; // in seconds private static String logfilename = "queueprocessor.log"; public static void main(String[] args) { ! ProcessQueue processQueue = new ProcessQueue(); ! PollStudentUpdates pollStudentUpdates = new PollStudentUpdates(); Date lastRunTime = new Date(); if (ApplicationProperties.getProperty("queueprocessor.sleepinterval") != null) { sleep_interval = Integer.parseInt(ApplicationProperties.getProperty("queueprocessor.sleepinterval")); *************** *** 89,97 **** System.out.println("Queue Processor Log File:"+logfilename); - Properties properties = new Properties(); - if (args.length == 3) - properties.put("connection.url", connectString); try { ! HibernateUtil.configureHibernate(properties); } catch (Exception e1) { e1.printStackTrace(); --- 83,88 ---- System.out.println("Queue Processor Log File:"+logfilename); try { ! HibernateUtil.configureHibernate(ApplicationProperties.getProperties()); } catch (Exception e1) { e1.printStackTrace(); *************** *** 117,121 **** || (new Date()).getTime() - lastRunTime.getTime() >= sleep_interval) { lastRunTime = new Date(); ! pq.process(); } else { try { --- 108,113 ---- || (new Date()).getTime() - lastRunTime.getTime() >= sleep_interval) { lastRunTime = new Date(); ! processQueue.process(); ! pollStudentUpdates.poll(); } else { try { |
|
From: Tomas M. <to...@us...> - 2010-12-01 17:34:19
|
Update of /cvsroot/unitime/UniTimeBannerAddOn In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22821 Modified Files: .cvsignore .classpath build.xml Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: .cvsignore =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 20 Jul 2010 03:28:10 -0000 1.1 --- .cvsignore 1 Dec 2010 17:34:11 -0000 1.2 *************** *** 1 **** --- 1,2 ---- Distributions + .settings Index: .classpath =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/.classpath,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .classpath 20 Jul 2010 03:28:10 -0000 1.1 --- .classpath 1 Dec 2010 17:34:11 -0000 1.2 *************** *** 4,16 **** <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/> ! <classpathentry kind="lib" path="/UniTime/WebContent/WEB-INF/lib/struts.jar"/> ! <classpathentry kind="lib" path="/UniTime/WebContent/WEB-INF/lib/cpsolver-all-1.1.jar"/> <classpathentry kind="lib" path="/UniTime/WebContent/WEB-INF/lib/hibernate3.jar"/> <classpathentry kind="lib" path="/UniTime/WebContent/WEB-INF/lib/dom4j-1.6.1.jar"/> ! <classpathentry kind="lib" path="/UniTime/WebContent/WEB-INF/lib/commons-logging-1.1.jar"/> ! <classpathentry kind="lib" path="/UniTime/WebContent/WEB-INF/lib/itext-1.4.5.jar" sourcepath="/3rd_party/itext-1.4.5/src"/> <classpathentry kind="lib" path="/UniTime/3rd_party/ant.jar"/> <classpathentry kind="src" path="/UniTime"/> ! <classpathentry kind="lib" path="/UniTime/3rd_party/ojdbc14.jar"/> <classpathentry kind="output" path="WebContent/WEB-INF/classes"/> </classpath> --- 4,17 ---- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/> ! <classpathentry kind="lib" path="/UniTime/WebContent/WEB-INF/lib/struts-core-1.3.10.jar"/> ! <classpathentry kind="lib" path="/UniTime/WebContent/WEB-INF/lib/struts-extras-1.3.10.jar"/> ! <classpathentry kind="lib" path="/UniTime/WebContent/WEB-INF/lib/cpsolver-all-1.2.jar"/> <classpathentry kind="lib" path="/UniTime/WebContent/WEB-INF/lib/hibernate3.jar"/> <classpathentry kind="lib" path="/UniTime/WebContent/WEB-INF/lib/dom4j-1.6.1.jar"/> ! <classpathentry kind="lib" path="/UniTime/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar"/> ! <classpathentry kind="lib" path="/UniTime/WebContent/WEB-INF/lib/iText-5.0.2.jar"/> <classpathentry kind="lib" path="/UniTime/3rd_party/ant.jar"/> <classpathentry kind="src" path="/UniTime"/> ! <classpathentry kind="lib" path="/UniTime/3rd_party/ojdbc6.jar"/> <classpathentry kind="output" path="WebContent/WEB-INF/classes"/> </classpath> Index: build.xml =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/build.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** build.xml 20 Jul 2010 03:28:10 -0000 1.1 --- build.xml 1 Dec 2010 17:34:11 -0000 1.2 *************** *** 1,5 **** <?xml version="1.0" encoding="UTF-8"?> <!-- ! * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * --- 1,5 ---- <?xml version="1.0" encoding="UTF-8"?> <!-- ! * UniTime 3.2 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * *************** *** 19,22 **** --- 19,29 ---- --> <project name="timetabling" basedir="." default="build"> + <!-- Mac GWT requires -XstartOnFirstThread --> + <condition property="mac"> + <os name="Mac OS X"/> + </condition> + <condition property="macJvmArgs" value="-XstartOnFirstThread" else="-Dgwt.dummy.arg1="> + <isset property="mac"/> + </condition> <target name="load-properties"> *************** *** 56,60 **** </propertyfile> <copy todir="${build.dir}" overwrite="Yes" preservelastmodified="Yes"> ! <fileset dir="${unitime.src.dir}" includes="**/*.*"/> <fileset dir="${src.dir}" includes="**/*.*" excludes="**/hibernate.cfg.xml"/> </copy> --- 63,67 ---- </propertyfile> <copy todir="${build.dir}" overwrite="Yes" preservelastmodified="Yes"> ! <fileset dir="${unitime.src.dir}" includes="**/*.*" excludes="**/menu-custom.xml"/> <fileset dir="${src.dir}" includes="**/*.*" excludes="**/hibernate.cfg.xml"/> </copy> *************** *** 83,86 **** --- 90,103 ---- <delete file="build.date" failonerror="false" /> </target> + + <target name="compile-gwt" depends="compile-java"> + <java failonerror="true" fork="true" classname="com.google.gwt.dev.Compiler" dir="${temp.dir}"> + <classpath refid="build.classpath" /> + <classpath path="${build.dir}"/> + <jvmarg value="-Xmx600M"/> + <jvmarg value="${macJvmArgs}"/> + <arg value="org.unitime.timetable.gwt.UniTime"/> + </java> + </target> <target name="define-merge-xml" depends="compile-java"> *************** *** 112,117 **** <manifest> <attribute name="Main-Class" value="org.unitime.timetable.solver.remote.core.Startup" /> ! <attribute name="Class-Path" value="cpsolver-all-1.1.jar log4j-1.2.8.jar dom4j-1.6.1.jar hibernate3.jar commons-logging-1.1.jar commons-collections-3.2.jar cglib-2.1.3.jar asm-attrs.jar asm.jar ehcache-1.2.3.jar jta.jar antlr-2.7.6.jar jsp-api.jar servlet-api.jar ojdbc14.jar commons-dbcp-1.2.2.jar commons-pool-1.3.jar mysql-connector-java-5.0.5-bin.jar" /> ! <attribute name="Timetabling-Version" value="3.0_bld${build.number} (Banner Add On)"/> </manifest> </jar> --- 129,134 ---- <manifest> <attribute name="Main-Class" value="org.unitime.timetable.solver.remote.core.Startup" /> ! <attribute name="Class-Path" value="antlr-2.7.6.jar backport-util-concurrent.jar commons-collections-3.2.1.jar commons-dbcp-1.4.jar commons-logging-1.1.1.jar commons-pool-1.5.4.jar cpsolver-all-1.2.jar dom4j-1.6.1.jar ehcache-1.5.0.jar hibernate3.jar javassist-3.9.0.GA.jar jta-1.1.jar log4j-1.2.15.jar mysql-connector-java-5.1.11-bin.jar ojdbc6.jar slf4j-api-1.5.8.jar slf4j-log4j12-1.5.8.jar jsp-api.jar servlet-api.jar" /> ! <attribute name="Timetabling-Version" value="3.2_bld${build.number} (Banner Add On)"/> </manifest> </jar> *************** *** 132,136 **** <attribute name="Main-Class" value="org.unitime.timetable.solver.remote.core.StartupMinimal" /> <attribute name="Class-Path" value="tray-win32.jar" /> ! <attribute name="Timetabling-Version" value="3.0_bld${build.number} (Banner Add On)"/> </manifest> </jar> --- 149,153 ---- <attribute name="Main-Class" value="org.unitime.timetable.solver.remote.core.StartupMinimal" /> <attribute name="Class-Path" value="tray-win32.jar" /> ! <attribute name="Timetabling-Version" value="3.2_bld${build.number} (Banner Add On)"/> </manifest> </jar> *************** *** 156,159 **** --- 173,177 ---- <fileset dir="${build.dir}"> <include name="custom.properties" /> + <include name="menu-custom.xml" /> </fileset> </copy> *************** *** 178,181 **** --- 196,200 ---- <include name="scripts/**/*.gif" /> <exclude name="WEB-INF/**/*.*" /> + <exclude name="unitime/**/*.*" /> <exclude name="test/**/*.*" /> </fileset> *************** *** 190,194 **** </target> ! <target name="compile-war" depends="timetable-jar,copy-libs,copy-jsp,define-merge-xml"> <mergexml target="${war.dir}/WEB-INF/web.xml" source="${jsp.dir}/WEB-INF/web.xml"/> <mergexml target="${war.dir}/WEB-INF/struts-config.xml" source="${jsp.dir}/WEB-INF/struts-config.xml"/> --- 209,219 ---- </target> ! <target name="copy-gwt" depends="init, compile-gwt"> ! <copy todir="${war.dir}" overwrite="Yes" preservelastmodified="Yes"> ! <fileset dir="${temp.dir}/war"/> ! </copy> ! </target> ! ! <target name="compile-war" depends="timetable-jar,compile-gwt,copy-libs,copy-jsp,copy-gwt,define-merge-xml"> <mergexml target="${war.dir}/WEB-INF/web.xml" source="${jsp.dir}/WEB-INF/web.xml"/> <mergexml target="${war.dir}/WEB-INF/struts-config.xml" source="${jsp.dir}/WEB-INF/struts-config.xml"/> *************** *** 200,204 **** </fileset> <manifest> ! <attribute name="Timetabling-Version" value="3.0_bld${build.number} (Banner Add On)"/> </manifest> </jar> --- 225,229 ---- </fileset> <manifest> ! <attribute name="Timetabling-Version" value="3.2_bld${build.number} (Banner Add On)"/> </manifest> </jar> *************** *** 219,222 **** --- 244,269 ---- </target> + <target name="create-model" depends="load-properties,init"> + <path id="build.classpath"> + <fileset dir="${lib.dir}"> + <include name="*.jar"/> + </fileset> + <fileset dir="${3rd_party.dir}"> + <include name="*.jar" /> + </fileset> + </path> + <javac source="1.5" target="1.5" destdir="${build.dir}" includes="org/unitime/commons/ant/CreateBaseModelFromXml.java" debug="true"> + <src path="${unitime.src.dir}"/> + <classpath refid="build.classpath"/> + </javac> + <taskdef name="create-model" classname="org.unitime.commons.ant.CreateBaseModelFromXml"> + <classpath refid="build.classpath"/> + <classpath path="${build.dir}"/> + </taskdef> + <create-model config="hibernate.cfg.xml" source="${src.dir}"/> + <delete dir="${build.dir}" failonerror="false"/> + <delete dir="${temp.dir}" failonerror="false"/> + </target> + <target name="build" depends="load-properties,compile-war,done" /> |
|
From: Tomas M. <to...@us...> - 2010-12-01 17:34:19
|
Update of /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/webutil In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22821/JavaSource/org/unitime/banner/webutil Modified Files: WebBannerCourseListTableBuilder.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: WebBannerCourseListTableBuilder.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/webutil/WebBannerCourseListTableBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WebBannerCourseListTableBuilder.java 20 Jul 2010 03:28:10 -0000 1.1 --- WebBannerCourseListTableBuilder.java 1 Dec 2010 17:34:11 -0000 1.2 *************** *** 248,254 **** row.setOnMouseOut(this.getRowMouseOut(true)); row.setOnClick(subjectOnClickAction(bc.getUniqueId())); ! boolean isManagedAs = !co.isIsControl().booleanValue(); ! ! TableCell cell = null; row.addContent(subjectAndCourseInfo(bc, io, co)); table.addContent(row); --- 248,252 ---- row.setOnMouseOut(this.getRowMouseOut(true)); row.setOnClick(subjectOnClickAction(bc.getUniqueId())); ! row.addContent(subjectAndCourseInfo(bc, io, co)); table.addContent(row); *************** *** 273,278 **** boolean isEditable = ioc.isViewableBy(user); String configName = ioc.getName(); - boolean unlimited = ioc.isUnlimitedEnrollment().booleanValue(); - boolean hasConfig = false; if (printConfigLine) { TableRow row = this.initRow(isHeaderRow); --- 271,274 ---- *************** *** 289,293 **** row.addContent(cell); table.addContent(row); - hasConfig = true; } ArrayList subpartList = new ArrayList(ioc.getSchedulingSubparts()); --- 285,288 ---- *************** *** 335,339 **** Iterator it = childClassesList.iterator(); Class_ child = null; - Integer previousItype = aClass.getSchedulingSubpart().getItype().getItype(); while (it.hasNext()){ child = (Class_) it.next(); --- 330,333 ---- |
|
From: Tomas M. <to...@us...> - 2010-12-01 17:34:19
|
Update of /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/queueprocessor/util In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22821/JavaSource/org/unitime/banner/queueprocessor/util Modified Files: QueueProcessorCheck.java Removed Files: XmlClobType.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) --- XmlClobType.java DELETED --- Index: QueueProcessorCheck.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/queueprocessor/util/QueueProcessorCheck.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** QueueProcessorCheck.java 20 Jul 2010 03:28:10 -0000 1.1 --- QueueProcessorCheck.java 1 Dec 2010 17:34:11 -0000 1.2 *************** *** 21,29 **** package org.unitime.banner.queueprocessor.util; - import java.io.IOException; - import java.util.Properties; - import java.util.Vector; - import org.hibernate.Query; import org.unitime.banner.queueprocessor.oracle.OracleConnector; import org.unitime.commons.Email; --- 21,26 ---- package org.unitime.banner.queueprocessor.util; import org.hibernate.Query; + import org.unitime.banner.queueprocessor.BannerCaller; import org.unitime.banner.queueprocessor.oracle.OracleConnector; import org.unitime.commons.Email; *************** *** 44,55 **** public static void main(String[] args) throws Exception { // UniTime connection ! Properties properties = new Properties(); ! properties.put("connection.url", ApplicationProperties ! .getProperty("connection.url")); ! properties.put("connection.username", ApplicationProperties ! .getProperty("connection.username")); ! properties.put("connection.password", ApplicationProperties ! .getProperty("connection.password")); ! HibernateUtil.configureHibernate(properties); // See if there are unprocessed items in the queue --- 41,45 ---- public static void main(String[] args) throws Exception { // UniTime connection ! HibernateUtil.configureHibernate(ApplicationProperties.getProperties()); // See if there are unprocessed items in the queue *************** *** 67,81 **** // See if Banner is up try { ! OracleConnector jdbc = new OracleConnector( ! ApplicationProperties.getProperty("banner.host"), ! ApplicationProperties.getProperty("banner.database"), ! ApplicationProperties.getProperty("banner.port"), ! ApplicationProperties.getProperty("banner.user"), ! ApplicationProperties.getProperty("banner.password")); mailMessage("UniTime Queue Processor for database " + HibernateUtil.getDatabaseName() + " has " + ct + " unprocessed transactions that are more than "+minutes+" minutes old"); System.exit(33); } catch (Exception e) { // do nothing - Banner is down; messages are supposed to be queueing } } --- 57,79 ---- // See if Banner is up + OracleConnector jdbc = null; try { ! jdbc = new OracleConnector( ! BannerCaller.getBannerHost(), ! BannerCaller.getBannerDatabase(), ! BannerCaller.getBannerPort(), ! BannerCaller.getBannerUser(), ! BannerCaller.getBannerPassword()); mailMessage("UniTime Queue Processor for database " + HibernateUtil.getDatabaseName() + " has " + ct + " unprocessed transactions that are more than "+minutes+" minutes old"); System.exit(33); } catch (Exception e) { + if (e.getMessage() != null && e.getMessage().contains("Missing required custom application property")){ + mailMessage("UniTime Queue Processor for database " + HibernateUtil.getDatabaseName() + " is not configured to connect to Banner. " + e.getMessage()); + throw(e); + } else { // do nothing - Banner is down; messages are supposed to be queueing + } + } finally { + if (jdbc != null) jdbc.cleanup(); } } *************** *** 83,101 **** static void mailMessage(String msg){ - Email email = new Email(); - - String subject = "UniTime Queue Processor has unprocessed transactions"; - try { ! email.sendMail( ! (String)ApplicationProperties.getProperty("tmtbl.smtp.host"), ! (String)ApplicationProperties.getProperty("tmtbl.smtp.domain"), ! (String)ApplicationProperties.getProperty("tmtbl.local.support.email", (String)ApplicationProperties.getProperty("tmtbl.inquiry.sender")), ! (String)ApplicationProperties.getProperty("tmtbl.local.support.email", (String)ApplicationProperties.getProperty("tmtbl.inquiry.sender")), ! (String)ApplicationProperties.getProperty("tmtbl.local.support.email", (String)ApplicationProperties.getProperty("tmtbl.inquiry.email")), ! subject, ! msg, ! new Vector<Object>()); ! } catch (IOException e) { e.printStackTrace(); } --- 81,91 ---- static void mailMessage(String msg){ try { ! Email email = new Email(); ! email.setSubject("UniTime Queue Processor has unprocessed transactions"); ! email.addNotify(); ! email.setText(msg); ! email.send(); ! } catch (Exception e) { e.printStackTrace(); } |
|
From: Tomas M. <to...@us...> - 2010-12-01 17:34:19
|
Update of /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/model In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22821/JavaSource/org/unitime/banner/model Modified Files: BannerConfig.java BannerSectionToClass.java BannerSection.java Queue.java BannerSession.java QueueError.java BannerTermCrnProperties.java BannerResponse.java BannerCourse.java Removed Files: QueueErrorId.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: QueueError.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/model/QueueError.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** QueueError.java 20 Jul 2010 03:28:10 -0000 1.1 --- QueueError.java 1 Dec 2010 17:34:10 -0000 1.2 *************** *** 39,59 **** super(); } - - /** - * Constructor for primary key - */ - public QueueError (org.unitime.banner.model.QueueErrorId id) { - super(id); - } - /*[CONSTRUCTOR MARKER END]*/ public void setId(Queue queueEntry) { ! QueueErrorId eid = new QueueErrorId(); ! eid.setQueueId(queueEntry.getUniqueId()); ! eid.setErrorType(queueEntry.getQueueType()); ! eid.setErrorDate(new Date()); ! ! setId(eid); } --- 39,48 ---- super(); } /*[CONSTRUCTOR MARKER END]*/ public void setId(Queue queueEntry) { ! setQueueId(queueEntry.getUniqueId()); ! setErrorType(queueEntry.getQueueType()); ! setErrorDate(new Date()); } Index: BannerSession.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/model/BannerSession.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerSession.java 20 Jul 2010 03:28:10 -0000 1.1 --- BannerSession.java 1 Dec 2010 17:34:10 -0000 1.2 *************** *** 51,77 **** super(uniqueId); } - - /** - * Constructor for required fields - */ - public BannerSession ( - java.lang.Long uniqueId, - org.unitime.timetable.model.Session session, - java.lang.String bannerCampus, - java.lang.String bannerTermCode, - java.lang.Boolean storeDataForBanner, - java.lang.Boolean sendDataToBanner, - java.lang.Boolean loadingOfferingsFile) { - - super ( - uniqueId, - session, - bannerCampus, - bannerTermCode, - storeDataForBanner, - sendDataToBanner, - loadingOfferingsFile); - } - /*[CONSTRUCTOR MARKER END]*/ --- 51,54 ---- Index: BannerConfig.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/model/BannerConfig.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerConfig.java 20 Jul 2010 03:28:10 -0000 1.1 --- BannerConfig.java 1 Dec 2010 17:34:10 -0000 1.2 *************** *** 50,69 **** super(uniqueId); } - - /** - * Constructor for required fields - */ - public BannerConfig ( - java.lang.Long uniqueId, - org.unitime.banner.model.BannerCourse bannerCourse, - java.lang.Long instrOfferingConfigId) { - - super ( - uniqueId, - bannerCourse, - instrOfferingConfigId); - } - - /*[CONSTRUCTOR MARKER END]*/ --- 50,53 ---- Index: BannerCourse.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/model/BannerCourse.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerCourse.java 20 Jul 2010 03:28:10 -0000 1.1 --- BannerCourse.java 1 Dec 2010 17:34:10 -0000 1.2 *************** *** 64,80 **** super(uniqueId); } - - /** - * Constructor for required fields - */ - public BannerCourse ( - java.lang.Long uniqueId, - java.lang.Long courseOfferingId) { - - super ( - uniqueId, - courseOfferingId); - } - /*[CONSTRUCTOR MARKER END]*/ --- 64,67 ---- Index: BannerSection.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/model/BannerSection.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerSection.java 20 Jul 2010 03:28:10 -0000 1.1 --- BannerSection.java 1 Dec 2010 17:34:10 -0000 1.2 *************** *** 23,26 **** --- 23,27 ---- import java.sql.CallableStatement; import java.sql.Connection; + import java.util.Enumeration; import java.util.HashSet; import java.util.Iterator; *************** *** 30,35 **** import java.util.Vector; - import net.sf.cpsolver.coursett.model.TimeLocation.IntEnumeration; - import org.hibernate.FlushMode; import org.hibernate.Session; --- 31,34 ---- *************** *** 60,64 **** import org.unitime.timetable.model.dao._RootDAO; import org.unitime.timetable.solver.ClassAssignmentProxy; - import org.unitime.timetable.solver.ui.AssignmentPreferenceInfo; import org.unitime.timetable.util.Constants; --- 59,62 ---- *************** *** 87,105 **** super(uniqueId); } - - /** - * Constructor for required fields - */ - public BannerSection ( - java.lang.Long uniqueId, - org.unitime.banner.model.BannerConfig bannerConfig, - org.unitime.timetable.model.Session session) { - - super ( - uniqueId, - bannerConfig, - session); - } - /*[CONSTRUCTOR MARKER END]*/ --- 85,88 ---- *************** *** 716,728 **** if (classAssignment!=null) { Assignment a = null; - AssignmentPreferenceInfo info = null; try { a = classAssignment.getAssignment(aClass); - info = classAssignment.getAssignmentInfo(aClass); } catch (Exception e) { Debug.error(e); } if (a!=null) { - IntEnumeration e = a.getTimeLocation().getDays(); if (a.getRoomLocations().size() > 1){ for (int i = 1; i < a.getRoomLocations().size() ; i++){ --- 699,708 ---- *************** *** 767,779 **** if (classAssignment!=null) { Assignment a = null; - AssignmentPreferenceInfo info = null; try { a = classAssignment.getAssignment(aClass); - info = classAssignment.getAssignmentInfo(aClass); } catch (Exception e) { Debug.error(e); } if (a!=null) { - IntEnumeration e = a.getTimeLocation().getDays(); if (a.getRoomLocations().size() > 1){ for (int i = 1; i < a.getRoomLocations().size() ; i++){ --- 747,756 ---- *************** *** 822,836 **** if (classAssignment!=null) { Assignment a = null; - AssignmentPreferenceInfo info = null; try { a = classAssignment.getAssignment(aClass); - info = classAssignment.getAssignmentInfo(aClass); } catch (Exception e) { Debug.error(e); } if (a!=null) { ! IntEnumeration e = a.getTimeLocation().getDays(); while (e.hasMoreElements()){ ! sb.append(Constants.DAY_NAMES_SHORT[(int)e.nextInt()]); } sb.append(" "); --- 799,811 ---- if (classAssignment!=null) { Assignment a = null; try { a = classAssignment.getAssignment(aClass); } catch (Exception e) { Debug.error(e); } if (a!=null) { ! Enumeration<Integer> e = a.getTimeLocation().getDays(); while (e.hasMoreElements()){ ! sb.append(Constants.DAY_NAMES_SHORT[e.nextElement()]); } sb.append(" "); *************** *** 878,885 **** if (classAssignment!=null){ Assignment a = null; - AssignmentPreferenceInfo info = null; try { a= classAssignment.getAssignment(aClass); - info = classAssignment.getAssignmentInfo(aClass); } catch (Exception e) { Debug.error(e); --- 853,858 ---- *************** *** 930,937 **** if (classAssignment!=null){ Assignment a = null; - AssignmentPreferenceInfo info = null; try { a= classAssignment.getAssignment(aClass); - info = classAssignment.getAssignmentInfo(aClass); } catch (Exception e) { Debug.error(e); --- 903,908 ---- Index: BannerSectionToClass.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/model/BannerSectionToClass.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerSectionToClass.java 20 Jul 2010 03:28:10 -0000 1.1 --- BannerSectionToClass.java 1 Dec 2010 17:34:10 -0000 1.2 *************** *** 43,61 **** super(uniqueId); } - - /** - * Constructor for required fields - */ - public BannerSectionToClass ( - java.lang.Long uniqueId, - org.unitime.banner.model.BannerSection bannerSection, - java.lang.Long classId) { - - super ( - uniqueId, - bannerSection, - classId); - } - /*[CONSTRUCTOR MARKER END]*/ --- 43,46 ---- Index: BannerTermCrnProperties.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/model/BannerTermCrnProperties.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerTermCrnProperties.java 20 Jul 2010 03:28:10 -0000 1.1 --- BannerTermCrnProperties.java 1 Dec 2010 17:34:10 -0000 1.2 *************** *** 47,71 **** super(uniqueId); } - - /** - * Constructor for required fields - */ - public BannerTermCrnProperties ( - java.lang.Long uniqueId, - java.lang.String bannerTermCode, - java.lang.Integer lastCrn, - java.lang.Boolean searchFlag, - java.lang.Integer minCrn, - java.lang.Integer maxCrn) { - - super ( - uniqueId, - bannerTermCode, - lastCrn, - searchFlag, - minCrn, - maxCrn); - } - /*[CONSTRUCTOR MARKER END]*/ --- 47,50 ---- Index: Queue.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/model/Queue.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Queue.java 20 Jul 2010 03:28:10 -0000 1.1 --- Queue.java 1 Dec 2010 17:34:10 -0000 1.2 *************** *** 21,25 **** package org.unitime.banner.model; - import org.dom4j.Document; import org.unitime.banner.model.base.BaseQueue; --- 21,24 ---- *************** *** 50,66 **** super(uniqueId); } - - /** - * Constructor for required fields - */ - public Queue ( - java.lang.Long uniqueId, - Document xml) { - - super ( - uniqueId, - xml); - } - /*[CONSTRUCTOR MARKER END]*/ --- 49,52 ---- --- QueueErrorId.java DELETED --- Index: BannerResponse.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/model/BannerResponse.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerResponse.java 20 Jul 2010 03:28:10 -0000 1.1 --- BannerResponse.java 1 Dec 2010 17:34:10 -0000 1.2 *************** *** 69,73 **** this.uniqueId = uniqueId; } ! public int getSequenceNumber() { return sequenceNumber; } --- 69,73 ---- this.uniqueId = uniqueId; } ! public Integer getSequenceNumber() { return sequenceNumber; } |
|
From: Tomas M. <to...@us...> - 2010-12-01 17:34:19
|
Update of /cvsroot/unitime/UniTimeBannerAddOn/WebContent/banner In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22821/WebContent/banner Modified Files: rollForwardBannerSession.jsp Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: rollForwardBannerSession.jsp =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/WebContent/banner/rollForwardBannerSession.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rollForwardBannerSession.jsp 20 Jul 2010 03:28:09 -0000 1.1 --- rollForwardBannerSession.jsp 1 Dec 2010 17:34:11 -0000 1.2 *************** *** 19,24 **** <%@ page language="java" pageEncoding="ISO-8859-1"%> <%@ page import="org.unitime.banner.form.RollForwardBannerSessionForm"%> ! <%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean"%> ! <%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%> <%@ taglib uri="/WEB-INF/tld/struts-logic.tld" prefix="logic" %> --- 19,24 ---- <%@ page language="java" pageEncoding="ISO-8859-1"%> <%@ page import="org.unitime.banner.form.RollForwardBannerSessionForm"%> ! <%@ taglib uri="/WEB-INF/tld/struts-bean.tld" prefix="bean"%> ! <%@ taglib uri="/WEB-INF/tld/struts-html.tld" prefix="html"%> <%@ taglib uri="/WEB-INF/tld/struts-logic.tld" prefix="logic" %> |
|
From: Tomas M. <to...@us...> - 2010-12-01 17:34:19
|
Update of /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/model/dao In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22821/JavaSource/org/unitime/banner/model/dao Modified Files: BannerResponseDAO.java _RootDAO.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: _RootDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/model/dao/_RootDAO.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** _RootDAO.java 20 Jul 2010 03:28:10 -0000 1.1 --- _RootDAO.java 1 Dec 2010 17:34:11 -0000 1.2 *************** *** 21,48 **** package org.unitime.banner.model.dao; ! import org.hibernate.Session; ! ! ! - public abstract class _RootDAO extends org.unitime.timetable.model.base._BaseRootDAO { ! /* ! If you are using lazy loading, uncomment this ! Somewhere, you should call RootDAO.closeCurrentThreadSessions(); ! */ ! public void closeSession (Session session) { ! // do nothing here because the session will be closed later ! } - /* - If you are pulling the SessionFactory from a JNDI tree, uncomment this - protected SessionFactory getSessionFactory(String configFile) { - // If you have a single session factory, ignore the configFile parameter - // Otherwise, you can set a meta attribute under the class node called "config-file" which - // will be passed in here so you can tell what session factory an individual mapping file - // belongs to - return (SessionFactory) new InitialContext().lookup("java:/{SessionFactoryName}"); - } - */ } \ No newline at end of file --- 21,28 ---- package org.unitime.banner.model.dao; ! import java.io.Serializable; ! public abstract class _RootDAO<T, K extends Serializable> extends org.unitime.timetable.model.dao._RootDAO<T, K> { } \ No newline at end of file Index: BannerResponseDAO.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/model/dao/BannerResponseDAO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BannerResponseDAO.java 21 Sep 2010 19:46:14 -0000 1.2 --- BannerResponseDAO.java 1 Dec 2010 17:34:11 -0000 1.3 *************** *** 21,24 **** --- 21,27 ---- package org.unitime.banner.model.dao; + import java.text.DateFormat; + import java.text.ParseException; + import java.text.SimpleDateFormat; import java.util.Date; import java.util.Iterator; *************** *** 63,116 **** ! String subjectCode = null; ! if(searchSubject != null && searchSubject > 0) { ! subjectCode = SubjectAreaDAO.getInstance().get(searchSubject).getSubjectAreaAbbreviation(); ! } ! ! ! Date startDateDte; ! if(startDate != null && !startDate.equals("")) { ! ! startDateDte = new Date(Date.parse(startDate)); ! startDateDte.setHours(0); ! startDateDte.setMinutes(0); ! startDateDte.setSeconds(0); ! } else { ! startDateDte = null; ! } ! ! Date stopDateDte; ! if(stopDate != null && !stopDate.equals("")) { ! stopDateDte = new Date(Date.parse(stopDate)); ! stopDateDte.setDate(stopDateDte.getDate() + 1); ! stopDateDte.setHours(23); ! stopDateDte.setMinutes(59); ! stopDateDte.setSeconds(59); ! } else { ! stopDateDte = null; } - - - return find(sessionId, - startDateDte, - stopDateDte, - subjectCode, - subjects, - searchManager, - searchDepartment, - searchCourseNumber, - searchCrn, - searchXlst, - searchMessage, - maxResults, - showHistory, - actionAudit, - actionUpdate, - actionDelete, - typeSuccess, - typeError, - typeWarning); - } --- 66,111 ---- ! try { ! String subjectCode = null; ! if(searchSubject != null && searchSubject > 0) { ! subjectCode = SubjectAreaDAO.getInstance().get(searchSubject).getSubjectAreaAbbreviation(); ! } ! ! DateFormat df = new SimpleDateFormat("MM/dd/yyyy"); ! ! Date startDateDte = null; ! if (startDate != null && !startDate.equals("")) { ! startDateDte = df.parse(startDate); ! } ! ! Date stopDateDte = null; ! if(stopDate != null && !stopDate.equals("")) { ! stopDateDte = df.parse(stopDate); ! } ! ! return find(sessionId, ! startDateDte, ! stopDateDte, ! subjectCode, ! subjects, ! searchManager, ! searchDepartment, ! searchCourseNumber, ! searchCrn, ! searchXlst, ! searchMessage, ! maxResults, ! showHistory, ! actionAudit, ! actionUpdate, ! actionDelete, ! typeSuccess, ! typeError, ! typeWarning); ! ! } catch (ParseException e) { ! throw new LoggableException(e); } } |
|
From: Tomas M. <to...@us...> - 2010-12-01 17:34:19
|
Update of /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/action In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22821/JavaSource/org/unitime/banner/action Modified Files: BannerMessageResponsesAction.java BannerTermCrnPropertiesEditAction.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: BannerMessageResponsesAction.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/action/BannerMessageResponsesAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerMessageResponsesAction.java 20 Jul 2010 03:28:10 -0000 1.1 --- BannerMessageResponsesAction.java 1 Dec 2010 17:34:11 -0000 1.2 *************** *** 150,154 **** if ("Export CSV".equals(op) && responses!=null) { - String messageIds = ""; CSVFile csvFile = webTable.toCSVFile(0); --- 150,153 ---- Index: BannerTermCrnPropertiesEditAction.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/action/BannerTermCrnPropertiesEditAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BannerTermCrnPropertiesEditAction.java 20 Jul 2010 03:28:10 -0000 1.1 --- BannerTermCrnPropertiesEditAction.java 1 Dec 2010 17:34:11 -0000 1.2 *************** *** 29,33 **** import javax.servlet.http.HttpServletResponse; - import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; --- 29,32 ---- *************** *** 168,172 **** } else { - ActionErrors errors2 = new ActionErrors(); setAvailableSessionsInForm(bannerTermCrnPropertiesEditForm); return mapping.findForward("showAdd"); --- 167,170 ---- |
|
From: Tomas M. <to...@us...> - 2010-12-01 17:34:19
|
Update of /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/queueprocessor/oracle In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22821/JavaSource/org/unitime/banner/queueprocessor/oracle Modified Files: OracleConnector.java Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) Index: OracleConnector.java =================================================================== RCS file: /cvsroot/unitime/UniTimeBannerAddOn/JavaSource/org/unitime/banner/queueprocessor/oracle/OracleConnector.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OracleConnector.java 20 Jul 2010 03:28:10 -0000 1.1 --- OracleConnector.java 1 Dec 2010 17:34:11 -0000 1.2 *************** *** 30,38 **** import org.dom4j.Document; import org.dom4j.DocumentException; - - import org.unitime.banner.dataexchange.SendBannerMessage; import org.unitime.banner.queueprocessor.util.ClobTools; import org.unitime.commons.Debug; /* * based on code contributed by Aaron Tyler and Dagmar Murray --- 30,37 ---- import org.dom4j.Document; import org.dom4j.DocumentException; import org.unitime.banner.dataexchange.SendBannerMessage; import org.unitime.banner.queueprocessor.util.ClobTools; import org.unitime.commons.Debug; + import org.unitime.timetable.ApplicationProperties; /* * based on code contributed by Aaron Tyler and Dagmar Murray *************** *** 63,86 **** } public Clob processUnitimePacket(Document in_clob) throws SQLException, IOException { ! String oracleQuery = "begin sz_unitime.p_process_packet(in_packet => ?,out_response => ?,out_sync => ?); end;"; ! ! CallableStatement stmt = conn.prepareCall(oracleQuery); try { stmt.setClob(1, ClobTools.documentToCLOB(in_clob, conn)); } catch(Exception ex) { ! Debug.info("***************************************"); ! Debug.info("** Error in documentToCLOB (probably) *"); ! Debug.info("***************************************"); ! ex.printStackTrace(); ! Debug.info("***************************************"); } - stmt.registerOutParameter(2, java.sql.Types.CLOB); - stmt.registerOutParameter(3, java.sql.Types.CLOB); ! stmt.execute(); Clob out_clob = stmt.getClob(2); --- 62,142 ---- } + private void outputStandardDebugInfo(Exception e){ + Debug.info("******************************************************************************************************"); + Debug.info("** Make sure the stored procedure that is to process the messages for banner exists. The call to "); + Debug.info("** the stored procedure is defined by the property: 'banner.storedProcedure.call'."); + Debug.info("** The required format of the parameters for the Banner Stored procedure must be: "); + Debug.info("**"); + Debug.info("** in_packet => ?,out_response => ?,out_sync => ?"); + Debug.info("**"); + Debug.info("** The names of the parameters may change but the first parameter must be a CLOB input,"); + Debug.info("** the second parameter must be a CLOB output, and the third parameter must be a CLOB output"); + Debug.info("**"); + Debug.info("** An example of how to define a banner stored procedure call in the properties file is as follows:"); + Debug.info("**"); + Debug.info("** banner.storedProcedure.call=begin sz_unitime.p_process_packet(in_packet => ?,out_response => ?,out_sync => ?); end;"); + Debug.info("**"); + Debug.info("** If you change the value of the 'banner.storedProcedure.call' the queue processor must be"); + Debug.info("** restarted to begin using the new procedure call."); + Debug.info("**"); + Debug.info("** If you have the parameters defined correctly then possbile he error is in documentToCLOB "); + Debug.info("******************************************************************************************************"); + e.printStackTrace(); + Debug.info("******************************************************************************************************"); + + } + + private void outputStandardStudentUpdateDebugInfo(Exception e){ + Debug.info("******************************************************************************************************"); + Debug.info("** Make sure the stored procedure that is to request student updates for banner exists. The call to "); + Debug.info("** the stored procedure is defined by the property: 'banner.studentUpdates.storedProcedure.call'."); + Debug.info("** The required format of the parameters for the Banner Stored procedure must be: "); + Debug.info("**"); + Debug.info("** out_response => ?"); + Debug.info("**"); + Debug.info("** The names of the parameters may change but the first parameter must be a CLOB input,"); + Debug.info("** the second parameter must be a CLOB output, and the third parameter must be a CLOB output"); + Debug.info("**"); + Debug.info("** An example of how to define a banner stored procedure call in the properties file is as follows:"); + Debug.info("**"); + Debug.info("** banner.storedProcedure.call=begin sz_unitime.p_request_student_updates(out_response => ?); end;"); + Debug.info("**"); + Debug.info("** If you change the value of the 'banner.studentUpdates.storedProcedure.call' the queue processor must be"); + Debug.info("** restarted to begin using the new procedure call."); + Debug.info("**"); + Debug.info("** If you have the parameters defined correctly then possbile he error is in documentToCLOB "); + Debug.info("******************************************************************************************************"); + e.printStackTrace(); + Debug.info("******************************************************************************************************"); + + } + public Clob processUnitimePacket(Document in_clob) throws SQLException, IOException { ! CallableStatement stmt = null; ! try { ! stmt = conn.prepareCall(getBannerStoredProcedureCall()); ! } catch (Exception e1) { ! outputStandardDebugInfo(e1); ! } try { stmt.setClob(1, ClobTools.documentToCLOB(in_clob, conn)); } catch(Exception ex) { ! outputStandardDebugInfo(ex); ! } ! try { ! stmt.registerOutParameter(2, java.sql.Types.CLOB); ! stmt.registerOutParameter(3, java.sql.Types.CLOB); ! } catch (Exception e) { ! outputStandardDebugInfo(e); } ! try { ! stmt.execute(); ! } catch (Exception e) { ! outputStandardDebugInfo(e); ! } Clob out_clob = stmt.getClob(2); *************** *** 94,102 **** SendBannerMessage.writeOutMessage(ClobTools.clobToDocument(out_sync_clob)); } catch (DocumentException e) { ! Debug.info("***************************************"); Debug.info("** Error in SendBannerMessage: sending sync CLOB *"); ! Debug.info("***************************************"); e.printStackTrace(); ! Debug.info("***************************************"); } } --- 150,158 ---- SendBannerMessage.writeOutMessage(ClobTools.clobToDocument(out_sync_clob)); } catch (DocumentException e) { ! Debug.info("******************************************************************************************************"); Debug.info("** Error in SendBannerMessage: sending sync CLOB *"); ! Debug.info("******************************************************************************************************"); e.printStackTrace(); ! Debug.info("******************************************************************************************************"); } } *************** *** 106,109 **** --- 162,196 ---- } + + public Clob requestEnrollmentChanges() throws SQLException, + IOException { + + CallableStatement stmt = null; + try { + stmt = conn.prepareCall(getBannerStudentUpdatesStoredProcedureCall()); + } catch (Exception e1) { + outputStandardStudentUpdateDebugInfo(e1); + } + + try { + stmt.registerOutParameter(1, java.sql.Types.CLOB); + } catch (Exception e) { + outputStandardStudentUpdateDebugInfo(e); + } + + try { + stmt.execute(); + } catch (Exception e) { + outputStandardStudentUpdateDebugInfo(e); + } + + Clob out_clob = stmt.getClob(1); + + stmt.close(); + + return out_clob; + + } + public void cleanup() throws SQLException { *************** *** 111,113 **** --- 198,217 ---- conn.close(); } + + private static String getBannerStoredProcedureCall() throws Exception{ + String bannerStoredProcedureCall = ApplicationProperties.getProperty("banner.storedProcedure.call"); + if (bannerStoredProcedureCall == null || bannerStoredProcedureCall.trim().length() == 0){ + bannerStoredProcedureCall = "begin sz_unitime.p_process_packet(in_packet => ?,out_response => ?,out_sync => ?); end;"; + } + return bannerStoredProcedureCall; + } + + private static String getBannerStudentUpdatesStoredProcedureCall() throws Exception{ + String bannerStudentUpdatesStoredProcedureCall = ApplicationProperties.getProperty("banner.studentUpdates.storedProcedure.call"); + if (bannerStudentUpdatesStoredProcedureCall == null || bannerStudentUpdatesStoredProcedureCall.trim().length() == 0){ + bannerStudentUpdatesStoredProcedureCall = "begin sz_unitime.p_request_student_updates(out_response => ?); end;"; + } + return bannerStudentUpdatesStoredProcedureCall; + } + } |
|
From: Tomas M. <to...@us...> - 2010-12-01 17:34:19
|
Update of /cvsroot/unitime/UniTimeBannerAddOn/Documentation/Database/Oracle/Changes In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22821/Documentation/Database/Oracle/Changes Added Files: 03 Banner CRN Lookup Indexes.sql 02 Banner Response Indexes.sql Log Message: UniTime 3.1 moved to branch maint_UniTime31 UniTime 3.2 merged from dev_curricula back to main branch (HEAD) --- NEW FILE: 03 Banner CRN Lookup Indexes.sql --- /* * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* * Author: Stephanie Schluttenhofer */ /* * Add indexes to the Banner Section and Banner Session tables */ create index idx_banner_section_sess_crn on banner_section(session_id, crn); create index idx_banner_session_term_code on banner_session(banner_term_code); /* * Update database version */ update application_config set value='3' where name='tmtbl.db.banner.version'; commit; --- NEW FILE: 02 Banner Response Indexes.sql --- /* * UniTime 3.1 (University Timetabling Application) * Copyright (C) 2010, UniTime LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* * Author: Stephanie Schluttenhofer */ /* * Add indexes to the Banner Response table */ create index idx_response_term_code on banner_response(term_code); create index idx_response_crn on banner_response(crn); create index idx_response_xlst_group on banner_response(xlst_group); /* * Update database version */ update application_config set value='2' where name='tmtbl.db.banner.version'; commit; |
