From: Richard Millet <remillet@berkeley.edu>
Date: Thu, 20 Sep 2012 23:40:31 +0000 (-0700)
Subject: Merge branch 'v2.7'
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=bc78dbd3a05105f89f13e692f2acbff91a33dab3;p=tmp%2Fjakarta-migration.git

Merge branch 'v2.7'
---

bc78dbd3a05105f89f13e692f2acbff91a33dab3
diff --cc services/common/src/main/java/org/collectionspace/services/common/relation/RelationJAXBSchema.java
index 713c546d2,2237211d0..3d4d01fa3
--- a/services/common/src/main/java/org/collectionspace/services/common/relation/RelationJAXBSchema.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/relation/RelationJAXBSchema.java
@@@ -44,12 -46,10 +46,12 @@@ public interface RelationJAXBSchema 
  	
  	/** The Constant RELATIONSHIP_TYPE_DISPLAYNAME. */
  	final static String RELATIONSHIP_TYPE_DISPLAYNAME = "predicateDisplayName";
 +        
 +        final static String RELATIONSHIP_META_TYPE = "relationshipMetaType";
  
      final static String SUBJECT_URI =		"subjectUri";
-     final static String SUBJECT_CSID =		"subjectCsid";
-     final static String SUBJECT_REFNAME =	"subjectRefName";
+     final static String SUBJECT_CSID =		IRelationsManager.SUBJECT;
+     final static String SUBJECT_REFNAME =	IRelationsManager.SUBJECT_REFNAME;
      final static String SUBJECT_DOCTYPE =	"subjectDocumentType";
  
      final static String OBJECT_URI =		"objectUri";