Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml =================================================================== diff -u -r2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e -r809352b41790344e447df862668ab048d4dd56e3 --- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 2959fa5d52dd601e35c5a8a5ca4b37b2aaf8787e) +++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 809352b41790344e447df862668ab048d4dd56e3) @@ -24,6 +24,7 @@ + org.lamsfoundation.lams.contentrepository org.lamsfoundation.lams.learningdesign org.lamsfoundation.lams.logevent org.lamsfoundation.lams.policies Fisheye: Tag 809352b41790344e447df862668ab048d4dd56e3 refers to a dead (removed) revision in file `lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrCredential.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 809352b41790344e447df862668ab048d4dd56e3 refers to a dead (removed) revision in file `lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 809352b41790344e447df862668ab048d4dd56e3 refers to a dead (removed) revision in file `lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 809352b41790344e447df862668ab048d4dd56e3 refers to a dead (removed) revision in file `lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 809352b41790344e447df862668ab048d4dd56e3 refers to a dead (removed) revision in file `lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspace.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 809352b41790344e447df862668ab048d4dd56e3 refers to a dead (removed) revision in file `lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrCredential.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r809352b41790344e447df862668ab048d4dd56e3 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrCredential.java (.../CrCredential.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrCredential.java (.../CrCredential.java) (revision 809352b41790344e447df862668ab048d4dd56e3) @@ -27,31 +27,41 @@ import java.io.Serializable; import java.util.Set; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.OneToMany; +import javax.persistence.Table; + import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -/** - * - * - * -*/ +@Entity +@Table(name = "lams_cr_credential") public class CrCredential implements Serializable { - /** identifier field */ + @Id + @Column(name = "credential_id") + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long credentialId; - /** persistent field */ + @Column private String name; - /** persistent field */ + @Column private String password; - /** persistent field */ - private Set crWorkspaceCredentials; + @OneToMany(mappedBy = "crCredential", + cascade = CascadeType.ALL, + orphanRemoval = true) + private Set crWorkspaceCredentials; /** full constructor */ - public CrCredential(String name, String password, Set crWorkspaceCredentials) { + public CrCredential(String name, String password, Set crWorkspaceCredentials) { this.name = name; this.password = password; this.crWorkspaceCredentials = crWorkspaceCredentials; @@ -61,14 +71,6 @@ public CrCredential() { } - /** - * - * - * - * - * - * - */ public Long getCredentialId() { return this.credentialId; } @@ -77,14 +79,6 @@ this.credentialId = credentialId; } - /** - * - * - * - * - * - * - */ public String getName() { return this.name; } @@ -93,13 +87,6 @@ this.name = name; } - /** - * - * - * - * - * - */ public String getPassword() { return this.password; } @@ -108,24 +95,11 @@ this.password = password; } - /** - * bi-directional one-to-many association to CrWorkspaceCredential - * - * - * - * - * - * - * - * - * - * - */ - public Set getCrWorkspaceCredentials() { + public Set getCrWorkspaceCredentials() { return this.crWorkspaceCredentials; } - public void setCrWorkspaceCredentials(Set crWorkspaceCredentials) { + public void setCrWorkspaceCredentials(Set crWorkspaceCredentials) { this.crWorkspaceCredentials = crWorkspaceCredentials; } Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r809352b41790344e447df862668ab048d4dd56e3 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java (.../CrNode.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java (.../CrNode.java) (revision 809352b41790344e447df862668ab048d4dd56e3) @@ -32,44 +32,56 @@ import java.util.SortedSet; import java.util.TreeSet; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.Table; + import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.log4j.Logger; -/** - * - * - * - * -*/ +@Entity +@Table(name = "lams_cr_node") public class CrNode implements Serializable { - protected Logger log = Logger.getLogger(CrNode.class); - - /** identifier field */ + @Id + @Column(name = "node_id") + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long nodeId; - /** nullable persistent field */ + @Column private String path; - /** persistent field */ + @Column private String type; - /** nullable persistent field */ + @Column(name = "created_date_time") private Date createdDateTime; - /** persistent field */ + @Column(name = "next_version_id") private Long nextVersionId; - /** persistent field */ + @ManyToOne + @JoinColumn(name = "workspace_id") private org.lamsfoundation.lams.contentrepository.CrWorkspace crWorkspace; - /** persistent field */ + @ManyToOne + @JoinColumn(name = "parent_nv_id") private org.lamsfoundation.lams.contentrepository.CrNodeVersion parentNodeVersion; - /** versions of this node. persistent field */ - private Set crNodeVersions; + @OneToMany(mappedBy = "node", + cascade = CascadeType.ALL, + orphanRemoval = true, + fetch = FetchType.EAGER) + private Set crNodeVersions; /** default constructor - used by Hibernate */ public CrNode() { @@ -98,29 +110,21 @@ /* * public CrNode(String path, String type, Date createdDateTime, Long nextVersionId, * org.lamsfoundation.lams.contentrepository.CrWorkspace crWorkspace, - * org.lamsfoundation.lams.contentrepository.CrNodeVersion parentNodeVersion, Set crNodeVersions) { + * org.lamsfoundation.lams.contentrepository.CrNodeVersion parentNodeVersion, Set crNodeVersions) { * } */ /** minimal constructor */ /* * public CrNode(String type, Long nextVersionId, org.lamsfoundation.lams.contentrepository.CrWorkspace crWorkspace, - * org.lamsfoundation.lams.contentrepository.CrNodeVersion parentNodeVersion, Set crNodeVersions) { + * org.lamsfoundation.lams.contentrepository.CrNodeVersion parentNodeVersion, Set crNodeVersions) { * this.type = type; * this.nextVersionId = nextVersionId; * this.crWorkspace = crWorkspace; * this.parentNodeVersion = parentNodeVersion; * this.crNodeVersions = crNodeVersions; * } */ - /** - * - * - * - * - * - * - */ public Long getNodeId() { return this.nodeId; } @@ -129,12 +133,6 @@ this.nodeId = nodeId; } - /** - * - * - * - * - */ public String getPath() { return this.path; } @@ -143,13 +141,6 @@ this.path = path; } - /** - * - * - * - * - * - */ public String getType() { return this.type; } @@ -158,12 +149,6 @@ this.type = type; } - /** - * - * - * - * - */ public Date getCreatedDateTime() { return this.createdDateTime; } @@ -172,12 +157,6 @@ this.createdDateTime = createdDateTime; } - /** - * - * - * - * - */ public Long getNextVersionId() { return this.nextVersionId; } @@ -186,14 +165,6 @@ this.nextVersionId = nextVersionId; } - /** - * bi-directional many-to-one association to CrWorkspace - * - * - * - * - * - */ public org.lamsfoundation.lams.contentrepository.CrWorkspace getCrWorkspace() { return this.crWorkspace; } @@ -202,17 +173,6 @@ this.crWorkspace = crWorkspace; } - /** - * Get the parent node/version to this node. - * bi-directional many-to-one association to CrNodeVersion. - * - * - * - * - * - * - * - */ public org.lamsfoundation.lams.contentrepository.CrNodeVersion getParentNodeVersion() { return this.parentNodeVersion; } @@ -221,33 +181,18 @@ this.parentNodeVersion = parentNodeVersion; } - /** - * bi-directional one-to-many association to CrNodeVersion - * - * - * - * - * - * - * - * - * - * - * usage = "transactional" - * - */ - public Set getCrNodeVersions() { + public Set getCrNodeVersions() { return this.crNodeVersions; } - private void setCrNodeVersions(Set crNodeVersions) { + private void setCrNodeVersions(Set crNodeVersions) { this.crNodeVersions = crNodeVersions; } /** Add a version to this node */ public void addCrNodeVersion(CrNodeVersion version) { if (getCrNodeVersions() == null) { - Set set = new HashSet(); + Set set = new HashSet(); set.add(version); setCrNodeVersions(set); } else { @@ -324,9 +269,9 @@ */ public SortedSet getVersionHistory() { - SortedSet history = new TreeSet(); + SortedSet history = new TreeSet(); - Set versions = getCrNodeVersions(); + Set versions = getCrNodeVersions(); if (versions != null) { Iterator iter = versions.iterator(); while (iter.hasNext()) { @@ -357,7 +302,7 @@ public CrNodeVersion getNodeVersion(Long versionId) { CrNodeVersion nodeVersion = null; - Set nodeVersionSet = getCrNodeVersions(); + Set nodeVersionSet = getCrNodeVersions(); if (nodeVersionSet != null) { Iterator iter = nodeVersionSet.iterator(); @@ -408,7 +353,7 @@ /** Get a list of all the versions - just the Long value. */ public Long[] getVersionIds() { - Set allCrNodeVersions = getCrNodeVersions(); + Set allCrNodeVersions = getCrNodeVersions(); Long[] versions = new Long[allCrNodeVersions != null ? allCrNodeVersions.size() : 0]; Iterator iter = allCrNodeVersions.iterator(); int i = 0; Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r809352b41790344e447df862668ab048d4dd56e3 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java (.../CrNodeVersion.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java (.../CrNodeVersion.java) (revision 809352b41790344e447df862668ab048d4dd56e3) @@ -30,46 +30,56 @@ import java.util.Iterator; import java.util.Set; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.Table; + import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; import org.lamsfoundation.lams.contentrepository.exception.RepositoryRuntimeException; -/** - * - * - * - * -*/ +@Entity +@Table(name = "lams_cr_node_version") public class CrNodeVersion implements Serializable { - /** identifier field */ + @Id + @Column(name = "nv_id") + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long nvId; /** * persistent field. Should never be null, but make it a Long * (rather than long), so that we don't have to keep converting * it to Long to match UUID. */ + @Column(name = "version_id") private Long versionId; - /** nullable persistent field */ + @Column(name = "created_date_time") private Date createdDateTime; - /** persistent field */ + @Column(name = "user_id") private Integer userId; - /** persistent field */ + @ManyToOne + @JoinColumn(name = "node_id") private org.lamsfoundation.lams.contentrepository.CrNode node; - /* - * child Nodes. persistent field - * private Set childNodes; - */ + @OneToMany(mappedBy = "crNodeVersion", + cascade = CascadeType.ALL, + orphanRemoval = true, + fetch = FetchType.EAGER) + private Set crNodeVersionProperties; - /** persistent field */ - private Set crNodeVersionProperties; - /* full constructor */ /* * public CrNodeVersion(Long versionId, Date createdDateTime, org.lamsfoundation.lams.contentrepository.CrNode node, Set @@ -108,14 +118,6 @@ * } */ - /** - * - * - * - * - * - * - */ public Long getNvId() { return this.nvId; } @@ -124,14 +126,6 @@ this.nvId = nvId; } - /** - * - * - * - * - * - * - */ public Long getVersionId() { return this.versionId; } @@ -140,13 +134,6 @@ this.versionId = versionId; } - /** - * - * - * - * - * - */ public Date getCreatedDateTime() { return this.createdDateTime; } @@ -155,12 +142,6 @@ this.createdDateTime = createdDateTime; } - /** - * - * - * - * - */ public Integer getUserId() { return userId; } @@ -169,14 +150,6 @@ this.userId = userId; } - /** - * bi-directional many-to-one association to CrNode - * - * - * - * - * - */ public org.lamsfoundation.lams.contentrepository.CrNode getNode() { return this.node; } @@ -185,25 +158,11 @@ this.node = node; } - /** - * bi-directional one-to-many association to CrNodeVersionProperty - * - * - * - * - * - * - * - * - * - * - * usage = "transactional" - */ - public Set getCrNodeVersionProperties() { + public Set getCrNodeVersionProperties() { return this.crNodeVersionProperties; } - public void setCrNodeVersionProperties(Set crNodeVersionProperties) { + public void setCrNodeVersionProperties(Set crNodeVersionProperties) { this.crNodeVersionProperties = crNodeVersionProperties; } Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r809352b41790344e447df862668ab048d4dd56e3 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.java (.../CrNodeVersionProperty.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.java (.../CrNodeVersionProperty.java) (revision 809352b41790344e447df862668ab048d4dd56e3) @@ -31,33 +31,42 @@ import java.util.Date; import java.util.GregorianCalendar; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; +import javax.persistence.Transient; + import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.log4j.Logger; import org.lamsfoundation.lams.contentrepository.exception.ValueFormatException; -/** - * - * - * - * -*/ +@Entity +@Table(name = "lams_cr_node_version_property") public class CrNodeVersionProperty implements IValue, Serializable { - /** identifier field */ + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - /** persistent field */ + @Column private String name; - /** persistent field */ + @Column private String value; - /** persistent field */ + @Column private int type; - /** persistent field */ + @ManyToOne + @JoinColumn(name = "nv_id") private org.lamsfoundation.lams.contentrepository.CrNodeVersion crNodeVersion; /** full constructor */ @@ -73,29 +82,14 @@ public CrNodeVersionProperty() { } - /** - * - * - * - * - * - * - */ - public Long getId() { + public Long getId() { return this.id; } public void setId(Long id) { this.id = id; } - /** - * - * - * - * - * - */ public String getName() { return this.name; } @@ -104,13 +98,6 @@ this.name = name; } - /** - * - * - * - * - * - */ public String getValue() { return this.value; } @@ -119,13 +106,6 @@ this.value = value; } - /** - * - * - * - * - * - */ @Override public int getType() { return this.type; @@ -141,14 +121,6 @@ this.type = type; } - /** - * bi-directional many-to-one association to CrNodeVersion - * - * - * - * - * - */ public org.lamsfoundation.lams.contentrepository.CrNodeVersion getCrNodeVersion() { return this.crNodeVersion; } @@ -185,7 +157,7 @@ /* ** Implementation of IValue interface ** */ - protected Logger log = Logger.getLogger(CrNodeVersionProperty.class); + @Transient protected Logger log = Logger.getLogger(CrNodeVersionProperty.class); /** * Returns a string representation of the value. Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspace.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r809352b41790344e447df862668ab048d4dd56e3 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspace.java (.../CrWorkspace.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspace.java (.../CrWorkspace.java) (revision 809352b41790344e447df862668ab048d4dd56e3) @@ -27,49 +27,51 @@ import java.io.Serializable; import java.util.Set; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.OneToMany; +import javax.persistence.Table; + import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -/** - * - * - * - * -*/ +@Entity +@Table(name = "lams_cr_workspace") public class CrWorkspace implements IWorkspace, Serializable { - /** identifier field */ + @Id + @Column(name = "workspace_id") + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long workspaceId; - /** persistent field */ + @Column private String name; - /** persistent field */ - private Set crWorkspaceCredentials; + @OneToMany(mappedBy = "crWorkspace", + cascade = CascadeType.ALL, + orphanRemoval = true) + private Set crWorkspaceCredentials; - /** persistent field */ - private Set crNodes; + @OneToMany(mappedBy = "crWorkspace", + cascade = CascadeType.ALL, + orphanRemoval = true) + private Set crNodes; /** full constructor */ - public CrWorkspace(String name, Set crWorkspaceCredentials, Set crNodes) { + public CrWorkspace(String name, Set crWorkspaceCredentials, Set crNodes) { this.name = name; this.crWorkspaceCredentials = crWorkspaceCredentials; this.crNodes = crNodes; } - /** default constructor */ public CrWorkspace() { } - /** - * - * - * - * - * - * - */ @Override public Long getWorkspaceId() { return this.workspaceId; @@ -79,13 +81,6 @@ this.workspaceId = workspaceId; } - /** - * - * - * - * - * - */ @Override public String getName() { return this.name; @@ -95,39 +90,19 @@ this.name = name; } - /** - * bi-directional one-to-many association to CrWorkspaceCredential - * - * - * - * - * - * - * - */ - public Set getCrWorkspaceCredentials() { + public Set getCrWorkspaceCredentials() { return this.crWorkspaceCredentials; } - public void setCrWorkspaceCredentials(Set crWorkspaceCredentials) { + public void setCrWorkspaceCredentials(Set crWorkspaceCredentials) { this.crWorkspaceCredentials = crWorkspaceCredentials; } - /** - * bi-directional one-to-many association to CrNode - * - * - * - * - * - * - * - */ - public Set getCrNodes() { + public Set getCrNodes() { return this.crNodes; } - public void setCrNodes(Set crNodes) { + public void setCrNodes(Set crNodes) { this.crNodes = crNodes; } Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r809352b41790344e447df862668ab048d4dd56e3 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.java (.../CrWorkspaceCredential.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.java (.../CrWorkspaceCredential.java) (revision 809352b41790344e447df862668ab048d4dd56e3) @@ -26,24 +26,34 @@ import java.io.Serializable; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -/** - * - * - * -*/ +@Entity +@Table(name = "lams_cr_workspace_credential") public class CrWorkspaceCredential implements Serializable { - /** identifier field */ + @Id + @Column(name = "wc_id") + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long wcId; - - /** persistent field */ + + @ManyToOne + @JoinColumn(name = "workspace_id") private org.lamsfoundation.lams.contentrepository.CrWorkspace crWorkspace; - /** persistent field */ + @ManyToOne + @JoinColumn(name = "credential_id") private org.lamsfoundation.lams.contentrepository.CrCredential crCredential; /** full constructor */ @@ -57,14 +67,6 @@ public CrWorkspaceCredential() { } - /** - * - * - * - * - * - * - */ public Long getWcId() { return this.wcId; } @@ -73,30 +75,14 @@ this.wcId = wcId; } - /** - * bi-directional many-to-one association to CrWorkspace - * - * - * - * - * - */ - public org.lamsfoundation.lams.contentrepository.CrWorkspace getCrWorkspace() { + public org.lamsfoundation.lams.contentrepository.CrWorkspace getCrWorkspace() { return this.crWorkspace; } public void setCrWorkspace(org.lamsfoundation.lams.contentrepository.CrWorkspace crWorkspace) { this.crWorkspace = crWorkspace; } - /** - * bi-directional many-to-one association to CrCredential - * - * - * - * - * - */ public org.lamsfoundation.lams.contentrepository.CrCredential getCrCredential() { return this.crCredential; } Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/CredentialDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r809352b41790344e447df862668ab048d4dd56e3 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/CredentialDAO.java (.../CredentialDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/CredentialDAO.java (.../CredentialDAO.java) (revision 809352b41790344e447df862668ab048d4dd56e3) @@ -50,9 +50,10 @@ private static final String GET_CREDENTIAL = "FROM " + CrCredential.class.getName() + " AS cr WHERE cr.name = ?"; private static final String CHECK_CREDENTIAL = "SELECT COUNT(*) FROM " + CrCredential.class.getName() - + " AS cr WHERE cr.name = ? AND cr.password = ?"; + + " AS cr WHERE cr.name = :name AND cr.password = :password"; private static final String CHECK_CREDENTIAL_WITH_WORKSPACE = "SELECT COUNT(*) FROM " + CrCredential.class.getName() - + " AS cr INNER JOIN cr.crWorkspaceCredentials AS wcr WHERE cr.name = ? AND cr.password = ? AND wcr.crWorkspace.workspaceId = ?"; + + " AS cr INNER JOIN cr.crWorkspaceCredentials AS wcr WHERE cr.name = :name AND cr.password = :password " + + " AND wcr.crWorkspace.workspaceId = :workspaceId"; /** * Checks whether a user can login to this workspace. The Credential must include the password. @@ -68,9 +69,9 @@ Session hibernateSession = getSessionFactory().getCurrentSession(); Query query = hibernateSession.createQuery(CredentialDAO.CHECK_CREDENTIAL_WITH_WORKSPACE); - query.setString(0, credential.getName()); - query.setString(1, String.valueOf(credential.getPassword())); - query.setLong(2, workspace.getWorkspaceId()); + query.setString("name", credential.getName()); + query.setString("password", String.valueOf(credential.getPassword())); + query.setLong("workspaceId", workspace.getWorkspaceId()); Long count = (Long) query.uniqueResult(); if (count > 2) { @@ -96,8 +97,8 @@ Session hibernateSession = getSessionFactory().getCurrentSession(); Query query = hibernateSession.createQuery(CredentialDAO.CHECK_CREDENTIAL); - query.setString(0, credential.getName()); - query.setString(1, String.valueOf(credential.getPassword())); + query.setString("name", credential.getName()); + query.setString("password", String.valueOf(credential.getPassword())); Long count = (Long) query.uniqueResult(); if (count > 2) {