EDIT

cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/oaipmh/ReferenceOaiPmhController.java -text

cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/converter/TimePeriodConverter.java -text

cdmlib-remote/src/main/webapp/WEB-INF/json-views.xml -text

cdmlib-remote/src/main/webapp/WEB-INF/oai-views.xml -text

cdmlib-remote/src/main/webapp/WEB-INF/xml-views.xml -text

cdm-server/.classpath

cdm-server/.project

cdm-server/target

        if(identifier != null) {

        	T  object = service.find(identifier);

        //criteria.add(AuditEntity.property("lsid_lsid").isNotNull()); 

        //TODO this isNotNull criterion did not work with mysql, so using a like statement as interim solution

        criteria.add(AuditEntity.property("lsid_lsid").like("urn:lsid:%"));

        Pager<AuditEventRecord<T>> results = service.pageAuditEvents(clazz, fromAuditEvent, untilAuditEvent, criteria, pageSize, 0, AuditEventSort.FORWARDS, null); 

            //criteria.add(AuditEntity.property("lsid_lsid").isNotNull()); 

            //TODO this isNotNull criterion did not work with mysql, so using a like statement as interim solution

            criteria.add(AuditEntity.property("lsid_lsid").like("urn:lsid:%"));

    public ModelAndView listRecords(@RequestParam(value = "from", required = false) DateTime from, 

    		@RequestParam(value = "until", required = false) DateTime until,

    		@RequestParam(value = "metadataPrefix", required = true) MetadataPrefix metadataPrefix, 

    		@RequestParam(value = "set", required = false) SetSpec set) {

        //criteria.add(AuditEntity.property("lsid_lsid").isNotNull()); 

        //TODO this isNotNull criterion did not work with mysql, so using a like statement as interim solution

        criteria.add(AuditEntity.property("lsid_lsid").like("urn:lsid:%"));

        Pager<AuditEventRecord<T>> results = service.pageAuditEvents(clazz, fromAuditEvent, untilAuditEvent, criteria, pageSize, 0, AuditEventSort.FORWARDS, getPropertyPaths()); 

            cacheProviderFacade.putInCache(resumptionToken.getValue(), cachingModel, resumptionToken);

            //criteria.add(AuditEntity.property("lsid_lsid").isNotNull()); 

            //TODO this isNotNull criterion did not work with mysql, so using a like statement as interim solution

            criteria.add(AuditEntity.property("lsid_lsid").like("urn:lsid:%"));

package eu.etaxonomy.cdm.remote.controller.oaipmh;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.HashSet;

import java.util.List;

import java.util.Set;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.servlet.ModelAndView;

import eu.etaxonomy.cdm.api.service.IReferenceService;

import eu.etaxonomy.cdm.model.reference.ReferenceBase;

import eu.etaxonomy.cdm.remote.controller.AbstractOaiPmhController;

import eu.etaxonomy.cdm.remote.dto.oaipmh.SetSpec;

@Controller

@RequestMapping(value = "/reference/oai", params = "verb")

public class ReferenceOaiPmhController extends AbstractOaiPmhController<ReferenceBase, IReferenceService> {

	@Override

	protected List<String> getPropertyPaths() {

		return Arrays.asList(new String []{

				"$",

				"inBook.authorTeam",

				"inJournal",

				"inProceedings",

		});

	}

    @Override

    protected void addSets(ModelAndView modelAndView) {

    	Set<SetSpec> sets = new HashSet<SetSpec>();

    	sets.add(SetSpec.REFERENCE);

    	modelAndView.addObject("sets",sets);

    }

    @Override

    @Autowired

	public void setService(IReferenceService service) {

		this.service = service;

	}

}

// $Id$

/**

* Copyright (C) 2007 EDIT

* European Distributed Institute of Taxonomy 

* http://www.e-taxonomy.eu

* 

* The contents of this file are subject to the Mozilla Public License Version 1.1

* See LICENSE.TXT at the top of this package for the full license terms.

*/

package eu.etaxonomy.cdm.remote.dto.assembler.converter;

import net.sf.dozer.util.mapping.MappingException;

import net.sf.dozer.util.mapping.converters.CustomConverter;

import org.joda.time.DateTime;

import eu.etaxonomy.cdm.model.common.TimePeriod;

public class TimePeriodConverter implements CustomConverter {

	/* (non-Javadoc)

	 * @see net.sf.dozer.util.mapping.converters.CustomConverter#convert(java.lang.Object, java.lang.Object, java.lang.Class, java.lang.Class)

	 */

	public Object convert(Object destination, Object source, Class destClass, Class sourceClass) {

		if (source == null) {

			return null;

		}

		if (source instanceof TimePeriod) {	   

			//convert from TimePeriod -> DateTime

			//FIXME .toDateTime(null) most probably not correct

			return ((TimePeriod)source).getStart().toDateTime(null); 

		} else if (source instanceof DateTime) {

			//convert from DateTime -> TimePeriod

			//FIXME implement

			return null; 

		} else {

			throw new MappingException("Converter TestCustomConverter used incorrectly. Arguments passed in were:"

					+ destination + " and " + source);

		}

	}

}

import eu.etaxonomy.cdm.model.reference.ReferenceBase;

	SPECIMEN_DESCRIPTION("specimenDescription","Descriptions of specimens and occurrences",SpecimenDescription.class,null),

	REFERENCE("reference","Any kind of Reference",ReferenceBase.class,null);

    public static SetSpec bySpec(String spec){

    	for(SetSpec setSpec : SetSpec.values()) {

			if(setSpec.getSpec().equals(spec)) {

				return setSpec;

			}

		}

    	return null;

    }

			SetSpec setSpec = SetSpec.bySpec(text);

			if(setSpec != null){

				setValue(setSpec);

			} else {				

				throw new IllegalArgumentException(text + " is not an acceptable set spec");

		    return ((SetSpec)getValue()).getSpec();

// $Id$

/**

* Copyright (C) 2007 EDIT

* European Distributed Institute of Taxonomy 

* http://www.e-taxonomy.eu

* 

* The contents of this file are subject to the Mozilla Public License Version 1.1

* See LICENSE.TXT at the top of this package for the full license terms.

*/

package eu.etaxonomy.cdm.remote.json.processor;

import java.text.DateFormat;

import java.text.SimpleDateFormat;

import java.util.Calendar;

import net.sf.json.JsonConfig;

import net.sf.json.processors.JsonValueProcessor;

import org.apache.log4j.Logger;

/**

 * @author a.kohlbecker

 * @created 20.01.2009

 * @version 1.0

 */

public class CalendarJSONValueProcessor implements JsonValueProcessor {

	private static Logger logger = Logger.getLogger(DateTimeJSONValueProcessor.class);

	private static SimpleDateFormat iso8601Format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssz");

	/* (non-Javadoc)

	 * @see net.sf.json.processors.JsonValueProcessor#processArrayValue(java.lang.Object, net.sf.json.JsonConfig)

	 */

	public Object processArrayValue(Object object, JsonConfig jsonConfig) {

		if(object == null){

			return "";

		}

		Calendar calendar = (Calendar) object;

		if (logger.isDebugEnabled()) {

			logger.debug("processArrayValue of java.util.Calendar: " + CalendarJSONValueProcessor.iso8601Format.format(calendar.getTime()));

		}

        return CalendarJSONValueProcessor.iso8601Format.format(calendar.getTime());

	}

	/* (non-Javadoc)

	 * @see net.sf.json.processors.JsonValueProcessor#processObjectValue(java.lang.String, java.lang.Object, net.sf.json.JsonConfig)

	 */

	public Object processObjectValue(String key, Object object, JsonConfig jsonConfig) {

		if(object == null){

			return "";

		}

		Calendar dateTime = (Calendar) object;

		if (logger.isDebugEnabled()) {

			logger.debug("processObjectValue of java.util.Calendar: " + CalendarJSONValueProcessor.iso8601Format.format(dateTime.getTime()));

		}

        return CalendarJSONValueProcessor.iso8601Format.format(dateTime.getTime());

	}

}

// $Id$

/**

* Copyright (C) 2007 EDIT

* European Distributed Institute of Taxonomy 

* http://www.e-taxonomy.eu

* 

* The contents of this file are subject to the Mozilla Public License Version 1.1

* See LICENSE.TXT at the top of this package for the full license terms.

*/

package eu.etaxonomy.cdm.remote.json.processor;

import net.sf.json.JsonConfig;

import net.sf.json.processors.JsonValueProcessor;

import org.apache.log4j.Logger;

import org.joda.time.DateTime;

import org.joda.time.format.DateTimeFormatter;

import org.joda.time.format.ISODateTimeFormat;

/**

 * @author n.hoffmann

 * @created 24.07.2008

 * @version 1.0

 */

public class DateTimeJSONValueProcessor implements JsonValueProcessor {

	private static Logger logger = Logger

			.getLogger(DateTimeJSONValueProcessor.class);

	private static DateTimeFormatter iso8601Format = ISODateTimeFormat.dateTime();

	/* (non-Javadoc)

	 * @see net.sf.json.processors.JsonValueProcessor#processArrayValue(java.lang.Object, net.sf.json.JsonConfig)

	 */

	public Object processArrayValue(Object object, JsonConfig jsonConfig) {

		DateTime dateTime = (DateTime) object;

        return DateTimeJSONValueProcessor.iso8601Format.print(dateTime);

	}

	/* (non-Javadoc)

	 * @see net.sf.json.processors.JsonValueProcessor#processObjectValue(java.lang.String, java.lang.Object, net.sf.json.JsonConfig)

	 */

	public Object processObjectValue(String key, Object object,

			JsonConfig jsonConfig) {

		DateTime dateTime = (DateTime) object;

        return DateTimeJSONValueProcessor.iso8601Format.print(dateTime);

	}

}

// $Id$

/**

* Copyright (C) 2007 EDIT

* European Distributed Institute of Taxonomy 

* http://www.e-taxonomy.eu

* 

* The contents of this file are subject to the Mozilla Public License Version 1.1

* See LICENSE.TXT at the top of this package for the full license terms.

*/

package eu.etaxonomy.cdm.remote.json.processor;

import net.sf.json.JsonConfig;

import net.sf.json.processors.JsonValueProcessor;

import org.apache.log4j.Logger;

import org.joda.time.Partial;

import org.joda.time.format.ISODateTimeFormat;

import eu.etaxonomy.cdm.model.common.PartialUserType;

/**

 * Partial time as four digit year, two digit month of year, and two digit day of month (yyyy-MM-dd).

 * @author a.kohlbecker

 * @created 20.01.2008

 * @version 1.0

 */

public class PartialJSONValueProcessor implements JsonValueProcessor {

	private static Logger logger = Logger.getLogger(PartialJSONValueProcessor.class);

	/* (non-Javadoc)

	 * @see net.sf.json.processors.JsonValueProcessor#processArrayValue(java.lang.Object, net.sf.json.JsonConfig)

	 */

	public Object processArrayValue(Object object, JsonConfig jsonConfig) {

		if(object == null){

			return "";

		}

		Partial partial = (Partial) object;

		if (logger.isDebugEnabled()) {

			logger.debug("processArrayValue of joda.time.DateTime: " + PartialUserType.partialToString(partial));

		}

        return partial.toString(ISODateTimeFormat.date());

	}

	/* (non-Javadoc)

	 * @see net.sf.json.processors.JsonValueProcessor#processObjectValue(java.lang.String, java.lang.Object, net.sf.json.JsonConfig)

	 */

	public Object processObjectValue(String key, Object object, JsonConfig jsonConfig) {

		if(object == null){

			return "";

		}

		Partial partial = (Partial) object;

		if (logger.isDebugEnabled()) {

			logger.debug("processObjectValue of joda.time.DateTime: " + PartialUserType.partialToString(partial));

		}

		return partial.toString(ISODateTimeFormat.date());

	}

}

// $Id$

/**

* Copyright (C) 2007 EDIT

* European Distributed Institute of Taxonomy 

* http://www.e-taxonomy.eu

* 

* The contents of this file are subject to the Mozilla Public License Version 1.1

* See LICENSE.TXT at the top of this package for the full license terms.

*/

package eu.etaxonomy.cdm.remote.json.processor;

import java.util.Arrays;

import java.util.List;

import net.sf.json.JSONObject;

import net.sf.json.JsonConfig;

import org.apache.log4j.Logger;

import eu.etaxonomy.cdm.model.common.CdmBase;

/**

 * @author n.hoffmann

 * @created Apr 9, 2010

 * @version 1.0

 */

public class TaxonNodeBeanProcessor extends AbstractCdmBeanProcessor {

	private static final Logger logger = Logger

			.getLogger(TaxonNodeBeanProcessor.class);

	/* (non-Javadoc)

	 * @see eu.etaxonomy.cdm.remote.json.processor.AbstractCdmBeanProcessor#getIgnorePropNames()

	 */

	@Override

	public List getIgnorePropNames() {

		return Arrays.asList(new String[]{

				"parent", //TODO put in json-config ignore list ?

		});

	}

	/* (non-Javadoc)

	 * @see eu.etaxonomy.cdm.remote.json.processor.AbstractCdmBeanProcessor#processBeanSecondStep(eu.etaxonomy.cdm.model.common.CdmBase, net.sf.json.JSONObject, net.sf.json.JsonConfig)

	 */

	@Override

	public JSONObject processBeanSecondStep(CdmBase bean, JSONObject json,

			JsonConfig jsonConfig) {

		return json;

	}

}

// $Id$

/**

* Copyright (C) 2007 EDIT

* European Distributed Institute of Taxonomy 

* http://www.e-taxonomy.eu

* 

* The contents of this file are subject to the Mozilla Public License Version 1.1

* See LICENSE.TXT at the top of this package for the full license terms.

*/

package eu.etaxonomy.cdm.remote.view;

import java.io.PrintWriter;

import java.util.Collection;

import java.util.Map;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;

import net.sf.json.JSON;

import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

import net.sf.json.JsonConfig;

import net.sf.json.xml.XMLSerializer;

import org.apache.log4j.Logger;

import org.springframework.web.servlet.View;

public class JsonView extends BaseView implements View{

	/**

	 * 

	 */

	private static final String CONTENTTYPE_JSON = "application/json";

	private static final String CONTENTTYPE_XML = "text/xml";

	public static final Logger logger = Logger.getLogger(JsonView.class);

	private JsonConfig jsonConfig;

	public enum Type{

		JSON, XML;

		public String toString(){

			if(this.equals(XML)){

				return "application/xml";

			}

			return "application/json";

		}

	}

	private Type type = Type.JSON;

	private String xsl;

	public void setXsl(String xsl) {

		this.xsl = xsl;

	}

	public Type getType() {

		return type;

	}

	/**

	 * Default is Type.JSON

	 * @param type

	 */

	public void setType(Type type) {

		this.type = type;

	}

	public void setJsonConfig(JsonConfig jsonConfig) {

			this.jsonConfig = jsonConfig;

	}

	public String getContentType() {

		return type.toString();

	}

	public void render(Map model, HttpServletRequest req, HttpServletResponse resp) throws Exception {

		// Retrieve data from model

		Object entity = getResponseData(model);

		// set content type 

		resp.setContentType(getContentType());

		// prepare writer

		// TODO determine preferred charset from HTTP Accept-Charset header

		//Writer out = new BufferedWriter(new OutputStreamWriter(resp.getOutputStream(),  "UTF-8"));

		PrintWriter out =  resp.getWriter();

		// create JSON Object

		boolean isCollectionType = false;

		JSON jsonObj;

		if (entity == null){

		  jsonObj = JSONObject.fromObject("{}");

		} else if(Collection.class.isAssignableFrom(entity.getClass())){

			isCollectionType = true;

			jsonObj = JSONArray.fromObject(entity, jsonConfig);

		}else if(entity instanceof String){

			jsonObj = JSONObject.fromObject("{\"String\":\""+entity+"\"}");

		} else if(entity instanceof Integer){

			jsonObj = JSONObject.fromObject("{\"Integer\":\""+((Integer)entity).intValue()+"\"}");

		} else {

			jsonObj = JSONObject.fromObject(entity, jsonConfig);

		}

		if(type.equals(Type.XML)){

			XMLSerializer xmlSerializer = new XMLSerializer();

			if(isCollectionType){

				xmlSerializer.setArrayName(entity.getClass().getSimpleName());

				Class elementType = Object.class;

				Collection c = (Collection)entity;

				if(c.size() > 0){

					elementType = c.iterator().next().getClass();

				}

				xmlSerializer.setObjectName(elementType.getSimpleName());

			} else if(entity != null){

				xmlSerializer.setObjectName(entity.getClass().getSimpleName());

			}

			String xml = xmlSerializer.write( jsonObj );

			if(xsl != null){

				String xslInclude = "\r\n<?xml-stylesheet type=\"text/xsl\" href=\"human.xsl\"?>\r\n";

				xml = xml.replaceFirst("\r\n", xslInclude);

			}

			resp.setContentType(CONTENTTYPE_XML);

			out.append(xml);

		} else {

			// assuming json

			resp.setContentType(CONTENTTYPE_JSON);

			out.append(jsonObj.toString());

		}

		out.flush();

	}

}

          </entry>

           <entry key="timePeriodConverter">

            <bean class="eu.etaxonomy.cdm.remote.dto.assembler.converter.TimePeriodConverter"/>

    </mapping>

    <mapping>

        <class-a>eu.etaxonomy.cdm.model.taxon.TaxonBase</class-a>

        <class-b map-null="false">eu.etaxonomy.cdm.remote.dto.oaipmh.OaiDc</class-b>

       </field>

    </mapping>

    <mapping>

        <class-a>eu.etaxonomy.cdm.model.reference.ReferenceBase</class-a>

        <class-b map-null="false">eu.etaxonomy.cdm.remote.dto.oaipmh.OaiDc</class-b>

        <field custom-converter-id="timePeriodConverter">

            <a>datePublished</a>

            <b>date</b>

        </field>

        <field custom-converter-id="hibernateProxyDeepConverter" custom-converter-param="titleCache" >

            <a>authorTeam</a>

            <b>creator</b>

        <field>

            <a>title</a>

            <b>title</b>

       </field>

log4j.logger.p6spy=INFO,STDOUT

#log4j.logger.p6spy=INFO, SQLPROFILER_CLIENT

<?xml version="1.0" encoding="UTF-8"?>

<beans xmlns="http://www.springframework.org/schema/beans"

    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

    xmlns:tx="http://www.springframework.org/schema/tx"

    xmlns:context="http://www.springframework.org/schema/context"

    xsi:schemaLocation="http://www.springframework.org/schema/beans   http://www.springframework.org/schema/beans/spring-beans-2.5.xsd

    http://www.springframework.org/schema/context   http://www.springframework.org/schema/context/spring-context-2.5.xsd

    http://www.springframework.org/schema/tx   http://www.springframework.org/schema/tx/spring-tx-2.5.xsd

    ">

	<!-- include default application context and customization -->

     <import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/>

     <bean id="persistentTermInitializer" class="eu.etaxonomy.cdm.database.PersistentTermInitializer">

     	<property name="omit" value="true" />

     </bean>

    <context:component-scan base-package="eu/etaxonomy/cdm/ext" />

    <import resource="classpath:/eu/etaxonomy/cdm/remote.xml"/>

    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">

		<property name="properties">

		  <props>

		      <prop key="eu.etaxonomy.cdm.base.path">${user.home}/.cdmLibrary/</prop>

		      <prop key="eu.etaxonomy.cdm.search.index.path">${user.home}/.cdmLibrary/index/</prop>

		      <prop key="eu.etaxonomy.cdm.ehcache.diskstore.path">${user.home}/.cdmLibrary/ehcache</prop>

		  </props>

        </property>

	</bean>

    <!-- enable the configuration of transactional behavior based on annotations -->

    <tx:annotation-driven transaction-manager="transactionManager"/>

    <!-- import additional beans into the root context -->

    <import resource="applicationContext.views.xml"/>

    <!-- CONFIGURE WEB APPLICATION HERE -->

    <import resource="datasources/configurable.xml" />

    <!-- OAI-PMH TODO externalize? -->

     <bean name="taxonOaiPmhController" class="eu.etaxonomy.cdm.remote.controller.oaipmh.TaxonOaiPmhController">

	   <property name="cachingModel" ref="taxonOaiPmhCacheMapping"/>

	 </bean>

	<bean name="taxonOaiPmhCacheMapping" class="org.springmodules.cache.provider.ehcache.EhCacheCachingModel">

	        <property name="cacheName" value="eu.etaxonomy.cdm.remote.controller.TaxonOaiPmhController.resumptionToken"/>

	</bean>

	<bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">

    <property name="configLocation" value="classpath:/eu/etaxonomy/cdm/remote/ehcache.xml" />

        <property name="shared" value="true"/>

    </bean>

	<bean id="serializableFactory" class="org.springmodules.cache.serializable.XStreamSerializableFactory"/>

	<bean id="cacheProviderFacade" class="org.springmodules.cache.provider.ehcache.EhCacheFacade">

	    <property name="cacheManager" ref="cacheManager" />

	    <property name="serializableFactory" ref="serializableFactory"/>

	</bean>

    <!-- 

     -->	

<?xml version="1.0" encoding="UTF-8"?>

<beans xmlns="http://www.springframework.org/schema/beans"

	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"

	xmlns:tx="http://www.springframework.org/schema/tx"

	xsi:schemaLocation="http://www.springframework.org/schema/beans 

    http://www.springframework.org/schema/beans/spring-beans-2.5.xsd

    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd

    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd

    ">

	<context:component-scan base-package="eu/etaxonomy/cdm/remote" />

	<!-- 

	  ======= HandlerMappings =======

	  -->

	<!--

		first we try to find the controller using the simpleurlmapping, then

		the classname this follows the principal of "convention over

		configuration"

	-->

	<bean

		class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping">

		<property name="order" value="1" />

		<property name="interceptors">

			<list>

				<!--<ref bean="contentNegociationHandlerInterceptor" /> -->

				<ref bean="localeContextHandlerInterceptor" />

			</list>

		</property>

	</bean>

    <!-- 

	<bean class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">

		<property name="order" value="0" />

		<property name="mappings">

			<props>

				<prop key="/index.do">urlFilenameViewController

				</prop>

				<prop key="/">welcomeFileViewController

				</prop>

			</props>

		</property>

	</bean>

	 -->

	<!-- 

	======= HandlerAdapters =======

	-->

	<bean

		class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter">

	</bean>

	<!-- needed when using SimpleUrlHandlerMapping 	-->

	<bean

		class="org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter" />

	<!-- 

	======= HandlerInterceptors =======

	-->