From: Richard Millet <remillet@berkeley.edu>
Date: Wed, 2 May 2012 17:24:16 +0000 (-0700)
Subject: Merge branch 'cspace-4813' of github.com:collectionspace/services into cspace-4813
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=e06f32f49b6a90680ab30a5a55770417d226571d;p=tmp%2Fjakarta-migration.git

Merge branch 'cspace-4813' of github.com:collectionspace/services into cspace-4813

Conflicts:
	services/authority/jaxb/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityItemJAXBSchema.java
---

e06f32f49b6a90680ab30a5a55770417d226571d
diff --cc services/authority/jaxb/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityItemJAXBSchema.java
index 990782cc4,024eab8bc..6c01bb5e7
--- a/services/authority/jaxb/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityItemJAXBSchema.java
+++ b/services/authority/jaxb/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityItemJAXBSchema.java
@@@ -36,11 -36,8 +36,8 @@@ public interface AuthorityItemJAXBSchem
          final static String TERM_DISPLAY_NAME = "termDisplayName";
          final static String TERM_NAME = "termName";
          final static String TERM_STATUS = "termStatus";
-         final static String PREFERRED_TERM_DISPLAY_NAME_XPATH ="termGroupList/0/termDisplayName";
-         final static String PREFERRED_TERM_NAME_XPATH ="termGroupList/0/termName";
-         final static String PREFERRED_TERM_STATUS_XPATH ="termGroupList/0/termStatus";
 -        // CSPACE-4813
 -        /*
 +        final static String TERM_INFO_GROUP_SCHEMA_NAME = ""; //FIXME: REM - Needs to be defined.
 +        // CSPACE-4813 - Remove all the below values and recompile all authorityitem related classes
  	final static String DISPLAY_NAME = "displayName";
  	final static String DISPLAY_NAME_COMPUTED = "displayNameComputed";
  	final static String SHORT_DISPLAY_NAME = "shortDisplayName";