Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml
===================================================================
diff -u -r5c85f79ac6eb2d698a970dfc662f027e4f642141 -r1dbf40946efb1324c987cccf44c18ad5559cdc53
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml (.../Tool.hbm.xml) (revision 5c85f79ac6eb2d698a970dfc662f027e4f642141)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml (.../Tool.hbm.xml) (revision 1dbf40946efb1324c987cccf44c18ad5559cdc53)
@@ -372,6 +372,21 @@
+
+
+ @hibernate.property
+ column="supports_outputs"
+ length="1"
+ not-null="true"
+
+
+
Index: lams_common/db/model/lams_11.clay
===================================================================
diff -u -r472bcb813040efc160e074021be5c71c15455f00 -r1dbf40946efb1324c987cccf44c18ad5559cdc53
--- lams_common/db/model/lams_11.clay (.../lams_11.clay) (revision 472bcb813040efc160e074021be5c71c15455f00)
+++ lams_common/db/model/lams_11.clay (.../lams_11.clay) (revision 1dbf40946efb1324c987cccf44c18ad5559cdc53)
@@ -2211,11 +2211,11 @@
+
-
@@ -3248,6 +3248,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
diff -u -r472bcb813040efc160e074021be5c71c15455f00 -r1dbf40946efb1324c987cccf44c18ad5559cdc53
--- lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 472bcb813040efc160e074021be5c71c15455f00)
+++ lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 1dbf40946efb1324c987cccf44c18ad5559cdc53)
@@ -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
===================================================================
diff -u -r472bcb813040efc160e074021be5c71c15455f00 -r1dbf40946efb1324c987cccf44c18ad5559cdc53
--- lams_common/db/sql/updatescripts/alter_21_branching.sql (.../alter_21_branching.sql) (revision 472bcb813040efc160e074021be5c71c15455f00)
+++ lams_common/db/sql/updatescripts/alter_21_branching.sql (.../alter_21_branching.sql) (revision 1dbf40946efb1324c987cccf44c18ad5559cdc53)
@@ -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
===================================================================
diff -u -r870373d635bc769aee2dc271e6ff12818fcfcea6 -r1dbf40946efb1324c987cccf44c18ad5559cdc53
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision 870373d635bc769aee2dc271e6ff12818fcfcea6)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision 1dbf40946efb1324c987cccf44c18ad5559cdc53)
@@ -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
===================================================================
diff -u -r870373d635bc769aee2dc271e6ff12818fcfcea6 -r1dbf40946efb1324c987cccf44c18ad5559cdc53
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java (.../LibraryActivityDTO.java) (revision 870373d635bc769aee2dc271e6ff12818fcfcea6)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java (.../LibraryActivityDTO.java) (revision 1dbf40946efb1324c987cccf44c18ad5559cdc53)
@@ -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
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r1dbf40946efb1324c987cccf44c18ad5559cdc53
--- lams_common/src/java/org/lamsfoundation/lams/tool/BasicToolVO.java (.../BasicToolVO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/BasicToolVO.java (.../BasicToolVO.java) (revision 1dbf40946efb1324c987cccf44c18ad5559cdc53)
@@ -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
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r1dbf40946efb1324c987cccf44c18ad5559cdc53
--- lams_common/src/java/org/lamsfoundation/lams/tool/IToolVO.java (.../IToolVO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/IToolVO.java (.../IToolVO.java) (revision 1dbf40946efb1324c987cccf44c18ad5559cdc53)
@@ -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
===================================================================
diff -u -r5c85f79ac6eb2d698a970dfc662f027e4f642141 -r1dbf40946efb1324c987cccf44c18ad5559cdc53
--- lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision 5c85f79ac6eb2d698a970dfc662f027e4f642141)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision 1dbf40946efb1324c987cccf44c18ad5559cdc53)
@@ -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
===================================================================
diff -u -r691d0f5085a52d31d37cb556b134714e944d5c27 -r1dbf40946efb1324c987cccf44c18ad5559cdc53
--- lams_tool_forum/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 691d0f5085a52d31d37cb556b134714e944d5c27)
+++ lams_tool_forum/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 1dbf40946efb1324c987cccf44c18ad5559cdc53)
@@ -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
===================================================================
diff -u -r5cf94a873af22670c1bcfb832c7e868ef168333a -r1dbf40946efb1324c987cccf44c18ad5559cdc53
--- lams_tool_forum/db/sql/updatescripts/updateTo20080220.sql (.../updateTo20080220.sql) (revision 5cf94a873af22670c1bcfb832c7e868ef168333a)
+++ lams_tool_forum/db/sql/updatescripts/updateTo20080220.sql (.../updateTo20080220.sql) (revision 1dbf40946efb1324c987cccf44c18ad5559cdc53)
@@ -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
===================================================================
diff -u -r691d0f5085a52d31d37cb556b134714e944d5c27 -r1dbf40946efb1324c987cccf44c18ad5559cdc53
--- lams_tool_lamc/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 691d0f5085a52d31d37cb556b134714e944d5c27)
+++ lams_tool_lamc/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 1dbf40946efb1324c987cccf44c18ad5559cdc53)
@@ -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
===================================================================
diff -u -r3ff06f3f26058ef66d171ad6673eab70e76cd662 -r1dbf40946efb1324c987cccf44c18ad5559cdc53
--- lams_tool_lamc/db/sql/updatescripts/updateTo20070820.sql (.../updateTo20070820.sql) (revision 3ff06f3f26058ef66d171ad6673eab70e76cd662)
+++ lams_tool_lamc/db/sql/updatescripts/updateTo20070820.sql (.../updateTo20070820.sql) (revision 1dbf40946efb1324c987cccf44c18ad5559cdc53)
@@ -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