Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Nullable.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Nullable.java,v diff -u -r1.2 -r1.3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Nullable.java 4 Jul 2005 06:11:24 -0000 1.2 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Nullable.java 24 Feb 2006 15:06:00 -0000 1.3 @@ -1,23 +1,24 @@ -/* - *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * - *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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - *USA - * - *http://www.gnu.org/licenses/gpl.txt - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v diff -u -r1.29 -r1.30 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 23 Feb 2006 19:33:19 -0000 1.29 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 24 Feb 2006 15:06:00 -0000 1.30 @@ -1,24 +1,31 @@ -/** - * Created on 20/04/2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa; /** * @author Ozgur Demirtas - * - * TODO: Check back the constants with "Attention" - * Holds constants used throughout the application - * */ public interface QaAppConstants { - /* - * Currently we are hardcoding the default content id. - * This will be replaced when the deploy logic automatically assigns a default content id in the deploy script. - */ - + public static final String MY_SIGNATURE ="laqa11"; public static final long DEFAULT_CONTENT_ID =0; public static final long DEFAULT_QUE_CONTENT_ID =1; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaComparator.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaComparator.java,v diff -u -r1.2 -r1.3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaComparator.java 4 Jul 2005 06:11:24 -0000 1.2 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaComparator.java 24 Feb 2006 15:06:00 -0000 1.3 @@ -1,9 +1,24 @@ -/* - * Created on 20/04/2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa; import java.io.Serializable; @@ -32,7 +47,6 @@ int key1=new Long(s1).intValue(); int key2=new Long(s2).intValue(); - //logger.debug(logger + " " + this.getClass().getName() + "comparing key1 and key2:" + key1 + " and " + key2); return key1 - key2; } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java,v diff -u -r1.6 -r1.7 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java 14 Feb 2006 18:03:12 -0000 1.6 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java 24 Feb 2006 15:06:00 -0000 1.7 @@ -1,3 +1,25 @@ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ + package org.lamsfoundation.lams.tool.qa; import java.io.Serializable; import java.util.Date; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java,v diff -u -r1.6 -r1.7 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java 15 Feb 2006 14:10:56 -0000 1.6 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java 24 Feb 2006 15:06:00 -0000 1.7 @@ -1,23 +1,24 @@ -/* - *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * - *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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - *USA - * - *http://www.gnu.org/licenses/gpl.txt - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa; import java.io.Serializable; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java,v diff -u -r1.4 -r1.5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java 9 Feb 2006 20:02:08 -0000 1.4 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java 24 Feb 2006 15:06:00 -0000 1.5 @@ -1,23 +1,24 @@ -/* - *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * - *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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - *USA - * - *http://www.gnu.org/licenses/gpl.txt - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa; import java.io.Serializable; @@ -76,13 +77,6 @@ /** persistent field */ private Set qaUsrResps; - public QaQueUsr() - { - logger.debug(logger + " " + this.getClass().getName() + "in constructor: QaQueUsr()"); - } - - - /** full constructor */ public QaQueUsr(Long queUsrId, String username, @@ -126,7 +120,6 @@ } - public QaQueUsr(String username, String fullname, QaQueContent qaQueContent, @@ -142,8 +135,6 @@ } - - //implement this, double check this, what is it for? /** * Copy construtor; We copy all data except the hibernate id field. * @param queUsr the original survey question user object. @@ -440,16 +431,6 @@ { QaQueUsr qUser = (QaQueUsr) o; - /* - if (this.qaQueContent == null - && qUser.getQaQueContent() == null) - return String.CASE_INSENSITIVE_ORDER.compare(username, - qUser.username); - if (this.qaQueContent == null) - return 1; - if (qUser.getQaQueContent() == null) - return -1; - */ return this.getQaQueContent().compareTo(qUser.getQaQueContent()); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.java,v diff -u -r1.6 -r1.7 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.java 15 Feb 2006 14:10:56 -0000 1.6 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaSession.java 24 Feb 2006 15:06:00 -0000 1.7 @@ -1,29 +1,28 @@ -/* - *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * - *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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - *USA - * - *http://www.gnu.org/licenses/gpl.txt - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa; import java.io.Serializable; -import java.util.ArrayList; import java.util.Date; -import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.TreeSet; @@ -75,9 +74,9 @@ /** persistent field */ private Long qaContentId; + + public QaSession(){}; - - /** full constructor */ public QaSession(Long qaSessionId, Date session_start_date, @@ -95,11 +94,6 @@ logger.debug(logger + " " + this.getClass().getName() + "in full constructor: QaSession()"); } - /** default constructor */ - public QaSession() - { - logger.debug(logger + " " + this.getClass().getName() + "in constructor: QaSession()"); - } /** * Construtor for initializing survey session. @@ -117,13 +111,7 @@ this(qaSessionId,session_start_date,null,session_status,qaContent,qaQueUsers); } - /** - * @hibernate.id - * generator-class="assigned" - * type="java.lang.Long" - * column="survey_session_id" - * - */ + public Long getQaSessionId() { return this.qaSessionId; @@ -134,12 +122,6 @@ this.qaSessionId = qaSessionId; } - /** - * @hibernate.property - * column="session_start_date" - * length="10" - * - */ public Date getSession_start_date() { return this.session_start_date; @@ -150,12 +132,6 @@ this.session_start_date = session_start_date; } - /** - * @hibernate.property - * column="session_end_date" - * length="10" - * - */ public Date getSession_end_date() { return this.session_end_date; @@ -167,28 +143,18 @@ } - /** - * @hibernate.property column="session_status" length="128" - * @return Returns the sessionStatus. - */ public String getSession_status() { return session_status; } - /** - * @param sessionStatus The sessionStatus to set. - */ + + public void setSession_status(String session_status) { this.session_status = session_status; } + - /** - * @hibernate.many-to-one - * not-null="true" - * @hibernate.column name="survey_content_id" - * - */ public QaContent getQaContent() { return this.qaContent; @@ -199,113 +165,27 @@ this.qaContent = qaContent; } - /** - * @hibernate.set lazy="false" inverse="true" cascade="all-delete-orphan" - * @hibernate.collection-key column="survey_session_id" - * @hibernate.collection-one-to-many - * class="org.lamsfoundation.lams.tool.survey.SurveyQueUsr" - * - */ + public Set getQaQueUsers() { if (this.qaQueUsers == null) setQaQueUsers(new TreeSet()); return this.qaQueUsers; } - public void setQaQueUsers(Set qaQueUsers) { this.qaQueUsers = qaQueUsers; } - //--------------------------------------------------------------------- - // Domain Service Methods - //--------------------------------------------------------------------- - /** - * - * @param responses - */ - - public void removeQueUsersBy(List responses) { - //make a copy of que user to avoid concurrent modification exception Set queUserSet = new TreeSet(this.getQaQueUsers()); - - /* - for (Iterator i = queUserSet.iterator(); i.hasNext();) - { - SurveyQueUsr curUser = (SurveyQueUsr) i.next(); - //remove question user object if no new response has reference - //to it. - if (!curUser.checkUpQueUsrHas(responses)) - this.getSurveyQueUsrs().remove(curUser); - } - */ } - - /** - * - * @param responses - */ - - - public void updateQueUsersBy(List responses) - { - for (Iterator i = this.getQaQueUsers().iterator(); i.hasNext();) - { - /* - SurveyQueUsr curUser = (SurveyQueUsr) i.next(); - if (curUser.checkUpQueUsrHas(responses)) - curUser.updateQueUsr(responses); - */ - } - } - - /** - * @param responses - */ - - public void addNewQueUsersBy(List responses) - { - //make a defensive a copy to avoid mutation from outside. - ArrayList resps = new ArrayList(responses); - for(Iterator i = resps.iterator();i.hasNext();) - { - /* - SurveyUsrResp response = (SurveyUsrResp)i.next(); - SurveyQueUsr queUser = response.getSurveyQueUsr(); - if(!isQueUsrExist(queUser)) - this.getSurveyQueUsrs().add(queUser); - */ - } - } - - - /** - * @param queUser - * @return - */ - - /* - private boolean isQueUsrExist(SurveyQueUsr queUser) - { - for(Iterator i = this.getSurveyQueUsrs().iterator();i.hasNext();) - { - - SurveyQueUsr curUser = (SurveyQueUsr)i.next(); - if(curUser.getSurveyQueContent().equals(queUser.getSurveyQueContent())) - return true; - } - return false; - } - */ - public String toString() { return new ToStringBuilder(this).append("qaSessionId",getQaSessionId()) @@ -316,7 +196,6 @@ } - public boolean equals(Object other) { if (!(other instanceof QaSession)) @@ -344,36 +223,27 @@ return (int) (qaSessionId.longValue() - qaSession.qaSessionId.longValue()); } - /** - * This object should not be null. - * @see org.lamsfoundation.lams.tool.survey.Nullable#isNull() - */ + public boolean isNull() { return false; } - /** - * @return Returns the qaContentId. - */ + public Long getQaContentId() { return qaContentId; } - /** - * @param qaContentId The qaContentId to set. - */ + + public void setQaContentId(Long qaContentId) { this.qaContentId = qaContentId; } - /** - * @return Returns the uid. - */ + + public Long getUid() { return uid; } - /** - * @param uid The uid to set. - */ + public void setUid(Long uid) { this.uid = uid; } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaStringComparator.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaStringComparator.java,v diff -u -r1.2 -r1.3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaStringComparator.java 4 Jul 2005 06:11:24 -0000 1.2 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaStringComparator.java 24 Feb 2006 15:06:00 -0000 1.3 @@ -1,9 +1,24 @@ -/* - * Created on 20/04/2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa; import java.io.Serializable; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaUploadedFile.java,v diff -u -r1.4 -r1.5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java 29 Nov 2005 05:41:23 -0000 1.4 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUploadedFile.java 24 Feb 2006 15:06:00 -0000 1.5 @@ -1,23 +1,24 @@ -/* - *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * - *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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - *USA - * - *http://www.gnu.org/licenses/gpl.txt - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa; import java.io.Serializable; @@ -56,8 +57,6 @@ /** persistent field */ private String fileName; - //private Long qaContentId; - /** persistent field */ private QaContent qaContent; @@ -136,20 +135,7 @@ public void setQaContent(QaContent qaContent) { this.qaContent = qaContent; } -// /** -// * @return Returns the qaContentId. -// */ -// public Long getQaContentId() { -// if(this.qaContent != null) -// return qaContent.getQaContentId(); -// return null; -// } -// /** -// * @param qaContentId The qaContentId to set. -// */ -// public void setQaContentId(Long qaContentId) { -// this.qaContentId = qaContentId; -// } + /** * @return Returns the submissionId. */ Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.java,v diff -u -r1.4 -r1.5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.java 9 Feb 2006 20:02:08 -0000 1.4 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUsrResp.java 24 Feb 2006 15:06:00 -0000 1.5 @@ -1,3 +1,24 @@ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa; import java.io.Serializable; @@ -50,6 +71,7 @@ /** nullable persistent field */ private String timezone; + /** full constructor */ public QaUsrResp(Long responseId, String answer, Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaUtils.java,v diff -u -r1.22 -r1.23 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java 23 Feb 2006 19:33:19 -0000 1.22 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java 24 Feb 2006 15:06:00 -0000 1.23 @@ -1,9 +1,24 @@ -/* - * Created on 21/04/2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa; import java.security.Principal; @@ -50,11 +65,11 @@ public abstract class QaUtils implements QaAppConstants { static Logger logger = Logger.getLogger(QaUtils.class.getName()); -// public static IQaService getToolService(HttpServletRequest request) -// { -// IQaService qaService=(IQaService)request.getSession().getAttribute(TOOL_SERVICE); -// return qaService; -// } + public static IQaService getToolService(HttpServletRequest request) + { + IQaService qaService=(IQaService)request.getSession().getAttribute(TOOL_SERVICE); + return qaService; + } public static long generateId() { @@ -127,7 +142,6 @@ request.getSession().removeAttribute(CHECK_ALL_SESSIONS_COMPLETED); request.getSession().removeAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID); request.getSession().removeAttribute(ATTR_USERDATA); -// request.getSession().removeAttribute(TOOL_SERVICE); request.getSession().removeAttribute(TARGET_MODE); } @@ -157,14 +171,6 @@ qaAuthoringForm.setUsernameVisible(defaultQaContent.isUsernameVisible()?ON:OFF); qaAuthoringForm.setSynchInMonitor(defaultQaContent.isSynchInMonitor()?ON:OFF); qaAuthoringForm.setQuestionsSequenced(defaultQaContent.isQuestionsSequenced()?ON:OFF); - -// request.getSession().setAttribute(TITLE,qaAuthoringForm.getTitle()); -// request.getSession().setAttribute(INSTRUCTIONS,qaAuthoringForm.getInstructions()); -// -// request.getSession().setAttribute(RICHTEXT_TITLE, defaultQaContent.getTitle()); -// request.getSession().setAttribute(RICHTEXT_INSTRUCTIONS, defaultQaContent.getInstructions()); -// request.getSession().setAttribute(RICHTEXT_OFFLINEINSTRUCTIONS,defaultQaContent.getOfflineInstructions()); -// request.getSession().setAttribute(RICHTEXT_ONLINEINSTRUCTIONS,defaultQaContent.getOnlineInstructions()); } @@ -351,384 +357,17 @@ } -// public static void configureContentRepository(HttpServletRequest request) -// { -// logger.debug("attempt configureContentRepository"); -// IQaService qaService =QaUtils.getToolService(request); -// logger.debug("retrieving qaService from session: " + qaService); -// logger.debug("calling configureContentRepository()"); -// qaService.configureContentRepository(); -// logger.debug("configureContentRepository ran successfully"); -// } - - - public static void addFileToContentRepository(HttpServletRequest request, QaAuthoringForm qaAuthoringForm, boolean isOfflineFile) + public static void configureContentRepository(HttpServletRequest request) { -// logger.debug("attempt addFileToContentRepository"); -// IQaService qaService =QaUtils.getToolService(request); -// logger.debug("qaService: " + qaService); -// -// List attachmentList = (List) request.getSession().getAttribute(ATTACHMENT_LIST); -// List deletedAttachmentList = (List) request.getSession().getAttribute(DELETED_ATTACHMENT_LIST); -// -// FormFile uploadedFile = (isOfflineFile)?qaAuthoringForm.getTheOfflineFile():qaAuthoringForm.getTheOnlineFile(); -// logger.debug("uploadedFile.getFileName(): " + uploadedFile.getFileName()); -// -// String toolContentId=(String)request.getSession().getAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID); -// -// -//// if a file with the same name already exists then move the old one to deleted -// deletedAttachmentList = moveToDelete(uploadedFile.getFileName(), !isOfflineFile, null, attachmentList, deletedAttachmentList ); - - -// -// Boolean populateUploadedFilesData=(Boolean)request.getSession().getAttribute(POPULATED_UPLOADED_FILESDATA); -// logger.debug("boolean populateUploadedFilesData: " + populateUploadedFilesData); -// -// if ((populateUploadedFilesData !=null) && (populateUploadedFilesData.booleanValue())) -// { -// String toolContentId=(String)request.getSession().getAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID); -// logger.debug("toolContentId: " + toolContentId); -// QaContent defaultQaContent=qaService.loadQa(new Long(toolContentId).longValue()); -// logger.debug("defaultQaContent: " + defaultQaContent); -// -// populateUploadedFilesMetaDataFromDb(request, defaultQaContent); -// logger.debug("done populateUploadedFilesMetaDataFromDb"); -// } -// -// -// List listUploadedOfflineFilesUuid = (List) request.getSession().getAttribute(LIST_UPLOADED_OFFLINE_FILES_UUID); -// logger.debug("listUploadedOfflineFilesUuid: " + listUploadedOfflineFilesUuid); -// -// List listUploadedOfflineFilesName = (List) request.getSession().getAttribute(LIST_UPLOADED_OFFLINE_FILES_NAME); -// logger.debug("listUploadedOfflineFilesName: " + listUploadedOfflineFilesName); -// -// List listUploadedOnlineFilesUuid = (List) request.getSession().getAttribute(LIST_UPLOADED_ONLINE_FILES_UUID); -// logger.debug("listUploadedOnlineFilesUuid: " + listUploadedOnlineFilesUuid); -// -// List listUploadedOnlineFilesName = (List) request.getSession().getAttribute(LIST_UPLOADED_ONLINE_FILES_NAME); -// logger.debug("listUploadedOnlineFilesName: " + listUploadedOnlineFilesName); -// -// List listUploadedOfflineFiles= (List) request.getSession().getAttribute(LIST_UPLOADED_OFFLINE_FILES); -// logger.debug("listUploadedOfflineFiles: " + listUploadedOfflineFiles); -// -// List listUploadedOfflineFileNames=(List)request.getSession().getAttribute(LIST_UPLOADED_OFFLINE_FILENAMES); -// logger.debug("listUploadedOfflineFiles: " + listUploadedOfflineFiles); -// -// List listUploadedOnlineFileNames=(List)request.getSession().getAttribute(LIST_UPLOADED_ONLINE_FILENAMES); -// logger.debug("listUploadedOnlineFileNames: " + listUploadedOnlineFileNames); -// -// -// if (listUploadedOfflineFileNames == null) -// listUploadedOfflineFileNames = new LinkedList(); -// logger.debug("listUploadedOfflineFileNames: " + listUploadedOfflineFileNames); -// -// if (listUploadedOnlineFileNames == null) -// listUploadedOnlineFileNames = new LinkedList(); -// logger.debug("listUploadedOnlineFileNames: " + listUploadedOnlineFileNames); -// -// Map allOfflineUuids= new TreeMap(new QaComparator()); -// if ((listUploadedOfflineFilesUuid != null) && (listUploadedOfflineFilesName != null)) -// { -// logger.debug("listUploadedOfflineFilesUuid and listUploadedOfflineFilesName are not null"); -// Iterator listUploadedOfflineFilesUuidIterator=listUploadedOfflineFilesUuid.iterator(); -// int counter=1; -// logger.debug("allOfflineUuids: " + allOfflineUuids); -// while (listUploadedOfflineFilesUuidIterator.hasNext()) -// { -// String uuid = (String)listUploadedOfflineFilesUuidIterator.next(); -// allOfflineUuids.put(new Integer(counter).toString(), uuid); -// counter++; -// } -// logger.debug("allOfflineUuids: " + allOfflineUuids); -// Iterator listUploadedOfflineFilesNameIterator=listUploadedOfflineFilesName.iterator(); -// -// counter=1; -// while (listUploadedOfflineFilesNameIterator.hasNext()) -// { -// String fileName = (String)listUploadedOfflineFilesNameIterator.next(); -// if (!offLineFileNameExists(request,fileName)) -// { -// logger.debug("reading with counter: " + new Integer(counter).toString()); -// String uuid=(String)allOfflineUuids.get(new Integer(counter).toString()); -// logger.debug("parsed uuid: " + uuid); -// listUploadedOfflineFiles.add(uuid + '~'+ fileName); -// counter++; -// } -// else -// { -// logger.debug("offline fileName exists: " +fileName); -// } -// } -// logger.debug("final listUploadedOfflineFiles: " + listUploadedOfflineFiles); -// request.getSession().setAttribute(LIST_UPLOADED_OFFLINE_FILES,listUploadedOfflineFiles); -// } -// /* -// List listUploadedOfflineFileNames = (List) request.getSession().getAttribute(LIST_UPLOADED_OFFLINE_FILENAMES); -// logger.debug("listUploadedOfflineFileNames: " + listUploadedOfflineFileNames); -// -// -// List listUploadedOnlineFileNames = (List) request.getSession().getAttribute(LIST_UPLOADED_ONLINE_FILENAMES); -// logger.debug("listUploadedOnlineFileNames: " + listUploadedOnlineFileNames); -// */ -// -// -// /* holds final online files list */ -// List listUploadedOnlineFiles= (List) request.getSession().getAttribute(LIST_UPLOADED_ONLINE_FILES); -// logger.debug("listUploadedOnlineFiles: " + listUploadedOnlineFiles); -// -// Map allOnlineUuids= new TreeMap(new QaComparator()); -// if ((listUploadedOnlineFilesUuid != null) && (listUploadedOnlineFilesName != null)) -// { -// logger.debug("listUploadedOnlineFilesUuid and listUploadedOnlineFilesName are not null"); -// Iterator listUploadedOnlineFilesUuidIterator=listUploadedOnlineFilesUuid.iterator(); -// int counter=1; -// logger.debug("allOnlineUuids: " + allOnlineUuids); -// while (listUploadedOnlineFilesUuidIterator.hasNext()) -// { -// String uuid = (String)listUploadedOnlineFilesUuidIterator.next(); -// allOnlineUuids.put(new Integer(counter).toString(), uuid); -// counter++; -// -// } -// logger.debug("allOnlineUuids: " + allOnlineUuids); -// Iterator listUploadedOnlineFilesNameIterator=listUploadedOnlineFilesName.iterator(); -// -// counter=1; -// while (listUploadedOnlineFilesNameIterator.hasNext()) -// { -// String fileName = (String)listUploadedOnlineFilesNameIterator.next(); -// if (!onLineFileNameExists(request,fileName)) -// { -// logger.debug("reading with counter: " + new Integer(counter).toString()); -// String uuid=(String)allOnlineUuids.get(new Integer(counter).toString()); -// logger.debug("parsed uuid: " + uuid); -// listUploadedOnlineFiles.add(uuid + '~'+ fileName); -// counter++; -// } -// else -// { -// logger.debug("online fileName exists: " +fileName); -// } -// -// -// } -// logger.debug("final listUploadedOnlineFiles: " + listUploadedOnlineFiles); -// request.getSession().setAttribute(LIST_UPLOADED_ONLINE_FILES,listUploadedOnlineFiles); -// } -// -// -// if (isOfflineFile) -// { -// /* read uploaded file informtion - offline file*/ -// logger.debug("retrieve theOfflineFile."); -// FormFile theOfflineFile = qaAuthoringForm.getTheOfflineFile(); -// logger.debug("retrieved theOfflineFile: " + theOfflineFile); -// -// String offlineFileName=""; -// NodeKey nodeKey=null; -// String offlineFileUuid=""; -// try -// { -// InputStream offlineFileInputStream = theOfflineFile.getInputStream(); -// logger.debug("retrieved offlineFileInputStream: " + offlineFileInputStream); -// offlineFileName=theOfflineFile.getFileName(); -// logger.debug("retrieved offlineFileName: " + offlineFileName); -// nodeKey=qaService.uploadFileToRepository(offlineFileInputStream, offlineFileName); -// logger.debug("repository returned nodeKey: " + nodeKey); -// logger.debug("repository returned offlineFileUuid nodeKey uuid: " + nodeKey.getUuid()); -// offlineFileUuid=nodeKey.getUuid().toString(); -// logger.debug("offline file added to contentRepository"); -// logger.debug("using listUploadedOfflineFiles: " + listUploadedOfflineFiles); -// listUploadedOfflineFiles.add(offlineFileUuid + "~" + offlineFileName); -// logger.debug("listUploadedOfflineFiles updated: " + listUploadedOfflineFiles); -// request.getSession().setAttribute(LIST_UPLOADED_OFFLINE_FILES,listUploadedOfflineFiles); -// -// listUploadedOfflineFileNames.add(offlineFileName); -// request.getSession().setAttribute(LIST_UPLOADED_OFFLINE_FILENAMES,listUploadedOfflineFileNames); -// } -// catch(FileNotFoundException e) -// { -// logger.debug("exception occured, offline file not found : " + e.getMessage()); -// //possibly give warning to user in request scope -// } -// catch(IOException e) -// { -// logger.debug("exception occured in offline file transfer: " + e.getMessage()); -// //possibly give warning to user in request scope -// } -// catch(QaApplicationException e) -// { -// logger.debug("exception occured in accessing the repository server: " + e.getMessage()); -// //possibly give warning to user in request scope -// } -// } -// else -// { -// /** read uploaded file information - online file*/ -// logger.debug("retrieve theOnlineFile"); -// FormFile theOnlineFile = qaAuthoringForm.getTheOnlineFile(); -// logger.debug("retrieved theOnlineFile: " + theOnlineFile); -// -// String onlineFileName=""; -// NodeKey nodeKey=null; -// String onlineFileUuid=""; -// try -// { -// InputStream onlineFileInputStream = theOnlineFile.getInputStream(); -// logger.debug("retrieved onlineFileInputStream: " + onlineFileInputStream); -// onlineFileName=theOnlineFile.getFileName(); -// logger.debug("retrieved onlineFileName: " + onlineFileName); -// nodeKey=qaService.uploadFileToRepository(onlineFileInputStream, onlineFileName); -// logger.debug("repository returned nodeKey: " + nodeKey); -// logger.debug("repository returned onlineFileUuid nodeKey uuid: " + nodeKey.getUuid()); -// onlineFileUuid=nodeKey.getUuid().toString(); -// logger.debug("online file added to contentRepository"); -// listUploadedOnlineFiles.add(onlineFileUuid + "~" + onlineFileName); -// logger.debug("listUploadedOnlineFiles updated: " + listUploadedOnlineFiles); -// request.getSession().setAttribute(LIST_UPLOADED_ONLINE_FILES,listUploadedOnlineFiles); -// -// listUploadedOnlineFileNames.add(onlineFileName); -// request.getSession().setAttribute(LIST_UPLOADED_ONLINE_FILENAMES,listUploadedOnlineFileNames); -// } -// catch(FileNotFoundException e) -// { -// logger.debug("exception occured, online file not found : " + e.getMessage()); -// //possibly give warning to user in request scope -// } -// catch(IOException e) -// { -// logger.debug("exception occured in online file transfer: " + e.getMessage()); -// //possibly give warning to user in request scope -// } -// catch(QaApplicationException e) -// { -// logger.debug("exception occured in accessing the repository server: " + e.getMessage()); -// //possibly give warning to user in request scope -// } -// } -// -// -// if ((populateUploadedFilesData != null) && (populateUploadedFilesData.booleanValue())) -// { -// logger.debug("removing ofline + online file list attributes"); -// request.getSession().removeAttribute(LIST_UPLOADED_OFFLINE_FILES_UUID); -// request.getSession().removeAttribute(LIST_UPLOADED_OFFLINE_FILES_NAME); -// request.getSession().removeAttribute(LIST_UPLOADED_ONLINE_FILES_UUID); -// request.getSession().removeAttribute(LIST_UPLOADED_ONLINE_FILES_NAME); -// } + logger.debug("attempt configureContentRepository"); + IQaService qaService =QaUtils.getToolService(request); + logger.debug("retrieving qaService from session: " + qaService); + logger.debug("calling configureContentRepository()"); + qaService.configureContentRepository(); + logger.debug("configureContentRepository ran successfully"); } -// static boolean offLineFileNameExists(HttpServletRequest request,String fileName) -// { -// logger.debug("attempt populateUploadedFilesData"); -// IQaService qaService =QaUtils.getToolService(request); -// logger.debug("qaService: " + qaService); -// -// String toolContentId=(String)request.getSession().getAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID); -// logger.debug("toolContentId: " + toolContentId); -// QaContent defaultQaContent=qaService.loadQa(new Long(toolContentId).longValue()); -// logger.debug("defaultQaContent: " + defaultQaContent); -// -// /** read the uploaded offline uuid + file name pair */ -// List listOfflineFilesName=new LinkedList(); -// listOfflineFilesName=qaService.retrieveQaUploadedOfflineFilesName(defaultQaContent); -// logger.debug("listOfflineFilesName: " + listOfflineFilesName); -// -// Iterator listOfflineFilesNameIterator=listOfflineFilesName.iterator(); -// while (listOfflineFilesNameIterator.hasNext()) -// { -// String currentFileName = (String)listOfflineFilesNameIterator.next(); -// logger.debug("currentFileName: " + currentFileName); -// if (currentFileName.equalsIgnoreCase(fileName)) -// { -// logger.debug("existing fileName: " + currentFileName); -// return true; -// } -// } -// return false; -// } -// static boolean onLineFileNameExists(HttpServletRequest request,String fileName) -// { -// logger.debug("attempt populateUploadedFilesData"); -// IQaService qaService =QaUtils.getToolService(request); -// logger.debug("qaService: " + qaService); -// -// String toolContentId=(String)request.getSession().getAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID); -// logger.debug("toolContentId: " + toolContentId); -// QaContent defaultQaContent=qaService.loadQa(new Long(toolContentId).longValue()); -// logger.debug("defaultQaContent: " + defaultQaContent); -// -// /* read the uploaded offline uuid + file name pair */ -// List listOnlineFilesName=new LinkedList(); -// listOnlineFilesName=qaService.retrieveQaUploadedOnlineFilesName(defaultQaContent); -// logger.debug("listOnlineFilesName: " + listOnlineFilesName); -// -// Iterator listOnlineFilesNameIterator=listOnlineFilesName.iterator(); -// while (listOnlineFilesNameIterator.hasNext()) -// { -// String currentFileName = (String)listOnlineFilesNameIterator.next(); -// logger.debug("currentFileName: " + currentFileName); -// if (currentFileName.equalsIgnoreCase(fileName)) -// { -// logger.debug("existing fileName: " + currentFileName); -// return true; -// } -// -// } -// return false; -// } - -// public static void populateUploadedFilesData(HttpServletRequest request, QaContent defaultQaContent) -// { -// populateUploadedFilesMetaDataFromDb(request, defaultQaContent); -// request.getSession().setAttribute(POPULATED_UPLOADED_FILESDATA, new Boolean(true)); -// } - - -// public static void populateUploadedFilesMetaDataFromDb(HttpServletRequest request, QaContent defaultQaContent) -// { -// logger.debug("attempt populateUploadedFilesData"); -// IQaService qaService =QaUtils.getToolService(request); -// logger.debug("qaService: " + qaService); -// -// /* just for jsp purposes ** -// /* read the uploaded offline uuid + file name pair */ -// List listOfflineFilesUuid=new LinkedList(); -// listOfflineFilesUuid=qaService.retrieveQaUploadedOfflineFilesUuid(defaultQaContent); -// logger.debug("initial listOfflineFilesUuid: " + listOfflineFilesUuid); -// request.getSession().removeAttribute(LIST_UPLOADED_OFFLINE_FILES_UUID); -// request.getSession().setAttribute(LIST_UPLOADED_OFFLINE_FILES_UUID, listOfflineFilesUuid); -// -// /* read the uploaded online uuid + file name pair */ -// List listOnlineFilesUuid=new LinkedList(); -// listOnlineFilesUuid=qaService.retrieveQaUploadedOnlineFilesUuid(defaultQaContent); -// logger.debug("initial listOnlineFilesUuid: " + listOnlineFilesUuid); -// request.getSession().removeAttribute(LIST_UPLOADED_ONLINE_FILES_UUID); -// request.getSession().setAttribute(LIST_UPLOADED_ONLINE_FILES_UUID, listOnlineFilesUuid); -// -// /* read the uploaded offline uuid + file name pair */ -// List listOfflineFilesName=new LinkedList(); -// listOfflineFilesName=qaService.retrieveQaUploadedOfflineFilesName(defaultQaContent); -// logger.debug("initial listOfflineFilesName: " + listOfflineFilesName); -// request.getSession().removeAttribute(LIST_UPLOADED_OFFLINE_FILES_NAME); -// request.getSession().setAttribute(LIST_UPLOADED_OFFLINE_FILES_NAME, listOfflineFilesName); -// -// /* read the uploaded online uuid + file name pair */ -// List listOnlineFilesName=new LinkedList(); -// listOnlineFilesName=qaService.retrieveQaUploadedOnlineFilesName(defaultQaContent); -// logger.debug("initial listOnlineFilesName: " + listOnlineFilesName); -// request.getSession().removeAttribute(LIST_UPLOADED_ONLINE_FILES_NAME); -// request.getSession().setAttribute(LIST_UPLOADED_ONLINE_FILES_NAME, listOnlineFilesName); -// -// request.getSession().removeAttribute(LIST_UPLOADED_OFFLINE_FILENAMES); -// request.getSession().removeAttribute(LIST_UPLOADED_ONLINE_FILENAMES); -// request.getSession().setAttribute(LIST_UPLOADED_OFFLINE_FILENAMES, listOfflineFilesName); -// request.getSession().setAttribute(LIST_UPLOADED_ONLINE_FILENAMES, listOnlineFilesName); -// } - - public static void populateUploadedFilesData(HttpServletRequest request, QaContent qaContent, IQaService qaService) { List attachmentList = qaService.retrieveQaUploadedFiles(qaContent); request.getSession().setAttribute(ATTACHMENT_LIST, attachmentList); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaContentDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaContentDAO.java,v diff -u -r1.5 -r1.6 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaContentDAO.java 14 Feb 2006 18:03:12 -0000 1.5 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaContentDAO.java 24 Feb 2006 15:06:00 -0000 1.6 @@ -1,30 +1,29 @@ -/* - *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * - *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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - *USA - * - *http://www.gnu.org/licenses/gpl.txt - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa.dao; import org.lamsfoundation.lams.tool.qa.QaContent; - - /** * * @author Ozgur Demirtas @@ -34,19 +33,8 @@ { public QaContent getQaById(long qaId); - /** - * - * return null if not found - */ public QaContent loadQaById(long qaId); - /** - * returns qa content - * getQaBySession(Long sessionId) - * @param sessionId - * @return QaContent - */ - public QaContent getQaContentByUID(Long uid); public QaContent getQaBySession(Long sessionId); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQueContentDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/Attic/IQaQueContentDAO.java,v diff -u -r1.8 -r1.9 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQueContentDAO.java 5 Jan 2006 04:33:27 -0000 1.8 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQueContentDAO.java 24 Feb 2006 15:06:00 -0000 1.9 @@ -1,23 +1,24 @@ -/* - *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * - *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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - *USA - * - *http://www.gnu.org/licenses/gpl.txt - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa.dao; import java.util.List; @@ -44,5 +45,4 @@ public void removeQueContent(long qaQueContentId); public List getQaQueContentsByContentId(long qaContentId); - } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQueUsrDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQueUsrDAO.java,v diff -u -r1.5 -r1.6 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQueUsrDAO.java 9 Feb 2006 20:02:08 -0000 1.5 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQueUsrDAO.java 24 Feb 2006 15:06:00 -0000 1.6 @@ -1,23 +1,24 @@ -/* - *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * - *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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - *USA - * - *http://www.gnu.org/licenses/gpl.txt - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa.dao; import org.lamsfoundation.lams.tool.qa.QaQueUsr; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaSessionDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaSessionDAO.java,v diff -u -r1.5 -r1.6 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaSessionDAO.java 6 Dec 2005 00:32:38 -0000 1.5 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaSessionDAO.java 24 Feb 2006 15:06:00 -0000 1.6 @@ -1,23 +1,24 @@ -/* - *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * - *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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - *USA - * - *http://www.gnu.org/licenses/gpl.txt - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa.dao; import java.util.List; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUploadedFileDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/Attic/IQaUploadedFileDAO.java,v diff -u -r1.5 -r1.6 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUploadedFileDAO.java 6 Dec 2005 00:32:38 -0000 1.5 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUploadedFileDAO.java 24 Feb 2006 15:06:00 -0000 1.6 @@ -1,23 +1,24 @@ -/* - *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * - *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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - *USA - * - *http://www.gnu.org/licenses/gpl.txt - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa.dao; import java.util.List; @@ -48,16 +49,6 @@ public List retrieveQaUploadedFiles(QaContent qa); -// public List retrieveQaUploadedFiles(QaContent qa, boolean fileOnline); - -// public List retrieveQaUploadedOfflineFilesUuid(QaContent qa); -// -// public List retrieveQaUploadedOnlineFilesUuid(QaContent qa); -// -// public List retrieveQaUploadedOfflineFilesName(QaContent qa); -// -// public List retrieveQaUploadedOnlineFilesName(QaContent qa); - public void cleanUploadedFilesMetaData(); public void flush(); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUsrRespDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUsrRespDAO.java,v diff -u -r1.4 -r1.5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUsrRespDAO.java 6 Dec 2005 00:32:38 -0000 1.4 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUsrRespDAO.java 24 Feb 2006 15:06:00 -0000 1.5 @@ -1,23 +1,24 @@ -/* - *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * - *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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - *USA - * - *http://www.gnu.org/licenses/gpl.txt - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa.dao; import org.lamsfoundation.lams.tool.qa.QaUsrResp; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java,v diff -u -r1.8 -r1.9 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java 15 Feb 2006 14:09:59 -0000 1.8 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java 24 Feb 2006 15:06:00 -0000 1.9 @@ -1,9 +1,24 @@ -/* - * Created on 15/03/2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa.dao.hibernate; import java.util.List; @@ -18,7 +33,6 @@ - /** * @author Ozgur Demirtas * Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java,v diff -u -r1.8 -r1.9 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java 15 Feb 2006 14:09:59 -0000 1.8 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java 24 Feb 2006 15:06:00 -0000 1.9 @@ -1,23 +1,24 @@ -/* - *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * - *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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - *USA - * - *http://www.gnu.org/licenses/gpl.txt - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa.dao.hibernate; import java.util.List; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUploadedFileDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/Attic/QaUploadedFileDAO.java,v diff -u -r1.7 -r1.8 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUploadedFileDAO.java 6 Dec 2005 00:32:38 -0000 1.7 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUploadedFileDAO.java 24 Feb 2006 15:06:00 -0000 1.8 @@ -46,15 +46,6 @@ private static final String GET_UPLOADED_FILES = "from QaUploadedFile qaUploadedFile where qaUploadedFile.qaContent.qaContentId = :contentId"; -// private static final String GET_ONLINE_FILENAMES_FOR_CONTENT = "select qaUploadedFile.fileName from QaUploadedFile qaUploadedFile where qaUploadedFile.qaContentId = :qa and qaUploadedFile.fileOnline=1"; -// private static final String GET_OFFLINE_FILENAMES_FOR_CONTENT = "select qaUploadedFile.fileName from QaUploadedFile qaUploadedFile where qaUploadedFile.qaContentId = :qa and qaUploadedFile.fileOnline=0"; -// -// private static final String GET_ONLINE_FILES_UUID = "select qaUploadedFile.uuid from QaUploadedFile qaUploadedFile where qaUploadedFile.qaContentId = :qa and qaUploadedFile.fileOnline=1"; -// private static final String GET_ONLINE_FILES_NAME ="select qaUploadedFile.fileName from QaUploadedFile qaUploadedFile where qaUploadedFile.qaContentId = :qa and qaUploadedFile.fileOnline=1 order by qaUploadedFile.uuid"; -// -// private static final String GET_OFFLINE_FILES_UUID = "select qaUploadedFile.uuid from QaUploadedFile qaUploadedFile where qaUploadedFile.qaContentId = :qa and qaUploadedFile.fileOnline=0"; -// private static final String GET_OFFLINE_FILES_NAME ="select qaUploadedFile.fileName from QaUploadedFile qaUploadedFile where qaUploadedFile.qaContentId = :qa and qaUploadedFile.fileOnline=0 order by qaUploadedFile.uuid"; - private static final String DELETE_FILES_META_DATA = "from qaUploadedFile in class QaUploadedFile"; public QaUploadedFile getUploadedFileById(long submissionId) @@ -145,55 +136,7 @@ listFilenames=(getHibernateTemplate().findByNamedParam(GET_UPLOADED_FILES, "contentId", qa.getQaContentId())); return listFilenames; } -// -// -// public List retrieveQaUploadedOfflineFilesUuid(QaContent qa) -// { -// List listFilesUuid=null; -// -// listFilesUuid=(getHibernateTemplate().findByNamedParam(GET_OFFLINE_FILES_UUID, -// "qa", -// qa)); -// -// return listFilesUuid; -// } -// -// public List retrieveQaUploadedOnlineFilesUuid(QaContent qa) -// { -// List listFilesUuid=null; -// -// listFilesUuid=(getHibernateTemplate().findByNamedParam(GET_ONLINE_FILES_UUID, -// "qa", -// qa)); -// -// return listFilesUuid; -// } -// -// -// public List retrieveQaUploadedOfflineFilesName(QaContent qa) -// { -// List listFilesUuid=null; -// -// listFilesUuid=(getHibernateTemplate().findByNamedParam(GET_OFFLINE_FILES_NAME, -// "qa", -// qa)); -// -// return listFilesUuid; -// } -// -// public List retrieveQaUploadedOnlineFilesName(QaContent qa) -// { -// List listFilesUuid=null; -// -// listFilesUuid=(getHibernateTemplate().findByNamedParam(GET_ONLINE_FILES_NAME, -// "qa", -// qa)); -// -// return listFilesUuid; -// } - - public void deleteUploadFile(QaUploadedFile qaUploadedFile) { this.getSession().setFlushMode(FlushMode.AUTO); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java,v diff -u -r1.7 -r1.8 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java 15 Feb 2006 14:09:59 -0000 1.7 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java 24 Feb 2006 15:06:00 -0000 1.8 @@ -1,23 +1,24 @@ -/* - *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * - *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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - *USA - * - *http://www.gnu.org/licenses/gpl.txt - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa.dao.hibernate; import org.hibernate.FlushMode; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java,v diff -u -r1.23 -r1.24 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java 23 Feb 2006 19:33:21 -0000 1.23 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java 24 Feb 2006 15:06:00 -0000 1.24 @@ -1,23 +1,24 @@ -/* - *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * - *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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - *USA - * - *http://www.gnu.org/licenses/gpl.txt - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa.service; import java.io.InputStream; @@ -205,18 +206,14 @@ public QaQueContent getToolDefaultQuestionContent(long contentId); - /** repository access related methods from here: */ public void configureContentRepository() throws QaApplicationException; public ITicket getRepositoryLoginTicket() throws QaApplicationException; public void deleteFromRepository(Long uuid, Long versionID) throws QaApplicationException; -// public NodeKey uploadFileToRepository(InputStream stream, String fileName) throws QaApplicationException; - public InputStream downloadFile(Long uuid, Long versionID)throws QaApplicationException; - /** repository access related methods till here */ public void persistFile(String uuid, boolean isOnlineFile, String fileName, QaContent qaContent) throws QaApplicationException; public void persistFile(QaContent content, QaUploadedFile file) throws QaApplicationException; @@ -225,16 +222,6 @@ public List retrieveQaUploadedFiles(QaContent qa) throws QaApplicationException; -// public List retrieveQaUploadedFiles(QaContent qa, boolean fileOnline) throws QaApplicationException; - -// public List retrieveQaUploadedOfflineFilesUuid(QaContent qa); -// -// public List retrieveQaUploadedOnlineFilesUuid(QaContent qa); -// -// public List retrieveQaUploadedOfflineFilesName(QaContent qa); -// -// public List retrieveQaUploadedOnlineFilesName(QaContent qa); - public void cleanUploadedFilesMetaData() throws QaApplicationException; public List retrieveQaQueContentsByToolContentId(long toolContentId); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v diff -u -r1.31 -r1.32 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 23 Feb 2006 19:33:21 -0000 1.31 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 24 Feb 2006 15:06:00 -0000 1.32 @@ -1,26 +1,27 @@ -/* - *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * - *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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - *USA - * - *http://www.gnu.org/licenses/gpl.txt - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ + package org.lamsfoundation.lams.tool.qa.service; import java.io.InputStream; -import java.io.Serializable; import java.util.Date; import java.util.Iterator; import java.util.List; @@ -526,80 +527,6 @@ } } -// public List retrieveQaUploadedFiles(QaContent qa, boolean fileOnline) throws QaApplicationException -// { -// try -// { -// return qaUploadedFileDAO.retrieveQaUploadedFiles(qa, fileOnline); -// } -// catch (DataAccessException e) -// { -// throw new QaApplicationException("Exception occured when lams is loading qa uploaded files: " -// + e.getMessage(), -// e); -// } -// } -// -// -// public List retrieveQaUploadedOfflineFilesUuid(QaContent qa) -// { -// try -// { -// return qaUploadedFileDAO.retrieveQaUploadedOfflineFilesUuid(qa); -// } -// catch (DataAccessException e) -// { -// throw new QaApplicationException("Exception occured when lams is loading qa uploaded files: offline + uuids " -// + e.getMessage(), -// e); -// } -// } -// -// public List retrieveQaUploadedOnlineFilesUuid(QaContent qa) -// { -// try -// { -// return qaUploadedFileDAO.retrieveQaUploadedOnlineFilesUuid(qa); -// } -// catch (DataAccessException e) -// { -// throw new QaApplicationException("Exception occured when lams is loading qa uploaded files: online + uuids " -// + e.getMessage(), -// e); -// } -// } -// -// public List retrieveQaUploadedOfflineFilesName(QaContent qa) -// { -// try -// { -// return qaUploadedFileDAO.retrieveQaUploadedOfflineFilesName(qa); -// } -// catch (DataAccessException e) -// { -// throw new QaApplicationException("Exception occured when lams is loading qa uploaded files: offline + fileNames " -// + e.getMessage(), -// e); -// } -// } -// -// public List retrieveQaUploadedOnlineFilesName(QaContent qa) -// { -// try -// { -// return qaUploadedFileDAO.retrieveQaUploadedOnlineFilesName(qa); -// } -// catch (DataAccessException e) -// { -// throw new QaApplicationException("Exception occured when lams is loading qa uploaded files: online + fileNames " -// + e.getMessage(), -// e); -// } -// -// } - - - public int countTotalNumberOfUserResponsed(QaContent qa) throws QaApplicationException { try @@ -1493,39 +1420,6 @@ } -// /** -// * This method is called everytime a new content has to be added to the -// * repository. In order to do so first of all a valid ticket is obtained -// * from the Repository hence authenticating the tool(SubmitFiles) and then -// * the corresponding file is added to the repository. -// * -// * @param stream -// * The InputStream representing the data to be -// * added -// * @param fileName -// * The name of the file being added -// * @param mimeType -// * The MIME type of the file (eg. TXT, DOC, GIF etc) -// * @return NodeKey Represents the two part key - UUID and Version. -// * @throws SubmitFilesException -// */ -// public NodeKey uploadFileToRepository(InputStream stream, String fileName) throws QaApplicationException { -// logger.debug("attempt getting the ticket"); -// ITicket ticket = getRepositoryLoginTicket(); -// logger.debug("retrieved ticket: " + ticket); -// -// try { -// NodeKey nodeKey = repositoryService.addFileItem(ticket, stream, -// fileName, null, null); -// logger.debug("retrieved nodeKey from repository service: " + nodeKey); -// return nodeKey; -// } catch (Exception e) { -// throw new QaApplicationException("Exception occured while trying to" -// + " upload file into the repository" + e.getMessage()); -// } -// } - - public InputStream downloadFile(Long uuid, Long versionID)throws QaApplicationException{ ITicket ticket = getRepositoryLoginTicket(); try{ Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServiceProxy.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServiceProxy.java,v diff -u -r1.4 -r1.5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServiceProxy.java 6 Dec 2005 00:32:38 -0000 1.4 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServiceProxy.java 24 Feb 2006 15:06:00 -0000 1.5 @@ -1,23 +1,24 @@ -/* - *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * - *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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - *USA - * - *http://www.gnu.org/licenses/gpl.txt - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa.service; import javax.servlet.ServletContext; @@ -27,8 +28,6 @@ import org.springframework.web.context.support.WebApplicationContextUtils; - - /** *

This class act as the proxy between web layer and service layer. It is * designed to decouple the presentation logic and business logic completely. @@ -45,7 +44,7 @@ * Return the survey domain service object. It will delegate to the Spring * helper method to retrieve the proper bean from Spring bean factory. * @param servletContext the servletContext for current application - * @return survey service object. + * @return qaService object. */ public static final IQaService getQaService(ServletContext servletContext) { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaToolContentHandler.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaToolContentHandler.java,v diff -u -r1.3 -r1.4 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaToolContentHandler.java 6 Dec 2005 00:32:38 -0000 1.3 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaToolContentHandler.java 24 Feb 2006 15:06:00 -0000 1.4 @@ -1,23 +1,25 @@ -/* -Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ -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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -USA - -http://www.gnu.org/licenses/gpl.txt -*/ package org.lamsfoundation.lams.tool.qa.util; import org.lamsfoundation.lams.contentrepository.client.ToolContentHandler; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java,v diff -u -r1.23 -r1.24 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java 19 Feb 2006 19:45:58 -0000 1.23 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java 24 Feb 2006 15:05:59 -0000 1.24 @@ -1,9 +1,25 @@ -/* - * Created on 16/05/2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ + package org.lamsfoundation.lams.tool.qa.web; import java.util.Date; @@ -141,336 +157,10 @@ } -// /** -// * findSelectedTab(ActionMapping mapping, -// ActionForm form, -// HttpServletRequest request, -// HttpServletResponse response) -// * -// * @param mapping -// * @param form -// * @param request -// * @param response -// * -// * determines which tab in the UI is the active one -// */ -// protected void findSelectedTab(ActionMapping mapping, -// ActionForm form, -// HttpServletRequest request, -// HttpServletResponse response) -// { -// QaAuthoringForm qaAuthoringForm = (QaAuthoringForm) form; -// String choiceBasic=qaAuthoringForm.getChoiceBasic(); -// String choiceAdvanced=qaAuthoringForm.getChoiceAdvanced(); -// String choiceInstructions=qaAuthoringForm.getChoiceInstructions(); -// -// /* make the Basic tab the default one */ -// request.getSession().setAttribute(CHOICE,CHOICE_TYPE_BASIC); -// -// if (choiceBasic != null) -// { -// logger.debug("CHOICE_TYPE_BASIC"); -// request.getSession().setAttribute(CHOICE,CHOICE_TYPE_BASIC); -// } -// else if (choiceAdvanced != null) -// { -// logger.debug("CHOICE_TYPE_ADVANCED"); -// request.getSession().setAttribute(CHOICE,CHOICE_TYPE_ADVANCED); -// } -// else if (choiceInstructions != null) -// { -// logger.debug("CHOICE_TYPE_INSTRUCTIONS"); -// request.getSession().setAttribute(CHOICE,CHOICE_TYPE_INSTRUCTIONS); -// } -// -// logger.debug("CHOICE is:" + request.getSession().getAttribute(CHOICE)); -// /* reset tab controllers */ -// qaAuthoringForm.choiceBasic=null; -// qaAuthoringForm.choiceAdvanced=null; -// qaAuthoringForm.choiceInstructions=null; -// -// -// /* -// * if the presentation is for monitoring EditActivity screen, keep preserving request scope START_MONITORING_SUMMARY_REQUEST -// */ -// Boolean renderMonitoringEditActivity=(Boolean)request.getSession().getAttribute(RENDER_MONITORING_EDITACTIVITY); -// if ((renderMonitoringEditActivity != null) && (renderMonitoringEditActivity.booleanValue())) -// { -// request.setAttribute(FORM_INDEX, "1"); -// request.setAttribute(START_MONITORING_SUMMARY_REQUEST, new Boolean(true)); -// } -// else -// { -// request.setAttribute(FORM_INDEX, "0"); -// request.setAttribute(START_MONITORING_SUMMARY_REQUEST, new Boolean(false)); -// } -// -// logger.debug("START_MONITORING_SUMMARY_REQUEST: " + request.getAttribute(START_MONITORING_SUMMARY_REQUEST)); -// logger.debug("formIndex:" + request.getAttribute(FORM_INDEX)); -// -// request.getSession().setAttribute(EDITACTIVITY_EDITMODE, new Boolean(false)); -// if (qaAuthoringForm.getEdit() != null) -// { -// logger.debug("request for editActivity - editmode"); -// IQaService qaService =QaUtils.getToolService(request); -// Long monitoredContentId=(Long)request.getSession().getAttribute(MONITORED_CONTENT_ID); -// logger.debug("MONITORED_CONTENT_ID: " + monitoredContentId); -// -// try -// { -// qaService.setAsDefineLater(monitoredContentId); -// } -// catch (ToolException e) -// { -// logger.debug("We should never come here."); -// logger.debug("Warning! ToolException occurred"); -// } -// -// -// logger.debug("MONITORED_CONTENT_ID has been marked as defineLater: "); -// request.getSession().setAttribute(EDITACTIVITY_EDITMODE, new Boolean(true)); -// } -// else -// { -// request.getSession().setAttribute(TITLE,qaAuthoringForm.getTitle()); -// request.getSession().setAttribute(INSTRUCTIONS,qaAuthoringForm.getInstructions()); -// } -// } - - -// /** -// * QaContent createContent(Map mapQuestionContent, HttpServletRequest request, QaAuthoringForm qaAuthoringForm) -// * return QaContent -// * At this stage, the Map is available from the presentaion layer and can be passed to services layer for persistance. -// * We are making the content and question contents persistent. -// * Id generation is "CURRENTLY" based on java.util.Random -// */ -// protected QaContent createContent(Map mapQuestionContent, HttpServletRequest request, QaAuthoringForm qaAuthoringForm) -// { -// IQaService qaService =QaUtils.getToolService(request); -// -// /* the tool content id is passed from the container to the tool and placed into session in the QaStarterAction */ -// String toolContentId=(String)request.getSession().getAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID); -// /* -// if ((toolContentId != null) && (!toolContentId.equals(""))) -// { -// logger.debug("passed TOOL_CONTENT_ID : " + new Long(toolContentId)); -// qaService.deleteQaById(new Long(toolContentId)); -// logger.debug("post-deletion existing content"); -// } -// */ -// logger.debug("using TOOL_CONTENT_ID: " + toolContentId); -// request.getSession().setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID,toolContentId); -// -// boolean isQuestionsSequenced=false; -// boolean isSynchInMonitor=false; -// boolean isUsernameVisible=false; -// String reportTitle=""; -// String monitoringReportTitle=""; -// String offlineInstructions=""; -// String onlineInstructions=""; -// String endLearningMessage=""; -// String creationDate=""; -// -// Boolean isQuestionsSequencedBoolean=new Boolean(false); -// Boolean isSynchInMonitorBoolean=new Boolean(false); -// Boolean isUsernameVisibleBoolean=new Boolean(false); -// -// Boolean renderMonitoringEditActivity=(Boolean)request.getSession().getAttribute(RENDER_MONITORING_EDITACTIVITY); -// if ((renderMonitoringEditActivity != null) && (renderMonitoringEditActivity.booleanValue())) -// { -// logger.debug("getting properties based on editActivity: All properties available from the http session."); -// isQuestionsSequencedBoolean=(Boolean)request.getSession().getAttribute(IS_QUESTIONS_SEQUENCED_MONITORING); -// isSynchInMonitorBoolean=(Boolean)request.getSession().getAttribute(IS_SYNCH_INMONITOR_MONITORING); -// isUsernameVisibleBoolean=(Boolean)request.getSession().getAttribute(IS_USERNAME_VISIBLE_MONITORING); -// reportTitle=(String)request.getSession().getAttribute(REPORT_TITLE); -// monitoringReportTitle=(String)request.getSession().getAttribute(MONITORING_REPORT_TITLE); -// offlineInstructions=(String)request.getSession().getAttribute(OFFLINE_INSTRUCTIONS); -// onlineInstructions=(String)request.getSession().getAttribute(ONLINE_INSTRUCTIONS); -// endLearningMessage=(String)request.getSession().getAttribute(END_LEARNING_MESSSAGE); -// endLearningMessage=(String)request.getSession().getAttribute(END_LEARNING_MESSSAGE); -// -// if (isQuestionsSequencedBoolean != null) -// isQuestionsSequenced=isQuestionsSequencedBoolean.booleanValue(); -// -// if (isSynchInMonitorBoolean != null) -// isSynchInMonitor=isSynchInMonitorBoolean.booleanValue(); -// -// if (isUsernameVisibleBoolean != null) -// isUsernameVisible=isUsernameVisibleBoolean.booleanValue(); -// } -// else -// { -// logger.debug("getting properties based on normal flow: Properties available from form and request parameters."); -// logger.debug("isQuestionsSequenced: " + qaAuthoringForm.getQuestionsSequenced()); -// if (qaAuthoringForm.getQuestionsSequenced().equalsIgnoreCase(ON)) -// isQuestionsSequenced=true; -// -// logger.debug("isSynchInMonitor: " + qaAuthoringForm.getSynchInMonitor()); -// if (qaAuthoringForm.getSynchInMonitor().equalsIgnoreCase(ON)) -// isSynchInMonitor=true; -// -// logger.debug("isUsernameVisible: " + qaAuthoringForm.getUsernameVisible()); -// if (qaAuthoringForm.getUsernameVisible().equalsIgnoreCase(ON)) -// isUsernameVisible=true; -// -// reportTitle=qaAuthoringForm.getReportTitle(); -// monitoringReportTitle=qaAuthoringForm.getMonitoringReportTitle(); -// offlineInstructions=qaAuthoringForm.getOnlineInstructions(); -// onlineInstructions=qaAuthoringForm.getOfflineInstructions(); -// endLearningMessage=qaAuthoringForm.getEndLearningMessage(); -// } -// creationDate=(String)request.getSession().getAttribute(CREATION_DATE); -// if (creationDate == null) -// creationDate=new Date(System.currentTimeMillis()).toString(); -// -// /* read rich text values */ -// String richTextOfflineInstructions=""; -// richTextOfflineInstructions = (String)request.getSession().getAttribute(RICHTEXT_OFFLINEINSTRUCTIONS); -// logger.debug("createContent: richTextOfflineInstructions from session: " + richTextOfflineInstructions); -// if (richTextOfflineInstructions == null) richTextOfflineInstructions=""; -// -// String richTextOnlineInstructions=""; -// richTextOnlineInstructions = (String)request.getSession().getAttribute(RICHTEXT_ONLINEINSTRUCTIONS); -// logger.debug("createContent richTextOnlineInstructions from session: " + richTextOnlineInstructions); -// if (richTextOnlineInstructions == null) richTextOnlineInstructions=""; -// -// String richTextTitle=""; -// richTextTitle = (String)request.getSession().getAttribute(RICHTEXT_TITLE); -// logger.debug("createContent richTextTitle from session: " + richTextTitle); -// if (richTextTitle == null) richTextTitle=""; -// -// String richTextInstructions=""; -// richTextInstructions = (String)request.getSession().getAttribute(RICHTEXT_INSTRUCTIONS); -// logger.debug("createContent richTextInstructions from session: " + richTextInstructions); -// if (richTextInstructions == null) richTextInstructions=""; -// -// -// /* obtain user object from the session*/ -// HttpSession ss = SessionManager.getSession(); -// /* get back login user DTO*/ -// UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER); -// logger.debug("retrieving toolUser: " + toolUser); -// logger.debug("retrieving toolUser userId: " + toolUser.getUserID()); -// String fullName= toolUser.getFirstName() + " " + toolUser.getLastName(); -// logger.debug("retrieving toolUser fullname: " + fullName); -// long userId=toolUser.getUserID().longValue(); -// -// /* create a new qa content and leave the default content intact*/ -// QaContent qa = new QaContent(); -// qa.setQaContentId(new Long(toolContentId)); -// qa.setTitle(richTextTitle); -// qa.setInstructions(richTextInstructions); -// qa.setCreationDate(creationDate); /**preserve this from the db*/ -// qa.setUpdateDate(new Date(System.currentTimeMillis())); /**keep updating this one*/ -// qa.setCreatedBy(userId); /**make sure we are setting the userId from the User object above*/ -// qa.setUsernameVisible(isUsernameVisible); -// qa.setQuestionsSequenced(isQuestionsSequenced); /**the default question listing in learner mode will be all in the same page*/ -// qa.setSynchInMonitor(isSynchInMonitor); -// qa.setOnlineInstructions(richTextOnlineInstructions); -// qa.setOfflineInstructions(richTextOfflineInstructions); -// qa.setEndLearningMessage(endLearningMessage); -// qa.setReportTitle(reportTitle); -// qa.setMonitoringReportTitle(monitoringReportTitle); -// qa.setQaQueContents(new TreeSet()); -// qa.setQaSessions(new TreeSet()); -// qa.setQaUploadedFiles(new TreeSet()); -// logger.debug("qa content :" + qa); -// -// /* create the content in the db*/ -// qaService.createQa(qa); -// logger.debug("qa created with content id: " + toolContentId); -// -// logger.debug("attempt cleaning files meta data from the db"); -// qaService.cleanUploadedFilesMetaData(); -// logger.debug("cleaned up files meta data from the db"); - - - -// List attachmentList = (List) request.getSession().getAttribute(ATTACHMENT_LIST); -// logger.debug("final attachmentList: " + attachmentList); -// List deletedAttachmentList = (List) request.getSession().getAttribute(DELETED_ATTACHMENT_LIST); -// logger.debug("final deletedAttachmentList: " + deletedAttachmentList); -// -// try{ -// logger.debug("start persisting offline file information to db..."); -// Iterator iter=attachmentList.iterator(); -// while (iter.hasNext()) -// { -// QaUploadedFile file=(QaUploadedFile) iter.next(); -// qaService.persistFile(file); -// -// } -// logger.debug("all offline files data has been persisted"); -// } -// catch(Exception e) -// { -// logger.debug("error persisting offline files data: " + attachmentList); -// } - -// LinkedList listUploadedOfflineFiles = (LinkedList) request.getSession().getAttribute(LIST_UPLOADED_OFFLINE_FILES); -// logger.debug("final listUploadedOfflineFiles: " + listUploadedOfflineFiles); -// LinkedList listUploadedOnlineFiles = (LinkedList) request.getSession().getAttribute(LIST_UPLOADED_ONLINE_FILES); -// logger.debug("final listUploadedOnlineFiles: " + listUploadedOnlineFiles); -// -// try{ -// logger.debug("start persisting offline file information to db..."); -// Iterator offlineFilesIterator=listUploadedOfflineFiles.iterator(); -// while (offlineFilesIterator.hasNext()) -// { -// String uuidAndFileName=(String) offlineFilesIterator.next(); -// logger.debug("iterated uuidAndFileName: " + uuidAndFileName); -// if ((uuidAndFileName != null) && (uuidAndFileName.indexOf('~') > 0)) -// { -// int separator=uuidAndFileName.indexOf('~'); -// logger.debug("separator: " + separator); -// String uuid=uuidAndFileName.substring(0,separator); -// String fileName=uuidAndFileName.substring(separator+1); -// logger.debug("using uuid: " + uuid); -// logger.debug("using fileName: " + fileName); -// qaService.persistFile(uuid,false, fileName,qa); -// } -// } -// logger.debug("all offline files data has been persisted"); -// } -// catch(Exception e) -// { -// logger.debug("error persisting offline files data: " + listUploadedOfflineFiles); -// } -// -// try{ -// logger.debug("start persisting online file information to db..."); -// Iterator onlineFilesIterator=listUploadedOnlineFiles.iterator(); -// while (onlineFilesIterator.hasNext()) -// { -// String uuidAndFileName=(String) onlineFilesIterator.next(); -// logger.debug("iterated uuidAndFileName: " + uuidAndFileName); -// if ((uuidAndFileName != null) && (uuidAndFileName.indexOf('~') > 0)) -// { -// int separator=uuidAndFileName.indexOf('~'); -// logger.debug("separator: " + separator); -// String uuid=uuidAndFileName.substring(0,separator); -// String fileName=uuidAndFileName.substring(separator+1); -// logger.debug("using uuid: " + uuid); -// logger.debug("using fileName: " + fileName); -// qaService.persistFile(uuid,true, fileName,qa); -// } -// } -// logger.debug("all online files data has been persisted"); -// } -// catch(Exception e) -// { -// logger.debug("error persisting offline files data: " + listUploadedOnlineFiles); -// } - -// return qa; -// } - - //doesn't update files public QaContent saveOrUpdateQaContent(Map mapQuestionContent, IQaService qaService, QaAuthoringForm qaAuthoringForm){ logger.debug("starting saveOrUpdateQaContent."); - UserDTO toolUser = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);//request.getSession().getAttribute(AttributeNames.USER); + UserDTO toolUser = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); boolean isQuestionsSequenced=false; boolean isSynchInMonitor=false; @@ -574,7 +264,6 @@ Map.Entry pairs = (Map.Entry)itMap.next(); logger.debug("using the pair: " + pairs.getKey() + " = " + pairs.getValue()); - /*make sure question entered is NOT blank*/ if (pairs.getValue().toString().length() != 0) { logger.debug("starting createQuestionContent: pairs.getValue().toString():" + pairs.getValue().toString()); @@ -593,96 +282,4 @@ } logger.debug("all questions in the Map persisted:"); } - -// /** remove existing content data from the db -// * -// * qaService.removeToolContent(Long toolContentId) gets automatically called only in monitoring mode when -// * the author chooses to delete a lesson. -// * -// * In here we act as another client of this contact method since we want to clear q/a tool's content tables based on -// * author's UI interactions. We are removing content + question's content + relavant tool sessions from the db. -// * -// * removeAllDBContent(TreeMap mapQuestionContent, HttpServletRequest request) -// * return void -// * removes content for a specific content Id -// */ -// protected void removeAllDBContent(HttpServletRequest request) -// { -// IQaService qaService =QaUtils.getToolService(request); -// logger.debug("retrieve qaService: " + qaService); -// String toolContentId=null; -// -// if (request.getSession().getAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID) != null) -// toolContentId=(String)(request.getSession().getAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID)); -// -// if ((toolContentId != null) && (!toolContentId.equals(""))) -// { -// logger.debug("simulate container behaviour by calling: removeToolContent with: " + new Long(toolContentId)); -// /* -// * we are calling removeToolContent to clear content tables although this method normally -// * gets called only in the monitoring mode automatically by the core. -// * -// * Having this method here also makes sure that this contract has implemented and tested properly. -// */ -// qaService.removeToolContent(new Long(toolContentId)); -// logger.debug("simulated container behaviour by calling: removeToolContent with: " + toolContentId); -// logger.debug("removed content from database for content id:" + toolContentId); -// } -// } - -// /** -// * Normally, a request to set runOffline property of the content comes directly from container through the property inspector. -// * What we do below is simulate that for development purposes. -// * @param request -// */ -// -// public void simulatePropertyInspector_RunOffline(HttpServletRequest request) -// { -// IQaService qaService =QaUtils.getToolService(request); -// -// String toolContentId=(String)request.getSession().getAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID); -// if ((toolContentId != null) && (!toolContentId.equals(""))) -// { -// logger.debug("passed TOOL_CONTENT_ID : " + new Long(toolContentId)); -// try -// { -// qaService.setAsRunOffline(new Long(toolContentId)); -// } -// catch(ToolException e) -// { -// logger.debug("we should never come here"); -// } -// -// logger.debug("post-RunAsOffline"); -// } -// logger.debug("end of simulating RunOffline on content id: " + toolContentId); -// } -// -// /** -// * Normally, a request to set defineLaterproperty of the content comes directly from container through the property inspector. -// * What we do below is simulate that for development purposes. -// * @param request -// */ -// public void simulatePropertyInspector_setAsDefineLater(HttpServletRequest request) -// { -// IQaService qaService =QaUtils.getToolService(request); -// -// String toolContentId=(String)request.getSession().getAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID); -// if ((toolContentId != null) && (!toolContentId.equals(""))) -// { -// logger.debug("passed TOOL_CONTENT_ID : " + new Long(toolContentId)); -// try -// { -// qaService.setAsDefineLater(new Long(toolContentId)); -// } -// catch(ToolException e) -// { -// logger.debug("we should never come here"); -// } -// -// logger.debug("post-setAsDefineLater"); -// } -// logger.debug("end of simulating setAsDefineLater on content id: " + toolContentId); -// } - } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/CustomStrutsExceptionHandler.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/CustomStrutsExceptionHandler.java,v diff -u -r1.1 -r1.2 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/CustomStrutsExceptionHandler.java 23 Feb 2006 19:33:21 -0000 1.1 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/CustomStrutsExceptionHandler.java 24 Feb 2006 15:05:59 -0000 1.2 @@ -1,24 +1,24 @@ -/* - Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - - 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - USA - - http://www.gnu.org/licenses/gpl.txt -*/ - +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa.web; import javax.servlet.http.HttpServletRequest; @@ -53,11 +53,6 @@ ActionForward forward = null; String property = null; - /* - * Get the path for the forward either from the exception element or - * from the input attribute. - */ - String path = null; if (ae.getPath() != null) { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java,v diff -u -r1.16 -r1.17 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java 9 Feb 2006 20:02:08 -0000 1.16 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java 24 Feb 2006 15:05:59 -0000 1.17 @@ -1,9 +1,24 @@ -/** +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= * - * Keeps all operations needed for Learning mode. - * @author ozgurd - * - */ + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa.web; import java.util.Date; @@ -118,18 +133,8 @@ QaQueContent qaQueContent=(QaQueContent)contentIterator.next(); if (qaQueContent != null) { - /* - * get the question - */ String question=qaQueContent.getQuestion(); - /* - * get the question's display order - */ String displayOrder=new Long(qaQueContent.getDisplayOrder()).toString(); - - /* - * get the answer from the map of that displayOrder - */ String answer=(String)mapAnswers.get(displayOrder); logger.debug("iterationg question-answers: displayOrder: " + displayOrder + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/MonitoringUtil.java,v diff -u -r1.11 -r1.12 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java 9 Feb 2006 20:02:08 -0000 1.11 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java 24 Feb 2006 15:05:59 -0000 1.12 @@ -1,3 +1,24 @@ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa.web; import java.util.Iterator; @@ -30,7 +51,6 @@ */ public boolean isSessionsSync(QaContent qaContent) { - /* * iterate all the tool sessions, if even one session is INCOMPLETE, the function returns false */ @@ -72,135 +92,8 @@ request.getSession().removeAttribute(CHECK_ALL_SESSIONS_COMPLETED); request.getSession().removeAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID); request.getSession().removeAttribute(ATTR_USERDATA); -// request.getSession().removeAttribute(TOOL_SERVICE); request.getSession().removeAttribute(TARGET_MODE); } -// -// /** -// * startLesson(QaMonitoringForm qaMonitoringForm, HttpServletRequest request) throws ToolException -// * -// * @param qaMonitoringForm -// * @param request -// * @throws ToolException -// */ -// public void startLesson(QaMonitoringForm qaMonitoringForm, HttpServletRequest request) throws ToolException -// { -// IQaService qaService=QaUtils.getToolService(request); -// -// String strFromToolContentId=""; -// String strToToolContentId=""; -// -// qaMonitoringForm.resetUserAction(); -// /* -// * In deployment, we won't be passing FROM_TOOL_CONTENT_ID, TO_TOOL_CONTENT_ID and TOOL_SESSION_ID from url -// * the Monitoring Service bean calls: -// * copyToolContent(Long fromContentId, Long toContentId) -// */ -// strFromToolContentId=request.getParameter(FROM_TOOL_CONTENT_ID); -// logger.debug("startLesson" + "FROM_TOOL_CONTENT_ID: " + strFromToolContentId); -// if (strFromToolContentId == null) -// { -// throw new QaApplicationException("Exception occured: " + -// "Tool expects a legitimate FROM_TOOL_CONTENT_ID from the container. Can't continue!"); -// } -// -// strToToolContentId=request.getParameter(TO_TOOL_CONTENT_ID); -// logger.debug("startLesson" + "TO_TOOL_CONTENT_ID: " + strToToolContentId); -// if (strToToolContentId == null) -// { -// throw new QaApplicationException("Exception occured: " + -// "Tool expects a legitimate TO_TOOL_CONTENT_ID from the container. Can't continue!"); -// } -// -// try -// { -// qaService.copyToolContent(new Long(strFromToolContentId), new Long(strToToolContentId)); -// } -// catch(ToolException e) -// { -// logger.debug("exception copying content."); -// throw e; -// } -// -// /* calls to these two methods will be made from Monitoring Service bean optionally depending on -// * the the tool is setup for DefineLater and (or) RunOffline -// */ -// -// /* -// * TESTED to work -// * qaService.setAsDefineLater(new Long(strToToolContentId)); -// qaService.setAsRunOffline(new Long(strToToolContentId)); -// * -// */ -// qaMonitoringForm.resetUserAction(); -// } -// -// /** -// * deleteLesson(QaMonitoringForm qaMonitoringForm, HttpServletRequest request) -// * @param qaMonitoringForm -// * @param request -// */ -// public void deleteLesson(QaMonitoringForm qaMonitoringForm, HttpServletRequest request) -// { -// IQaService qaService=QaUtils.getToolService(request); -// -// String strFromToolContentId=""; -// String strToToolContentId=""; -// -// qaMonitoringForm.resetUserAction(); -// -// /* -// * TESTED to work -// */ -// strToToolContentId=request.getParameter(TO_TOOL_CONTENT_ID); -// logger.debug("TO_TOOL_CONTENT_ID: " + strToToolContentId); -// if (strToToolContentId == null) -// { -// throw new QaApplicationException("Exception occured: " + -// "Tool expects a legitimate TO_TOOL_CONTENT_ID from the container. Can't continue!"); -// } -// qaService.removeToolContent(new Long(strToToolContentId)); -// qaMonitoringForm.resetUserAction(); -// } -// -// -// /** -// * forceComplete(QaMonitoringForm qaMonitoringForm, HttpServletRequest request) -// * @param qaMonitoringForm -// * @param request -// */ -// public void forceComplete(QaMonitoringForm qaMonitoringForm, HttpServletRequest request) -// { -// IQaService qaService=QaUtils.getToolService(request); -// /* -// * Parameter: userId -// */ -// qaMonitoringForm.resetUserAction(); -// logger.debug("request for forceComplete"); -// String userId=request.getParameter(MONITOR_USER_ID); -// logger.debug("MONITOR_USER_ID: " + userId); -// qaService.setAsForceComplete(new Long(userId)); -// logger.debug("end of setAsForceComplete with userId: " + userId); -// } -// -// /** -// * boolean isDefaultMonitoringScreen(QaMonitoringForm qaMonitoringForm) -// * @param qaMonitoringForm -// * @return boolean -// */ -// public boolean isDefaultMonitoringScreen(QaMonitoringForm qaMonitoringForm) -// { -// if ((qaMonitoringForm.getSummary() == null) && -// (qaMonitoringForm.getInstructions() == null) && -// (qaMonitoringForm.getEditActivity() == null) && -// (qaMonitoringForm.getStats() == null)) -// { -// qaMonitoringForm.setSummary("summary"); -// return true; -// } -// return false; -// } - /** * findSelectedMonitoringTab(ActionForm form, @@ -249,6 +142,7 @@ qaMonitoringForm.setEditActivity(null); qaMonitoringForm.setStats(null); } + /** * boolean isNonDefaultScreensVisited(HttpServletRequest request) @@ -276,6 +170,7 @@ return false; } + /** * updateResponse(HttpServletRequest request, String responseId, String updatedResponse) * @param qaService @@ -292,6 +187,7 @@ logger.debug("updated user response in the db: " + qaUsrResp); } + /** * hideResponse(HttpServletRequest request, String responseId) * @param qaService @@ -307,6 +203,7 @@ logger.debug("updated user response in the db: " + qaUsrResp); } + /** * unHideResponse(HttpServletRequest request, String responseId) * @param request Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/QAction.java,v diff -u -r1.24 -r1.25 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java 23 Feb 2006 19:33:21 -0000 1.24 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java 24 Feb 2006 15:05:59 -0000 1.25 @@ -1,23 +1,24 @@ -/* - *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * - *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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - *USA - * - *http://www.gnu.org/licenses/gpl.txt - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa.web; import java.io.FileNotFoundException; @@ -209,177 +210,6 @@ * @throws QaApplicationException the known runtime exception * */ - -// /** -// * loadQ(ActionMapping mapping, -// ActionForm form, -// HttpServletRequest request, -// HttpServletResponse response) throws IOException, -// ServletException -// -// * return ActionForward -// * main content/question content management and workflow logic -// * -// * if the passed toolContentId exists in the db, we need to get the relevant data into the Map -// * if not, create the default Map -// */ -// -// public ActionForward loadQ(ActionMapping mapping, -// ActionForm form, -// HttpServletRequest request, -// HttpServletResponse response) throws IOException, -// ServletException -// { -// -// AuthoringUtil authoringUtil= new AuthoringUtil(); -// -// authoringUtil.findSelectedTab(mapping, -// form, -// request, -// response); -// -// QaAuthoringForm qaAuthoringForm = (QaAuthoringForm) form; -// IQaService qaService =QaUtils.getToolService(request); -// -// /* -// * the status of define later is determined from the property inspector and -// * by now, we know whether it is on or off -// * -// * enable-disable tool html elements based on "define later" status -// */ -// -// /* -// * double check QaUtils.getDefineLaterStatus() -// */ -// boolean defineLaterStatus=QaUtils.getDefineLaterStatus(); -// -// Boolean defineLater=new Boolean(defineLaterStatus); -// logger.debug("defineLater: " + defineLater); -// if (defineLater.equals(new Boolean(false))) -// { -// request.getSession().setAttribute(IS_DEFINE_LATER,"false"); -// request.getSession().setAttribute(DISABLE_TOOL,""); -// } -// else -// { -// request.getSession().setAttribute(IS_DEFINE_LATER,"true"); -// request.getSession().setAttribute(DISABLE_TOOL,"disabled"); -// } -// -// /*retrieve the default question content map */ -// Map mapQuestionContent=(Map)request.getSession().getAttribute(MAP_QUESTION_CONTENT); -// logger.debug("MAP_QUESTION_CONTENT:" + request.getSession().getAttribute(MAP_QUESTION_CONTENT)); -// -// String userAction=""; -// userAction=getUserAction(qaAuthoringForm); -// logger.debug("returned userAction:" + userAction); -// -// QaUtils.persistRichText(request); -// -// /* add a new question to Map */ -// if (userAction.equalsIgnoreCase(ADD_NEW_QUESTION)) -// { -// request.getSession().setAttribute(EDITACTIVITY_EDITMODE, new Boolean(true)); -// authoringUtil.reconstructQuestionContentMapForAdd(mapQuestionContent, request); -// }/* delete a question*/ -// else if (userAction.equalsIgnoreCase(REMOVE_QUESTION)) -// { -// request.getSession().setAttribute(EDITACTIVITY_EDITMODE, new Boolean(true)); -// authoringUtil.reconstructQuestionContentMapForRemove(mapQuestionContent, request, qaAuthoringForm); -// } /* remove selected content*/ -//// else if (userAction.equalsIgnoreCase(REMOVE_ALL_CONTENT)) -//// { -//// authoringUtil.removeAllDBContent(request); -//// QaUtils.cleanupSession(request); -//// qaAuthoringForm.resetUserAction(); -//// return (mapping.findForward(LOAD_STARTER)); -//// } -// else if (userAction.equalsIgnoreCase(SUBMIT_OFFLINE_FILE)) -// { -// logger.debug("will submit offline file: " + userAction); -// addFileToContentRepository(request, qaAuthoringForm, true); -// logger.debug("offline file added to repository successfully."); -// qaAuthoringForm.resetUserAction(); -// request.getSession().setAttribute(CHOICE,CHOICE_TYPE_INSTRUCTIONS); -// logger.debug("forward back to instructions screen"); -// return (mapping.findForward(LOAD_QUESTIONS)); -// } -// else if (userAction.equalsIgnoreCase(SUBMIT_ONLINE_FILE)) -// { -// logger.debug("will submit online file: " + userAction); -// addFileToContentRepository(request, qaAuthoringForm, false); -// logger.debug("online file added to repository successfully."); -// qaAuthoringForm.resetUserAction(); -// request.getSession().setAttribute(CHOICE,CHOICE_TYPE_INSTRUCTIONS); -// logger.debug("forward back to instructions screen"); -// return (mapping.findForward(LOAD_QUESTIONS)); -// } -// else if (userAction.equalsIgnoreCase(SUBMIT_TAB_DONE)) -// { -// logger.debug("user is done with this tab."); -// qaAuthoringForm.resetUserAction(); -// return (mapping.findForward(LOAD_QUESTIONS)); -// }/*submit questions contained in the Map*/ -// else if (userAction.equalsIgnoreCase(SUBMIT_ALL_CONTENT)) -// { -// ActionMessages errors= new ActionMessages(); -// /* full form validation should be performed only in standard authoring mode, but not in monitoring EditActivity */ -// errors=validateSubmit(request, errors, qaAuthoringForm); -// -// if (errors.size() > 0) -// { -// logger.debug("returning back to from to fix errors:"); -// request.getSession().setAttribute(EDITACTIVITY_EDITMODE, new Boolean(true)); -// return (mapping.findForward(LOAD_QUESTIONS)); -// } -// -// /* -// * look after defineLater flag -// */ -// Long monitoredContentId=(Long)request.getSession().getAttribute(MONITORED_CONTENT_ID); -// logger.debug("MONITORED_CONTENT_ID: " + monitoredContentId); -// if (monitoredContentId != null) -// { -// qaService.unsetAsDefineLater(monitoredContentId); -// logger.debug("MONITORED_CONTENT_ID has been unset as defineLater: "); -// } -// -// List attachmentList = (List) request.getSession().getAttribute(ATTACHMENT_LIST); -// List deletedAttachmentList = (List) request.getSession().getAttribute(DELETED_ATTACHMENT_LIST); -// -// -// /*delete existing content from the database*/ -//// authoringUtil.removeAllDBContent(request); -// -//// QaContent qaContent=authoringUtil.createContent(mapQuestionContent, request, qaAuthoringForm); -// -// /*delete-recreate the questions in the db*/ -// authoringUtil.reconstructQuestionContentMapForSubmit(mapQuestionContent, request); -// -// QaContent qaContent = authoringUtil.saveOrUpdateQaContent(mapQuestionContent, request, qaAuthoringForm); -// -// saveAttachments(qaContent, attachmentList, deletedAttachmentList, mapping, request); -// -// /*give the user a feedback*/ -// errors.clear(); -// errors.add(Globals.ERROR_KEY, new ActionMessage("submit.successful")); -// logger.debug("submit successful."); -// saveErrors(request,errors); -// } -// else -// { -// logger.debug("Warning!: Uncatered-for user action: " + userAction); -// } -// -// qaAuthoringForm.resetUserAction(); -// -// /* -// ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, WebUtil.PARAM_MODE,MODE_OPTIONAL); -// logger.debug("retrieving mode: " + mode); -// */ -// return (mapping.findForward(LOAD_QUESTIONS)); -// } - public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); return (mapping.findForward(LOAD_QUESTIONS)); @@ -424,14 +254,6 @@ List attachmentList = (List) request.getSession().getAttribute(ATTACHMENT_LIST); List deletedAttachmentList = (List) request.getSession().getAttribute(DELETED_ATTACHMENT_LIST); - - /*delete existing content from the database*/ -// authoringUtil.removeAllDBContent(request); - -// QaContent qaContent=authoringUtil.createContent(mapQuestionContent, request, qaAuthoringForm); - - /*delete-recreate the questions in the db*/ - authoringUtil.reconstructQuestionContentMapForSubmit(mapQuestionContent, request); logger.debug("before saveOrUpdateQaContent."); @@ -440,7 +262,6 @@ saveAttachments(qaContent, attachmentList, deletedAttachmentList, mapping, request); - /*give the user a feedback*/ errors.clear(); errors.add(Globals.ERROR_KEY, new ActionMessage("submit.successful")); request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(1)); @@ -453,13 +274,6 @@ return mapping.findForward(LOAD_QUESTIONS); } -// public ActionForward submitTabDone(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) -// throws IOException, ServletException { -// QaAuthoringForm qaAuthoringForm = (QaAuthoringForm) form; -// qaAuthoringForm.resetUserAction(); -// return mapping.findForward(LOAD_QUESTIONS); -// } - public ActionForward addNewQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); @@ -505,8 +319,8 @@ request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); long uuid = WebUtil.readLongParam(request, UUID); - // move the file's details from the attachment collection to the deleted attachments collection - // the attachment will be delete on saving. + /* move the file's details from the attachment collection to the deleted attachments collection + the attachment will be delete on saving. */ List attachmentList = (List) request.getSession().getAttribute(ATTACHMENT_LIST); List deletedAttachmentList = (List) request.getSession().getAttribute(DELETED_ATTACHMENT_LIST); if(deletedAttachmentList == null) @@ -518,10 +332,6 @@ } - - - - /** * perform error validation on form submit * @@ -534,10 +344,9 @@ protected ActionMessages validateSubmit(HttpServletRequest request, ActionMessages errors, QaAuthoringForm qaAuthoringForm) { request.getSession().setAttribute(SUBMIT_SUCCESS, new Integer(0)); -// String richTextTitle=(String) request.getSession().getAttribute(RICHTEXT_TITLE); String title = qaAuthoringForm.getTitle(); logger.debug("title: " + title); -// String richTextInstructions=(String) request.getSession().getAttribute(RICHTEXT_INSTRUCTIONS); + String instructions = qaAuthoringForm.getInstructions(); logger.debug("instructions: " + instructions); @@ -580,56 +389,11 @@ } } - /* end of error validation */ - saveErrors(request,errors); return errors; } -// /** -// * determine the chosen user action -// * -// * String getUserAction(QaAuthoringForm qaAuthoringForm) -// * @param qaAuthoringForm -// * @return -// */ -// protected String getUserAction(QaAuthoringForm qaAuthoringForm) -// { -// String userAction=""; -// if (qaAuthoringForm.getAddContent() != null) -// { -// userAction=ADD_NEW_QUESTION; -// } -// else if (qaAuthoringForm.getRemoveContent() != null) -// { -// userAction=REMOVE_QUESTION; -// } -// else if (qaAuthoringForm.getRemoveAllContent() != null) -// { -// userAction=REMOVE_ALL_CONTENT; -// } -// else if (qaAuthoringForm.getSubmitTabDone() != null) -// { -// userAction=SUBMIT_TAB_DONE; -// } -// else if (qaAuthoringForm.getSubmitAllContent() != null) -// { -// userAction=SUBMIT_ALL_CONTENT; -// } -// else if (qaAuthoringForm.getSubmitOfflineFile() != null) -// { -// userAction=SUBMIT_OFFLINE_FILE; -// } -// else if (qaAuthoringForm.getSubmitOnlineFile() != null) -// { -// userAction=SUBMIT_ONLINE_FILE; -// } -// logger.debug("user action is: " + userAction); -// return userAction; -// } - - /** * This method manages the presentation Map for the learner mode. * The dispatch method to decide which view should be shown to the user. @@ -770,93 +534,11 @@ return null; } - /* Also cleanup session attributes */ - //QaUtils.cleanupSession(request); - logger.debug("forwarding to: " + LOAD_LEARNER); qaLearningForm.resetUserActions(); return (mapping.findForward(LOAD_LEARNER)); } - -// /** -// * used to load Monitoring tabs back once the controller moves to Edit Activity. -// * -// * ActionForward loadMonitoring(ActionMapping mapping, -// ActionForm form, -// HttpServletRequest request, -// HttpServletResponse response) throws IOException, -// ServletException -// -// * @param mapping -// * @param form -// * @param request -// * @param response -// * @return ActionForward -// * @throws IOException -// * @throws ServletException -// */ -// public ActionForward loadMonitoring(ActionMapping mapping, -// ActionForm form, -// HttpServletRequest request, -// HttpServletResponse response) throws IOException, -// ServletException -// { -// QaAuthoringForm qaAuthoringForm = (QaAuthoringForm) form; -// -// if (qaAuthoringForm.getSummaryMonitoring() != null) -// { -// logger.debug("request for getSummaryMonitoring, start proxying..."); -// logger.debug("NO_AVAILABLE_SESSIONS: " + request.getSession().getAttribute(NO_AVAILABLE_SESSIONS)); -// -// Boolean noAvailableSessions=(Boolean)request.getSession().getAttribute(NO_AVAILABLE_SESSIONS); -// logger.debug("NO_AVAILABLE_SESSIONS: " +noAvailableSessions); -// qaAuthoringForm.resetUserAction(); -// if ((noAvailableSessions != null) && (noAvailableSessions.booleanValue())) -// { -// persistError(request,"error.noStudentActivity"); -// request.setAttribute(START_MONITORING_SUMMARY_REQUEST, new Boolean(true)); -// request.setAttribute(STOP_RENDERING_QUESTIONS, new Boolean(true)); -// return (mapping.findForward(LOAD)); -// } -// else -// { -// logger.debug("NO_AVAILABLE_SESSIONS: " +false); -// QaMonitoringAction qaMonitoringAction=new QaMonitoringAction(); -// QaMonitoringForm qaMonitoringForm=new QaMonitoringForm(); -// return qaMonitoringAction.generateToolSessionDataMap(mapping,qaMonitoringForm,request,response); -// } -// } -// else if (qaAuthoringForm.getInstructionsMonitoring() != null) -// { -// logger.debug("QAction- request for getInstructionsMonitoring()"); -// qaAuthoringForm.resetUserAction(); -// QaMonitoringAction qaMonitoringAction=new QaMonitoringAction(); -// QaMonitoringForm qaMonitoringForm=new QaMonitoringForm(); -// qaMonitoringForm.setInstructions("instructions"); -// return qaMonitoringAction.generateToolSessionDataMap(mapping,qaMonitoringForm,request,response); -// } -// else if (qaAuthoringForm.getEditActivityMonitoring() != null) -// { -// logger.debug("QAction-request for getEditActivityMonitoring()"); -// QaStarterAction qaStarterAction = new QaStarterAction(); -// logger.debug("forwarding to Authoring Basic tab."); -// ActionForward actionForward=qaStarterAction.startMonitoringSummary(mapping, qaAuthoringForm, request, response); -// logger.debug("actionForward: " + actionForward); -// qaAuthoringForm.resetUserAction(); -// return (actionForward); -// } -// else if (qaAuthoringForm.getStatsMonitoring() != null) -// { -// qaAuthoringForm.resetUserAction(); -// QaMonitoringAction qaMonitoringAction=new QaMonitoringAction(); -// QaMonitoringForm qaMonitoringForm=new QaMonitoringForm(); -// qaMonitoringForm.setStats("stats"); -// return qaMonitoringAction.generateToolSessionDataMap(mapping,qaMonitoringForm,request,response); -// } -// return null; -// } - /** * persists error messages to request scope @@ -907,9 +589,6 @@ logger.debug("uploadedFile.getFileName(): " + uploadedFile.getFileName()); - // String toolContentId=(String)request.getSession().getAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID); - //QaContent qaContent = qaService.loadQa(Long.parseLong(toolContentId)); - // if a file with the same name already exists then move the old one to deleted deletedAttachmentList = QaUtils.moveToDelete(uploadedFile.getFileName(), isOnlineFile, attachmentList, deletedAttachmentList ); @@ -1015,6 +694,4 @@ return deletedAttachmentList; } - - } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/QaAuthoringForm.java,v diff -u -r1.8 -r1.9 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringForm.java 23 Feb 2006 19:33:21 -0000 1.8 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringForm.java 24 Feb 2006 15:05:59 -0000 1.9 @@ -1,15 +1,27 @@ -/* - * ozgurd - * Created on 26/04/2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa.web; -/* - * ActionForm for the Authoring environment - */ +/* ActionForm for the Authoring environment*/ import org.apache.struts.action.ActionForm; import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.apache.struts.upload.FormFile; @@ -31,7 +43,6 @@ protected String submitOnlineFile; protected String dispatch; - /* tab controller, these may go away once the Flash wraps the jsp */ protected String choice; protected String choiceBasic; protected String choiceAdvanced; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaEmptyForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/QaEmptyForm.java,v diff -u -r1.5 -r1.6 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaEmptyForm.java 6 Dec 2005 00:32:38 -0000 1.5 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaEmptyForm.java 24 Feb 2006 15:05:59 -0000 1.6 @@ -1,10 +1,24 @@ -/* - * ozgurd - * Created on 26/04/2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa.web; import org.apache.struts.action.ActionForm; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportPortfolioForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/QaExportPortfolioForm.java,v diff -u -r1.4 -r1.5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportPortfolioForm.java 6 Dec 2005 00:32:38 -0000 1.4 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportPortfolioForm.java 24 Feb 2006 15:06:00 -0000 1.5 @@ -1,10 +1,24 @@ -/* - * ozgurd - * Created on 26/04/2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa.web; import org.apache.struts.action.ActionForm; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportPortfolioStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/QaExportPortfolioStarterAction.java,v diff -u -r1.16 -r1.17 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportPortfolioStarterAction.java 5 Jan 2006 04:36:32 -0000 1.16 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportPortfolioStarterAction.java 24 Feb 2006 15:05:59 -0000 1.17 @@ -1,9 +1,24 @@ -/* - * Created on 8/03/2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ /** * @author Ozgur Demirtas @@ -63,24 +78,11 @@ { IQaService qaService=null; qaService = QaServiceProxy.getQaService(getServlet().getServletContext()); -// logger.debug("retrieved qaService : " + qaService); -// request.getSession().setAttribute(TOOL_SERVICE, qaService); - /* * persist time zone information to session scope. */ QaUtils.persistTimeZone(request); - /* - * mark the http session as an export portfolio activity - */ - - //request.getSession().setAttribute(TARGET_MODE,TARGET_MODE_EXPORT_PORTFOLIO); - - /* - * obtain and setup the current user's data - */ - /* get session from shared session.*/ HttpSession ss = SessionManager.getSession(); /* get back login user DTO */ Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/QaLearningForm.java,v diff -u -r1.5 -r1.6 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningForm.java 6 Dec 2005 00:32:38 -0000 1.5 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningForm.java 24 Feb 2006 15:05:59 -0000 1.6 @@ -1,10 +1,24 @@ -/* - * ozgurd - * Created on 26/04/2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa.web; /** Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java,v diff -u -r1.18 -r1.19 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java 23 Feb 2006 19:33:21 -0000 1.18 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java 24 Feb 2006 15:05:59 -0000 1.19 @@ -1,8 +1,24 @@ -/** - * Created on 8/03/2005 - * initializes the tool's learning mode - */ - +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa.web; import java.io.IOException; import java.util.Iterator; @@ -36,11 +52,6 @@ import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; -/** - * TO DO: - * remove line: - * Long currentToolContentId= new Long(4321); - */ /** * Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java,v diff -u -r1.10 -r1.11 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java 5 Jan 2006 04:36:32 -0000 1.10 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java 24 Feb 2006 15:05:59 -0000 1.11 @@ -72,7 +72,6 @@ QaMonitoringForm qaMonitoringForm = (QaMonitoringForm) form; IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext()); -// qaService =(IQaService)request.getSession().getAttribute(TOOL_SERVICE); /* * persist time zone information to session scope. @@ -103,24 +102,10 @@ logger.debug("TOOL_USER is:" + user); -// String toolContentId=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID); Long toolContentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID)); logger.debug("TOOL_CONTENT_ID: " + toolContentId); qaMonitoringForm.setToolContentID(toolContentId); -// Long initialMonitoringContentId=(Long) request.getSession().getAttribute(INITIAL_MONITORING_TOOL_CONTENT_ID); -// logger.debug("INITIAL_MONITORING_TOOL_CONTENT_ID: " + initialMonitoringContentId); -// -// if ((toolContentId == null) || (toolContentId.length() == 0)) -// { -// logger.debug(logger + "Warning!: toolContentId is not available!"); -// } -// else if (initialMonitoringContentId != null) -// { -// logger.debug("using INITIAL_MONITORING_TOOL_CONTENT_ID: " + initialMonitoringContentId); -// toolContentId=initialMonitoringContentId.toString(); -// } - try { if ((toolContentId != null) && (toolContentId.longValue() != 0)) @@ -132,7 +117,6 @@ logger.debug("forwarding to: " + MONITORING_ERROR); return (mapping.findForward(MONITORING_REPORT)); } -// request.getSession().setAttribute(INITIAL_MONITORING_TOOL_CONTENT_ID, new Long(toolContentId)); } } catch(NumberFormatException e) @@ -143,18 +127,6 @@ return (mapping.findForward(MONITORING_REPORT)); } -// /* -// * load the values for online and offline instructions -// */ -// initialMonitoringContentId=(Long)request.getSession().getAttribute(INITIAL_MONITORING_TOOL_CONTENT_ID); -// if (initialMonitoringContentId != null) -// { -// QaContent qaContent=qaService.retrieveQa(initialMonitoringContentId.longValue()); -// logger.debug("qaContent: " + qaContent); -// request.getSession().setAttribute(MONITORED_OFFLINE_INSTRUCTIONS, qaContent.getOfflineInstructions()); -// request.getSession().setAttribute(MONITORED_ONLINE_INSTRUCTIONS, qaContent.getOnlineInstructions()); -// logger.debug("session updated with online/offline instructions"); -// } /* * find out if only content id but no tool sessions has been passed @@ -363,7 +335,7 @@ QaMonitoringForm qaMonitoringForm = (QaMonitoringForm) form; IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext()); logger.debug("retrieving qaService: " + qaService); -// Long toolContentId=(Long)request.getSession().getAttribute(INITIAL_MONITORING_TOOL_CONTENT_ID); + Long toolContentId = qaMonitoringForm.getToolContentID(); logger.debug("toolContentId: " + toolContentId); @@ -457,55 +429,8 @@ QaMonitoringForm qaMonitoringForm = (QaMonitoringForm) form; IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext()); -// Boolean noToolSessionsAvailable=(Boolean)request.getSession().getAttribute(NO_TOOL_SESSIONS_AVAILABLE); -// logger.debug("generateSummaryScreen has noToolSessionsAvailable: " + noToolSessionsAvailable); -// if ((noToolSessionsAvailable !=null) && (noToolSessionsAvailable.booleanValue())) -// { -// qaMonitoringForm.resetUserAction(); -// logger.debug("detected noToolSessionsAvailable:" + noToolSessionsAvailable); -// persistError(request,"error.content.noToolSessions"); -// request.setAttribute(USER_EXCEPTION_ONLYCONTENT_ANDNOSESSIONS, new Boolean(true)); -// logger.debug("forwarding to: " + MONITORING_REPORT); -// return (mapping.findForward(MONITORING_REPORT)); -// } MonitoringUtil monitoringUtil = new MonitoringUtil(); -// String responseId=qaMonitoringForm.getResponseId(); -// String hiddenResponseId=qaMonitoringForm.getHiddenResponseId(); -// String unHiddenResponseId=qaMonitoringForm.getUnHiddenResponseId(); - -// if (qaMonitoringForm.getEditReport() != null) -// { -// logger.debug("responseId for editReport" + responseId); -// request.getSession().setAttribute(DATAMAP_EDITABLE_RESPONSE_ID, responseId); -// } -// else if (qaMonitoringForm.getUpdateReport() != null) -// { -// logger.debug("request for responseUpdate with id: " + request.getSession().getAttribute(DATAMAP_EDITABLE_RESPONSE_ID)); -// responseId=(String)request.getSession().getAttribute(DATAMAP_EDITABLE_RESPONSE_ID); -// String updatedResponse=qaMonitoringForm.getUpdatedResponse(); -// monitoringUtil.updateResponse(qaService, responseId, updatedResponse); -// request.getSession().setAttribute(DATAMAP_EDITABLE_RESPONSE_ID, ""); -// logger.debug("end of updateResponse with: " + responseId + "-" + updatedResponse); -// } -// -// if (qaMonitoringForm.getHideReport() != null) -// { -// logger.debug("hiddenResponseId for hideReport" + hiddenResponseId); -// request.getSession().setAttribute(DATAMAP_HIDDEN_RESPONSE_ID, hiddenResponseId); -// monitoringUtil.hideResponse(qaService, hiddenResponseId); -// } -// -// if (qaMonitoringForm.getUnhideReport() != null) -// { -// logger.debug("hiddenResponseId for unHideReport" + unHiddenResponseId); -// request.getSession().setAttribute(DATAMAP_HIDDEN_RESPONSE_ID, ""); -// monitoringUtil.unHideResponse(qaService, unHiddenResponseId); -// } - -// logger.debug("DATAMAP_EDITABLE_RESPONSE_ID: " + request.getSession().getAttribute(DATAMAP_EDITABLE_RESPONSE_ID)); -// logger.debug("DATAMAP_HIDDEN_RESPONSE_ID: " + request.getSession().getAttribute(DATAMAP_HIDDEN_RESPONSE_ID)); - qaMonitoringForm.setUpdatedResponse(""); logger.debug("request for summary"); @@ -891,730 +816,7 @@ return showSummary(mapping, form, request, response); } - -// public ActionForward generateToolSessionDataMap(ActionMapping mapping, -// ActionForm form, -// HttpServletRequest request, -// HttpServletResponse response) throws IOException, ServletException -// { -// QaMonitoringForm qaMonitoringForm = (QaMonitoringForm) form; -// MonitoringUtil monitoringUtil = new MonitoringUtil(); -// monitoringUtil.findSelectedMonitoringTab(form, request); -// logger.debug("done with findSelectedMonitoringTab"); -// -// /* -// * load the values for online and offline instructions -// */ -// handleInstructionsScreen(mapping, form, request); -// IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext()); -// Long initialMonitoringContentId=(Long)request.getSession().getAttribute(INITIAL_MONITORING_TOOL_CONTENT_ID); -// if (initialMonitoringContentId != null) -// { -// QaContent qaContent=qaService.retrieveQa(initialMonitoringContentId.longValue()); -// logger.debug("qaContent: " + qaContent); -// request.getSession().setAttribute(MONITORED_OFFLINE_INSTRUCTIONS, qaContent.getOfflineInstructions()); -// request.getSession().setAttribute(MONITORED_ONLINE_INSTRUCTIONS, qaContent.getOnlineInstructions()); -// logger.debug("session updated with online/offline instructions"); -// } -// -// /* -// * determine what screen(tab) to generate -// */ -// String choiceMonitoring=(String)request.getSession().getAttribute(CHOICE_MONITORING); -// logger.debug("CHOICE_MONITORING: " + choiceMonitoring); -// -// if (choiceMonitoring.equalsIgnoreCase(CHOICE_TYPE_MONITORING_SUMMARY)) -// { -// logger.debug("will generate summary screen"); -// return generateSummaryScreen(mapping, form, request, response); -// } -// else if (choiceMonitoring.equalsIgnoreCase(CHOICE_TYPE_MONITORING_INSTRUCTIONS)) -// { -// logger.debug("will generate instructions screen"); -// request.getSession().setAttribute(MONITORING_INSTRUCTIONS_VISITED, new Boolean(true)); -// return generateInstructionsScreen(mapping, form, request, response); -// } -// else if (choiceMonitoring.equalsIgnoreCase(CHOICE_TYPE_MONITORING_EDITACTIVITY)) -// { -// logger.debug("will generate editActivity screen"); -// request.getSession().setAttribute(MONITORING_EDITACTIVITY_VISITED, new Boolean(true)); -// return generateEditActivityScreen(mapping, form, request, response); -// } -// else if (choiceMonitoring.equalsIgnoreCase(CHOICE_TYPE_MONITORING_STATS)) -// { -// logger.debug("will generate stats screen"); -// request.getSession().setAttribute(MONITORING_STATS_VISITED, new Boolean(true)); -// return generateStatsScreen(mapping, form, request, response); -// } -// return null; -// } - - -// /** -// * -// * produces the summary screen -// * ActionForward generateSummaryScreen(ActionMapping mapping, -// ActionForm form, -// HttpServletRequest request, -// HttpServletResponse response) throws IOException, -// ServletException -// * -// * @param mapping -// * @param form -// * @param request -// * @param response -// * @return ActionForward -// * @throws IOException -// * @throws ServletException -// */ -// public ActionForward generateSummaryScreen(ActionMapping mapping, -// ActionForm form, -// HttpServletRequest request, -// HttpServletResponse response) throws IOException, -// ServletException -// { -// QaMonitoringForm qaMonitoringForm = (QaMonitoringForm) form; -// IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext()); -// -// Boolean noToolSessionsAvailable=(Boolean)request.getSession().getAttribute(NO_TOOL_SESSIONS_AVAILABLE); -// logger.debug("generateSummaryScreen has noToolSessionsAvailable: " + noToolSessionsAvailable); -// if ((noToolSessionsAvailable !=null) && (noToolSessionsAvailable.booleanValue())) -// { -// qaMonitoringForm.resetUserAction(); -// logger.debug("detected noToolSessionsAvailable:" + noToolSessionsAvailable); -// persistError(request,"error.content.noToolSessions"); -// request.setAttribute(USER_EXCEPTION_ONLYCONTENT_ANDNOSESSIONS, new Boolean(true)); -// logger.debug("forwarding to: " + MONITORING_REPORT); -// return (mapping.findForward(MONITORING_REPORT)); -// } -// -// MonitoringUtil monitoringUtil = new MonitoringUtil(); -// String responseId=qaMonitoringForm.getResponseId(); -// String hiddenResponseId=qaMonitoringForm.getHiddenResponseId(); -// String unHiddenResponseId=qaMonitoringForm.getUnHiddenResponseId(); -// -// if (qaMonitoringForm.getEditReport() != null) -// { -// logger.debug("responseId for editReport" + responseId); -// request.getSession().setAttribute(DATAMAP_EDITABLE_RESPONSE_ID, responseId); -// } -// else if (qaMonitoringForm.getUpdateReport() != null) -// { -// logger.debug("request for responseUpdate with id: " + request.getSession().getAttribute(DATAMAP_EDITABLE_RESPONSE_ID)); -// responseId=(String)request.getSession().getAttribute(DATAMAP_EDITABLE_RESPONSE_ID); -// String updatedResponse=qaMonitoringForm.getUpdatedResponse(); -// monitoringUtil.updateResponse(qaService, responseId, updatedResponse); -// request.getSession().setAttribute(DATAMAP_EDITABLE_RESPONSE_ID, ""); -// logger.debug("end of updateResponse with: " + responseId + "-" + updatedResponse); -// } -// -// if (qaMonitoringForm.getHideReport() != null) -// { -// logger.debug("hiddenResponseId for hideReport" + hiddenResponseId); -// request.getSession().setAttribute(DATAMAP_HIDDEN_RESPONSE_ID, hiddenResponseId); -// monitoringUtil.hideResponse(qaService, hiddenResponseId); -// } -// -// if (qaMonitoringForm.getUnhideReport() != null) -// { -// logger.debug("hiddenResponseId for unHideReport" + unHiddenResponseId); -// request.getSession().setAttribute(DATAMAP_HIDDEN_RESPONSE_ID, ""); -// monitoringUtil.unHideResponse(qaService, unHiddenResponseId); -// } -// -// logger.debug("DATAMAP_EDITABLE_RESPONSE_ID: " + request.getSession().getAttribute(DATAMAP_EDITABLE_RESPONSE_ID)); -// logger.debug("DATAMAP_HIDDEN_RESPONSE_ID: " + request.getSession().getAttribute(DATAMAP_HIDDEN_RESPONSE_ID)); -// -// qaMonitoringForm.setUpdatedResponse(""); -// logger.debug("request for summary"); -// -// String isToolSessionChanged=request.getParameter(IS_TOOL_SESSION_CHANGED); -// logger.debug("IS_TOOL_SESSION_CHANGED - initial: " + isToolSessionChanged); -// -// /* -// * sessionList holds all the toolSessionIds passed to summary page to be presented in a drop-down box. -// */ -// Map sessionList = new TreeMap(); -// int SELECTION_CASE=0; -// -// logger.debug("isNonDefaultScreensVisited: " + monitoringUtil.isNonDefaultScreensVisited(request)); -// -// /* -// * Following conditions test which entry has been selected in the monitoring mode-summary screen drop box. -// * is Default page -// */ -// String selectionCase=(String)request.getSession().getAttribute("selectionCase"); -// logger.debug("current selectionCase: " + selectionCase); -// -// boolean sessionListReadable=false; -// if ((isToolSessionChanged == null) && !monitoringUtil.isNonDefaultScreensVisited(request)) -// { -// logger.debug("First case based on null. Gets rendered only once in http session life time"); -// logger.debug("summary to use MAX_TOOL_SESSION_COUNT"); -// /* -// * initialize sessionList with "All", which is the default option. -// */ -// sessionList.put("All", "All"); -// READABLE_TOOL_SESSION_COUNT=MAX_TOOL_SESSION_COUNT; -// SELECTION_CASE=1; -// } -// else if ((isToolSessionChanged == null) && monitoringUtil.isNonDefaultScreensVisited(request)) -// { -// logger.debug("Other tabs visited. Gets rendered for all tool sessions"); -// sessionList.put("All", "All"); -// READABLE_TOOL_SESSION_COUNT=MAX_TOOL_SESSION_COUNT; -// SELECTION_CASE=2; -// sessionListReadable=true; -// } -// else if ((isToolSessionChanged != null) && isToolSessionChanged.equalsIgnoreCase("1")) -// { -// String selectedToolSessionId=(String)request.getParameter("toolSessionId1"); -// logger.debug("selectedToolSessionId" + selectedToolSessionId); -// /* -// * is "All" selected -// */ -// if (selectedToolSessionId.equalsIgnoreCase("All")) -// { -// logger.debug("Second case"); -// logger.debug("summary to use MAX_TOOL_SESSION_COUNT"); -// /* -// * initialize sessionList with "All", which is the default option. -// */ -// sessionList.put("All", "All"); -// READABLE_TOOL_SESSION_COUNT=MAX_TOOL_SESSION_COUNT; -// SELECTION_CASE=2; -// sessionListReadable=true; -// } -// else -// { -// /* -// * is a single session id selected -// */ -// logger.debug("Third case"); -// logger.debug("selectedToolSessionId" + selectedToolSessionId); -// READABLE_TOOL_SESSION_COUNT=new Integer(2); -// SELECTION_CASE=3; -// request.getSession().setAttribute(CURRENT_MONITORED_TOOL_SESSION,selectedToolSessionId); -// logger.debug("CURRENT_MONITORED_TOOL_SESSION " + selectedToolSessionId); -// } -// } -// else if (isToolSessionChanged.equals("") && (selectionCase.equals("3"))) -// { -// /* -// * is a single session id selected -// */ -// logger.debug("case with single session and edit or update selected"); -// READABLE_TOOL_SESSION_COUNT=new Integer(2); -// SELECTION_CASE=3; -// } -// else if (isToolSessionChanged.equals("")) -// { -// logger.debug("All is selected"); -// sessionList.put("All", "All"); -// READABLE_TOOL_SESSION_COUNT=MAX_TOOL_SESSION_COUNT; -// SELECTION_CASE=2; -// sessionListReadable=true; -// } -// logger.debug("final SELECTION_CASE: " + SELECTION_CASE); -// -// boolean useSelectedToolSessionId=false; -// String selectedToolSessionId = (String) request.getSession().getAttribute(CURRENT_MONITORED_TOOL_SESSION); -// if ((selectedToolSessionId != null) && (SELECTION_CASE == 3) && (READABLE_TOOL_SESSION_COUNT.intValue() == 2)) -// { -// useSelectedToolSessionId=true; -// } -// -// if ((qaMonitoringForm.getEditReport() == null) && (qaMonitoringForm.getUpdateReport() == null)) -// { -// logger.debug("no editReport or updateReport selected"); -// request.getSession().setAttribute(DATAMAP_EDITABLE_RESPONSE_ID, ""); -// request.getSession().setAttribute("selectionCase",new Long(SELECTION_CASE).toString()); -// } -// qaMonitoringForm.resetUserAction(); -// -// /* -// * holds all the toolSessionIds passed in the form toolSessionId1, toolSessionId2 etc. -// */ -// Map mapToolSessions= new TreeMap(new QaStringComparator()); -// request.getSession().setAttribute(MAP_TOOL_SESSIONS,mapToolSessions); -// logger.debug("MAP_TOOL_SESSIONS placed into session"); -// -// Map mapUserResponses= new TreeMap(new QaStringComparator()); -// request.getSession().setAttribute(MAP_USER_RESPONSES,mapUserResponses); -// logger.debug("MAP_USER_RESPONSES placed into session"); -// logger.debug("request for contributeLesson"); -// /* -// * monitoring reads all the toolSessionsIds appended one after other until it finds a null one. The cap was limited to 500. -// * This is the case all the tool sessions are using the same content. -// * -// * The final Map mapToolSessions holds the Map mapQuestions which in turn holds the Map mapUserResponses. -// * The key of mapToolSessions: incremental numbers -// * The key of mapQuestions: questions themselves -// * The key of mapUserResponses: incremental numbers -// * -// */ -// -// request.getSession().setAttribute(NO_AVAILABLE_SESSIONS,new Boolean(false)); -// logger.debug("NO_AVAILABLE_SESSIONS: " + false); -// -// logger.debug("retrieving ORIGINAL_TOOL_SESSIONS"); -// Map originalSessionList=(Map)request.getSession().getAttribute(ORIGINAL_TOOL_SESSIONS); -// logger.debug("retrieved ORIGINAL_TOOL_SESSIONS : " + originalSessionList); -// /* -// * monitoredToolSessionsCounter holds the total number of valid toolSessionIds passed to the monitoring url -// */ -// logger.debug("READABLE_TOOL_SESSION_COUNT: " + READABLE_TOOL_SESSION_COUNT); -// int monitoredToolSessionsCounter=0; -// for (int toolSessionIdCounter=1; toolSessionIdCounter < READABLE_TOOL_SESSION_COUNT.intValue(); toolSessionIdCounter++) -// { -// logger.debug("toolSessionIdCounter: " + toolSessionIdCounter); -// String strToolSessionId=""; -// if (useSelectedToolSessionId) -// { -// strToolSessionId=(String) request.getSession().getAttribute(CURRENT_MONITORED_TOOL_SESSION); -// logger.debug("using strToolSessionId: " +strToolSessionId); -// } -// else -// { -// strToolSessionId=(String) originalSessionList.get(""+toolSessionIdCounter); -// logger.debug("using strToolSessionId from the session: "); -// } -// logger.debug("original strToolSessionId: " + strToolSessionId); -// -// String strRetrievableToolSessionId=""; -// /* -// * catering for un-formatted monitoring url -// * Watch for case where the "All" is selected in the drop-down. -// */ -// logger.debug("SELECTION_CASE: " + SELECTION_CASE); -// if ((strToolSessionId == null) && (SELECTION_CASE == 1)) -// { -// logger.debug("un-formatted monitoring url, exiting..."); -// break; -// } -// else if ((!sessionListReadable) && ((strToolSessionId == null) || (strToolSessionId.length() == 0))) -// { -// logger.debug("un-formatted monitoring url, exiting..."); -// break; -// } -// else -// { -// if (sessionListReadable) -// { -// logger.debug("sessionListReadable is true."); -// logger.debug("strToolSessionId is All: " + strToolSessionId); -// sessionList=(Map)request.getSession().getAttribute(SUMMARY_TOOL_SESSIONS); -// logger.debug("toolSessionIdCounter: " + toolSessionIdCounter); -// logger.debug(logger + " " + this.getClass().getName() + "sessionList size: " + sessionList.size()); -// -// if (toolSessionIdCounter==sessionList.size()) -// { -// logger.debug("sessionList size equals toolSessionIdCounter, exiting..."); -// break; -// } -// -// logger.debug("sessionList: " + sessionList); -// strToolSessionId=(String)sessionList.get("Group" + toolSessionIdCounter); -// logger.debug("strToolSessionId from sessionList: " + strToolSessionId); -// } -// -// strRetrievableToolSessionId=strToolSessionId; -// logger.debug("retrievableStrToolSessionId: " + strRetrievableToolSessionId); -// -// QaSession qaSession=qaService.retrieveQaSessionOrNullById(new Long(strRetrievableToolSessionId).longValue()); -// logger.debug("retrieving qaSession: " + qaSession); -// -// if (qaSession !=null) -// { -// monitoredToolSessionsCounter++; -// request.getSession().setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, new Long(strToolSessionId)); -// logger.debug("TOOL_SESSION_ID in session"); -// -// if (READABLE_TOOL_SESSION_COUNT.equals(MAX_TOOL_SESSION_COUNT)) -// { -// logger.debug("default screen - READABLE_TOOL_SESSION_COUNT equals MAX_TOOL_SESSION_COUNT"); -// /* -// * add the current toolSessionId to the arraylist for the drop-down box -// */ -// sessionList.put("Group" + monitoredToolSessionsCounter, strToolSessionId); -// logger.debug("sessionList Map new entry, strToolSessionId added to the list: " + toolSessionIdCounter + "->" + strToolSessionId ); -// } -// -// /* -// * get to content from the tool session -// */ -// QaContent qaContent=qaSession.getQaContent(); -// logger.debug("using qaContent: " + qaContent); -// logger.debug("Monitor - contribute will be using TOOL_CONTENT_ID: " + qaContent.getQaContentId()); -// -// /* -// * editActivity-defineLater screen depends on MONITORED_CONTENT_ID -// */ -// request.getSession().setAttribute(MONITORED_CONTENT_ID,qaContent.getQaContentId()); -// -// /* -// * place it into TOOL_CONTENT_ID session attribute since learningUtil.buidLearnerReport(request) depends on it -// * to generate a report -// */ -// request.getSession().setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID,qaContent.getQaContentId()); -// -// /* -// * this is to convince jsp although usernameVisible applies only to learning mode -// */ -// request.getSession().setAttribute(IS_USERNAME_VISIBLE, new Boolean(true)); -// -// logger.debug("REPORT_TITLE_MONITOR: " + qaContent.getMonitoringReportTitle()); -// request.getSession().setAttribute(REPORT_TITLE_MONITOR,qaContent.getMonitoringReportTitle()); -// -// -// /* -// * check if the author requires that the all tool sessions must be COMPLETED before the report in Monitoring -// */ -// boolean isAllSessionsCompleted=monitoringUtil.isSessionsSync(qaContent); -// logger.debug("Monitor - contribute will be using isAllSessionsCompleted: " + isAllSessionsCompleted); -// logger.debug("Monitor - contribute will be using isSynchInMonitor: " + qaContent.isSynchInMonitor()); -// /* -// * if the author requires syncronization but not all the sessions are COMPLETED give an error -// */ -// if (qaContent.isSynchInMonitor() && (!isAllSessionsCompleted)) -// { -// request.getSession().setAttribute(CHECK_ALL_SESSIONS_COMPLETED, new Boolean(true)); -// request.getSession().setAttribute(IS_ALL_SESSIONS_COMPLETED, new Boolean(isAllSessionsCompleted)); -// -// ActionMessages errors= new ActionMessages(); -// errors.add(Globals.ERROR_KEY, new ActionMessage("error.synchInMonitor")); -// logger.debug("add synchInMonitor to ActionMessages"); -// saveErrors(request,errors); -// } -// else -// { -// request.getSession().setAttribute(CHECK_ALL_SESSIONS_COMPLETED, new Boolean(false)); -// } -// logger.debug("IS_ALL_SESSIONS_COMPLETED:" + request.getSession().getAttribute(IS_ALL_SESSIONS_COMPLETED)); -// logger.debug("CHECK_ALL_SESSIONS_COMPLETED" + request.getSession().getAttribute(CHECK_ALL_SESSIONS_COMPLETED)); -// -// LearningUtil learningUtil= new LearningUtil(); -// /* -// * generate a report for the Author/Teacher -// */ -// logger.debug("calling buidMonitoringReport with toolSessionIdCounter:" + toolSessionIdCounter); -// learningUtil.buidLearnerReport(request, toolSessionIdCounter, qaService); -// } -// } -// } -// -// /* -// * store the arrayList in the session -// */ -// if (READABLE_TOOL_SESSION_COUNT.equals(MAX_TOOL_SESSION_COUNT)) -// { -// logger.debug("sessionList storable"); -// request.getSession().setAttribute(SUMMARY_TOOL_SESSIONS,sessionList); -// logger.debug("SUMMARY_TOOL_SESSIONS stored into the session:" + request.getSession().getAttribute(SUMMARY_TOOL_SESSIONS)); -// } -// -// mapToolSessions=(Map)request.getSession().getAttribute(MAP_TOOL_SESSIONS); -// logger.debug("before forwarding MAP_TOOL_SESSIONS:" + mapToolSessions); -// -// if (mapToolSessions.size() == 0) -// { -// request.getSession().setAttribute(NO_AVAILABLE_SESSIONS,new Boolean(true)); -// logger.debug("NO_AVAILABLE_SESSIONS: " +true); -// ActionMessages errors= new ActionMessages(); -// errors.add(Globals.ERROR_KEY, new ActionMessage("error.noStudentActivity")); -// logger.debug("add error.noStudentActivity to ActionMessages"); -// saveErrors(request,errors); -// } -// -// Boolean noAvailableSessions=(Boolean) request.getSession().getAttribute(NO_AVAILABLE_SESSIONS); -// logger.debug("before forwarding NO_AVAILABLE_SESSIONS:" + noAvailableSessions); -// -// Map mapMonitoringQuestions=(Map)request.getSession().getAttribute(MAP_MONITORING_QUESTIONS); -// logger.debug("before forwarding MAP_MONITORING_QUESTIONS:" + mapMonitoringQuestions); -// -// String targetMode=(String )request.getSession().getAttribute(TARGET_MODE); -// logger.debug("TARGET_MODE: " + targetMode); -// return (mapping.findForward(MONITORING_REPORT)); -// } - -// /** -// * produces the Instructions screen -// * -// * ActionForward generateInstructionsScreen(ActionMapping mapping, -// ActionForm form, -// HttpServletRequest request, -// HttpServletResponse response) throws IOException, -// ServletException -// * -// * @param mapping -// * @param form -// * @param request -// * @param response -// * @return ActionForward -// * @throws IOException -// * @throws ServletException -// */ -// public ActionForward generateInstructionsScreen(ActionMapping mapping, -// ActionForm form, -// HttpServletRequest request, -// HttpServletResponse response) throws IOException, -// ServletException -// { -// logger.debug(logger + " " + this.getClass().getName() + "will generateInstructionsScreen."); -// QaMonitoringForm qaMonitoringForm = (QaMonitoringForm) form; -// -// Long initialMonitoringContentId=(Long)request.getSession().getAttribute(INITIAL_MONITORING_TOOL_CONTENT_ID); -// if (initialMonitoringContentId == null) -// { -// logger.debug("missing content id:"); -// persistError(request,"error.tab.contentId.required"); -// request.setAttribute(USER_EXCEPTION_MONITORINGTAB_CONTENTID_REQUIRED, new Boolean(true)); -// logger.debug("forwarding to: " + MONITORING_REPORT); -// return (mapping.findForward(MONITORING_REPORT)); -// } -// -// qaMonitoringForm.resetUserAction(); -// return (mapping.findForward(MONITORING_REPORT)); -// } - -// /** -// * produces the EditActivity screen -// * -// * ActionForward generateEditActivityScreen(ActionMapping mapping, -// ActionForm form, -// HttpServletRequest request, -// HttpServletResponse response) throws IOException, -// ServletException -// * -// * @param mapping -// * @param form -// * @param request -// * @param response -// * @return ActionForward -// * @throws IOException -// * @throws ServletException -// */ -// public ActionForward generateEditActivityScreen(ActionMapping mapping, -// ActionForm form, -// HttpServletRequest request, -// HttpServletResponse response) throws IOException, -// ServletException -// { -// QaMonitoringForm qaMonitoringForm = (QaMonitoringForm) form; -// -// request.getSession().setAttribute(CONTENT_LOCKED, new Boolean(false)); -// IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext()); -// logger.debug("retrieving qaService: " + qaService); -// -// Long toolContentId=(Long)request.getSession().getAttribute(INITIAL_MONITORING_TOOL_CONTENT_ID); -// logger.debug("toolContentId: " + toolContentId); -// -// if (toolContentId == null) -// { -// /* -// * toolContentId is not available from the toolSessions passed to the monitoring url. -// * in this case, toolContentId must have been passed separetely -// */ -// Long monitoredContentId=(Long)request.getSession().getAttribute(MONITORED_CONTENT_ID); -// logger.debug("will generateEditActivityScreen: " + monitoredContentId); -// -// if (monitoredContentId == null) -// { -// throw new QaApplicationException("Exception occured: " + -// "Tool expects a legitimate TOOL_CONTENT_ID from the container since it is also not available from the toolSession(s) passed. Can't continue!"); -// } -// toolContentId=monitoredContentId; -// } -// request.getSession().setAttribute(MONITORED_CONTENT_ID, toolContentId); -// -// logger.debug("will use monitoredContentId: " + toolContentId); -// QaContent qaContent=qaService.loadQa(toolContentId.longValue()); -// logger.debug("will use qaContent: " + qaContent); -// -// request.getSession().setAttribute(IS_MONITORING_DEFINE_LATER, new Boolean(qaContent.isDefineLater())); -// logger.debug("IS_MONITORING_DEFINE_LATER: " + request.getSession().getAttribute(IS_MONITORING_DEFINE_LATER)); -// -// logger.debug("calling studentActivityOccurredGlobal with: " + qaContent); -// boolean studentActivity=qaService.studentActivityOccurredGlobal(qaContent); -// logger.debug("studentActivity on content: " + studentActivity); -// -// qaMonitoringForm.resetUserAction(); -// if (studentActivity == false) -// { -// /* -// * forward to Authoring Basic tab -// */ -// QaStarterAction qaStarterAction = new QaStarterAction(); -// QaAuthoringForm qaAuthoringForm = new QaAuthoringForm(); -// logger.debug("forward to Authoring Basic tab "); -// ActionForward actionForward=qaStarterAction.startMonitoringSummary(mapping, qaAuthoringForm, request, response); -// logger.debug("actionForward: " + actionForward); -// return (actionForward); -// } -// else -// { -// logger.debug("forward to warning screen as the content is not allowed to be modified."); -// ActionMessages errors= new ActionMessages(); -// errors.add(Globals.ERROR_KEY, new ActionMessage("error.content.inUse")); -// saveErrors(request,errors); -// request.getSession().setAttribute(CONTENT_LOCKED, new Boolean(true)); -// request.setAttribute(START_MONITORING_SUMMARY_REQUEST, new Boolean(true)); -// logger.debug("forwarding to:" + LOAD); -// return (mapping.findForward(LOAD)); -// } -// } -// /** -// * produces the Stats screen -// * -// * ActionForward generateStatsScreen(ActionMapping mapping, -// ActionForm form, -// HttpServletRequest request, -// HttpServletResponse response) throws IOException, -// ServletException -// * -// * @param mapping -// * @param form -// * @param request -// * @param response -// * @return -// * @throws IOException -// * @throws ServletException -// */ -// public ActionForward generateStatsScreen(ActionMapping mapping, -// ActionForm form, -// HttpServletRequest request, -// HttpServletResponse response) throws IOException, -// ServletException -// { -// QaMonitoringForm qaMonitoringForm = (QaMonitoringForm) form; -// Boolean noToolSessionsAvailable=(Boolean)request.getSession().getAttribute(NO_TOOL_SESSIONS_AVAILABLE); -// if ((noToolSessionsAvailable !=null) && (noToolSessionsAvailable.booleanValue())) -// { -// qaMonitoringForm.resetUserAction(); -// logger.debug("detected noToolSessionsAvailable:" + noToolSessionsAvailable); -// persistError(request,"error.content.noToolSessions"); -// request.setAttribute(USER_EXCEPTION_ONLYCONTENT_ANDNOSESSIONS, new Boolean(true)); -// logger.debug("forwarding to: " + MONITORING_REPORT); -// return (mapping.findForward(MONITORING_REPORT)); -// } -// -// IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext()); -// logger.debug("retrieving qaService: " + qaService); -// -// Map mapStats= new TreeMap(new QaStringComparator()); -// request.getSession().setAttribute(MAP_STATS,mapStats); -// -// Map sessionList=(Map)request.getSession().getAttribute(SUMMARY_TOOL_SESSIONS); -// for (int toolSessionIdCounter=1; toolSessionIdCounter < READABLE_TOOL_SESSION_COUNT.intValue(); toolSessionIdCounter++) -// { -// String strToolSessionId=(String)sessionList.get("Group" + toolSessionIdCounter); -// logger.debug("strToolSessionId from http session: " + strToolSessionId); -// if ((strToolSessionId != null) && (strToolSessionId.length() > 0)) -// { -// QaSession qaSession=qaService.retrieveQaSessionOrNullById(new Long(strToolSessionId).longValue()); -// logger.debug("retrieving qaSession: " + qaSession); -// if (qaSession != null) -// { -// logger.debug("retrieving qaSession: " + qaSession); -// int countSessionUser=qaService.countSessionUser(qaSession); -// logger.debug("countSessionUser: " + countSessionUser); -// mapStats.put(strToolSessionId, new Integer(countSessionUser).toString()); -// request.getSession().setAttribute(MAP_STATS,mapStats); -// } -// -// } -// } -// mapStats=(Map)request.getSession().getAttribute(MAP_STATS); -// logger.debug("final MAP_STATS: " + mapStats); -// qaMonitoringForm.resetUserAction(); -// return (mapping.findForward(MONITORING_REPORT)); -// } - - -// /** -// * markDataMapAsEditable(ActionMapping mapping, -// ActionForm form, -// HttpServletRequest request, -// HttpServletResponse response) throws IOException, -// ServletException -// * -// * @param mapping -// * @param form -// * @param request -// * @param response -// * @return ActionForward -// * @throws IOException -// * @throws ServletException -// * -// * -// * marks the dataMap so that jsp renders the summary screen as editable -// */ -// public ActionForward markDataMapAsEditable(ActionMapping mapping, -// ActionForm form, -// HttpServletRequest request, -// HttpServletResponse response) throws IOException, -// ServletException -// { -// request.getSession().setAttribute(DATAMAP_EDITABLE, new Boolean(true)); -// logger.debug("will generate editable summary screen"); -// return generateSummaryScreen(mapping, form, request, response); -// } - - -// /** -// * ActionForward handleInstructionsScreen(ActionMapping mapping,ActionForm form, HttpServletRequest request) -// * @param mapping -// * @param form -// * @param request -// * @return ActionForward -// */ -// public ActionForward handleInstructionsScreen(ActionMapping mapping,ActionForm form, HttpServletRequest request) -// { -// /* -// * update online and offline instuctions content if there is a request. -// */ -// QaMonitoringForm qaMonitoringForm = (QaMonitoringForm) form; -// IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext()); -// if (qaMonitoringForm.getSubmitMonitoringInstructions() != null) -// { -// logger.debug("request for prosssing Monitoring instructions :"); -// qaMonitoringForm.setSubmitMonitoringInstructions(null); -// -// logger.debug("online instructions :" + qaMonitoringForm.getOnlineInstructions()); -// logger.debug("offline instructions :" + qaMonitoringForm.getOfflineInstructions()); -// Long initialMonitoringContentId=(Long)request.getSession().getAttribute(INITIAL_MONITORING_TOOL_CONTENT_ID); -// if (initialMonitoringContentId == null) -// { -// logger.debug("missing content id:"); -// persistError(request,"error.tab.contentId.required"); -// request.setAttribute(USER_EXCEPTION_MONITORINGTAB_CONTENTID_REQUIRED, new Boolean(true)); -// logger.debug("forwarding to: " + MONITORING_ERROR); -// return (mapping.findForward(MONITORING_REPORT)); -// } -// else -// { -// /* -// * update the content -// */ -// logger.debug("content id: " + initialMonitoringContentId); -// QaContent qaContent=qaService.retrieveQa(initialMonitoringContentId.longValue()); -// logger.debug("qaContent: " + qaContent); -// qaContent.setOnlineInstructions(qaMonitoringForm.getOnlineInstructions()); -// qaContent.setOfflineInstructions(qaMonitoringForm.getOfflineInstructions()); -// qaService.updateQa(qaContent); -// logger.debug("qaContent updated in the db"); -// request.getSession().setAttribute(MONITORED_OFFLINE_INSTRUCTIONS, qaContent.getOfflineInstructions()); -// request.getSession().setAttribute(MONITORED_ONLINE_INSTRUCTIONS, qaContent.getOnlineInstructions()); -// logger.debug("session updated with online/offline instructions"); -// request.setAttribute(MONITORING_INSTRUCTIONS_UPDATE_MESSAGE, new Boolean(true)); -// return (mapping.findForward(MONITORING_REPORT)); -// } -// } -// logger.debug("end of online-offline instructions content handling"); -// return null; -// } - /** * persists error messages to request scope * persistError(HttpServletRequest request, String message) Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/QaMonitoringForm.java,v diff -u -r1.6 -r1.7 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringForm.java 5 Jan 2006 04:36:32 -0000 1.6 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringForm.java 24 Feb 2006 15:05:59 -0000 1.7 @@ -1,15 +1,27 @@ -/* - * ozgurd - * Created on 26/04/2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa.web; -/* - * ActionForm for the Monitoring environment - */ +/* ActionForm for the Monitoring environment */ import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.lamsfoundation.lams.tool.qa.QaAppConstants; @@ -22,17 +34,11 @@ */ public class QaMonitoringForm extends ActionForm implements QaAppConstants { static Logger logger = Logger.getLogger(QaMonitoringForm.class.getName()); - - /* - * these buttons are only for development purposes - */ + protected String startLesson; protected String deleteLesson; protected String forceComplete; - /* - * buttons - */ protected String editReport; protected String updateReport; protected String hideReport; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java,v diff -u -r1.30 -r1.31 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java 19 Feb 2006 19:15:07 -0000 1.30 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java 24 Feb 2006 15:06:00 -0000 1.31 @@ -1,3 +1,25 @@ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ + /** * @author Ozgur Demirtas * Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/AbstractQaTestCase.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/AbstractQaTestCase.java,v diff -u -r1.7 -r1.8 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/AbstractQaTestCase.java 23 Feb 2006 20:43:41 -0000 1.7 +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/AbstractQaTestCase.java 24 Feb 2006 15:06:00 -0000 1.8 @@ -1,4 +1,24 @@ - +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa; import org.springframework.context.ApplicationContext; Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/AllTests.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/AllTests.java,v diff -u -r1.7 -r1.8 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/AllTests.java 23 Feb 2006 20:43:41 -0000 1.7 +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/AllTests.java 24 Feb 2006 15:06:00 -0000 1.8 @@ -1,9 +1,24 @@ -/* - * Created on 1/04/2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa; import junit.framework.Test; Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/QaDataAccessTestCase.java,v diff -u -r1.13 -r1.14 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java 23 Feb 2006 20:43:41 -0000 1.13 +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java 24 Feb 2006 15:06:00 -0000 1.14 @@ -1,3 +1,24 @@ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa; import java.util.Date; Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/TestQaContent.java,v diff -u -r1.15 -r1.16 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java 23 Feb 2006 20:43:41 -0000 1.15 +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java 24 Feb 2006 15:06:00 -0000 1.16 @@ -1,12 +1,24 @@ -/* ******************************************************************************** - * Copyright Notice - * ================= - * This file contains propriety information of LAMS Foundation. - * Copying or reproduction with prior written permission is prohibited. - * Copyright (c) 2004 - * Created on 2004-12-23 - ******************************************************************************** */ - +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa; import java.text.DateFormat; Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaQueContent.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/TestQaQueContent.java,v diff -u -r1.8 -r1.9 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaQueContent.java 23 Feb 2006 20:43:41 -0000 1.8 +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaQueContent.java 24 Feb 2006 15:06:00 -0000 1.9 @@ -1,11 +1,24 @@ -/* ******************************************************************************** - * Copyright Notice - * ================= - * This file contains propriety information of LAMS Foundation. - * Copying or reproduction with prior written permission is prohibited. - * Copyright (c) 2004 - * Created on 2004-12-23 - ******************************************************************************** */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa; /* Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaQueUsr.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/TestQaQueUsr.java,v diff -u -r1.8 -r1.9 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaQueUsr.java 23 Feb 2006 20:43:41 -0000 1.8 +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaQueUsr.java 24 Feb 2006 15:06:00 -0000 1.9 @@ -1,11 +1,24 @@ -/* ******************************************************************************** - * Copyright Notice - * ================= - * This file contains propriety information of LAMS Foundation. - * Copying or reproduction with prior written permission is prohibited. - * Copyright (c) 2004 - * Created on 2004-12-20 - ******************************************************************************** */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa; Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaSession.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/TestQaSession.java,v diff -u -r1.8 -r1.9 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaSession.java 23 Feb 2006 20:43:41 -0000 1.8 +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaSession.java 24 Feb 2006 15:06:00 -0000 1.9 @@ -1,16 +1,27 @@ -/* ******************************************************************************** - * Copyright Notice - * ================= - * This file contains propriety information of LAMS Foundation. - * Copying or reproduction with prior written permission is prohibited. - * Copyright (c) 2004 - * Created on 2004-12-23 - ******************************************************************************** */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa; -import java.util.Date; -import java.util.TreeSet; /* Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaUsrResp.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/TestQaUsrResp.java,v diff -u -r1.9 -r1.10 --- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaUsrResp.java 23 Feb 2006 20:43:41 -0000 1.9 +++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaUsrResp.java 24 Feb 2006 15:06:00 -0000 1.10 @@ -1,11 +1,24 @@ -/* ******************************************************************************** - * Copyright Notice - * ================= - * This file contains propriety information of LAMS Foundation. - * Copying or reproduction with prior written permission is prohibited. - * Copyright (c) 2004 - * Created on 2004-12-20 - ******************************************************************************** */ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ package org.lamsfoundation.lams.tool.qa; Index: lams_tool_laqa/web/AuthoringMaincontent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/AuthoringMaincontent.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_laqa/web/AuthoringMaincontent.jsp 23 Feb 2006 19:33:20 -0000 1.1 +++ lams_tool_laqa/web/AuthoringMaincontent.jsp 24 Feb 2006 15:05:59 -0000 1.2 @@ -1,11 +1,33 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-logic" prefix="logic" %> -<%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + Index: lams_tool_laqa/web/Errorbox.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/Errorbox.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_laqa/web/Errorbox.jsp 23 Feb 2006 19:33:20 -0000 1.2 +++ lams_tool_laqa/web/Errorbox.jsp 24 Feb 2006 15:05:59 -0000 1.3 @@ -18,29 +18,29 @@ http://www.gnu.org/licenses/gpl.txt --> -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> -<%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> - + - + - + - + Index: lams_tool_laqa/web/Header.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/Header.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_laqa/web/Header.jsp 23 Feb 2006 19:33:20 -0000 1.1 +++ lams_tool_laqa/web/Header.jsp 24 Feb 2006 15:05:59 -0000 1.2 @@ -18,11 +18,11 @@ http://www.gnu.org/licenses/gpl.txt --> -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> -<%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> <%@ page contentType="text/html; charset=iso-8859-1" language="java" %> Index: lams_tool_laqa/web/QaErrorBox.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/QaErrorBox.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_laqa/web/QaErrorBox.jsp 23 Feb 2006 19:33:20 -0000 1.2 +++ lams_tool_laqa/web/QaErrorBox.jsp 24 Feb 2006 15:05:59 -0000 1.3 @@ -18,15 +18,16 @@ http://www.gnu.org/licenses/gpl.txt --> -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> -<%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %>

- + - + Index: lams_tool_laqa/web/SystemErrorContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/SystemErrorContent.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_laqa/web/SystemErrorContent.jsp 23 Feb 2006 19:33:20 -0000 1.1 +++ lams_tool_laqa/web/SystemErrorContent.jsp 24 Feb 2006 15:05:59 -0000 1.2 @@ -19,12 +19,12 @@ http://www.gnu.org/licenses/gpl.txt --> -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> -<%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> @@ -36,7 +36,7 @@
@@ -38,6 +39,6 @@


- <%@ include file="Errorbox.jsp" %> + <%@ include file="/Errorbox.jsp" %>
Index: lams_tool_laqa/web/Template.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/Template.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_laqa/web/Template.jsp 23 Feb 2006 19:33:20 -0000 1.1 +++ lams_tool_laqa/web/Template.jsp 24 Feb 2006 15:05:59 -0000 1.2 @@ -18,13 +18,13 @@ http://www.gnu.org/licenses/gpl.txt --> -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-logic" prefix="logic" %> -<%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %> Index: lams_tool_laqa/web/exportPortfolio.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/exportPortfolio.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_laqa/web/exportPortfolio.jsp 23 Feb 2006 19:33:20 -0000 1.1 +++ lams_tool_laqa/web/exportPortfolio.jsp 24 Feb 2006 15:05:59 -0000 1.2 @@ -1,10 +1,31 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-logic" prefix="logic" %> -<%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %> Index: lams_tool_laqa/web/index.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/index.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_laqa/web/index.jsp 23 Feb 2006 19:33:20 -0000 1.3 +++ lams_tool_laqa/web/index.jsp 24 Feb 2006 15:05:59 -0000 1.4 @@ -1,10 +1,32 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> -<%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + <% String toolContentId="1234"; Index: lams_tool_laqa/web/learningIndex.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/learningIndex.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_laqa/web/learningIndex.jsp 23 Feb 2006 19:33:20 -0000 1.3 +++ lams_tool_laqa/web/learningIndex.jsp 24 Feb 2006 15:05:59 -0000 1.4 @@ -1,9 +1,30 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> -<%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> <% Index: lams_tool_laqa/web/login.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/login.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_laqa/web/login.jsp 23 Feb 2006 20:14:03 -0000 1.3 +++ lams_tool_laqa/web/login.jsp 24 Feb 2006 15:05:59 -0000 1.4 @@ -1,4 +1,25 @@ +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + + <%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> <% String path = request.getContextPath(); Index: lams_tool_laqa/web/monitoringIndex.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/monitoringIndex.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_laqa/web/monitoringIndex.jsp 23 Feb 2006 19:33:20 -0000 1.3 +++ lams_tool_laqa/web/monitoringIndex.jsp 24 Feb 2006 15:05:59 -0000 1.4 @@ -1,9 +1,30 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> -<%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> <% Index: lams_tool_laqa/web/WEB-INF/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/Attic/lams.tld,v diff -u -r1.5 -r1.6 --- lams_tool_laqa/web/WEB-INF/lams.tld 23 Feb 2006 20:14:03 -0000 1.5 +++ lams_tool_laqa/web/WEB-INF/lams.tld 24 Feb 2006 15:06:00 -0000 1.6 @@ -32,22 +32,197 @@ - css - org.lamsfoundation.lams.web.tag.CssTag - - - - localLink - false - + WebAppURL + org.lamsfoundation.lams.web.tag.WebAppURLTag + - WebAppURL - org.lamsfoundation.lams.web.tag.WebAppURLTag - + css + org.lamsfoundation.lams.web.tag.CssTag + + + STRUTS-textarea + org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag + + accesskey + false + true + + + alt + false + true + + + altKey + false + true + + + bundle + false + true + + + cols + false + true + + + disabled + false + true + + + errorKey + false + true + + + errorStyle + false + true + + + errorStyleClass + false + true + + + errorStyleId + false + true + + + indexed + false + true + + + name + false + true + + + onblur + false + true + + + onchange + false + true + + + onclick + false + true + + + ondblclick + false + true + + + onfocus + false + true + + + onkeydown + false + true + + + onkeypress + false + true + + + onkeyup + false + true + + + onmousedown + false + true + + + onmousemove + false + true + + + onmouseout + false + true + + + onmouseover + false + true + + + onmouseup + false + true + + + property + true + true + + + readonly + false + true + + + rows + false + true + + + style + false + true + + + styleClass + false + true + + + styleId + false + true + + + tabindex + false + true + + + title + false + true + + + titleKey + false + true + + + value + false + true + + + Index: lams_tool_laqa/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/web.xml,v diff -u -r1.15 -r1.16 --- lams_tool_laqa/web/WEB-INF/web.xml 23 Feb 2006 20:14:03 -0000 1.15 +++ lams_tool_laqa/web/WEB-INF/web.xml 24 Feb 2006 15:06:00 -0000 1.16 @@ -1,61 +1,101 @@ - + + + javax.servlet.jsp.jstl.fmt.localizationContext + org.lamsfoundation.lams.tool.qa.web.QaResources + + + contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml - classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml - classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml - classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml - + + classpath:/org/lamsfoundation/lams/applicationContext.xml + classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml + classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml + classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml + classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml + classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml + - - - org.springframework.web.context.ContextLoaderListener - - - hibernateFilter - - org.springframework.orm.hibernate3.support.OpenSessionInViewFilter - - - sessionFactoryBeanName - qaSessionFactory - + SystemSessionFilter + + org.lamsfoundation.lams.web.session.SystemSessionFilter + + + + + hibernateFilter + + org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter + + + sessionFactoryBeanName + qaSessionFactory + - - - SystemSessionFilter + + + LocaleFilter - org.lamsfoundation.lams.web.session.SystemSessionFilter + org.lamsfoundation.lams.web.filter.LocaleFilter - + - hibernateFilter - /* - - SystemSessionFilter + /* + + + + hibernateFilter /* - + + + LocaleFilter + /* + + + + + org.springframework.web.context.ContextLoaderListener + + + + + + org.lamsfoundation.lams.web.SessionListener + + + context org.springframework.web.context.ContextLoaderServlet 1 + action org.apache.struts.action.ActionServlet @@ -77,28 +117,9 @@ 2 - - - download - Instructions Download - Instructions Download org.lamsfoundation.lams.contentrepository.client.ToolDownload toolContentHandlerBeanName @@ -109,14 +130,27 @@ exportPortfolio - Export Portfolio - Export Portfolio org.lamsfoundation.lams.tool.qa.web.QaExportServlet - + + + + Connector + com.fredck.FCKeditor.connector.ConnectorServlet + + baseDir + /UserFiles/ + + + debug + false + + 1 + + action - *.do + *.do @@ -128,112 +162,106 @@ exportPortfolio /portfolioExport - - - + + Connector + /fckeditor/editor/filemanager/browser/default/connectors/jsp/connector + - - 120 - + + 120 + - + 403 /403.html + + - - - - tags-bean - /WEB-INF/struts/tlds/struts-bean.tld - + + --> - - tags-html - /WEB-INF/struts/tlds/struts-html.tld - + - - tags-tiles - /WEB-INF/struts/tlds/struts-tiles.tld - + + + + + + tags-bean + /WEB-INF/struts/tlds/struts-bean.tld + + + tags-html + /WEB-INF/struts/tlds/struts-html.tld + + + tags-logic + /WEB-INF/struts/tlds/struts-logic.tld + + + tags-tiles + /WEB-INF/struts/tlds/struts-tiles.tld + + + + + + tags-fmt + /WEB-INF/jstl/tlds/fmt.tld + + + tags-core + /WEB-INF/jstl/tlds/c.tld + + + tags-function + /WEB-INF/jstl/tlds/fn.tld + + + tags-xml + /WEB-INF/jstl/tlds/x.tld + + + + + + tags-permittedTaglibs + /WEB-INF/jstl/tlds/permittedTaglibs.tld + + + tags-scriptfree + /WEB-INF/jstl/tlds/scriptfree.tld + + + + + + fck-editor + /WEB-INF/fckeditor/tlds/FCKeditor.tld + + + tags-lams + /WEB-INF/lams.tld + + - - tags-bean-el - /WEB-INF/struts/tlds/struts-bean-el.tld - - - - tags-html-el - /WEB-INF/struts/tlds/struts-html-el.tld - - - - tags-logic-el - /WEB-INF/struts/tlds/struts-logic-el.tld - - - - tags-tiles-el - /WEB-INF/struts/tlds/struts-tiles-el.tld - - - - - - - - tags-fmt - /WEB-INF/jstl/tlds/fmt.tld - - - - tags-fmt-rt - /WEB-INF/jstl/tlds/fmt-rt.tld - - - - tags-c - /WEB-INF/jstl/tlds/c.tld - - - - tags-core-rt - /WEB-INF/jstl/tlds/c-rt.tld - - - - - - - - - tags-lams - /WEB-INF/lams.tld - - - - tags-fck-editor - /WEB-INF/fckeditor/tlds/FCKeditor.tld - - Secure Content - /* + *.jsp + *.html + /index.jsp + /flashCrashDump LEARNER @@ -245,46 +273,43 @@ - - + - Secure Content - /* + Authoring Update + /authoring.do - LEARNER - TEACHER - STAFF AUTHOR - ADMIN - SYSADMIN + + + Staff Content + /monitoring.do + + + STAFF + + - Authoring Update - /authoringStarter.do - /authoring.do - + Adminstrator Content + /admin.do + - AUTHOR + ADMIN - - - Staff Content - /monitoringStarter.do - /monitoring.do + LAMS System Adminstrator Content + /sysadmin.do - STAFF + SYSADMIN - - @@ -299,14 +324,45 @@ - FORM LAMS /login.jsp + /login.jsp?failed=y + + + + + Student + LEARNER + + + Student + TEACHER + + + Can create/modify a learning design + AUTHOR + + + + Can running and monitoring a learning session + STAFF + + + + Can add/remove users to the system, set up classes of users for sessions + ADMIN + + + + Can add/remove users to the system, set up classes of users for sessions + SYSADMIN + + Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/jstl/tlds/c-rt.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/web/WEB-INF/jstl/tlds/c.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/jstl/tlds/Attic/c.tld,v diff -u -r1.3 -r1.4 --- lams_tool_laqa/web/WEB-INF/jstl/tlds/c.tld 23 Feb 2006 20:14:03 -0000 1.3 +++ lams_tool_laqa/web/WEB-INF/jstl/tlds/c.tld 24 Feb 2006 15:05:59 -0000 1.4 @@ -1,415 +1,562 @@ - - - - 1.0 - 1.2 - c - http://java.sun.com/jstl/core + + + + + JSTL 1.1 core library JSTL core - JSTL 1.0 core library + 1.1 + c + http://java.sun.com/jsp/jstl/core + + Provides core validation features for JSTL tags. + - org.apache.taglibs.standard.tlv.JstlCoreTLV + org.apache.taglibs.standard.tlv.JstlCoreTLV - - expressionAttributes - - out:value - out:default - out:escapeXml - if:test - import:url - import:context - import:charEncoding - forEach:items - forEach:begin - forEach:end - forEach:step - forTokens:items - forTokens:begin - forTokens:end - forTokens:step - param:encode - param:name - param:value - redirect:context - redirect:url - set:property - set:target - set:value - url:context - url:value - when:test - - - Whitespace-separated list of colon-separated token pairs - describing tag:attribute combinations that accept expressions. - The validator uses this information to determine which - attributes need their syntax validated. - - - catch - org.apache.taglibs.standard.tag.common.core.CatchTag - JSP Catches any Throwable that occurs in its body and optionally exposes it. + catch + org.apache.taglibs.standard.tag.common.core.CatchTag + JSP + +Name of the exported scoped variable for the +exception thrown from a nested action. The type of the +scoped variable is the type of the exception thrown. + var false false + + Simple conditional tag that establishes a context for + mutually exclusive conditional operations, marked by + <when> and <otherwise> + choose org.apache.taglibs.standard.tag.common.core.ChooseTag JSP - - Simple conditional tag that establishes a context for - mutually exclusive conditional operations, marked by - <when> and <otherwise> - - out - org.apache.taglibs.standard.tag.el.core.OutTag - JSP - Like <%= ... >, but for expressions. + Simple conditional tag, which evalutes its body if the + supplied condition is true and optionally exposes a Boolean + scripting variable representing the evaluation of this condition - - value - true - false - - - default - false - false - - - escapeXml - false - false - - - - if - org.apache.taglibs.standard.tag.el.core.IfTag + org.apache.taglibs.standard.tag.rt.core.IfTag JSP - - Simple conditional tag, which evalutes its body if the - supplied condition is true and optionally exposes a Boolean - scripting variable representing the evaluation of this condition - + +The test condition that determines whether or +not the body content should be processed. + test true - false + true + boolean + +Name of the exported scoped variable for the +resulting value of the test condition. The type +of the scoped variable is Boolean. + var false false + +Scope for var. + scope false false + + Retrieves an absolute or relative URL and exposes its contents + to either the page, a String in 'var', or a Reader in 'varReader'. + import - org.apache.taglibs.standard.tag.el.core.ImportTag + org.apache.taglibs.standard.tag.rt.core.ImportTag org.apache.taglibs.standard.tei.ImportTEI JSP - - Retrieves an absolute or relative URL and exposes its contents - to either the page, a String in 'var', or a Reader in 'varReader'. - + +The URL of the resource to import. + url true - false + true + +Name of the exported scoped variable for the +resource's content. The type of the scoped +variable is String. + var false false + +Scope for var. + scope false false + +Name of the exported scoped variable for the +resource's content. The type of the scoped +variable is Reader. + varReader false false + +Name of the context when accessing a relative +URL resource that belongs to a foreign +context. + context false - false + true + +Character encoding of the content at the input +resource. + charEncoding false - false + true - forEach - org.apache.taglibs.standard.tag.el.core.ForEachTag - org.apache.taglibs.standard.tei.ForEachTEI - JSP The basic iteration tag, accepting many different collection types and supporting subsetting and other functionality + forEach + org.apache.taglibs.standard.tag.rt.core.ForEachTag + org.apache.taglibs.standard.tei.ForEachTEI + JSP + +Collection of items to iterate over. + items false - false + true + java.lang.Object + +If items specified: +Iteration begins at the item located at the +specified index. First item of the collection has +index 0. +If items not specified: +Iteration begins with index set at the value +specified. + begin false - false + true + int + +If items specified: +Iteration ends at the item located at the +specified index (inclusive). +If items not specified: +Iteration ends when index reaches the value +specified. + end false - false + true + int + +Iteration will only process every step items of +the collection, starting with the first one. + step false - false + true + int + +Name of the exported scoped variable for the +current item of the iteration. This scoped +variable has nested visibility. Its type depends +on the object of the underlying collection. + var false false + +Name of the exported scoped variable for the +status of the iteration. Object exported is of type +javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested +visibility. + varStatus false false - forTokens - org.apache.taglibs.standard.tag.el.core.ForTokensTag - JSP Iterates over tokens, separated by the supplied delimeters + forTokens + org.apache.taglibs.standard.tag.rt.core.ForTokensTag + JSP + +String of tokens to iterate over. + items true - false + true + java.lang.String + +The set of delimiters (the characters that +separate the tokens in the string). + delims true - false + true + java.lang.String + +Iteration begins at the token located at the +specified index. First token has index 0. + begin false - false + true + int + +Iteration ends at the token located at the +specified index (inclusive). + end false - false + true + int + +Iteration will only process every step tokens +of the string, starting with the first one. + step false - false + true + int + +Name of the exported scoped variable for the +current item of the iteration. This scoped +variable has nested visibility. + var false false + +Name of the exported scoped variable for the +status of the iteration. Object exported is of +type +javax.servlet.jsp.jstl.core.LoopTag +Status. This scoped variable has nested +visibility. + varStatus false false - otherwise - org.apache.taglibs.standard.tag.common.core.OtherwiseTag + + Like <%= ... >, but for expressions. + + out + org.apache.taglibs.standard.tag.rt.core.OutTag JSP + + +Expression to be evaluated. + + value + true + true + + + +Default value if the resulting value is null. + + default + false + true + + + +Determines whether characters <,>,&,'," in the +resulting string should be converted to their +corresponding character entity codes. Default value is +true. + + escapeXml + false + true + + + + + - Subtag of <choose> that follows <when> tags - and runs only if all of the prior conditions evaluated to - 'false' + Subtag of <choose> that follows <when> tags + and runs only if all of the prior conditions evaluated to + 'false' + otherwise + org.apache.taglibs.standard.tag.common.core.OtherwiseTag + JSP - param - org.apache.taglibs.standard.tag.el.core.ParamTag - JSP - Adds a parameter to a containing 'import' tag's URL. + Adds a parameter to a containing 'import' tag's URL. + param + org.apache.taglibs.standard.tag.rt.core.ParamTag + JSP + +Name of the query string parameter. + name true - false + true + +Value of the parameter. + value false - false + true - redirect - org.apache.taglibs.standard.tag.el.core.RedirectTag - JSP - Redirects to a new URL. + Redirects to a new URL. + redirect + org.apache.taglibs.standard.tag.rt.core.RedirectTag + JSP - var + +The URL of the resource to redirect to. + + url false - false + true - scope - false - false - - - url - true - false - - + +Name of the context when redirecting to a relative URL +resource that belongs to a foreign context. + context false - false + true + + Removes a scoped variable (from a particular scope, if specified). + remove org.apache.taglibs.standard.tag.common.core.RemoveTag empty - - Removes a scoped variable (from a particular scope, if specified). - + +Name of the scoped variable to be removed. + var true false + +Scope for var. + scope false false - - set - org.apache.taglibs.standard.tag.el.core.SetTag - JSP + - Sets the result of an expression evaluation in a 'scope' + Sets the result of an expression evaluation in a 'scope' + set + org.apache.taglibs.standard.tag.rt.core.SetTag + JSP + +Name of the exported scoped variable to hold the value +specified in the action. The type of the scoped variable is +whatever type the value expression evaluates to. + var false false + +Expression to be evaluated. + value false - false + true + +Target object whose property will be set. Must evaluate to +a JavaBeans object with setter property property, or to a +java.util.Map object. + target false - false + true + +Name of the property to be set in the target object. + property false - false + true + +Scope for var. + scope false false - url - org.apache.taglibs.standard.tag.el.core.UrlTag - JSP - Prints or exposes a URL with optional query parameters - (via the c:param tag). + Creates a URL with optional query parameters. + url + org.apache.taglibs.standard.tag.rt.core.UrlTag + JSP + +Name of the exported scoped variable for the +processed url. The type of the scoped variable is +String. + var false false + +Scope for var. + scope false false + +URL to be processed. + value - true - false + false + true + +Name of the context when specifying a relative URL +resource that belongs to a foreign context. + context false - false + true - when - org.apache.taglibs.standard.tag.el.core.WhenTag - JSP - Subtag of <choose> that includes its body if its - condition evalutes to 'true' + Subtag of <choose> that includes its body if its + condition evalutes to 'true' + when + org.apache.taglibs.standard.tag.rt.core.WhenTag + JSP + +The test condition that determines whether or not the +body content should be processed. + test true - false + true + boolean Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/jstl/tlds/fmt-rt.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/web/WEB-INF/jstl/tlds/fmt.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/jstl/tlds/Attic/fmt.tld,v diff -u -r1.3 -r1.4 --- lams_tool_laqa/web/WEB-INF/jstl/tlds/fmt.tld 23 Feb 2006 20:14:03 -0000 1.3 +++ lams_tool_laqa/web/WEB-INF/jstl/tlds/fmt.tld 24 Feb 2006 15:05:59 -0000 1.4 @@ -1,438 +1,667 @@ - - - - 1.0 - 1.2 - fmt - http://java.sun.com/jstl/fmt + + + + + JSTL 1.1 i18n-capable formatting library JSTL fmt - JSTL 1.0 i18n-capable formatting library + 1.1 + fmt + http://java.sun.com/jsp/jstl/fmt + + Provides core validation features for JSTL tags. + - org.apache.taglibs.standard.tlv.JstlFmtTLV + org.apache.taglibs.standard.tlv.JstlFmtTLV - - expressionAttributes - - requestEncoding:value - setLocale:value - setLocale:variant - timeZone:value - setTimeZone:value - bundle:basename - bundle:prefix - setBundle:basename - message:key - message:bundle - param:value - formatNumber:value - formatNumber:pattern - formatNumber:currencyCode - formatNumber:currencySymbol - formatNumber:groupingUsed - formatNumber:maxIntegerDigits - formatNumber:minIntegerDigits - formatNumber:maxFractionDigits - formatNumber:minFractionDigits - parseNumber:value - parseNumber:pattern - parseNumber:parseLocale - parseNumber:integerOnly - formatDate:value - formatDate:pattern - formatDate:timeZone - parseDate:value - parseDate:pattern - parseDate:timeZone - parseDate:parseLocale - - - Whitespace-separated list of colon-separated token pairs - describing tag:attribute combinations that accept expressions. - The validator uses this information to determine which - attributes need their syntax validated. - - - requestEncoding - org.apache.taglibs.standard.tag.el.fmt.RequestEncodingTag - empty Sets the request character encoding + requestEncoding + org.apache.taglibs.standard.tag.rt.fmt.RequestEncodingTag + empty + +Name of character encoding to be applied when +decoding request parameters. + value false - false + true - setLocale - org.apache.taglibs.standard.tag.el.fmt.SetLocaleTag - empty Stores the given locale in the locale configuration variable + setLocale + org.apache.taglibs.standard.tag.rt.fmt.SetLocaleTag + empty + +A String value is interpreted as the +printable representation of a locale, which +must contain a two-letter (lower-case) +language code (as defined by ISO-639), +and may contain a two-letter (upper-case) +country code (as defined by ISO-3166). +Language and country codes must be +separated by hyphen (-) or underscore +(_). + value true - false + true + +Vendor- or browser-specific variant. +See the java.util.Locale javadocs for +more information on variants. + variant false - false + true + +Scope of the locale configuration variable. + scope false false - timeZone - org.apache.taglibs.standard.tag.el.fmt.TimeZoneTag - JSP Specifies the time zone for any time formatting or parsing actions nested in its body + timeZone + org.apache.taglibs.standard.tag.rt.fmt.TimeZoneTag + JSP + +The time zone. A String value is interpreted as +a time zone ID. This may be one of the time zone +IDs supported by the Java platform (such as +"America/Los_Angeles") or a custom time zone +ID (such as "GMT-8"). See +java.util.TimeZone for more information on +supported time zone formats. + value true - false + true - setTimeZone - org.apache.taglibs.standard.tag.el.fmt.SetTimeZoneTag - empty Stores the given time zone in the time zone configuration variable + setTimeZone + org.apache.taglibs.standard.tag.rt.fmt.SetTimeZoneTag + empty + +The time zone. A String value is interpreted as +a time zone ID. This may be one of the time zone +IDs supported by the Java platform (such as +"America/Los_Angeles") or a custom time zone +ID (such as "GMT-8"). See java.util.TimeZone for +more information on supported time zone +formats. + value true - false + true + +Name of the exported scoped variable which +stores the time zone of type +java.util.TimeZone. + var false false + +Scope of var or the time zone configuration +variable. + scope false false - bundle - org.apache.taglibs.standard.tag.el.fmt.BundleTag - JSP Loads a resource bundle to be used by its tag body + bundle + org.apache.taglibs.standard.tag.rt.fmt.BundleTag + JSP + +Resource bundle base name. This is the bundle's +fully-qualified resource name, which has the same +form as a fully-qualified class name, that is, it uses +"." as the package component separator and does not +have any file type (such as ".class" or ".properties") +suffix. + basename true - false + true + +Prefix to be prepended to the value of the message +key of any nested <fmt:message> action. + prefix false - false + true - setBundle - org.apache.taglibs.standard.tag.el.fmt.SetBundleTag - empty Loads a resource bundle and stores it in the named scoped variable or the bundle configuration variable + setBundle + org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag + empty + +Resource bundle base name. This is the bundle's +fully-qualified resource name, which has the same +form as a fully-qualified class name, that is, it uses +"." as the package component separator and does not +have any file type (such as ".class" or ".properties") +suffix. + basename true - false + true + +Name of the exported scoped variable which stores +the i18n localization context of type +javax.servlet.jsp.jstl.fmt.LocalizationC +ontext. + var false false + +Scope of var or the localization context +configuration variable. + scope false false - message - org.apache.taglibs.standard.tag.el.fmt.MessageTag - JSP Maps key to localized message and performs parametric replacement + message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag + JSP + +Message key to be looked up. + key false - false + true + +Localization context in whose resource +bundle the message key is looked up. + bundle false - false + true + +Name of the exported scoped variable +which stores the localized message. + var false false + +Scope of var. + scope false false - param - org.apache.taglibs.standard.tag.el.fmt.ParamTag - JSP Supplies an argument for parametric replacement to a containing <message> tag + param + org.apache.taglibs.standard.tag.rt.fmt.ParamTag + JSP + +Argument used for parametric replacement. + value false - false + true - formatNumber - org.apache.taglibs.standard.tag.el.fmt.FormatNumberTag - JSP Formats a numeric value as a number, currency, or percentage + formatNumber + org.apache.taglibs.standard.tag.rt.fmt.FormatNumberTag + JSP + +Numeric value to be formatted. + value false - false + true + +Specifies whether the value is to be +formatted as number, currency, or +percentage. + type false - false + true + +Custom formatting pattern. + pattern false - false + true + +ISO 4217 currency code. Applied only +when formatting currencies (i.e. if type is +equal to "currency"); ignored otherwise. + currencyCode false - false + true + +Currency symbol. Applied only when +formatting currencies (i.e. if type is equal +to "currency"); ignored otherwise. + currencySymbol false - false + true + +Specifies whether the formatted output +will contain any grouping separators. + groupingUsed false - false + true + +Maximum number of digits in the integer +portion of the formatted output. + maxIntegerDigits false - false + true + +Minimum number of digits in the integer +portion of the formatted output. + minIntegerDigits false - false + true + +Maximum number of digits in the +fractional portion of the formatted output. + maxFractionDigits false - false + true + +Minimum number of digits in the +fractional portion of the formatted output. + minFractionDigits false - false + true + +Name of the exported scoped variable +which stores the formatted result as a +String. + var false false + +Scope of var. + scope false false - parseNumber - org.apache.taglibs.standard.tag.el.fmt.ParseNumberTag - JSP Parses the string representation of a number, currency, or percentage + parseNumber + org.apache.taglibs.standard.tag.rt.fmt.ParseNumberTag + JSP + +String to be parsed. + value false - false + true + +Specifies whether the string in the value +attribute should be parsed as a number, +currency, or percentage. + type false - false + true + +Custom formatting pattern that determines +how the string in the value attribute is to be +parsed. + pattern false - false + true + +Locale whose default formatting pattern (for +numbers, currencies, or percentages, +respectively) is to be used during the parse +operation, or to which the pattern specified +via the pattern attribute (if present) is +applied. + parseLocale false - false + true + +Specifies whether just the integer portion of +the given value should be parsed. + integerOnly false - false + true + +Name of the exported scoped variable which +stores the parsed result (of type +java.lang.Number). + var false false + +Scope of var. + scope false false - formatDate - org.apache.taglibs.standard.tag.el.fmt.FormatDateTag - empty Formats a date and/or time using the supplied styles and pattern + formatDate + org.apache.taglibs.standard.tag.rt.fmt.FormatDateTag + empty + +Date and/or time to be formatted. + value true - false + true + +Specifies whether the time, the date, or both +the time and date components of the given +date are to be formatted. + type false - false + true + +Predefined formatting style for dates. Follows +the semantics defined in class +java.text.DateFormat. Applied only +when formatting a date or both a date and +time (i.e. if type is missing or is equal to +"date" or "both"); ignored otherwise. + dateStyle false - false + true + +Predefined formatting style for times. Follows +the semantics defined in class +java.text.DateFormat. Applied only +when formatting a time or both a date and +time (i.e. if type is equal to "time" or "both"); +ignored otherwise. + timeStyle false - false + true + +Custom formatting style for dates and times. + pattern false - false + true + +Time zone in which to represent the formatted +time. + timeZone false - false + true + +Name of the exported scoped variable which +stores the formatted result as a String. + var false false + +Scope of var. + scope false false - parseDate - org.apache.taglibs.standard.tag.el.fmt.ParseDateTag - JSP Parses the string representation of a date and/or time + parseDate + org.apache.taglibs.standard.tag.rt.fmt.ParseDateTag + JSP + +Date string to be parsed. + value false - false + true + +Specifies whether the date string in the +value attribute is supposed to contain a +time, a date, or both. + type false - false + true + +Predefined formatting style for days +which determines how the date +component of the date string is to be +parsed. Applied only when formatting a +date or both a date and time (i.e. if type +is missing or is equal to "date" or "both"); +ignored otherwise. + dateStyle false - false + true + +Predefined formatting styles for times +which determines how the time +component in the date string is to be +parsed. Applied only when formatting a +time or both a date and time (i.e. if type +is equal to "time" or "both"); ignored +otherwise. + timeStyle false - false + true + +Custom formatting pattern which +determines how the date string is to be +parsed. + pattern false - false + true + +Time zone in which to interpret any time +information in the date string. + timeZone false - false + true + +Locale whose predefined formatting styles +for dates and times are to be used during +the parse operation, or to which the +pattern specified via the pattern +attribute (if present) is applied. + parseLocale false - false + true + +Name of the exported scoped variable in +which the parsing result (of type +java.util.Date) is stored. + var false false + +Scope of var. + scope false false Index: lams_tool_laqa/web/WEB-INF/jstl/tlds/fn.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/jstl/tlds/Attic/fn.tld,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_laqa/web/WEB-INF/jstl/tlds/fn.tld 24 Feb 2006 15:05:59 -0000 1.1 @@ -0,0 +1,207 @@ + + + + + JSTL 1.1 functions library + JSTL functions + 1.1 + fn + http://java.sun.com/jsp/jstl/functions + + + + Tests if an input string contains the specified substring. + + contains + org.apache.taglibs.standard.functions.Functions + boolean contains(java.lang.String, java.lang.String) + + <c:if test="${fn:contains(name, searchString)}"> + + + + + + Tests if an input string contains the specified substring in a case insensitive way. + + containsIgnoreCase + org.apache.taglibs.standard.functions.Functions + boolean containsIgnoreCase(java.lang.String, java.lang.String) + + <c:if test="${fn:containsIgnoreCase(name, searchString)}"> + + + + + + Tests if an input string ends with the specified suffix. + + endsWith + org.apache.taglibs.standard.functions.Functions + boolean endsWith(java.lang.String, java.lang.String) + + <c:if test="${fn:endsWith(filename, ".txt")}"> + + + + + + Escapes characters that could be interpreted as XML markup. + + escapeXml + org.apache.taglibs.standard.functions.Functions + java.lang.String escapeXml(java.lang.String) + + ${fn:escapeXml(param:info)} + + + + + + Returns the index withing a string of the first occurrence of a specified substring. + + indexOf + org.apache.taglibs.standard.functions.Functions + int indexOf(java.lang.String, java.lang.String) + + ${fn:indexOf(name, "-")} + + + + + + Joins all elements of an array into a string. + + join + org.apache.taglibs.standard.functions.Functions + java.lang.String join(java.lang.String[], java.lang.String) + + ${fn:join(array, ";")} + + + + + + Returns the number of items in a collection, or the number of characters in a string. + + length + org.apache.taglibs.standard.functions.Functions + int length(java.lang.Object) + + You have ${fn:length(shoppingCart.products)} in your shopping cart. + + + + + + Returns a string resulting from replacing in an input string all occurrences + of a "before" string into an "after" substring. + + replace + org.apache.taglibs.standard.functions.Functions + java.lang.String replace(java.lang.String, java.lang.String, java.lang.String) + + ${fn:replace(text, "-", "•")} + + + + + + Splits a string into an array of substrings. + + split + org.apache.taglibs.standard.functions.Functions + java.lang.String[] split(java.lang.String, java.lang.String) + + ${fn:split(customerNames, ";")} + + + + + + Tests if an input string starts with the specified prefix. + + startsWith + org.apache.taglibs.standard.functions.Functions + boolean startsWith(java.lang.String, java.lang.String) + + <c:if test="${fn:startsWith(product.id, "100-")}"> + + + + + + Returns a subset of a string. + + substring + org.apache.taglibs.standard.functions.Functions + java.lang.String substring(java.lang.String, int, int) + + P.O. Box: ${fn:substring(zip, 6, -1)} + + + + + + Returns a subset of a string following a specific substring. + + substringAfter + org.apache.taglibs.standard.functions.Functions + java.lang.String substringAfter(java.lang.String, java.lang.String) + + P.O. Box: ${fn:substringAfter(zip, "-")} + + + + + + Returns a subset of a string before a specific substring. + + substringBefore + org.apache.taglibs.standard.functions.Functions + java.lang.String substringBefore(java.lang.String, java.lang.String) + + Zip (without P.O. Box): ${fn:substringBefore(zip, "-")} + + + + + + Converts all of the characters of a string to lower case. + + toLowerCase + org.apache.taglibs.standard.functions.Functions + java.lang.String toLowerCase(java.lang.String) + + Product name: ${fn.toLowerCase(product.name)} + + + + + + Converts all of the characters of a string to upper case. + + toUpperCase + org.apache.taglibs.standard.functions.Functions + java.lang.String toUpperCase(java.lang.String) + + Product name: ${fn.UpperCase(product.name)} + + + + + + Removes white spaces from both ends of a string. + + trim + org.apache.taglibs.standard.functions.Functions + java.lang.String trim(java.lang.String) + + Name: ${fn.trim(name)} + + + + Index: lams_tool_laqa/web/WEB-INF/jstl/tlds/permittedTaglibs.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/jstl/tlds/Attic/permittedTaglibs.tld,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_laqa/web/WEB-INF/jstl/tlds/permittedTaglibs.tld 24 Feb 2006 15:05:59 -0000 1.1 @@ -0,0 +1,34 @@ + + + + + Restricts JSP pages to the JSTL tag libraries + + permittedTaglibs + 1.1 + permittedTaglibs + http://jakarta.apache.org/taglibs/standard/permittedTaglibs + + + + javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV + + + + Whitespace-separated list of taglib URIs to permit. This example + TLD for the Standard Taglib allows only JSTL 'el' taglibs to be + imported. + + permittedTaglibs + + http://java.sun.com/jsp/jstl/core + http://java.sun.com/jsp/jstl/fmt + http://java.sun.com/jsp/jstl/sql + http://java.sun.com/jsp/jstl/xml + + + + Index: lams_tool_laqa/web/WEB-INF/jstl/tlds/scriptfree.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/jstl/tlds/Attic/scriptfree.tld,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_laqa/web/WEB-INF/jstl/tlds/scriptfree.tld 24 Feb 2006 15:05:59 -0000 1.1 @@ -0,0 +1,51 @@ + + + + + Validates JSP pages to prohibit use of scripting elements. + + 1.1 + scriptfree + http://jakarta.apache.org/taglibs/standard/scriptfree + + + + Validates prohibitions against scripting elements. + + + javax.servlet.jsp.jstl.tlv.ScriptFreeTLV + + + + Controls whether or not declarations are considered valid. + + allowDeclarations + false + + + + Controls whether or not scriptlets are considered valid. + + allowScriptlets + false + + + + Controls whether or not top-level expressions are considered valid. + + allowExpressions + false + + + + Controls whether or not expressions used to supply request-time + attribute values are considered valid. + + allowRTExpressions + false + + + Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/jstl/tlds/sql-rt.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/jstl/tlds/sql.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/jstl/tlds/x-rt.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/web/WEB-INF/jstl/tlds/x.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/jstl/tlds/Attic/x.tld,v diff -u -r1.3 -r1.4 --- lams_tool_laqa/web/WEB-INF/jstl/tlds/x.tld 23 Feb 2006 20:14:03 -0000 1.3 +++ lams_tool_laqa/web/WEB-INF/jstl/tlds/x.tld 24 Feb 2006 15:05:59 -0000 1.4 @@ -1,269 +1,444 @@ - - - - 1.0 - 1.2 - x - http://java.sun.com/jstl/xml + + + + + JSTL 1.1 XML library JSTL XML - JSTL 1.0 XML library + 1.1 + x + http://java.sun.com/jsp/jstl/xml + + Provides validation features for JSTL XML tags. + org.apache.taglibs.standard.tlv.JstlXmlTLV - - expressionAttributes - - out:escapeXml - parse:xml - parse:systemId - parse:filter - transform:xml - transform:xmlSystemId - transform:xslt - transform:xsltSystemId - transform:result - - - Whitespace-separated list of colon-separated token pairs - describing tag:attribute combinations that accept expressions. - The validator uses this information to determine which - attributes need their syntax validated. - - - choose - org.apache.taglibs.standard.tag.common.core.ChooseTag - JSP Simple conditional tag that establishes a context for mutually exclusive conditional operations, marked by <when> and <otherwise> + choose + org.apache.taglibs.standard.tag.common.core.ChooseTag + JSP - out - org.apache.taglibs.standard.tag.el.xml.ExprTag - empty Like <%= ... >, but for XPath expressions. + out + org.apache.taglibs.standard.tag.rt.xml.ExprTag + empty + +XPath expression to be evaluated. + select true false + +Determines whether characters <,>,&,'," in the +resulting string should be converted to their +corresponding character entity codes. Default +value is true. + escapeXml false - false + true + + XML conditional tag, which evalutes its body if the + supplied XPath expression evalutes to 'true' as a boolean + if org.apache.taglibs.standard.tag.common.xml.IfTag JSP - - XML conditional tag, which evalutes its body if the - supplied XPath expression evalutes to 'true' as a boolean - + +The test condition that tells whether or not the +body content should be processed. + select true false + +Name of the exported scoped variable for the +resulting value of the test condition. The type +of the scoped variable is Boolean. + var false false + +Scope for var. + scope false false - forEach - org.apache.taglibs.standard.tag.common.xml.ForEachTag - JSP XML iteration tag. + forEach + org.apache.taglibs.standard.tag.common.xml.ForEachTag + JSP + +Name of the exported scoped variable for the +current item of the iteration. This scoped variable +has nested visibility. Its type depends on the +result of the XPath expression in the select +attribute. + var false false + +XPath expression to be evaluated. + select true false + + +Iteration begins at the item located at the +specified index. First item of the collection has +index 0. + + begin + false + true + int + + + +Iteration ends at the item located at the specified +index (inclusive). + + end + false + true + int + + + +Iteration will only process every step items of +the collection, starting with the first one. + + step + false + true + int + + + +Name of the exported scoped variable for the +status of the iteration. Object exported is of type +javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility. + + varStatus + false + false + - otherwise - org.apache.taglibs.standard.tag.common.core.OtherwiseTag - JSP Subtag of <choose> that follows <when> tags and runs only if all of the prior conditions evaluated to 'false' + otherwise + org.apache.taglibs.standard.tag.common.core.OtherwiseTag + JSP - param - org.apache.taglibs.standard.tag.el.xml.ParamTag - JSP Adds a parameter to a containing 'transform' tag's Transformer + param + org.apache.taglibs.standard.tag.rt.xml.ParamTag + JSP + +Name of the transformation parameter. + name true - false + true + +Value of the parameter. + value false - false + true - parse - org.apache.taglibs.standard.tag.el.xml.ParseTag - org.apache.taglibs.standard.tei.XmlParseTEI - JSP Parses XML content from 'source' attribute or 'body' + parse + org.apache.taglibs.standard.tag.rt.xml.ParseTag + org.apache.taglibs.standard.tei.XmlParseTEI + JSP + +Name of the exported scoped variable for +the parsed XML document. The type of the +scoped variable is implementation +dependent. + var false false + +Name of the exported scoped variable for +the parsed XML document. The type of the +scoped variable is +org.w3c.dom.Document. + varDom false false + +Scope for var. + scope false false + +Scope for varDom. + scopeDom false false + +Deprecated. Use attribute 'doc' instead. + xml false - false + true + +Source XML document to be parsed. + + doc + false + true + + + +The system identifier (URI) for parsing the +XML document. + systemId false - false + true + +Filter to be applied to the source +document. + filter false - false + true - set - org.apache.taglibs.standard.tag.common.xml.SetTag - empty Saves the result of an XPath expression evaluation in a 'scope' + set + org.apache.taglibs.standard.tag.common.xml.SetTag + empty + +Name of the exported scoped variable to hold +the value specified in the action. The type of the +scoped variable is whatever type the select +expression evaluates to. + var true false + +XPath expression to be evaluated. + select false false + +Scope for var. + scope false false - transform - org.apache.taglibs.standard.tag.el.xml.TransformTag - org.apache.taglibs.standard.tei.XmlTransformTEI - JSP Conducts a transformation given a source XML document and an XSLT stylesheet + transform + org.apache.taglibs.standard.tag.rt.xml.TransformTag + org.apache.taglibs.standard.tei.XmlTransformTEI + JSP + +Name of the exported +scoped variable for the +transformed XML +document. The type of the +scoped variable is +org.w3c.dom.Document. + var false false + +Scope for var. + scope false false + +Result +Object that captures or +processes the transformation +result. + result false - false + true + +Deprecated. Use attribute +'doc' instead. + xml false - false + true + +Source XML document to be +transformed. (If exported by +<x:set>, it must correspond +to a well-formed XML +document, not a partial +document.) + + doc + false + true + + + +Deprecated. Use attribute +'docSystemId' instead. + xmlSystemId false - false + true + +The system identifier (URI) +for parsing the XML +document. + + docSystemId + false + true + + + +javax.xml.transform.Source +Transformation stylesheet as +a String, Reader, or +Source object. + xslt false - false + true + +The system identifier (URI) +for parsing the XSLT +stylesheet. + xsltSystemId false - false + true - when - org.apache.taglibs.standard.tag.common.xml.WhenTag - JSP Subtag of <choose> that includes its body if its expression evalutes to 'true' + when + org.apache.taglibs.standard.tag.common.xml.WhenTag + JSP + +The test condition that tells whether or +not the body content should be +processed + select true false Index: lams_tool_laqa/web/WEB-INF/struts/tlds/c.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/struts/tlds/Attic/c.tld,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_laqa/web/WEB-INF/struts/tlds/c.tld 24 Feb 2006 15:05:59 -0000 1.1 @@ -0,0 +1,416 @@ + + + + 1.0 + 1.2 + c + http://java.sun.com/jstl/core + JSTL core + JSTL 1.0 core library + + + + org.apache.taglibs.standard.tlv.JstlCoreTLV + + + expressionAttributes + + out:value + out:default + out:escapeXml + if:test + import:url + import:context + import:charEncoding + forEach:items + forEach:begin + forEach:end + forEach:step + forTokens:items + forTokens:begin + forTokens:end + forTokens:step + param:encode + param:name + param:value + redirect:context + redirect:url + set:property + set:target + set:value + url:context + url:value + when:test + + + Whitespace-separated list of colon-separated token pairs + describing tag:attribute combinations that accept expressions. + The validator uses this information to determine which + attributes need their syntax validated. + + + + + + catch + org.apache.taglibs.standard.tag.common.core.CatchTag + JSP + + Catches any Throwable that occurs in its body and optionally + exposes it. + + + var + false + false + + + + + choose + org.apache.taglibs.standard.tag.common.core.ChooseTag + JSP + + Simple conditional tag that establishes a context for + mutually exclusive conditional operations, marked by + <when> and <otherwise> + + + + + out + org.apache.taglibs.standard.tag.el.core.OutTag + JSP + + Like <%= ... >, but for expressions. + + + value + true + false + + + default + false + false + + + escapeXml + false + false + + + + + if + org.apache.taglibs.standard.tag.el.core.IfTag + JSP + + Simple conditional tag, which evalutes its body if the + supplied condition is true and optionally exposes a Boolean + scripting variable representing the evaluation of this condition + + + test + true + false + + + var + false + false + + + scope + false + false + + + + + import + org.apache.taglibs.standard.tag.el.core.ImportTag + org.apache.taglibs.standard.tei.ImportTEI + JSP + + Retrieves an absolute or relative URL and exposes its contents + to either the page, a String in 'var', or a Reader in 'varReader'. + + + url + true + false + + + var + false + false + + + scope + false + false + + + varReader + false + false + + + context + false + false + + + charEncoding + false + false + + + + + forEach + org.apache.taglibs.standard.tag.el.core.ForEachTag + org.apache.taglibs.standard.tei.ForEachTEI + JSP + + The basic iteration tag, accepting many different + collection types and supporting subsetting and other + functionality + + + items + false + false + + + begin + false + false + + + end + false + false + + + step + false + false + + + var + false + false + + + varStatus + false + false + + + + + forTokens + org.apache.taglibs.standard.tag.el.core.ForTokensTag + JSP + + Iterates over tokens, separated by the supplied delimeters + + + items + true + false + + + delims + true + false + + + begin + false + false + + + end + false + false + + + step + false + false + + + var + false + false + + + varStatus + false + false + + + + + otherwise + org.apache.taglibs.standard.tag.common.core.OtherwiseTag + JSP + + Subtag of <choose> that follows <when> tags + and runs only if all of the prior conditions evaluated to + 'false' + + + + + param + org.apache.taglibs.standard.tag.el.core.ParamTag + JSP + + Adds a parameter to a containing 'import' tag's URL. + + + name + true + false + + + value + false + false + + + + + redirect + org.apache.taglibs.standard.tag.el.core.RedirectTag + JSP + + Redirects to a new URL. + + + var + false + false + + + scope + false + false + + + url + true + false + + + context + false + false + + + + + remove + org.apache.taglibs.standard.tag.common.core.RemoveTag + empty + + Removes a scoped variable (from a particular scope, if specified). + + + var + true + false + + + scope + false + false + + + + + set + org.apache.taglibs.standard.tag.el.core.SetTag + JSP + + Sets the result of an expression evaluation in a 'scope' + + + var + false + false + + + value + false + false + + + target + false + false + + + property + false + false + + + scope + false + false + + + + + url + org.apache.taglibs.standard.tag.el.core.UrlTag + JSP + + Prints or exposes a URL with optional query parameters + (via the c:param tag). + + + var + false + false + + + scope + false + false + + + value + true + false + + + context + false + false + + + + + when + org.apache.taglibs.standard.tag.el.core.WhenTag + JSP + + Subtag of <choose> that includes its body if its + condition evalutes to 'true' + + + test + true + false + + + + Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/struts/tlds/struts-bean-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/struts/tlds/struts-html-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/struts/tlds/struts-logic-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/struts/tlds/struts-tiles-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/web/authoring/AdvancedContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/AdvancedContent.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_laqa/web/authoring/AdvancedContent.jsp 23 Feb 2006 20:14:03 -0000 1.3 +++ lams_tool_laqa/web/authoring/AdvancedContent.jsp 24 Feb 2006 15:06:00 -0000 1.4 @@ -1,12 +1,32 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-logic" prefix="logic" %> -<%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %> -
Index: lams_tool_laqa/web/authoring/BasicContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/BasicContent.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_laqa/web/authoring/BasicContent.jsp 23 Feb 2006 20:14:03 -0000 1.3 +++ lams_tool_laqa/web/authoring/BasicContent.jsp 24 Feb 2006 15:06:00 -0000 1.4 @@ -1,10 +1,32 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-logic" prefix="logic" %> -<%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %> +
Index: lams_tool_laqa/web/authoring/InstructionsContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/Attic/InstructionsContent.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_laqa/web/authoring/InstructionsContent.jsp 23 Feb 2006 20:14:03 -0000 1.3 +++ lams_tool_laqa/web/authoring/InstructionsContent.jsp 24 Feb 2006 15:06:00 -0000 1.4 @@ -1,10 +1,31 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-logic" prefix="logic" %> -<%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %>
Index: lams_tool_laqa/web/learning/CombinedAnswersContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/CombinedAnswersContent.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp 23 Feb 2006 20:14:03 -0000 1.3 +++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp 24 Feb 2006 15:06:00 -0000 1.4 @@ -1,12 +1,32 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-logic" prefix="logic" %> -<%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %> -
Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/SequentialAnswersContent.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp 23 Feb 2006 20:14:03 -0000 1.3 +++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp 24 Feb 2006 15:06:00 -0000 1.4 @@ -1,10 +1,31 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-logic" prefix="logic" %> -<%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %>
Index: lams_tool_laqa/web/learning/answersContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/Attic/answersContent.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_laqa/web/learning/answersContent.jsp 23 Feb 2006 20:14:03 -0000 1.3 +++ lams_tool_laqa/web/learning/answersContent.jsp 24 Feb 2006 15:06:00 -0000 1.4 @@ -1,10 +1,31 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-logic" prefix="logic" %> -<%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %>
Index: lams_tool_laqa/web/learning/learnerReport.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/Attic/learnerReport.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_laqa/web/learning/learnerReport.jsp 23 Feb 2006 20:14:03 -0000 1.3 +++ lams_tool_laqa/web/learning/learnerReport.jsp 24 Feb 2006 15:06:00 -0000 1.4 @@ -1,10 +1,31 @@ -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="tags-bean" prefix="bean" %> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +USA + +http://www.gnu.org/licenses/gpl.txt +--%> + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-logic" prefix="logic" %> -<%@ taglib uri="tags-logic-el" prefix="logic-el" %> -<%@ taglib uri="tags-c" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %>