Merge branch 'maint-rel-1.6' into develop

This commit is contained in:
tworrall 2013-10-31 09:55:14 -04:00
commit 3ba871df7f

View file

@ -117,12 +117,6 @@ public class PersonHasIssuedCredentialGenerator extends VivoBaseGenerator implem
setValidators( list("datatype:" + XSD.xstring.toString()))
);
conf.addField( new FieldVTwo().
setName("orgLabelDisplay").
setRangeDatatypeUri(XSD.xstring.toString() ).
setValidators( list("datatype:" + XSD.xstring.toString()))
);
conf.addField( new FieldVTwo().
setName("credentialLabelDisplay").
setRangeDatatypeUri(XSD.xstring.toString() ).
@ -184,8 +178,8 @@ public class PersonHasIssuedCredentialGenerator extends VivoBaseGenerator implem
final static String n3ForExistingCredentialAssertion =
"@prefix vivo: <" + vivoCore + "> . \n\n" +
"?issuedCredential vivo:relates ?existingCredential . \n" +
"?existingCredential a <" + credentialTypeClass + "> . \n" +
"?existingCredential a ?credentialType . \n" +
/* "?existingCredential a <" + credentialTypeClass + "> . \n" +
"?existingCredential a ?credentialType . \n" + */
"?existingCredential vivo:relatedBy ?issuedCredential . " ;
final static String n3ForYearCredentialed =