fieldnames) {
- Field[] fields = new Field[fieldnames.size()];
- int f = 0;
- for (String s: fieldnames) {
- try {
- fields[f++] = o.getClass().getDeclaredField(s);
- } catch (SecurityException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (NoSuchFieldException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- for (int i = 0; i < fields.length; i++) {
- Field field = fields[i];
- try {
- field.setAccessible(true);
- System.out.println(field.getName()+": "+field.get(o));
- }
- catch (IllegalAccessException e) {
- System.err.println("Illegal access exception");
- } catch (NullPointerException e) {
- System.err.println("Nullpointer Exception");
- }
- }
- System.out.println();
- }
-
- /**
- * @param o
- */
- public static void logBusinessObject(Object o) {
- Field[] fields = o.getClass().getDeclaredFields();
-
- for (int i = 0; i < fields.length; i++) {
- Field field = fields[i];
- try {
- field.setAccessible(true);
- logger.info(field.getName()+": "+field.get(o));
- }
- catch (IllegalAccessException e) {
- logger.error("Illegal access exception");
- } catch (NullPointerException e) {
- logger.error("Nullpointer Exception");
- }
-
- }
- }
-
- /**
- * @param mapobject
- */
- public static void printMapObject(Map mapobject) {
- Iterator iter = mapobject.keySet().iterator();
- while (iter.hasNext()) {
- Object keyobj = iter.next();
- Object valobj = mapobject.get(keyobj);
- System.out.println(keyobj +": "+ valobj);
- }
- }
-
- /**
- * @param mapobject
- */
- public static void logMapObject(Map mapobject) {
- Iterator iter = mapobject.keySet().iterator();
- while (iter.hasNext()) {
- Object keyobj = iter.next();
- Object valobj = mapobject.get(keyobj);
- logger.info(keyobj +": "+ valobj);
- }
- }
-
- public static String nl2br(String text) {
- return text.replaceAll("\n\n", "").replaceAll("\n", " CONVERTABLE_CLASSES = new HashSet() {
- {
- add(XMLGregorianCalendar.class);
- }
- };
-
- /**
- * @param bean
- * @return
- */
- public static JSONObject serializeToJsonObject(Object bean) {
- Object result = serialize(bean);
- JSONObject jsonObj = new JSONObject();
- try {
- if (ObjectUtils.isArray(bean) || result instanceof JSONArray) {
- jsonObj.put("array", result);
- } else if (result instanceof JSONObject) {
- jsonObj = (JSONObject) result;
- } else {
- jsonObj.put(bean.getClass().getSimpleName(), result);
- }
- } catch (JSONException e) {
- logger.error("JSONException ",e);
- }
- return jsonObj;
- }
-
- /**
- * @param bean
- * @return
- */
- @SuppressWarnings("unchecked")
- public static Object serialize(Object bean) {
- //String simpleName = bean.getClass().getSimpleName();
- Object result = JSONNull.getInstance();
-
- if (isObjectJson(bean)) {
- result = bean;
- } else if (bean != null && isConvertable(bean.getClass())) {
- //logger.info("Converting convertable Class: "+simpleName);
- result = ConvertUtils.convert(bean);
- } else if (bean != null && Time.class.isAssignableFrom(bean.getClass())) {
- //logger.info("Converting Time Class: "+simpleName);
- result = TimeConverter.toUnixTime((Time) bean);
- } else if (bean != null && Day.class.isAssignableFrom(bean.getClass())) {
- //logger.info("Converting Day Class: "+simpleName);
- result = DayConverter.toUnixTime((Day) bean);
- } else if (bean != null
- && java.util.Date.class.isAssignableFrom(bean.getClass())) {
- // for date consistency, use the XMLGregorianCalendar
- // result =
- // DateConverter.toXMLGregorianCalendar((java.util.Date)bean
- // ).toString();
- //logger.info("Converting Date Class: "+simpleName);
- result = DateConverter.toFormattedString((java.util.Date) bean);
- } else if (bean != null && ObjectUtils.isComplex(bean)
- && !ObjectUtils.isArray(bean) && !ObjectUtils.isMap(bean)) {
- //logger.info("Converting complex bean: "+simpleName);
- JSONObject jsonObject = new JSONObject();
- try {
- PropertyDescriptor[] pds = PropertyUtils
- .getPropertyDescriptors(bean);
- for (int i = 0; i < pds.length; i++) {
- String key = pds[i].getName();
- if ("class".equals(key)) {
- continue;
- }
-
- Class type = pds[i].getPropertyType();
- Object value = PropertyUtils.getProperty(bean, key);
-
- if (String.class.isAssignableFrom(type)) {
- jsonObject.put(key, (value == null) ? "" : value);
- } else if (ObjectUtils.isArray(value)) {
- jsonObject.put(key, serialize(value));
- } else if (value == null) {
- jsonObject.put(key, JSONNull.getInstance());
- } else if (ObjectUtils.isSimpleType(value) || type.isEnum()) {
- if (ClassUtils.isXmlEnum(type)) {
- jsonObject.put(key, ObjectUtils.getXmlEnumValue(value));
- } else {
- jsonObject.put(key, value);
- }
- } else {
- jsonObject.put(key, serialize(value));
- }
- }
-
- result = jsonObject;
- } catch (IllegalAccessException e) {
- logger.error("IllegalAccessException ", e);
- } catch (InvocationTargetException e) {
- logger.error("InvocationTargetException ", e);
- } catch (NoSuchMethodException e) {
- logger.error("NoSuchMethodException ", e);
- } catch (JSONException e) {
- logger.error("JSONException ", e);
- }
- } else if (ObjectUtils.isArray(bean)) {
- //logger.info("Converting Array bean: "+simpleName);
- Collection collection = null;
- if (bean.getClass().isArray()) {
- collection = Arrays.asList((Object[]) bean);
- } else {
- collection = (Collection) bean;
- }
-
- result = new JSONArray();
- for (Object item : collection) {
- ((JSONArray) result).add(serialize(item));
- }
- } else if (ObjectUtils.isMap(bean)) {
- //logger.info("Converting Map bean: "+simpleName);
- Map map = (Map) bean;
- result = new JSONObject();
- for (Object key : map.keySet()) {
- try {
- ((JSONObject) result).put(key.toString(),
- serialize(map.get(key)));
- } catch (JSONException e) {
- logger.error("JSONException ",e);
- }
- }
- } else if (bean != null && ClassUtils.isXmlEnum(bean.getClass())) {
- //logger.info("converting xmlEnum bean: "+simpleName);
- result = ObjectUtils.getXmlEnumValue(bean);
- } else {
- //logger.info("just returning the bean: "+simpleName);
- result = bean;
- }
- return result;
- }
-
- /**
- * @param clazz
- * @return
- */
- @SuppressWarnings("unchecked")
- private static boolean isConvertable(Class clazz) {
- boolean found = false;
- for (Class convertableClass : CONVERTABLE_CLASSES) {
- if (convertableClass.isAssignableFrom(clazz)) {
- found = true;
- break;
- } else {
- //logger.warn("Class is not convertable");
- //logger.warn("Class: " + clazz.getSimpleName());
- }
- }
- return found;
- }
-
- /**
- * @param bean
- * @return
- */
- private static boolean isObjectJson(Object bean) {
- if ((JSONNull.getInstance().equals(bean)) || (bean instanceof JSONObject)
- || (bean instanceof JSONArray)) {
- return true;
- }
- return false;
- }
-}
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddResearcherRoleToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddResearcherRoleToPersonGenerator.java
index 79eb741f..8a70e00e 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddResearcherRoleToPersonGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddResearcherRoleToPersonGenerator.java
@@ -1,51 +1,53 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
-
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
-
-public class AddResearcherRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
-
- private static String template = "addResearcherRoleToPerson.ftl";
-
- @Override
- String getTemplate() {
- return template;
- }
-
- @Override
- public String getRoleType() {
- return "http://vivoweb.org/ontology/core#ResearcherRole";
- }
-
- /** Researcher role involves hard-coded options for the "right side" of the role or activity. */
- @Override
- FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
- return new ConstantFieldOptions(
- "", "Select one",
- "http://vivoweb.org/ontology/core#Grant", "Grant",
- "http://vivoweb.org/ontology/core#Project", "Project");
- }
-
- @Override
- boolean isShowRoleLabelField() { return true; }
- /*
- * Use the methods below to change the date/time precision in the
- * custom form associated with this generator. When not used, the
- * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
- * MINUTE, TIME and NONE.
- */
-/*
- public String getStartDatePrecision() {
- String precision = VitroVocabulary.Precision.MONTH.uri();
- return precision;
- }
-
- public String getEndDatePrecision() {
- String precision = VitroVocabulary.Precision.DAY.uri();
- return precision;
- }
-*/
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
+
+public class AddResearcherRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
+
+ private static String template = "addResearcherRoleToPerson.ftl";
+
+ @Override
+ String getTemplate() {
+ return template;
+ }
+
+ @Override
+ public String getRoleType() {
+ return "http://vivoweb.org/ontology/core#ResearcherRole";
+ }
+
+ /** Researcher role involves hard-coded options for the "right side" of the role or activity. */
+ @Override
+ FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
+ return new ConstantFieldOptions(
+ "", "Select one",
+ "http://vivoweb.org/ontology/core#Grant", "Grant",
+ "http://purl.obolibrary.org/obo/ERO_0000015", "Human Study",
+ "http://vivoweb.org/ontology/core#Project", "Project",
+ "http://purl.obolibrary.org/obo/ERO_0000014", "Research Project");
+ }
+
+ @Override
+ boolean isShowRoleLabelField() { return true; }
+ /*
+ * Use the methods below to change the date/time precision in the
+ * custom form associated with this generator. When not used, the
+ * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
+ * MINUTE, TIME and NONE.
+ */
+/*
+ public String getStartDatePrecision() {
+ String precision = VitroVocabulary.Precision.MONTH.uri();
+ return precision;
+ }
+
+ public String getEndDatePrecision() {
+ String precision = VitroVocabulary.Precision.DAY.uri();
+ return precision;
+ }
+*/
+}
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java
index bef4eeda..f736c26d 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java
@@ -50,9 +50,14 @@ public class NewIndividualFormGenerator extends BaseEditConfigurationGenerator i
+ " ?newVcardInd vcard:hasName ?newVcardName . \n"
+ " ?newVcardName a vcard:Name . \n"
+ " ?newVcardName vcard:givenName ?firstName . \n"
- + " ?newVcardName vcard:familyName ?lastName . \n"
- + " ?newVcardName ?middleName .",
- N3_PREFIX + " ?newInd <" + RDFS.label.getURI() + "> ?label ."
+ + " ?newVcardName vcard:familyName ?lastName . \n",
+ N3_PREFIX + " ?newInd <" + RDFS.label.getURI() + "> ?label .",
+ N3_PREFIX + "@prefix vcard: .\n"
+ + " ?newInd ?newVcardInd . \n"
+ + " ?newVcardInd a vcard:Individual . \n"
+ + " ?newVcardInd vcard:hasName ?newVcardName . \n"
+ + " ?newVcardName a vcard:Name . \n"
+ + " ?newVcardName ?middleName ."
));
config.addNewResource("newInd", vreq.getWebappDaoFactory().getDefaultNamespace());
diff --git a/src/edu/cornell/mannlib/vitro/webapp/servlet/ConceptSearchServlet.java b/src/edu/cornell/mannlib/vitro/webapp/servlet/ConceptSearchServlet.java
index 04a0aca0..38bdf751 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/servlet/ConceptSearchServlet.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/servlet/ConceptSearchServlet.java
@@ -11,16 +11,16 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sf.json.JSONObject;
-
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
import edu.cornell.mannlib.semservices.bo.Concept;
import edu.cornell.mannlib.semservices.bo.ConceptInfo;
import edu.cornell.mannlib.semservices.bo.SemanticServicesError;
-import edu.cornell.mannlib.semservices.view.BeanToJsonSerializer;
import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.utils.ConceptSearchService.ConceptSearchServiceUtils;
@@ -58,7 +58,9 @@ public class ConceptSearchServlet extends VitroHttpServlet {
conceptInfo.setSemanticServicesError(semanticServicesError);
}
conceptInfo.setConceptList(results);
+
String json = renderJson(conceptInfo);
+
json = StringUtils.replaceChars(json, "\r\t\n", "");
PrintWriter writer = resp.getWriter();
resp.setContentType("application/json");
@@ -70,12 +72,18 @@ public class ConceptSearchServlet extends VitroHttpServlet {
}
}
+
protected String renderJson(ConceptInfo conceptInfo) {
+
+ ObjectMapper mapper = new ObjectMapper();
+ try {
+ return mapper.writeValueAsString(conceptInfo);
+ } catch (JsonProcessingException e) {
+ // TODO Auto-generated catch block
+ log.error("An error occurred in rendering conceptInfo as json ", e);
+ return null;
+ }
+ }
- JSONObject jsonObject = null;
- jsonObject = BeanToJsonSerializer.serializeToJsonObject(conceptInfo);
- log.debug(jsonObject.toString());
- return jsonObject.toString();
- }
}
diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/TestLinkedOpenData.html b/utilities/acceptance-tests/suites/LinkedOpenData/TestLinkedOpenData.html
new file mode 100644
index 00000000..b48253e9
--- /dev/null
+++ b/utilities/acceptance-tests/suites/LinkedOpenData/TestLinkedOpenData.html
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+Test the Linked Open Data requests
+
+Try various accept headers
+Try non-existent URI with RDFXML accept header
+Response data
+Response code is 000
+MIME type is No type
+Text is:
+No text
\ No newline at end of file
diff --git a/utilities/acceptance-tests/suites/LinkedOpenData/TestLinkedOpenData.n3 b/utilities/acceptance-tests/suites/LinkedOpenData/TestLinkedOpenData.n3
new file mode 100644
index 00000000..8f45ec5c
--- /dev/null
+++ b/utilities/acceptance-tests/suites/LinkedOpenData/TestLinkedOpenData.n3
@@ -0,0 +1,56 @@
+@prefix rdfs: .
+@prefix xmls: .
+@prefix local: .
+@prefix vcard: .
+@prefix obo: