hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-12 04:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Tom Desair
2016-04-07 16:31:10 +02:00
committed by dylan
parent b19189634d
commit 8db0faed33
102 changed files with 665 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dspace-api/src/main/java/org/dspace/content/MetadataSchema.java
View File

@@ -8,12 +8,11 @@
package org.dspace.content;
import org.dspace.core.Context;
import org.hibernate.annotations.*;
import org.dspace.core.ReloadableEntity;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.proxy.HibernateProxyHelper;
import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* Class representing a schema in DSpace.
@@ -32,7 +31,7 @@ import javax.persistence.Table;
@Cacheable
@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
@Table(name="metadataschemaregistry")
public class MetadataSchema
public class MetadataSchema implements ReloadableEntity<Integer>
{
/** Short Name of built-in Dublin Core schema. */
public static final String DC_SCHEMA = "dc";
@@ -41,7 +40,7 @@ public class MetadataSchema
@Column(name="metadata_schema_id")
@GeneratedValue(strategy = GenerationType.SEQUENCE ,generator="metadataschemaregistry_seq")
@SequenceGenerator(name="metadataschemaregistry_seq", sequenceName="metadataschemaregistry_seq", allocationSize = 1)
private int id;
private Integer id;
@Column(name = "namespace", unique = true, length = 256)
private String namespace;
@@ -137,7 +136,7 @@ public class MetadataSchema
*
* @return schema record key
*/
public int getSchemaID()
public Integer getID()
{
return id;
}