Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml,v diff -u -r1.11 -r1.12 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml 6 Jul 2007 04:06:09 -0000 1.11 +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml 18 Mar 2008 04:17:58 -0000 1.12 @@ -372,6 +372,21 @@ + + + @hibernate.property + column="supports_outputs" + length="1" + not-null="true" + + + Index: lams_common/db/model/lams_11.clay =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/model/lams_11.clay,v diff -u -r1.96 -r1.97 --- lams_common/db/model/lams_11.clay 5 Mar 2008 07:31:32 -0000 1.96 +++ lams_common/db/model/lams_11.clay 18 Mar 2008 04:20:37 -0000 1.97 @@ -2211,11 +2211,11 @@ + - @@ -3248,6 +3248,19 @@ + + + + + + + + + + + + + Index: lams_common/db/sql/create_lams_11_tables.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/create_lams_11_tables.sql,v diff -u -r1.111 -r1.112 --- lams_common/db/sql/create_lams_11_tables.sql 5 Mar 2008 07:30:42 -0000 1.111 +++ lams_common/db/sql/create_lams_11_tables.sql 18 Mar 2008 04:20:37 -0000 1.112 @@ -468,6 +468,7 @@ , classpath_addition VARCHAR(255) , context_file VARCHAR(255) , admin_url TEXT + , supports_outputs TINYINT(1) DEFAULT 0 , UNIQUE UQ_lams_tool_sig (tool_signature) , UNIQUE UQ_lams_tool_class_name (service_name) , PRIMARY KEY (tool_id) Index: lams_common/db/sql/updatescripts/alter_21_branching.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/updatescripts/Attic/alter_21_branching.sql,v diff -u -r1.29 -r1.30 --- lams_common/db/sql/updatescripts/alter_21_branching.sql 5 Mar 2008 07:31:32 -0000 1.29 +++ lams_common/db/sql/updatescripts/alter_21_branching.sql 18 Mar 2008 04:20:37 -0000 1.30 @@ -295,3 +295,7 @@ -- LDEV-1005 alter table lams_user add column enable_flash TINYINT(1) DEFAULT 1; + +-- LDEV-1579 +alter table lams_tool add column supports_outputs TINYINT(1) DEFAULT 0; + Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java,v diff -u -r1.40 -r1.41 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java 11 Feb 2008 04:21:13 -0000 1.40 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java 18 Mar 2008 04:17:58 -0000 1.41 @@ -238,6 +238,8 @@ /** Used for I18N the URLS. Does not need to be sent to clients, so no getter exists. */ private String languageCode; + private Boolean supportsOutputs; + /***************************************************************************** * Constructors *****************************************************************************/ @@ -363,6 +365,7 @@ this.adminURL = toolActivity.getTool().getAdminUrl(); this.toolDisplayName = toolActivity.getTool().getToolDisplayName(); this.toolVersion = toolActivity.getTool().getToolVersion(); + this.supportsOutputs = toolActivity.getTool().getSupportsOutputs(); this.helpURL = HelpUtil.constructToolURL(toolActivity.getTool().getHelpUrl(), toolSignature, "", languageCode); @@ -1035,4 +1038,14 @@ public void setToolActivityUIID(Integer toolActivityUIID) { this.toolActivityUIID = toolActivityUIID; } + + + + public Boolean getSupportsOutputs() { + return supportsOutputs; + } + + public void setSupportsOutputs(Boolean supportsOutputs) { + this.supportsOutputs = supportsOutputs; + } } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java,v diff -u -r1.18 -r1.19 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java 11 Feb 2008 04:21:13 -0000 1.18 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java 18 Mar 2008 04:17:58 -0000 1.19 @@ -81,6 +81,7 @@ private Boolean supportsContribute; private String authoringURL; private String adminURL; + private Boolean supportsOutputs; /* Grouping Activities */ @@ -192,7 +193,7 @@ this.supportsContribute = new Boolean(tool.getSupportsContribute()); this.authoringURL = tool.getAuthorUrl(); this.adminURL = tool.getAdminUrl(); - + this.supportsOutputs = tool.getSupportsOutputs(); this.helpURL = HelpUtil.constructToolURL(tool.getHelpUrl(), toolSignature, "", languageCode); } @@ -536,5 +537,13 @@ this.toolSignature = toolSignature; } + public Boolean getSupportsOutputs() { + return supportsOutputs; + } + public void setSupportsOutputs(Boolean supportsOutputs) { + this.supportsOutputs = supportsOutputs; + } + + } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/tool/BasicToolVO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/BasicToolVO.java,v diff -u -r1.7 -r1.8 --- lams_common/src/java/org/lamsfoundation/lams/tool/BasicToolVO.java 17 Sep 2006 06:14:16 -0000 1.7 +++ lams_common/src/java/org/lamsfoundation/lams/tool/BasicToolVO.java 18 Mar 2008 04:17:58 -0000 1.8 @@ -113,6 +113,9 @@ /** Name of the file (including the package) that contains the text strings for * this activity. e.g. org.lamsfoundation.lams.tool.sbmt.SbmtResources.properties. */ private String languageFile; + + /** Does this tool produce output definitions / conditions */ + private Boolean supportsOutputs; /** full constructor */ public BasicToolVO(Long toolId, @@ -138,7 +141,8 @@ Integer groupingSupportTypeId, String toolIdentifier, String toolVersion, - String languageFile) + String languageFile, + boolean supportsOutputs) { this.supportsGrouping=supportsGrouping; this.learnerUrl=learnerUrl; @@ -163,6 +167,7 @@ this.toolIdentifier=toolIdentifier; this.toolVersion=toolVersion; this.languageFile=languageFile; + this.supportsOutputs=supportsOutputs; } /** default constructor */ @@ -492,6 +497,17 @@ this.valid = valid; } + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#isSupportsOutputs() + */ + public boolean isSupportsOutputs() { + return supportsGrouping; + } + + public void setSupportsOutputs(boolean supportsOutputs) { + this.supportsOutputs = supportsOutputs; + } + public String toString() { return new ToStringBuilder(this) .append("toolId", getToolId()) Index: lams_common/src/java/org/lamsfoundation/lams/tool/IToolVO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/IToolVO.java,v diff -u -r1.7 -r1.8 --- lams_common/src/java/org/lamsfoundation/lams/tool/IToolVO.java 17 Sep 2006 06:14:16 -0000 1.7 +++ lams_common/src/java/org/lamsfoundation/lams/tool/IToolVO.java 18 Mar 2008 04:17:58 -0000 1.8 @@ -89,4 +89,6 @@ public abstract boolean isValid(); + public abstract boolean isSupportsOutputs(); + } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java,v diff -u -r1.21 -r1.22 --- lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java 6 Jul 2007 04:05:55 -0000 1.21 +++ lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java 18 Mar 2008 04:17:58 -0000 1.22 @@ -120,6 +120,9 @@ * this activity. e.g. org.lamsfoundation.lams.tool.sbmt.SbmtResources.properties. */ private String languageFile; + /** Does this tool produce output definitions / conditions */ + private Boolean supportsOutputs; + /** * Entries for an tool in a language property file */ @@ -150,7 +153,8 @@ Date createDateTime, String toolIdentifier, String toolVersion, - String languageFile) + String languageFile, + boolean supportsOutputs) { this.toolId = toolId; this.learnerUrl = learnerUrl; @@ -177,6 +181,7 @@ this.toolIdentifier = toolIdentifier; this.toolVersion = toolVersion; this.languageFile = languageFile; + this.supportsOutputs = supportsOutputs; } /** default constructor */ @@ -590,6 +595,23 @@ this.languageFile = languageFile; } + /** + * @hibernate.property column="supports_outputs" length="1" + * @return Returns the supportsOutputs. + */ + public boolean getSupportsOutputs() + { + return supportsOutputs; + } + + /** + * @param supportsRunOffline The supportsRunOffline to set. + */ + public void setSupportsOutputs(boolean supportsOutputs) + { + this.supportsOutputs = supportsOutputs; + } + public String toString() { return new ToStringBuilder(this) .append("toolId", getToolId()) @@ -639,7 +661,8 @@ this.groupingSupportTypeId, this.toolIdentifier, this.toolVersion, - this.languageFile); + this.languageFile, + this.supportsOutputs); return vo; } Index: lams_tool_forum/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/db/sql/tool_insert.sql,v diff -u -r1.25 -r1.26 --- lams_tool_forum/db/sql/tool_insert.sql 22 Mar 2007 05:21:01 -0000 1.25 +++ lams_tool_forum/db/sql/tool_insert.sql 18 Mar 2008 04:21:17 -0000 1.26 @@ -28,7 +28,8 @@ classpath_addition, context_file, create_date_time, -modified_date_time +modified_date_time, +supports_outputs ) VALUES ( @@ -58,5 +59,6 @@ 'lams-tool-lafrum11.jar', '/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml', NOW(), -NOW() +NOW(), +1 ) Index: lams_tool_forum/db/sql/updatescripts/updateTo20080220.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/db/sql/updatescripts/Attic/updateTo20080220.sql,v diff -u -r1.1 -r1.2 --- lams_tool_forum/db/sql/updatescripts/updateTo20080220.sql 20 Feb 2008 04:07:58 -0000 1.1 +++ lams_tool_forum/db/sql/updatescripts/updateTo20080220.sql 18 Mar 2008 04:21:17 -0000 1.2 @@ -6,6 +6,7 @@ alter table tl_lafrum11_message add index IX_msg_auth_parent (authored_parent_uid); +update lams_tool set supports_outputs = 1 where tool_signature = "lafrum11"; -- update the tool version - special code that should only be executed if the upgrade is being done manually. -- if it is being done via the tool deployer then it will update the version automatically. Index: lams_tool_lamc/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/tool_insert.sql,v diff -u -r1.23 -r1.24 --- lams_tool_lamc/db/sql/tool_insert.sql 22 Mar 2007 05:20:46 -0000 1.23 +++ lams_tool_lamc/db/sql/tool_insert.sql 18 Mar 2008 04:21:28 -0000 1.24 @@ -28,7 +28,8 @@ classpath_addition, context_file, create_date_time, -modified_date_time +modified_date_time, +supports_outputs ) VALUES ( @@ -58,4 +59,5 @@ 'lams-tool-lamc11.jar', '/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml', NOW(), -NOW()) +NOW(), +1) Index: lams_tool_lamc/db/sql/updatescripts/updateTo20070820.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/updatescripts/Attic/updateTo20070820.sql,v diff -u -r1.4 -r1.5 --- lams_tool_lamc/db/sql/updatescripts/updateTo20070820.sql 11 Oct 2007 06:27:32 -0000 1.4 +++ lams_tool_lamc/db/sql/updatescripts/updateTo20070820.sql 18 Mar 2008 04:21:28 -0000 1.5 @@ -27,6 +27,8 @@ update tl_lamc11_que_usr qu1 set qu1.last_attempt_total_mark = ( select sum(mark) from tl_lamc11_usr_attempt att where att.que_usr_id = qu1.uid and att.attemptOrder = qu1.last_attempt_order); +update lams_tool set supports_outputs = 1 where tool_signature = "lamc11"; + -- update the tool version - special code that should only be executed if the upgrade is being done manually. -- if it is being done via the tool deployer then it will update the version automatically. -- update lams_tool set tool_version = "20070820" where tool_signature = "lamc11"; \ No newline at end of file