From 7950d645c7c93b6784c151cbfd10e7f3dc9a43e5 Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Fri, 28 Nov 2014 13:04:41 +0100
Subject: [PATCH] Updated some versions.

---
 oaipmh-core/.classpath   | 116 +++++++++++++-------------
 oaipmh-core/pom.xml      | 170 ++++++++++++++++++---------------------
 oaipmh-webapp/.classpath | 149 +++++++++++++++++-----------------
 oaipmh-webapp/pom.xml    | 100 +++++++++++------------
 pom.xml                  |  95 +++++++++++-----------
 5 files changed, 310 insertions(+), 320 deletions(-)

diff --git a/oaipmh-core/.classpath b/oaipmh-core/.classpath
index 67574496..1b28993d 100644
--- a/oaipmh-core/.classpath
+++ b/oaipmh-core/.classpath
@@ -6,12 +6,12 @@
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="var" path="M2_REPO/javax/ws/rs/javax.ws.rs-api/2.0-m10/javax.ws.rs-api-2.0-m10.jar" sourcepath="M2_REPO/javax/ws/rs/javax.ws.rs-api/2.0-m10/javax.ws.rs-api-2.0-m10-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/javax/ws/rs/javax.ws.rs-api/2.0-m10/javax.ws.rs-api-2.0-m10-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/javax/ws/rs/javax.ws.rs-api/2.0-m10/javax.ws.rs-api-2.0-m10-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/javax/ws/rs/jsr311-api/1.0/jsr311-api-1.0.jar" sourcepath="M2_REPO/javax/ws/rs/jsr311-api/1.0/jsr311-api-1.0-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/javax/ws/rs/jsr311-api/1.0/jsr311-api-1.0-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/javax/ws/rs/jsr311-api/1.0/jsr311-api-1.0-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>
@@ -20,73 +20,73 @@
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-rs-client/3.0.0-milestone1/cxf-rt-rs-client-3.0.0-milestone1.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-rs-client/3.0.0-milestone1/cxf-rt-rs-client-3.0.0-milestone1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-rs-client/3.0.0-milestone1/cxf-rt-rs-client-3.0.0-milestone1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-rs-client/3.0.0-milestone1/cxf-rt-rs-client-3.0.0-milestone1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-transports-http/2.7.8/cxf-rt-transports-http-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-transports-http/2.7.8/cxf-rt-transports-http-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-transports-http/2.7.13/cxf-rt-transports-http-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-transports-http/2.7.13/cxf-rt-transports-http-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-transports-http/2.7.8/cxf-rt-transports-http-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-transports-http/2.7.13/cxf-rt-transports-http-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-core/3.0.0-milestone1/cxf-core-3.0.0-milestone1.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-core/3.0.0-milestone1/cxf-core-3.0.0-milestone1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-core/3.0.0-milestone1/cxf-core-3.0.0-milestone1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-core/3.0.0-milestone1/cxf-core-3.0.0-milestone1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/woodstox-core-asl/4.2.0/woodstox-core-asl-4.2.0.jar" sourcepath="M2_REPO/org/codehaus/woodstox/woodstox-core-asl/4.2.0/woodstox-core-asl-4.2.0-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/codehaus/woodstox/woodstox-core-asl/4.2.0/woodstox-core-asl-4.2.0-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/codehaus/woodstox/woodstox-core-asl/4.2.0/woodstox-core-asl-4.2.0-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1.jar" sourcepath="M2_REPO/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/ws/xmlschema/xmlschema-core/2.0.3/xmlschema-core-2.0.3.jar" sourcepath="M2_REPO/org/apache/ws/xmlschema/xmlschema-core/2.0.3/xmlschema-core-2.0.3-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/ws/xmlschema/xmlschema-core/2.0.3/xmlschema-core-2.0.3-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/ws/xmlschema/xmlschema-core/2.0.3/xmlschema-core-2.0.3-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxrs/2.7.8/cxf-rt-frontend-jaxrs-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxrs/2.7.8/cxf-rt-frontend-jaxrs-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxrs/2.7.13/cxf-rt-frontend-jaxrs-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxrs/2.7.13/cxf-rt-frontend-jaxrs-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-frontend-jaxrs/2.7.8/cxf-rt-frontend-jaxrs-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-frontend-jaxrs/2.7.13/cxf-rt-frontend-jaxrs-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-transports-http-hc/2.7.8/cxf-rt-transports-http-hc-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-transports-http-hc/2.7.8/cxf-rt-transports-http-hc-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-transports-http-hc/2.7.13/cxf-rt-transports-http-hc-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-transports-http-hc/2.7.13/cxf-rt-transports-http-hc-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-transports-http-hc/2.7.8/cxf-rt-transports-http-hc-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-transports-http-hc/2.7.13/cxf-rt-transports-http-hc-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-api/2.7.8/cxf-api-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-api/2.7.8/cxf-api-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-api/2.7.13/cxf-api-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-api/2.7.13/cxf-api-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-api/2.7.8/cxf-api-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-api/2.7.13/cxf-api-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7.1/geronimo-javamail_1.4_spec-1.7.1.jar" sourcepath="M2_REPO/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7.1/geronimo-javamail_1.4_spec-1.7.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7.1/geronimo-javamail_1.4_spec-1.7.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7.1/geronimo-javamail_1.4_spec-1.7.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.3/wsdl4j-1.6.3.jar" sourcepath="M2_REPO/wsdl4j/wsdl4j/1.6.3/wsdl4j-1.6.3-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/wsdl4j/wsdl4j/1.6.3/wsdl4j-1.6.3-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/wsdl4j/wsdl4j/1.6.3/wsdl4j-1.6.3-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-core/2.7.8/cxf-rt-core-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-core/2.7.8/cxf-rt-core-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-core/2.7.13/cxf-rt-core-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-core/2.7.13/cxf-rt-core-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-core/2.7.8/cxf-rt-core-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-core/2.7.13/cxf-rt-core-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.2.6/jaxb-impl-2.2.6.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-impl/2.2.6/jaxb-impl-2.2.6-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/com/sun/xml/bind/jaxb-impl/2.2.6/jaxb-impl-2.2.6-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/com/sun/xml/bind/jaxb-impl/2.2.6/jaxb-impl-2.2.6-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore-nio/4.2.4/httpcore-nio-4.2.4.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore-nio/4.2.4/httpcore-nio-4.2.4-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/httpcomponents/httpcore-nio/4.2.4/httpcore-nio-4.2.4-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/httpcomponents/httpcore-nio/4.2.4/httpcore-nio-4.2.4-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.2.1/httpcore-4.2.1.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.2.1/httpcore-4.2.1-sources.jar"/>
@@ -94,151 +94,151 @@
   <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.2.1/httpclient-4.2.1.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.2.1/httpclient-4.2.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.6/commons-codec-1.6.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.6/commons-codec-1.6-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/commons-codec/commons-codec/1.6/commons-codec-1.6-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/commons-codec/commons-codec/1.6/commons-codec-1.6-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-bindings-xml/2.7.8/cxf-rt-bindings-xml-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-bindings-xml/2.7.8/cxf-rt-bindings-xml-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-bindings-xml/2.7.13/cxf-rt-bindings-xml-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-bindings-xml/2.7.13/cxf-rt-bindings-xml-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-bindings-xml/2.7.8/cxf-rt-bindings-xml-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-bindings-xml/2.7.13/cxf-rt-bindings-xml-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxws/2.7.8/cxf-rt-frontend-jaxws-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxws/2.7.8/cxf-rt-frontend-jaxws-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxws/2.7.13/cxf-rt-frontend-jaxws-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxws/2.7.13/cxf-rt-frontend-jaxws-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-frontend-jaxws/2.7.8/cxf-rt-frontend-jaxws-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-frontend-jaxws/2.7.13/cxf-rt-frontend-jaxws-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/xml-resolver/xml-resolver/1.2/xml-resolver-1.2.jar" sourcepath="M2_REPO/xml-resolver/xml-resolver/1.2/xml-resolver-1.2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/asm/asm/3.3.1/asm-3.3.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-bindings-soap/2.7.8/cxf-rt-bindings-soap-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-bindings-soap/2.7.8/cxf-rt-bindings-soap-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-bindings-soap/2.7.13/cxf-rt-bindings-soap-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-bindings-soap/2.7.13/cxf-rt-bindings-soap-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-bindings-soap/2.7.8/cxf-rt-bindings-soap-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-bindings-soap/2.7.13/cxf-rt-bindings-soap-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-databinding-jaxb/2.7.8/cxf-rt-databinding-jaxb-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-databinding-jaxb/2.7.8/cxf-rt-databinding-jaxb-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-databinding-jaxb/2.7.13/cxf-rt-databinding-jaxb-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-databinding-jaxb/2.7.13/cxf-rt-databinding-jaxb-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-databinding-jaxb/2.7.8/cxf-rt-databinding-jaxb-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-databinding-jaxb/2.7.13/cxf-rt-databinding-jaxb-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-simple/2.7.8/cxf-rt-frontend-simple-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-frontend-simple/2.7.8/cxf-rt-frontend-simple-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-simple/2.7.13/cxf-rt-frontend-simple-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-frontend-simple/2.7.13/cxf-rt-frontend-simple-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-frontend-simple/2.7.8/cxf-rt-frontend-simple-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-frontend-simple/2.7.13/cxf-rt-frontend-simple-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-ws-addr/2.7.8/cxf-rt-ws-addr-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-ws-addr/2.7.8/cxf-rt-ws-addr-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-ws-addr/2.7.13/cxf-rt-ws-addr-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-ws-addr/2.7.13/cxf-rt-ws-addr-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-ws-addr/2.7.8/cxf-rt-ws-addr-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-ws-addr/2.7.13/cxf-rt-ws-addr-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-ws-policy/2.7.8/cxf-rt-ws-policy-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-ws-policy/2.7.8/cxf-rt-ws-policy-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-ws-policy/2.7.13/cxf-rt-ws-policy-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-ws-policy/2.7.13/cxf-rt-ws-policy-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-ws-policy/2.7.8/cxf-rt-ws-policy-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-ws-policy/2.7.13/cxf-rt-ws-policy-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/neethi/neethi/3.0.2/neethi-3.0.2.jar" sourcepath="M2_REPO/org/apache/neethi/neethi/3.0.2/neethi-3.0.2-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/neethi/neethi/3.0.3/neethi-3.0.3.jar" sourcepath="M2_REPO/org/apache/neethi/neethi/3.0.3/neethi-3.0.3-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/neethi/neethi/3.0.2/neethi-3.0.2-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/neethi/neethi/3.0.3/neethi-3.0.3-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/junit/junit/4.11/junit-4.11.jar" sourcepath="M2_REPO/junit/junit/4.11/junit-4.11-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/junit/junit/4.11/junit-4.11-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/junit/junit/4.11/junit-4.11-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/elasticsearch/elasticsearch/1.0.1/elasticsearch-1.0.1.jar" sourcepath="M2_REPO/org/elasticsearch/elasticsearch/1.0.1/elasticsearch-1.0.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/4.6.1/lucene-core-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-core/4.6.1/lucene-core-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-core/4.6.1/lucene-core-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-core/4.6.1/lucene-core-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-analyzers-common/4.6.1/lucene-analyzers-common-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-analyzers-common/4.6.1/lucene-analyzers-common-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-analyzers-common/4.6.1/lucene-analyzers-common-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-analyzers-common/4.6.1/lucene-analyzers-common-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-codecs/4.6.1/lucene-codecs-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-codecs/4.6.1/lucene-codecs-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-codecs/4.6.1/lucene-codecs-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-codecs/4.6.1/lucene-codecs-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-queries/4.6.1/lucene-queries-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-queries/4.6.1/lucene-queries-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-queries/4.6.1/lucene-queries-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-queries/4.6.1/lucene-queries-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-memory/4.6.1/lucene-memory-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-memory/4.6.1/lucene-memory-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-memory/4.6.1/lucene-memory-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-memory/4.6.1/lucene-memory-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-highlighter/4.6.1/lucene-highlighter-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-highlighter/4.6.1/lucene-highlighter-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-highlighter/4.6.1/lucene-highlighter-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-highlighter/4.6.1/lucene-highlighter-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-queryparser/4.6.1/lucene-queryparser-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-queryparser/4.6.1/lucene-queryparser-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-queryparser/4.6.1/lucene-queryparser-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-queryparser/4.6.1/lucene-queryparser-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-sandbox/4.6.1/lucene-sandbox-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-sandbox/4.6.1/lucene-sandbox-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-sandbox/4.6.1/lucene-sandbox-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-sandbox/4.6.1/lucene-sandbox-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-suggest/4.6.1/lucene-suggest-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-suggest/4.6.1/lucene-suggest-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-suggest/4.6.1/lucene-suggest-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-suggest/4.6.1/lucene-suggest-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-misc/4.6.1/lucene-misc-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-misc/4.6.1/lucene-misc-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-misc/4.6.1/lucene-misc-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-misc/4.6.1/lucene-misc-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-join/4.6.1/lucene-join-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-join/4.6.1/lucene-join-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-join/4.6.1/lucene-join-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-join/4.6.1/lucene-join-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-grouping/4.6.1/lucene-grouping-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-grouping/4.6.1/lucene-grouping-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-grouping/4.6.1/lucene-grouping-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-grouping/4.6.1/lucene-grouping-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-spatial/4.6.1/lucene-spatial-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-spatial/4.6.1/lucene-spatial-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-spatial/4.6.1/lucene-spatial-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-spatial/4.6.1/lucene-spatial-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/com/spatial4j/spatial4j/0.3/spatial4j-0.3.jar" sourcepath="M2_REPO/com/spatial4j/spatial4j/0.3/spatial4j-0.3-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/com/spatial4j/spatial4j/0.3/spatial4j-0.3-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/com/spatial4j/spatial4j/0.3/spatial4j-0.3-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/info/textgrid/utils/httpclients/1.3.0-SNAPSHOT/httpclients-1.3.0-SNAPSHOT.jar" sourcepath="M2_REPO/info/textgrid/utils/httpclients/1.3.0-SNAPSHOT/httpclients-1.3.0-SNAPSHOT-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/info/textgrid/utils/httpclients/1.3.0-SNAPSHOT/httpclients-1.3.0-SNAPSHOT-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/info/textgrid/utils/httpclients/1.3.0-SNAPSHOT/httpclients-1.3.0-SNAPSHOT-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpmime/4.2.1/httpmime-4.2.1.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpmime/4.2.1/httpmime-4.2.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf4j-1.7.5.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf4j-1.7.5-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf4j-1.7.5-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf4j-1.7.5-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.7.5/slf4j-log4j12-1.7.5.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.7.5/slf4j-log4j12-1.7.5-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/slf4j/slf4j-log4j12/1.7.5/slf4j-log4j12-1.7.5-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/slf4j/slf4j-log4j12/1.7.5/slf4j-log4j12-1.7.5-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml
index 0b9a448b..42183706 100644
--- a/oaipmh-core/pom.xml
+++ b/oaipmh-core/pom.xml
@@ -1,49 +1,45 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>info.textgrid.middleware</groupId>
-  <artifactId>oaipmh-core</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
-  <name>TextGrid :: TG-OAI-PMH :: Core</name>
-
-  <url>http://maven.apache.org</url>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cxf.version>2.7.8</cxf.version>
-	<textgrid.httpclients.version>1.3.0-SNAPSHOT</textgrid.httpclients.version>
-	<tgsearch.version>3.0.2-SNAPSHOT</tgsearch.version>
-	<slf4j.version>1.7.5</slf4j.version>
-  </properties>
-	
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<artifactId>oaipmh</artifactId>
+		<groupId>info.textgrid.middleware</groupId>
+		<version>1.3.0-SNAPSHOT</version>
+	</parent>
+
+	<groupId>info.textgrid.middleware</groupId>
+	<artifactId>oaipmh-core</artifactId>
+	<version>1.3.0-SNAPSHOT</version>
+	<packaging>jar</packaging>
+	<name>TextGrid :: TG-OAI-PMH :: Core</name>
+	<url>http://maven.apache.org</url>
+
 	<dependencies>
-	
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-rs-client</artifactId>
 			<version>3.0.0-milestone1</version>
 		</dependency>
-	
+
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-transports-http-hc</artifactId>
- 			<version>${cxf.version}</version>
+			<version>${cxf.version}</version>
 		</dependency>
-	
+
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-frontend-jaxrs</artifactId>
 			<version>${cxf.version}</version>
 		</dependency>
-	
+
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-frontend-jaxws</artifactId>
 			<version>${cxf.version}</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>javax.ws.rs</groupId>
 			<artifactId>jsr311-api</artifactId>
@@ -59,34 +55,31 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.11</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
-	
+
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>jaxb-api</artifactId>
 			<version>2.1</version>
 		</dependency>
-	
+
 		<dependency>
 			<groupId>org.elasticsearch</groupId>
 			<artifactId>elasticsearch</artifactId>
-			<version>1.0.1</version>
+			<version>${elasticsearch.version}</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>info.textgrid.utils</groupId>
 			<artifactId>httpclients</artifactId>
 			<version>${textgrid.httpclients.version}</version>
 		</dependency>
-	
-		<!-- >dependency>
-			<groupId>org.openrdf.sesame</groupId>
-			<artifactId>sesame-runtime</artifactId>
-			<version>2.5.0</version>
-		</dependency-->
-    
+
+		<!-- >dependency> <groupId>org.openrdf.sesame</groupId> <artifactId>sesame-runtime</artifactId> 
+			<version>2.5.0</version> </dependency -->
+
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
@@ -97,7 +90,7 @@
 			<artifactId>jcl-over-slf4j</artifactId>
 			<version>${slf4j.version}</version>
 			<scope>runtime</scope>
-    	</dependency>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
@@ -123,59 +116,56 @@
 				<enabled>true</enabled>
 			</snapshots>
 		</repository>
-		
-		<!-- repository>
-        	<id>aduna</id>
-        	<name>Aduna Software</name>
-        	<url>http://repo.aduna-software.org/maven2/releases/</url>
-      	</repository-->
+
+		<!-- repository> <id>aduna</id> <name>Aduna Software</name> <url>http://repo.aduna-software.org/maven2/releases/</url> 
+			</repository -->
 	</repositories>
-	
-  <build>
-	<pluginManagement>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>2.5.1</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+
 		<plugins>
-           	<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.5.1</version>
-        	</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>jaxb2-maven-plugin</artifactId>
+				<version>1.5</version>
+				<executions>
+
+					<execution>
+						<id>oaipmhSchema-xjc</id>
+						<goals>
+							<goal>xjc</goal>
+						</goals>
+						<configuration>
+							<schemaFile>oai_pmh.xsd</schemaFile>
+							<packageName>info.textgrid.middleware.oaipmh</packageName>
+							<staleFile>${project.build.directory}/jaxb2/.oaipmhSchemaXjcStaleFlag</staleFile>
+							<clearOutputDir>false</clearOutputDir>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>oaipmhDCSchema-xjc</id>
+						<goals>
+							<goal>xjc</goal>
+						</goals>
+						<configuration>
+							<schemaFile>oai_dc.xsd</schemaFile>
+							<packageName>info.textgrid.middleware.oaidc</packageName>
+							<staleFile>${project.build.directory}/jaxb2/.oaiDCSchemaXjcStaleFlag</staleFile>
+							<clearOutputDir>false</clearOutputDir>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
-    </pluginManagement>
-    
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>jaxb2-maven-plugin</artifactId>
-        <version>1.5</version>
-        <executions>
-         
-          <execution>
-            <id>oaipmhSchema-xjc</id>
-            <goals>
-              <goal>xjc</goal>
-            </goals>
-            <configuration>
-              <schemaFile>oai_pmh.xsd</schemaFile>
-              <packageName>info.textgrid.middleware.oaipmh</packageName>
-              <staleFile>${project.build.directory}/jaxb2/.oaipmhSchemaXjcStaleFlag</staleFile>
-              <clearOutputDir>false</clearOutputDir>
-            </configuration>
-          </execution>
-          
-          <execution>
-            <id>oaipmhDCSchema-xjc</id>
-            <goals>
-              <goal>xjc</goal>
-            </goals>
-            <configuration>
-              <schemaFile>oai_dc.xsd</schemaFile>
-              <packageName>info.textgrid.middleware.oaidc</packageName>
-              <staleFile>${project.build.directory}/jaxb2/.oaiDCSchemaXjcStaleFlag</staleFile>
-              <clearOutputDir>false</clearOutputDir>
-            </configuration>
-          </execution>
- 		</executions>
-      </plugin>
-	</plugins>
-  </build>
+	</build>
 </project>
diff --git a/oaipmh-webapp/.classpath b/oaipmh-webapp/.classpath
index d238a371..819fbaae 100644
--- a/oaipmh-webapp/.classpath
+++ b/oaipmh-webapp/.classpath
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="var" path="M2_REPO/javax/ws/rs/javax.ws.rs-api/2.0-m10/javax.ws.rs-api-2.0-m10.jar" sourcepath="M2_REPO/javax/ws/rs/javax.ws.rs-api/2.0-m10/javax.ws.rs-api-2.0-m10-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/javax/ws/rs/javax.ws.rs-api/2.0-m10/javax.ws.rs-api-2.0-m10-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/javax/ws/rs/javax.ws.rs-api/2.0-m10/javax.ws.rs-api-2.0-m10-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/javax/ws/rs/jsr311-api/1.0/jsr311-api-1.0.jar" sourcepath="M2_REPO/javax/ws/rs/jsr311-api/1.0/jsr311-api-1.0-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/javax/ws/rs/jsr311-api/1.0/jsr311-api-1.0-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/javax/ws/rs/jsr311-api/1.0/jsr311-api-1.0-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>
@@ -18,146 +17,150 @@
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/4.11/junit-4.11.jar" sourcepath="M2_REPO/junit/junit/4.11/junit-4.11-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/junit/junit/4.11/junit-4.11-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/junit/junit/4.11/junit-4.11-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.0.5.RELEASE/spring-core-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-core/3.0.5.RELEASE/spring-core-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-asm/3.0.5.RELEASE/spring-asm-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-asm/3.0.5.RELEASE/spring-asm-3.0.5.RELEASE-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.1.2.RELEASE/spring-core-3.1.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-core/3.1.2.RELEASE/spring-core-3.1.2.RELEASE-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-asm/3.1.2.RELEASE/spring-asm-3.1.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-asm/3.1.2.RELEASE/spring-asm-3.1.2.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/3.0.5.RELEASE/spring-web-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-web/3.0.5.RELEASE/spring-web-3.0.5.RELEASE-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/3.1.2.RELEASE/spring-web-3.1.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-web/3.1.2.RELEASE/spring-web-3.1.2.RELEASE-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-beans/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/3.0.5.RELEASE/spring-context-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-context/3.0.5.RELEASE/spring-context-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/3.0.5.RELEASE/spring-aop-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-aop/3.0.5.RELEASE/spring-aop-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/3.0.5.RELEASE/spring-expression-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-expression/3.0.5.RELEASE/spring-expression-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-webmvc/3.0.5.RELEASE/spring-webmvc-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-webmvc/3.0.5.RELEASE/spring-webmvc-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context-support/3.0.5.RELEASE/spring-context-support-3.0.5.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-context-support/3.0.5.RELEASE/spring-context-support-3.0.5.RELEASE-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxws/2.7.8/cxf-rt-frontend-jaxws-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxws/2.7.8/cxf-rt-frontend-jaxws-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/3.1.2.RELEASE/spring-beans-3.1.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-beans/3.1.2.RELEASE/spring-beans-3.1.2.RELEASE-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/3.1.2.RELEASE/spring-context-3.1.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-context/3.1.2.RELEASE/spring-context-3.1.2.RELEASE-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/3.1.2.RELEASE/spring-aop-3.1.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-aop/3.1.2.RELEASE/spring-aop-3.1.2.RELEASE-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/3.1.2.RELEASE/spring-expression-3.1.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-expression/3.1.2.RELEASE/spring-expression-3.1.2.RELEASE-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-webmvc/3.1.2.RELEASE/spring-webmvc-3.1.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-webmvc/3.1.2.RELEASE/spring-webmvc-3.1.2.RELEASE-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context-support/3.1.2.RELEASE/spring-context-support-3.1.2.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-context-support/3.1.2.RELEASE/spring-context-support-3.1.2.RELEASE-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxws/2.7.13/cxf-rt-frontend-jaxws-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxws/2.7.13/cxf-rt-frontend-jaxws-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-frontend-jaxws/2.7.8/cxf-rt-frontend-jaxws-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-frontend-jaxws/2.7.13/cxf-rt-frontend-jaxws-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/xml-resolver/xml-resolver/1.2/xml-resolver-1.2.jar" sourcepath="M2_REPO/xml-resolver/xml-resolver/1.2/xml-resolver-1.2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/asm/asm/3.3.1/asm-3.3.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-api/2.7.8/cxf-api-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-api/2.7.8/cxf-api-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-api/2.7.13/cxf-api-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-api/2.7.13/cxf-api-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-api/2.7.8/cxf-api-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-api/2.7.13/cxf-api-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/woodstox-core-asl/4.2.0/woodstox-core-asl-4.2.0.jar" sourcepath="M2_REPO/org/codehaus/woodstox/woodstox-core-asl/4.2.0/woodstox-core-asl-4.2.0-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/woodstox-core-asl/4.4.1/woodstox-core-asl-4.4.1.jar" sourcepath="M2_REPO/org/codehaus/woodstox/woodstox-core-asl/4.4.1/woodstox-core-asl-4.4.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/codehaus/woodstox/woodstox-core-asl/4.2.0/woodstox-core-asl-4.2.0-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/codehaus/woodstox/woodstox-core-asl/4.4.1/woodstox-core-asl-4.4.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1.jar" sourcepath="M2_REPO/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/ws/xmlschema/xmlschema-core/2.0.3/xmlschema-core-2.0.3.jar" sourcepath="M2_REPO/org/apache/ws/xmlschema/xmlschema-core/2.0.3/xmlschema-core-2.0.3-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/stax2-api/3.1.4/stax2-api-3.1.4.jar" sourcepath="M2_REPO/org/codehaus/woodstox/stax2-api/3.1.4/stax2-api-3.1.4-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/ws/xmlschema/xmlschema-core/2.0.3/xmlschema-core-2.0.3-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/codehaus/woodstox/stax2-api/3.1.4/stax2-api-3.1.4-javadoc.jar!/" name="javadoc_location"/>
+    </attributes>
+  </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/org/apache/ws/xmlschema/xmlschema-core/2.1.0/xmlschema-core-2.1.0.jar" sourcepath="M2_REPO/org/apache/ws/xmlschema/xmlschema-core/2.1.0/xmlschema-core-2.1.0-sources.jar">
+    <attributes>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/ws/xmlschema/xmlschema-core/2.1.0/xmlschema-core-2.1.0-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7.1/geronimo-javamail_1.4_spec-1.7.1.jar" sourcepath="M2_REPO/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7.1/geronimo-javamail_1.4_spec-1.7.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7.1/geronimo-javamail_1.4_spec-1.7.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7.1/geronimo-javamail_1.4_spec-1.7.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.3/wsdl4j-1.6.3.jar" sourcepath="M2_REPO/wsdl4j/wsdl4j/1.6.3/wsdl4j-1.6.3-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/wsdl4j/wsdl4j/1.6.3/wsdl4j-1.6.3-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/wsdl4j/wsdl4j/1.6.3/wsdl4j-1.6.3-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-core/2.7.8/cxf-rt-core-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-core/2.7.8/cxf-rt-core-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-core/2.7.13/cxf-rt-core-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-core/2.7.13/cxf-rt-core-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-core/2.7.8/cxf-rt-core-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-core/2.7.13/cxf-rt-core-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.2.6/jaxb-impl-2.2.6.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-impl/2.2.6/jaxb-impl-2.2.6-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/com/sun/xml/bind/jaxb-impl/2.2.6/jaxb-impl-2.2.6-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/com/sun/xml/bind/jaxb-impl/2.2.6/jaxb-impl-2.2.6-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-bindings-soap/2.7.8/cxf-rt-bindings-soap-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-bindings-soap/2.7.8/cxf-rt-bindings-soap-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-bindings-soap/2.7.13/cxf-rt-bindings-soap-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-bindings-soap/2.7.13/cxf-rt-bindings-soap-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-bindings-soap/2.7.8/cxf-rt-bindings-soap-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-bindings-soap/2.7.13/cxf-rt-bindings-soap-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-databinding-jaxb/2.7.8/cxf-rt-databinding-jaxb-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-databinding-jaxb/2.7.8/cxf-rt-databinding-jaxb-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-databinding-jaxb/2.7.13/cxf-rt-databinding-jaxb-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-databinding-jaxb/2.7.13/cxf-rt-databinding-jaxb-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-databinding-jaxb/2.7.8/cxf-rt-databinding-jaxb-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-databinding-jaxb/2.7.13/cxf-rt-databinding-jaxb-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-bindings-xml/2.7.8/cxf-rt-bindings-xml-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-bindings-xml/2.7.8/cxf-rt-bindings-xml-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-bindings-xml/2.7.13/cxf-rt-bindings-xml-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-bindings-xml/2.7.13/cxf-rt-bindings-xml-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-bindings-xml/2.7.8/cxf-rt-bindings-xml-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-bindings-xml/2.7.13/cxf-rt-bindings-xml-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-simple/2.7.8/cxf-rt-frontend-simple-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-frontend-simple/2.7.8/cxf-rt-frontend-simple-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-simple/2.7.13/cxf-rt-frontend-simple-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-frontend-simple/2.7.13/cxf-rt-frontend-simple-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-frontend-simple/2.7.8/cxf-rt-frontend-simple-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-frontend-simple/2.7.13/cxf-rt-frontend-simple-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-transports-http/2.7.8/cxf-rt-transports-http-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-transports-http/2.7.8/cxf-rt-transports-http-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-transports-http/2.7.13/cxf-rt-transports-http-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-transports-http/2.7.13/cxf-rt-transports-http-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-transports-http/2.7.8/cxf-rt-transports-http-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-transports-http/2.7.13/cxf-rt-transports-http-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-ws-addr/2.7.8/cxf-rt-ws-addr-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-ws-addr/2.7.8/cxf-rt-ws-addr-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-ws-addr/2.7.13/cxf-rt-ws-addr-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-ws-addr/2.7.13/cxf-rt-ws-addr-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-ws-addr/2.7.8/cxf-rt-ws-addr-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-ws-addr/2.7.13/cxf-rt-ws-addr-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-ws-policy/2.7.8/cxf-rt-ws-policy-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-ws-policy/2.7.8/cxf-rt-ws-policy-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-ws-policy/2.7.13/cxf-rt-ws-policy-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-ws-policy/2.7.13/cxf-rt-ws-policy-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-ws-policy/2.7.8/cxf-rt-ws-policy-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-ws-policy/2.7.13/cxf-rt-ws-policy-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/neethi/neethi/3.0.2/neethi-3.0.2.jar" sourcepath="M2_REPO/org/apache/neethi/neethi/3.0.2/neethi-3.0.2-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/neethi/neethi/3.0.3/neethi-3.0.3.jar" sourcepath="M2_REPO/org/apache/neethi/neethi/3.0.3/neethi-3.0.3-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/neethi/neethi/3.0.2/neethi-3.0.2-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/neethi/neethi/3.0.3/neethi-3.0.3-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-rs-security-cors/2.7.8/cxf-rt-rs-security-cors-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-rs-security-cors/2.7.8/cxf-rt-rs-security-cors-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-rs-security-cors/2.7.13/cxf-rt-rs-security-cors-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-rs-security-cors/2.7.13/cxf-rt-rs-security-cors-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-rs-security-cors/2.7.8/cxf-rt-rs-security-cors-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-rs-security-cors/2.7.13/cxf-rt-rs-security-cors-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxrs/2.7.8/cxf-rt-frontend-jaxrs-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxrs/2.7.8/cxf-rt-frontend-jaxrs-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxrs/2.7.13/cxf-rt-frontend-jaxrs-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxrs/2.7.13/cxf-rt-frontend-jaxrs-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-frontend-jaxrs/2.7.8/cxf-rt-frontend-jaxrs-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-frontend-jaxrs/2.7.13/cxf-rt-frontend-jaxrs-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="src" path="/oaipmh-core"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-rs-client/3.0.0-milestone1/cxf-rt-rs-client-3.0.0-milestone1.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-rs-client/3.0.0-milestone1/cxf-rt-rs-client-3.0.0-milestone1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-rs-client/3.0.0-milestone1/cxf-rt-rs-client-3.0.0-milestone1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-rs-client/3.0.0-milestone1/cxf-rt-rs-client-3.0.0-milestone1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-core/3.0.0-milestone1/cxf-core-3.0.0-milestone1.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-core/3.0.0-milestone1/cxf-core-3.0.0-milestone1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-core/3.0.0-milestone1/cxf-core-3.0.0-milestone1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-core/3.0.0-milestone1/cxf-core-3.0.0-milestone1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-transports-http-hc/2.7.8/cxf-rt-transports-http-hc-2.7.8.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-transports-http-hc/2.7.8/cxf-rt-transports-http-hc-2.7.8-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-transports-http-hc/2.7.13/cxf-rt-transports-http-hc-2.7.13.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-transports-http-hc/2.7.13/cxf-rt-transports-http-hc-2.7.13-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/cxf/cxf-rt-transports-http-hc/2.7.8/cxf-rt-transports-http-hc-2.7.8-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/cxf/cxf-rt-transports-http-hc/2.7.13/cxf-rt-transports-http-hc-2.7.13-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore-nio/4.2.4/httpcore-nio-4.2.4.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore-nio/4.2.4/httpcore-nio-4.2.4-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/httpcomponents/httpcore-nio/4.2.4/httpcore-nio-4.2.4-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/httpcomponents/httpcore-nio/4.2.4/httpcore-nio-4.2.4-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.2.1/httpcore-4.2.1.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.2.1/httpcore-4.2.1-sources.jar"/>
@@ -165,94 +168,94 @@
   <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.2.1/httpclient-4.2.1.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.2.1/httpclient-4.2.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.6/commons-codec-1.6.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.6/commons-codec-1.6-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/commons-codec/commons-codec/1.6/commons-codec-1.6-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/commons-codec/commons-codec/1.6/commons-codec-1.6-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/elasticsearch/elasticsearch/1.0.1/elasticsearch-1.0.1.jar" sourcepath="M2_REPO/org/elasticsearch/elasticsearch/1.0.1/elasticsearch-1.0.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/4.6.1/lucene-core-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-core/4.6.1/lucene-core-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-core/4.6.1/lucene-core-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-core/4.6.1/lucene-core-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-analyzers-common/4.6.1/lucene-analyzers-common-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-analyzers-common/4.6.1/lucene-analyzers-common-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-analyzers-common/4.6.1/lucene-analyzers-common-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-analyzers-common/4.6.1/lucene-analyzers-common-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-codecs/4.6.1/lucene-codecs-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-codecs/4.6.1/lucene-codecs-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-codecs/4.6.1/lucene-codecs-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-codecs/4.6.1/lucene-codecs-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-queries/4.6.1/lucene-queries-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-queries/4.6.1/lucene-queries-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-queries/4.6.1/lucene-queries-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-queries/4.6.1/lucene-queries-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-memory/4.6.1/lucene-memory-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-memory/4.6.1/lucene-memory-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-memory/4.6.1/lucene-memory-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-memory/4.6.1/lucene-memory-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-highlighter/4.6.1/lucene-highlighter-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-highlighter/4.6.1/lucene-highlighter-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-highlighter/4.6.1/lucene-highlighter-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-highlighter/4.6.1/lucene-highlighter-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-queryparser/4.6.1/lucene-queryparser-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-queryparser/4.6.1/lucene-queryparser-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-queryparser/4.6.1/lucene-queryparser-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-queryparser/4.6.1/lucene-queryparser-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-sandbox/4.6.1/lucene-sandbox-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-sandbox/4.6.1/lucene-sandbox-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-sandbox/4.6.1/lucene-sandbox-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-sandbox/4.6.1/lucene-sandbox-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-suggest/4.6.1/lucene-suggest-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-suggest/4.6.1/lucene-suggest-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-suggest/4.6.1/lucene-suggest-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-suggest/4.6.1/lucene-suggest-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-misc/4.6.1/lucene-misc-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-misc/4.6.1/lucene-misc-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-misc/4.6.1/lucene-misc-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-misc/4.6.1/lucene-misc-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-join/4.6.1/lucene-join-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-join/4.6.1/lucene-join-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-join/4.6.1/lucene-join-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-join/4.6.1/lucene-join-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-grouping/4.6.1/lucene-grouping-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-grouping/4.6.1/lucene-grouping-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-grouping/4.6.1/lucene-grouping-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-grouping/4.6.1/lucene-grouping-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-spatial/4.6.1/lucene-spatial-4.6.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-spatial/4.6.1/lucene-spatial-4.6.1-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/apache/lucene/lucene-spatial/4.6.1/lucene-spatial-4.6.1-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/apache/lucene/lucene-spatial/4.6.1/lucene-spatial-4.6.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/com/spatial4j/spatial4j/0.3/spatial4j-0.3.jar" sourcepath="M2_REPO/com/spatial4j/spatial4j/0.3/spatial4j-0.3-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/com/spatial4j/spatial4j/0.3/spatial4j-0.3-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/com/spatial4j/spatial4j/0.3/spatial4j-0.3-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/info/textgrid/utils/httpclients/1.3.0-SNAPSHOT/httpclients-1.3.0-SNAPSHOT.jar" sourcepath="M2_REPO/info/textgrid/utils/httpclients/1.3.0-SNAPSHOT/httpclients-1.3.0-SNAPSHOT-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/info/textgrid/utils/httpclients/1.3.0-SNAPSHOT/httpclients-1.3.0-SNAPSHOT-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/info/textgrid/utils/httpclients/1.3.0-SNAPSHOT/httpclients-1.3.0-SNAPSHOT-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpmime/4.2.1/httpmime-4.2.1.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpmime/4.2.1/httpmime-4.2.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf4j-1.7.5.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf4j-1.7.5-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf4j-1.7.5-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf4j-1.7.5-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.7.5/slf4j-log4j12-1.7.5.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.7.5/slf4j-log4j12-1.7.5-sources.jar">
     <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/org/slf4j/slf4j-log4j12/1.7.5/slf4j-log4j12-1.7.5-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/fugu/.m2/repository/org/slf4j/slf4j-log4j12/1.7.5/slf4j-log4j12-1.7.5-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
diff --git a/oaipmh-webapp/pom.xml b/oaipmh-webapp/pom.xml
index d4a84f83..18928d4c 100644
--- a/oaipmh-webapp/pom.xml
+++ b/oaipmh-webapp/pom.xml
@@ -1,91 +1,85 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>info.textgrid.middleware</groupId>
-  <artifactId>oaipmh-webapp</artifactId>
-  <packaging>war</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <name>TextGrid :: TG-OAI-PMH :: Webapp</name>
-  <url>http://maven.apache.org</url>
-  
-	<properties>
-		<spring.version>3.0.5.RELEASE</spring.version>
-		<junit.version>4.11</junit.version>
-		<jdk.version>1.7</jdk.version>
-		<cxf.version>2.7.8</cxf.version>
-	</properties>
-  
-  	<parent>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
 		<artifactId>oaipmh</artifactId>
 		<groupId>info.textgrid.middleware</groupId>
-		<version>1.0-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
-    	
-  	<profiles>
-        <profile>
-            <id>public</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <webxml.file>web.xml</webxml.file>
-                <finalName.war>tgoaipmh</finalName.war>
+
+	<groupId>info.textgrid.middleware</groupId>
+	<artifactId>oaipmh-webapp</artifactId>
+	<packaging>war</packaging>
+	<version>1.3.0-SNAPSHOT</version>
+	<name>TextGrid :: TG-OAI-PMH :: Webapp</name>
+	<url>http://maven.apache.org</url>
+
+	<profiles>
+		<profile>
+			<id>public</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<properties>
+				<webxml.file>web.xml</webxml.file>
+				<finalName.war>tgoaipmh</finalName.war>
 			</properties>
-          </profile>
-    </profiles>
-  	
- 	<dependencies>
+		</profile>
+	</profiles>
+
+	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
-  
-	  	<dependency>
+
+		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
- 
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
- 
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
-	
+
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-frontend-jaxws</artifactId>
 			<version>${cxf.version}</version>
 		</dependency>
-    
+
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-transports-http</artifactId>
 			<version>${cxf.version}</version>
 		</dependency>
-        
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-rs-security-cors</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>info.textgrid.middleware</groupId>
-            <artifactId>oaipmh-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-     
+
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-rs-security-cors</artifactId>
+			<version>${cxf.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>info.textgrid.middleware</groupId>
+			<artifactId>oaipmh-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
 	</dependencies>
-  
+
 	<build>
 		<finalName>tgoaipmh</finalName>
 		<plugins>
@@ -100,5 +94,5 @@
 			</plugin>
 		</plugins>
 	</build>
-	
+
 </project>
diff --git a/pom.xml b/pom.xml
index 395c19d8..2fd250fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,56 +3,59 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>info.textgrid.middleware</groupId>
   <artifactId>oaipmh</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>TextGrid :: TG-OAI-PMH :: Parent</name>
-
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- 		<sonar.host.url>https://ci.bibforge.org/sonar</sonar.host.url>
- 		<cxf.version>2.7.4</cxf.version>
-		<spring.version>3.1.2.RELEASE</spring.version>
-		<textgrid.httpclients.version>1.3.0-SNAPSHOT</textgrid.httpclients.version>
-    		<felix.version>2.3.4</felix.version>
-    		<jetty.version>6.1.15</jetty.version>
-    		<elasticsearch.version>1.0.1</elasticsearch.version>
-		<antlr-runtime.version>3.2</antlr-runtime.version>
-    		<antlr-maven-plugin.version>3.2</antlr-maven-plugin.version>
-    	</properties>
-
-	<build>
-		<defaultGoal>package</defaultGoal>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.0.2</version>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-					<fork>true</fork>
-					<showDeprecation>true</showDeprecation>
-					<showWarnings>true</showWarnings>
-					<encoding>UTF-8</encoding>
-				</configuration>
-			</plugin>
-
-            		<plugin>
-                		<groupId>org.apache.maven.plugins</groupId>
-                		<artifactId>maven-eclipse-plugin</artifactId>
-				<version>2.9</version>
-                		<configuration>
-                    			<downloadSources>true</downloadSources>
-					<downloadJavadocs>true</downloadJavadocs>
-                		</configuration>
-            		</plugin>
-		</plugins>
-	</build>
-
+  
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <sonar.host.url>https://ci.bibforge.org/sonar</sonar.host.url>
+    <cxf.version>2.7.13</cxf.version>
+    <spring.version>3.1.2.RELEASE</spring.version>
+    <textgrid.httpclients.version>1.3.0-SNAPSHOT</textgrid.httpclients.version>
+    <felix.version>2.3.4</felix.version>
+    <jetty.version>6.1.15</jetty.version>
+    <elasticsearch.version>1.0.1</elasticsearch.version>
+    <antlr-runtime.version>3.2</antlr-runtime.version>
+    <antlr-maven-plugin.version>3.2</antlr-maven-plugin.version>
+    <tgsearch.version>3.3.1-SNAPSHOT</tgsearch.version>
+    <slf4j.version>1.7.5</slf4j.version>
+    <junit.version>4.11</junit.version>
+    <jdk.version>1.7</jdk.version>
+  </properties>
+  
+  <build>
+    <defaultGoal>package</defaultGoal>
+    <plugins>
+      <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-compiler-plugin</artifactId>
+	<version>2.0.2</version>
+	<configuration>
+	  <source>${jdk.version}</source>
+	  <target>${jdk.version}</target>
+	  <fork>true</fork>
+	  <showDeprecation>true</showDeprecation>
+	  <showWarnings>true</showWarnings>
+	  <encoding>UTF-8</encoding>
+	</configuration>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+	<version>2.9</version>
+        <configuration>
+          <downloadSources>true</downloadSources>
+	  <downloadJavadocs>true</downloadJavadocs>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
   <modules>
     <module>oaipmh-core</module>
     <module>oaipmh-webapp</module>
   </modules>
-	
+  
 </project>
-- 
GitLab