Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r750f84843809e7143585d1ace1742c935df2898a -r36a7a9ea402e41d5fb0b0d456b268cbda664cafd
Binary files differ
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -r36a7a9ea402e41d5fb0b0d456b268cbda664cafd
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml (.../User.hbm.xml) (revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml (.../User.hbm.xml) (revision 36a7a9ea402e41d5fb0b0d456b268cbda664cafd)
@@ -270,10 +270,12 @@
@hibernate.many-to-one
+ lazy="false"
@hibernate.column name="workspace_id"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -r36a7a9ea402e41d5fb0b0d456b268cbda664cafd
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml (.../Workspace.hbm.xml) (revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml (.../Workspace.hbm.xml) (revision 36a7a9ea402e41d5fb0b0d456b268cbda664cafd)
@@ -102,14 +102,34 @@
name="rootFolder"
class="org.lamsfoundation.lams.usermanagement.WorkspaceFolder"
not-null="true"
+ lazy="false"
>
@hibernate.many-to-one
not-null="true"
+ lazy="false"
@hibernate.column name="root_folder_id"
+
+
+
+ @hibernate.many-to-one
+ not-null="true"
+ lazy="false"
+ @hibernate.column name="def_run_seq_fld_id"
+
+
+
+
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
diff -u -re39dfcb4766109894b8d9dfb21cee7b382119056 -r36a7a9ea402e41d5fb0b0d456b268cbda664cafd
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (.../User.java) (revision e39dfcb4766109894b8d9dfb21cee7b382119056)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (.../User.java) (revision 36a7a9ea402e41d5fb0b0d456b268cbda664cafd)
@@ -108,7 +108,6 @@
/** persistent field */
private Set lessons;
- private String fullName;
/** full constructor */
public User(String login, String password, String title, String firstName, String lastName, String addressLine1, String addressLine2, String addressLine3, String city, String state, String country, String dayPhone, String eveningPhone, String mobilePhone, String fax, String email, Boolean disabledFlag, Date createDate, Workspace workspace, AuthenticationMethod authenticationMethod, CSSThemeVisualElement theme, Set userOrganisations, Organisation baseOrganisation, Set learnerProgresses, Set userToolSessions, Set userGroups, Set learningDesigns, Set lessons) {
this.login = login;
@@ -441,6 +440,7 @@
/**
* @hibernate.many-to-one
* not-null="true"
+ * lazy="false"
* @hibernate.column name="workspace_id"
*
*/
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Workspace.java
===================================================================
diff -u -r26e7cbf75f02d6a8bdaf59bbf33148c566b69a19 -r36a7a9ea402e41d5fb0b0d456b268cbda664cafd
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Workspace.java (.../Workspace.java) (revision 26e7cbf75f02d6a8bdaf59bbf33148c566b69a19)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Workspace.java (.../Workspace.java) (revision 36a7a9ea402e41d5fb0b0d456b268cbda664cafd)
@@ -21,6 +21,9 @@
private WorkspaceFolder rootFolder;
/** persistent field */
+ private WorkspaceFolder defaultRunSequencesFolder;
+
+ /** persistent field */
private Set users;
/** persistent field */
@@ -64,6 +67,7 @@
/**
* @hibernate.many-to-one
* not-null="true"
+ * lazy="false"
* @hibernate.column name="root_folder_id"
*
*/
@@ -77,6 +81,22 @@
/**
+ * @hibernate.many-to-one
+ * not-null="true"
+ * lazy="false"
+ * @hibernate.column name="def_run_seq_fld_id"
+ *
+ */
+ public WorkspaceFolder getDefaultRunSequencesFolder() {
+ return defaultRunSequencesFolder;
+ }
+
+ public void setDefaultRunSequencesFolder(WorkspaceFolder defaultRunSequencesFolder) {
+ this.defaultRunSequencesFolder = defaultRunSequencesFolder;
+ }
+
+
+ /**
* @hibernate.set
* lazy="true"
* inverse="true"
@@ -128,10 +148,6 @@
.isEquals();
}
- public WorkspaceFolder getDefaultRunSequenceFolder() {
- return null;
- }
-
public int hashCode() {
return new HashCodeBuilder()
.append(getWorkspaceId())