diff --git a/daisy/applications/daisywiki/frontend/pom.xml b/daisy/applications/daisywiki/frontend/pom.xml
index f9391bb..7f316a0 100644
--- a/daisy/applications/daisywiki/frontend/pom.xml
+++ b/daisy/applications/daisywiki/frontend/pom.xml
@@ -141,8 +141,8 @@
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId><version>1.0</version></dependency>
     <dependency><groupId>xalan</groupId><artifactId>xalan</artifactId><version>2.6.0</version></dependency>
     <dependency><groupId>xml-apis</groupId><artifactId>xml-apis-ext</artifactId><version>1.3.04</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId><version>2.1.0</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId><version>2.1.0</version></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId><version>2.4.0</version></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId><version>2.4.0</version></dependency>
   </dependencies>
 
   <reporting>
diff --git a/daisy/applications/daisywiki/xmlschema-bindings/pom.xml b/daisy/applications/daisywiki/xmlschema-bindings/pom.xml
index c9a2cac..8c75f6d 100644
--- a/daisy/applications/daisywiki/xmlschema-bindings/pom.xml
+++ b/daisy/applications/daisywiki/xmlschema-bindings/pom.xml
@@ -24,8 +24,8 @@
     <version>2.5-dev</version>
   </parent>
   <dependencies>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
   </dependencies>
diff --git a/daisy/applications/docidconvertor/pom.xml b/daisy/applications/docidconvertor/pom.xml
index 99c161a..b27b6ed 100644
--- a/daisy/applications/docidconvertor/pom.xml
+++ b/daisy/applications/docidconvertor/pom.xml
@@ -63,8 +63,8 @@
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId><version>1.0</version></dependency>
     <dependency><groupId>xerces</groupId><artifactId>xercesImpl</artifactId><version>2.9.0</version></dependency>
     <dependency><groupId>xerces</groupId><artifactId>xmlParserAPIs</artifactId><version>2.2.1</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId><version>2.1.0</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId><version>2.1.0</version></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId><version>2.4.0</version></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId><version>2.4.0</version></dependency>
   </dependencies>
   <reporting>
     <plugins>
diff --git a/daisy/applications/eventdumper/pom.xml b/daisy/applications/eventdumper/pom.xml
index a588c0a..287cc68 100644
--- a/daisy/applications/eventdumper/pom.xml
+++ b/daisy/applications/eventdumper/pom.xml
@@ -36,8 +36,8 @@
     <dependency><groupId>org.apache.geronimo.specs</groupId><artifactId>geronimo-jta_1.0.1B_spec</artifactId><version>1.1.1</version></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId><version>3.8.2</version><scope>test</scope></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId><version>1.0</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId><version>2.1.0</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId><version>2.1.0</version></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId><version>2.4.0</version></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId><version>2.4.0</version></dependency>
   </dependencies>
   <reporting>
     <plugins>
diff --git a/daisy/applications/importexport/pom.xml b/daisy/applications/importexport/pom.xml
index 5cef55a..47a932e 100644
--- a/daisy/applications/importexport/pom.xml
+++ b/daisy/applications/importexport/pom.xml
@@ -49,8 +49,8 @@
     <dependency><groupId>saxpath</groupId><artifactId>saxpath</artifactId><version>1.0-FCS</version></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId><version>1.0</version></dependency>
     <dependency><groupId>xerces</groupId><artifactId>xercesImpl</artifactId><version>2.9.0</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId><version>2.1.0</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId><version>2.1.0</version></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId><version>2.4.0</version></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId><version>2.4.0</version></dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/daisy/applications/jsclient/pom.xml b/daisy/applications/jsclient/pom.xml
index b9fbee8..c02911e 100644
--- a/daisy/applications/jsclient/pom.xml
+++ b/daisy/applications/jsclient/pom.xml
@@ -53,8 +53,8 @@
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId><version>1.0</version></dependency>
     <dependency><groupId>xerces</groupId><artifactId>xercesImpl</artifactId><version>2.9.0</version></dependency>
     <dependency><groupId>xerces</groupId><artifactId>xmlParserAPIs</artifactId><version>2.2.1</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId><version>2.1.0</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId><version>2.1.0</version></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId><version>2.4.0</version></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId><version>2.4.0</version></dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/daisy/applications/jspwiki_import/pom.xml b/daisy/applications/jspwiki_import/pom.xml
index bccb0e0..706b788 100644
--- a/daisy/applications/jspwiki_import/pom.xml
+++ b/daisy/applications/jspwiki_import/pom.xml
@@ -42,8 +42,8 @@
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-common-impl</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>commons-httpclient</groupId><artifactId>commons-httpclient</artifactId><version>3.1</version></dependency>
     <dependency><groupId>commons-codec</groupId><artifactId>commons-codec</artifactId><version>1.3</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId><version>2.1.0</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId><version>2.1.0</version></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId><version>2.4.0</version></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId><version>2.4.0</version></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId><version>1.0</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-xmlschema-bindings</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-util</artifactId><version>${project.version}</version></dependency>
diff --git a/daisy/applications/large-dataset-test/pom.xml b/daisy/applications/large-dataset-test/pom.xml
index 6affee6..45cc21d 100644
--- a/daisy/applications/large-dataset-test/pom.xml
+++ b/daisy/applications/large-dataset-test/pom.xml
@@ -62,8 +62,8 @@
     <dependency><groupId>daisy</groupId><artifactId>daisy-util</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId><version>3.8.2</version><scope>test</scope></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId><version>1.0</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId><version>2.1.0</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId><version>2.1.0</version></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId><version>2.4.0</version></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId><version>2.4.0</version></dependency>
   </dependencies>
   <reporting>
     <plugins>
diff --git a/daisy/applications/sync/core/pom.xml b/daisy/applications/sync/core/pom.xml
index b5fa361..8e8b95b 100644
--- a/daisy/applications/sync/core/pom.xml
+++ b/daisy/applications/sync/core/pom.xml
@@ -81,8 +81,8 @@
     <dependency><groupId>commons-collections</groupId><artifactId>commons-collections</artifactId><version>3.2</version></dependency>
     <dependency><groupId>commons-httpclient</groupId><artifactId>commons-httpclient</artifactId><version>3.1</version></dependency>
     <dependency><groupId>commons-codec</groupId><artifactId>commons-codec</artifactId><version>1.3</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId><version>2.1.0</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId><version>2.1.0</version></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId><version>2.4.0</version></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId><version>2.4.0</version></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId><version>1.0</version></dependency>
     <dependency><groupId>mysql</groupId><artifactId>mysql-connector-java</artifactId><version>3.1.12</version></dependency>
     <dependency><groupId>org.mortbay.jetty</groupId><artifactId>jetty</artifactId><version>6.0.1</version></dependency>
diff --git a/daisy/applications/sync/xmlschema-bindings/pom.xml b/daisy/applications/sync/xmlschema-bindings/pom.xml
index 3ebbba1..35c8405 100644
--- a/daisy/applications/sync/xmlschema-bindings/pom.xml
+++ b/daisy/applications/sync/xmlschema-bindings/pom.xml
@@ -24,8 +24,8 @@
     <version>2.5-dev</version>
   </parent>
   <dependencies>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
   </dependencies>
diff --git a/daisy/install/pom.xml b/daisy/install/pom.xml
index 2635d7b..c4a95e7 100644
--- a/daisy/install/pom.xml
+++ b/daisy/install/pom.xml
@@ -47,8 +47,8 @@
     <dependency><groupId>org.apache.geronimo.specs</groupId><artifactId>geronimo-jms_1.1_spec</artifactId></dependency>
     <dependency><groupId>saxpath</groupId><artifactId>saxpath</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/daisy/pom.xml b/daisy/pom.xml
index b38ac3f..07bce87 100644
--- a/daisy/pom.xml
+++ b/daisy/pom.xml
@@ -106,7 +106,7 @@
       <dependency><groupId>bsh</groupId><artifactId>bsh</artifactId><version>1.3.0</version></dependency>
       <dependency><groupId>cglib</groupId><artifactId>cglib</artifactId><version>2.1_3</version></dependency>
       <dependency><groupId>cocoon</groupId><artifactId>cocoon-wildcardhelper</artifactId><version>20031212</version></dependency>
-      <dependency><groupId>com.drewnoakes</groupId><artifactId>metadata-extractor</artifactId><version>2.3.0</version></dependency>
+      <dependency><groupId>com.drewnoakes</groupId><artifactId>metadata-extractor</artifactId><version>2.4.0-beta-1</version></dependency>
       <dependency><groupId>commons-cli</groupId><artifactId>commons-cli</artifactId><version>1.1</version></dependency>
       <dependency><groupId>commons-codec</groupId><artifactId>commons-codec</artifactId><version>1.3</version></dependency>
       <dependency><groupId>commons-collections</groupId><artifactId>commons-collections</artifactId><version>3.2</version></dependency>
@@ -142,6 +142,7 @@
       <dependency><groupId>excalibur-configuration</groupId><artifactId>excalibur-configuration</artifactId><version>1.2</version></dependency>
       <dependency><groupId>org.apache.geronimo.specs</groupId><artifactId>geronimo-jms_1.1_spec</artifactId><version>1.1.1</version></dependency>
       <dependency><groupId>org.apache.geronimo.specs</groupId><artifactId>geronimo-jta_1.0.1B_spec</artifactId><version>1.1.1</version></dependency>
+      <dependency><groupId>org.apache.geronimo.specs</groupId><artifactId>geronimo-stax-api_1.0_spec</artifactId><version>1.0.1</version></dependency>
       <dependency><groupId>net.java.dev.javacc</groupId><artifactId>javacc</artifactId><version>4.0</version></dependency>
       <dependency><groupId>javax.annotation</groupId><artifactId>jsr250-api</artifactId><version>1.0</version></dependency>
       <dependency><groupId>javax.mail</groupId><artifactId>mail</artifactId><version>1.4</version></dependency>
@@ -198,9 +199,15 @@
       <dependency><groupId>org.springframework</groupId><artifactId>spring-beans</artifactId><version>2.5</version></dependency>
       <dependency><groupId>org.springframework</groupId><artifactId>spring-context</artifactId><version>2.5</version></dependency>
       <dependency><groupId>org.springframework</groupId><artifactId>spring-core</artifactId><version>2.5</version></dependency>
-      <dependency><groupId>pdfbox</groupId><artifactId>pdfbox</artifactId><version>0.7.3</version></dependency>
-      <dependency><groupId>org.apache.poi</groupId><artifactId>poi-scratchpad</artifactId><version>3.0.1-FINAL</version></dependency>
-      <dependency><groupId>org.apache.poi</groupId><artifactId>poi</artifactId><version>3.0.1-FINAL</version></dependency>
+      <dependency><groupId>org.apache.pdfbox</groupId><artifactId>pdfbox</artifactId><version>1.1.0</version></dependency>
+      <dependency><groupId>org.apache.poi</groupId><artifactId>poi-scratchpad</artifactId><version>3.6</version></dependency>
+      <dependency><groupId>org.apache.poi</groupId><artifactId>poi-ooxml</artifactId><version>3.6</version></dependency>
+      <dependency><groupId>org.apache.poi</groupId><artifactId>poi-ooxml-schemas</artifactId><version>3.6</version></dependency>
+      <!--dependency><groupId>org.apache.poi</groupId><artifactId>ooxml-schemas</artifactId><version>1.1</version></dependency-->
+      <dependency><groupId>org.apache.poi</groupId><artifactId>poi</artifactId><version>3.6</version></dependency>
+      <dependency><groupId>org.ccil.cowan.tagsoup</groupId><artifactId>tagsoup</artifactId><version>1.2</version></dependency>
+      <dependency><groupId>org.apache.tika</groupId><artifactId>tika-core</artifactId><version>0.7</version></dependency>
+      <dependency><groupId>org.apache.tika</groupId><artifactId>tika-parsers</artifactId><version>0.7</version></dependency>
       <dependency><groupId>postgresql</groupId><artifactId>postgresql</artifactId><version>7.4-216.jdbc3</version></dependency>
       <dependency><groupId>rhino</groupId><artifactId>js</artifactId><version>1.6R5</version></dependency>
       <dependency><groupId>saxpath</groupId><artifactId>saxpath</artifactId><version>1.0-FCS</version></dependency>
@@ -219,8 +226,8 @@
           <exclusion><groupId>xerces</groupId><artifactId>xerces</artifactId></exclusion>
         </exclusions>
       </dependency>
-      <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId><version>2.1.0</version></dependency>
-      <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId><version>2.1.0</version></dependency>
+      <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId><version>2.4.0</version></dependency>
+      <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId><version>2.4.0</version></dependency>
       <dependency><groupId>xpp3</groupId><artifactId>xpp3_min</artifactId><version>1.1.3.4-RC8</version></dependency>
     </dependencies>
   </dependencyManagement>
@@ -278,8 +285,8 @@
              <sourceGenerationDirectory>${project.build.directory}/generated-sources</sourceGenerationDirectory>
           </configuration>
           <dependencies>
-            <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId><version>2.1.0</version></dependency>
-            <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId><version>2.1.0</version></dependency>
+            <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId><version>2.4.0</version></dependency>
+            <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId><version>2.4.0</version></dependency>
             <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId><version>1.0</version></dependency>
           </dependencies>
         </plugin>
diff --git a/daisy/repository/api/pom.xml b/daisy/repository/api/pom.xml
index 0b7c235..1154f60 100644
--- a/daisy/repository/api/pom.xml
+++ b/daisy/repository/api/pom.xml
@@ -28,8 +28,8 @@
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId><scope>test</scope></dependency>
     <dependency><groupId>joda-time</groupId><artifactId>joda-time</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/daisy/repository/client/pom.xml b/daisy/repository/client/pom.xml
index f3c156d..88c718d 100644
--- a/daisy/repository/client/pom.xml
+++ b/daisy/repository/client/pom.xml
@@ -47,8 +47,8 @@
     <dependency><groupId>org.apache.geronimo.specs</groupId><artifactId>geronimo-jms_1.1_spec</artifactId></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId><scope>test</scope></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/daisy/repository/common/pom.xml b/daisy/repository/common/pom.xml
index 9d9806b..7464be7 100644
--- a/daisy/repository/common/pom.xml
+++ b/daisy/repository/common/pom.xml
@@ -32,8 +32,8 @@
     <dependency><groupId>joda-time</groupId><artifactId>joda-time</artifactId></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
   </dependencies>
   <build>
   </build>
diff --git a/daisy/repository/launcher/src/main/resources/org/outerj/daisy/launcher/remoteclient/classloader.xml b/daisy/repository/launcher/src/main/resources/org/outerj/daisy/launcher/remoteclient/classloader.xml
index 2075a65..751f665 100644
--- a/daisy/repository/launcher/src/main/resources/org/outerj/daisy/launcher/remoteclient/classloader.xml
+++ b/daisy/repository/launcher/src/main/resources/org/outerj/daisy/launcher/remoteclient/classloader.xml
@@ -22,8 +22,8 @@
     <artifact groupId="avalon-framework" artifactId="avalon-framework-api" version="4.3"/>
     <artifact groupId="commons-httpclient" artifactId="commons-httpclient" version="3.1"/>
     <artifact groupId="commons-codec" artifactId="commons-codec" version="1.3"/>
-    <artifact groupId="xmlbeans" artifactId="xbean" version="2.1.0"/>
-    <artifact groupId="xmlbeans" artifactId="xmlpublic" version="2.1.0"/>
+    <artifact groupId="org.apache.xmlbeans" artifactId="xmlbeans" version="2.4.0"/>
+    <artifact groupId="org.apache.xmlbeans" artifactId="xmlbeans-xmlpublic" version="2.4.0"/>
     <artifact groupId="joda-time" artifactId="joda-time" version="1.6"/>
     <artifact groupId="stax" artifactId="stax-api" version="1.0"/>
     <artifact groupId="daisy" artifactId="daisy-repository-xmlschema-bindings" version="2.5-dev"/>
diff --git a/daisy/repository/server-spi/pom.xml b/daisy/repository/server-spi/pom.xml
index 53bd779..6e69b92 100644
--- a/daisy/repository/server-spi/pom.xml
+++ b/daisy/repository/server-spi/pom.xml
@@ -33,8 +33,8 @@
     <dependency><groupId>javax.servlet</groupId><artifactId>servlet-api</artifactId></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId><scope>test</scope></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
   </dependencies>
   <build>
   </build>
diff --git a/daisy/repository/server/pom.xml b/daisy/repository/server/pom.xml
index 4e2f955..93aa272 100644
--- a/daisy/repository/server/pom.xml
+++ b/daisy/repository/server/pom.xml
@@ -63,8 +63,8 @@
     <dependency><groupId>org.apache.lucene</groupId><artifactId>lucene-analyzers</artifactId></dependency>
     <dependency><groupId>mx4j</groupId><artifactId>mx4j</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>xpp3</groupId><artifactId>xpp3_min</artifactId></dependency>
   </dependencies>
   <build>
diff --git a/daisy/repository/server/src/main/resources/DAISY-INF/classloader.xml b/daisy/repository/server/src/main/resources/DAISY-INF/classloader.xml
index cba94ec..709a66c 100644
--- a/daisy/repository/server/src/main/resources/DAISY-INF/classloader.xml
+++ b/daisy/repository/server/src/main/resources/DAISY-INF/classloader.xml
@@ -22,8 +22,8 @@
     <artifact groupId="daisy" artifactId="daisy-credentials-provider-api" version="2.5-dev" share="required"/>
 
     <artifact groupId="joda-time" artifactId="joda-time" version="1.6" share="required"/>
-    <artifact groupId="xmlbeans" artifactId="xbean" version="2.1.0" share="required"/>
-    <artifact groupId="xmlbeans" artifactId="xmlpublic" version="2.1.0" share="required"/>
+    <artifact groupId="org.apache.xmlbeans" artifactId="xmlbeans" version="2.4.0" share="required"/>
+    <artifact groupId="org.apache.xmlbeans" artifactId="xmlbeans-xmlpublic" version="2.4.0" share="required"/>
     <artifact groupId="stax" artifactId="stax-api" version="1.0" share="required"/>
 
     <!-- keep our own implementation private -->
diff --git a/daisy/repository/test/pom.xml b/daisy/repository/test/pom.xml
index ede108f..45a3a65 100644
--- a/daisy/repository/test/pom.xml
+++ b/daisy/repository/test/pom.xml
@@ -66,8 +66,8 @@
     <dependency><groupId>saxpath</groupId><artifactId>saxpath</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>xerces</groupId><artifactId>xercesImpl</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/daisy/repository/xmlschema-bindings/pom.xml b/daisy/repository/xmlschema-bindings/pom.xml
index 34831b3..9f079a2 100644
--- a/daisy/repository/xmlschema-bindings/pom.xml
+++ b/daisy/repository/xmlschema-bindings/pom.xml
@@ -24,8 +24,8 @@
     <version>2.5-dev</version>
   </parent>
   <dependencies>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId><scope>test</scope></dependency>
   </dependencies>
diff --git a/daisy/services/credentialsprovider/api/pom.xml b/daisy/services/credentialsprovider/api/pom.xml
index f3d2cb8..3ce3fb9 100644
--- a/daisy/services/credentialsprovider/api/pom.xml
+++ b/daisy/services/credentialsprovider/api/pom.xml
@@ -27,8 +27,8 @@
   </build>
   <dependencies>
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-api</artifactId><version>${project.version}</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
   </dependencies>
diff --git a/daisy/services/credentialsprovider/impl/pom.xml b/daisy/services/credentialsprovider/impl/pom.xml
index cffcba4..74a6e93 100644
--- a/daisy/services/credentialsprovider/impl/pom.xml
+++ b/daisy/services/credentialsprovider/impl/pom.xml
@@ -48,8 +48,8 @@
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-server-spi</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-pluginregistry-api</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>avalon-framework</groupId><artifactId>avalon-framework-api</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>javax.servlet</groupId><artifactId>servlet-api</artifactId></dependency>
     <dependency><groupId>commons-logging</groupId><artifactId>commons-logging</artifactId></dependency>
diff --git a/daisy/services/doctaskrunner/client-impl/pom.xml b/daisy/services/doctaskrunner/client-impl/pom.xml
index 60fdb2d..3fb2406 100644
--- a/daisy/services/doctaskrunner/client-impl/pom.xml
+++ b/daisy/services/doctaskrunner/client-impl/pom.xml
@@ -37,8 +37,8 @@
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-spi</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
   </dependencies>
   <reporting>
     <plugins>
diff --git a/daisy/services/doctaskrunner/common-impl/pom.xml b/daisy/services/doctaskrunner/common-impl/pom.xml
index 984b6fc..eda579f 100644
--- a/daisy/services/doctaskrunner/common-impl/pom.xml
+++ b/daisy/services/doctaskrunner/common-impl/pom.xml
@@ -34,8 +34,8 @@
     <dependency><groupId>daisy</groupId><artifactId>daisy-util</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
   </dependencies>
   <reporting>
     <plugins>
diff --git a/daisy/services/doctaskrunner/server-impl/pom.xml b/daisy/services/doctaskrunner/server-impl/pom.xml
index 3014d69..76acc1c 100644
--- a/daisy/services/doctaskrunner/server-impl/pom.xml
+++ b/daisy/services/doctaskrunner/server-impl/pom.xml
@@ -45,8 +45,8 @@
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
     <dependency><groupId>rhino</groupId><artifactId>js</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
   </dependencies>
   <reporting>
     <plugins>
diff --git a/daisy/services/doctaskrunner/xmlschema-bindings/pom.xml b/daisy/services/doctaskrunner/xmlschema-bindings/pom.xml
index c636f83..25bb3bb 100644
--- a/daisy/services/doctaskrunner/xmlschema-bindings/pom.xml
+++ b/daisy/services/doctaskrunner/xmlschema-bindings/pom.xml
@@ -27,8 +27,8 @@
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-xmlschema-bindings</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/daisy/services/emailer/client-impl/pom.xml b/daisy/services/emailer/client-impl/pom.xml
index b9d9fdd..9e54287 100644
--- a/daisy/services/emailer/client-impl/pom.xml
+++ b/daisy/services/emailer/client-impl/pom.xml
@@ -32,8 +32,8 @@
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-common-impl</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>commons-httpclient</groupId><artifactId>commons-httpclient</artifactId></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-spi</artifactId><version>${project.version}</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
   </dependencies>
diff --git a/daisy/services/emailnotifier/client-impl/pom.xml b/daisy/services/emailnotifier/client-impl/pom.xml
index f56d873..35a3396 100644
--- a/daisy/services/emailnotifier/client-impl/pom.xml
+++ b/daisy/services/emailnotifier/client-impl/pom.xml
@@ -34,8 +34,8 @@
     <dependency><groupId>daisy</groupId><artifactId>daisy-emailnotifier-xmlschema-bindings</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-emailnotifier-common-impl</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-spi</artifactId><version>${project.version}</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
   </dependencies>
diff --git a/daisy/services/emailnotifier/common-impl/pom.xml b/daisy/services/emailnotifier/common-impl/pom.xml
index 1bd4f29..d14dc4d 100644
--- a/daisy/services/emailnotifier/common-impl/pom.xml
+++ b/daisy/services/emailnotifier/common-impl/pom.xml
@@ -29,8 +29,8 @@
     <dependency><groupId>daisy</groupId><artifactId>daisy-emailnotifier-api</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-emailnotifier-xmlschema-bindings</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-api</artifactId><version>${project.version}</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
   </dependencies>
diff --git a/daisy/services/emailnotifier/server-impl/pom.xml b/daisy/services/emailnotifier/server-impl/pom.xml
index 50185e6..ab4b6d3 100644
--- a/daisy/services/emailnotifier/server-impl/pom.xml
+++ b/daisy/services/emailnotifier/server-impl/pom.xml
@@ -57,8 +57,8 @@
     <dependency><groupId>daisy</groupId><artifactId>daisy-emailnotifier-xmlschema-bindings</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-emailnotifier-common-impl</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-emailer-api</artifactId><version>${project.version}</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-jmsclient-api</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>org.apache.geronimo.specs</groupId><artifactId>geronimo-jms_1.1_spec</artifactId></dependency>
diff --git a/daisy/services/emailnotifier/xmlschema-bindings/pom.xml b/daisy/services/emailnotifier/xmlschema-bindings/pom.xml
index 4ea8e77..11d654a 100644
--- a/daisy/services/emailnotifier/xmlschema-bindings/pom.xml
+++ b/daisy/services/emailnotifier/xmlschema-bindings/pom.xml
@@ -24,8 +24,8 @@
     <version>2.5-dev</version>
   </parent>
   <dependencies>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
   </dependencies>
diff --git a/daisy/services/image-presavehook/src/main/resources/DAISY-INF/classloader.xml b/daisy/services/image-presavehook/src/main/resources/DAISY-INF/classloader.xml
index 68ca988..8b721ec 100644
--- a/daisy/services/image-presavehook/src/main/resources/DAISY-INF/classloader.xml
+++ b/daisy/services/image-presavehook/src/main/resources/DAISY-INF/classloader.xml
@@ -14,5 +14,5 @@
   limitations under the License.
 --><classloader>
   <classpath>
-    <artifact groupId="com.drewnoakes" artifactId="metadata-extractor" version="2.3.0" share="allowed"/>
+    <artifact groupId="com.drewnoakes" artifactId="metadata-extractor" version="2.4.0-beta-1" share="allowed"/>
   </classpath>
diff --git a/daisy/services/navigation/api/pom.xml b/daisy/services/navigation/api/pom.xml
index f6ec30e..c3dacbc 100644
--- a/daisy/services/navigation/api/pom.xml
+++ b/daisy/services/navigation/api/pom.xml
@@ -27,8 +27,8 @@
   </build>
   <dependencies>
     <dependency><groupId>daisy</groupId><artifactId>daisy-navigation-xmlschema-bindings</artifactId><version>${project.version}</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-api</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
diff --git a/daisy/services/navigation/client-impl/pom.xml b/daisy/services/navigation/client-impl/pom.xml
index faf0712..69d9a91 100644
--- a/daisy/services/navigation/client-impl/pom.xml
+++ b/daisy/services/navigation/client-impl/pom.xml
@@ -33,8 +33,8 @@
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-common-impl</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>commons-httpclient</groupId><artifactId>commons-httpclient</artifactId></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-spi</artifactId><version>${project.version}</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
   </dependencies>
diff --git a/daisy/services/navigation/server-impl/pom.xml b/daisy/services/navigation/server-impl/pom.xml
index 1eff764..063bed7 100644
--- a/daisy/services/navigation/server-impl/pom.xml
+++ b/daisy/services/navigation/server-impl/pom.xml
@@ -38,8 +38,8 @@
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-server-spi</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-pluginregistry-api</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>avalon-framework</groupId><artifactId>avalon-framework-api</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>javax.servlet</groupId><artifactId>servlet-api</artifactId></dependency>
     <dependency><groupId>commons-collections</groupId><artifactId>commons-collections</artifactId></dependency>
diff --git a/daisy/services/navigation/xmlschema-bindings/pom.xml b/daisy/services/navigation/xmlschema-bindings/pom.xml
index 58823c2..bde2fac 100644
--- a/daisy/services/navigation/xmlschema-bindings/pom.xml
+++ b/daisy/services/navigation/xmlschema-bindings/pom.xml
@@ -24,8 +24,8 @@
     <version>2.5-dev</version>
   </parent>
   <dependencies>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
   </dependencies>
diff --git a/daisy/services/pluginregistry/samples/load-before/pom.xml b/daisy/services/pluginregistry/samples/load-before/pom.xml
index 82588a6..893edeb 100644
--- a/daisy/services/pluginregistry/samples/load-before/pom.xml
+++ b/daisy/services/pluginregistry/samples/load-before/pom.xml
@@ -29,8 +29,8 @@
     <dependency><groupId>daisy</groupId><artifactId>daisy-pluginregistry-api</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-repo-util</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>avalon-framework</groupId><artifactId>avalon-framework-api</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>javax.servlet</groupId><artifactId>servlet-api</artifactId></dependency>
     <dependency><groupId>commons-logging</groupId><artifactId>commons-logging</artifactId></dependency>
diff --git a/daisy/services/publisher/api/pom.xml b/daisy/services/publisher/api/pom.xml
index 7e9b884..0c2cee3 100644
--- a/daisy/services/publisher/api/pom.xml
+++ b/daisy/services/publisher/api/pom.xml
@@ -29,8 +29,8 @@
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-api</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-publisher-xmlschema-bindings</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-xmlschema-bindings</artifactId><version>${project.version}</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
   </dependencies>
diff --git a/daisy/services/publisher/client-impl/pom.xml b/daisy/services/publisher/client-impl/pom.xml
index 26bed52..bf8d046 100644
--- a/daisy/services/publisher/client-impl/pom.xml
+++ b/daisy/services/publisher/client-impl/pom.xml
@@ -34,8 +34,8 @@
     <dependency><groupId>daisy</groupId><artifactId>daisy-util</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>commons-httpclient</groupId><artifactId>commons-httpclient</artifactId></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-spi</artifactId><version>${project.version}</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
   </dependencies>
diff --git a/daisy/services/publisher/server-impl/pom.xml b/daisy/services/publisher/server-impl/pom.xml
index 46258cb..4554f26 100644
--- a/daisy/services/publisher/server-impl/pom.xml
+++ b/daisy/services/publisher/server-impl/pom.xml
@@ -60,8 +60,8 @@
     <dependency><groupId>daisy</groupId><artifactId>daisy-workflow-xmlschema-bindings</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>avalon-framework</groupId><artifactId>avalon-framework-api</artifactId></dependency>
     <dependency><groupId>joda-time</groupId><artifactId>joda-time</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>javax.servlet</groupId><artifactId>servlet-api</artifactId></dependency>
     <dependency><groupId>commons-logging</groupId><artifactId>commons-logging</artifactId></dependency>
diff --git a/daisy/services/publisher/xmlschema-bindings/pom.xml b/daisy/services/publisher/xmlschema-bindings/pom.xml
index ac7a117..9226cb4 100644
--- a/daisy/services/publisher/xmlschema-bindings/pom.xml
+++ b/daisy/services/publisher/xmlschema-bindings/pom.xml
@@ -24,8 +24,8 @@
     <version>2.5-dev</version>
   </parent>
   <dependencies>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
   </dependencies>
diff --git a/daisy/services/replication/server-impl/pom.xml b/daisy/services/replication/server-impl/pom.xml
index 4b506e8..95423d1 100644
--- a/daisy/services/replication/server-impl/pom.xml
+++ b/daisy/services/replication/server-impl/pom.xml
@@ -33,8 +33,8 @@
     <dependency><groupId>daisy</groupId><artifactId>daisy-emailer-api</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-jmsclient-api</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>joda-time</groupId><artifactId>joda-time</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>javax.servlet</groupId><artifactId>servlet-api</artifactId></dependency>
     <dependency><groupId>commons-logging</groupId><artifactId>commons-logging</artifactId></dependency>
diff --git a/daisy/services/textextraction/impl/pom.xml b/daisy/services/textextraction/impl/pom.xml
index 30515e8..5d08ff7 100644
--- a/daisy/services/textextraction/impl/pom.xml
+++ b/daisy/services/textextraction/impl/pom.xml
@@ -39,11 +39,19 @@
     <dependency><groupId>daisy</groupId><artifactId>daisy-textextraction-api</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-util</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-pluginregistry-api</artifactId><version>${project.version}</version></dependency>
-    <dependency><groupId>pdfbox</groupId><artifactId>pdfbox</artifactId></dependency>
+    <dependency><groupId>org.apache.pdfbox</groupId><artifactId>pdfbox</artifactId></dependency>
     <dependency><groupId>xpp3</groupId><artifactId>xpp3_min</artifactId></dependency>
     <dependency><groupId>org.apache.poi</groupId><artifactId>poi</artifactId></dependency>
     <dependency><groupId>org.apache.poi</groupId><artifactId>poi-scratchpad</artifactId></dependency>
+    <dependency><groupId>org.apache.poi</groupId><artifactId>poi-ooxml</artifactId></dependency>
+    <dependency><groupId>org.apache.poi</groupId><artifactId>poi-ooxml-schemas</artifactId></dependency>
+    <!--dependency><groupId>org.apache.poi</groupId><artifactId>ooxml-schemas</artifactId></dependency-->
+    <dependency><groupId>org.apache.tika</groupId><artifactId>tika-core</artifactId></dependency>
+    <dependency><groupId>org.apache.tika</groupId><artifactId>tika-parsers</artifactId></dependency>
     <dependency><groupId>commons-logging</groupId><artifactId>commons-logging</artifactId></dependency>
+    <dependency><groupId>com.drewnoakes</groupId><artifactId>metadata-extractor</artifactId></dependency>
+    <dependency><groupId>org.apache.geronimo.specs</groupId><artifactId>geronimo-stax-api_1.0_spec</artifactId></dependency>
+    <dependency><groupId>org.ccil.cowan.tagsoup</groupId><artifactId>tagsoup</artifactId></dependency>
     <dependency><groupId>javax.annotation</groupId><artifactId>jsr250-api</artifactId></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
   </dependencies>
diff --git a/daisy/services/textextraction/impl/src/main/java/org/outerj/daisy/textextraction/impl/MSExcelTextExtractor.java b/daisy/services/textextraction/impl/src/main/java/org/outerj/daisy/textextraction/impl/MSExcelTextExtractor.java
index 3e8c5d0..57aac20 100644
--- a/daisy/services/textextraction/impl/src/main/java/org/outerj/daisy/textextraction/impl/MSExcelTextExtractor.java
+++ b/daisy/services/textextraction/impl/src/main/java/org/outerj/daisy/textextraction/impl/MSExcelTextExtractor.java
@@ -16,13 +16,15 @@
 package org.outerj.daisy.textextraction.impl;
 
 import java.io.InputStream;
+import java.io.PushbackInputStream;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.WorkbookFactory;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Cell;
 import org.outerj.daisy.textextraction.TextExtractor;
 import org.outerj.daisy.plugin.PluginRegistry;
 
@@ -44,30 +46,32 @@ public class MSExcelTextExtractor extends AbstractTextExtractor implements TextE
     }
 
     public String getText(InputStream is) throws Exception {
-        HSSFWorkbook excelWb = new HSSFWorkbook(is);
+        WorkbookFactory wbFactory = new WorkbookFactory();
+        PushbackInputStream pbis = new PushbackInputStream(is);
+        Workbook excelWb = wbFactory.create(pbis); 
         StringBuilder contentBuffer = new StringBuilder();
         //contentBuffer.append("starting extraction\n");
         int numberOfSheets = excelWb.getNumberOfSheets();
         //contentBuffer.append("Number of sheets: " + numberOfSheets + "\n");
         for(int i=0; i<numberOfSheets; i++) {
-            HSSFSheet sheet = excelWb.getSheetAt(i);
+            Sheet sheet = excelWb.getSheetAt(i);
             int numberOfRows = sheet.getPhysicalNumberOfRows();
             if(numberOfRows > 0) {
                 //contentBuffer.append("Number of rows: " + numberOfRows + "\n");
                 Iterator rowIt = sheet.rowIterator();
                 while(rowIt.hasNext()) {
-                    HSSFRow row = (HSSFRow)rowIt.next();
+                    Row row = (Row)rowIt.next();
                     if(row != null) {
                         Iterator it = row.cellIterator();
                         while(it.hasNext()) {
-                            HSSFCell cell = (HSSFCell)it.next();
+                            Cell cell = (Cell)it.next();
                             switch(cell.getCellType()) {
-                                case HSSFCell.CELL_TYPE_NUMERIC:
+                                case Cell.CELL_TYPE_NUMERIC:
                                     String num = Double.toString(cell.getNumericCellValue()).trim();
                                     if(num.length() > 0)
                                         contentBuffer.append(num).append(" ");
                                     break;
-                                case HSSFCell.CELL_TYPE_STRING:
+                                case Cell.CELL_TYPE_STRING:
                                     try {
                                         String text = cell.getStringCellValue().trim();
                                         if(text.length() > 0)
diff --git a/daisy/services/textextraction/impl/src/main/java/org/outerj/daisy/textextraction/impl/MSPowerPointOOXMLTextExtractor.java b/daisy/services/textextraction/impl/src/main/java/org/outerj/daisy/textextraction/impl/MSPowerPointOOXMLTextExtractor.java
new file mode 100644
index 0000000..0002136
--- /dev/null
+++ b/daisy/services/textextraction/impl/src/main/java/org/outerj/daisy/textextraction/impl/MSPowerPointOOXMLTextExtractor.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2004 Outerthought bvba and Schaubroeck nv
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.outerj.daisy.textextraction.impl;
+
+import org.apache.poi.util.PackageHelper;
+import org.apache.poi.openxml4j.opc.OPCPackage;
+import org.apache.poi.xslf.extractor.XSLFPowerPointExtractor;
+import org.outerj.daisy.textextraction.TextExtractor;
+import org.outerj.daisy.plugin.PluginRegistry;
+
+import java.io.*;
+import java.util.List;
+
+/**
+ * Text extractor for Microsoft PowerPoint files.
+ */
+public class MSPowerPointOOXMLTextExtractor extends AbstractTextExtractor implements TextExtractor {
+
+    public MSPowerPointOOXMLTextExtractor() {
+        super();
+    }
+
+    public MSPowerPointOOXMLTextExtractor(List<String> mimeTypes, PluginRegistry pluginRegistry) {
+        super(mimeTypes, pluginRegistry);
+    }
+
+    protected String getName() {
+        return getClass().getName();
+    }
+
+    public String getText(InputStream is) throws Exception {
+        PackageHelper helper = new PackageHelper();
+        OPCPackage p = helper.open(is);
+        XSLFPowerPointExtractor extractor = new XSLFPowerPointExtractor(p);
+        return extractor.getText(true, true);
+    }
+
+}
diff --git a/daisy/services/textextraction/impl/src/main/java/org/outerj/daisy/textextraction/impl/MSWordOOXMLTextExtractor.java b/daisy/services/textextraction/impl/src/main/java/org/outerj/daisy/textextraction/impl/MSWordOOXMLTextExtractor.java
new file mode 100644
index 0000000..ebf6c9d
--- /dev/null
+++ b/daisy/services/textextraction/impl/src/main/java/org/outerj/daisy/textextraction/impl/MSWordOOXMLTextExtractor.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2004 Outerthought bvba and Schaubroeck nv
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.outerj.daisy.textextraction.impl;
+
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Iterator;
+
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.poi.xwpf.usermodel.XWPFParagraph;
+import org.outerj.daisy.textextraction.TextExtractor;
+import org.outerj.daisy.plugin.PluginRegistry;
+
+/**
+ * Text extractor for Microsoft Word files.
+ */
+public class MSWordOOXMLTextExtractor extends AbstractTextExtractor implements TextExtractor {
+
+    public MSWordOOXMLTextExtractor() {
+        super();
+    }
+
+    public MSWordOOXMLTextExtractor(List<String> mimeTypes, PluginRegistry pluginRegistry) {
+        super(mimeTypes, pluginRegistry);
+    }
+
+    protected String getName() {
+        return getClass().getName();
+    }
+
+    public String getText(InputStream is) throws Exception {
+        XWPFDocument wordDoc = new XWPFDocument(is);
+        StringBuilder contentBuffer = new StringBuilder();
+        java.util.List<XWPFParagraph> pList = Arrays.asList(wordDoc.getParagraphs());
+        Iterator it = pList.iterator();
+        while (it.hasNext()) {
+            XWPFParagraph paragraph = (XWPFParagraph)it.next();
+            if (paragraph != null) {
+                String text = paragraph.getText().trim();
+                if(text.length() > 0)
+                    contentBuffer.append(text).append(" ");
+            }
+        }
+        return contentBuffer.toString();
+    }
+}
diff --git a/daisy/services/textextraction/impl/src/main/java/org/outerj/daisy/textextraction/impl/PDFTextExtractor.java b/daisy/services/textextraction/impl/src/main/java/org/outerj/daisy/textextraction/impl/PDFTextExtractor.java
index f7fbe96..3f860a7 100644
--- a/daisy/services/textextraction/impl/src/main/java/org/outerj/daisy/textextraction/impl/PDFTextExtractor.java
+++ b/daisy/services/textextraction/impl/src/main/java/org/outerj/daisy/textextraction/impl/PDFTextExtractor.java
@@ -15,9 +15,9 @@
  */
 package org.outerj.daisy.textextraction.impl;
 
-import org.pdfbox.pdmodel.PDDocument;
-import org.pdfbox.pdfparser.PDFParser;
-import org.pdfbox.util.PDFTextStripper;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdfparser.PDFParser;
+import org.apache.pdfbox.util.PDFTextStripper;
 import org.outerj.daisy.textextraction.TextExtractor;
 import org.outerj.daisy.plugin.PluginRegistry;
 
diff --git a/daisy/services/textextraction/impl/src/main/java/org/outerj/daisy/textextraction/impl/TikaTextExtractor.java b/daisy/services/textextraction/impl/src/main/java/org/outerj/daisy/textextraction/impl/TikaTextExtractor.java
new file mode 100644
index 0000000..49b8127
--- /dev/null
+++ b/daisy/services/textextraction/impl/src/main/java/org/outerj/daisy/textextraction/impl/TikaTextExtractor.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2004 Outerthought bvba and Schaubroeck nv
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.outerj.daisy.textextraction.impl;
+
+import org.outerj.daisy.textextraction.TextExtractor;
+import org.outerj.daisy.plugin.PluginRegistry;
+
+
+import java.io.InputStream;
+import java.io.Writer;
+import java.io.StringWriter;
+import java.util.Collections;
+import java.util.List;
+import java.util.regex.Pattern;
+
+import org.apache.tika.exception.TikaException;
+import org.apache.tika.io.CountingInputStream;
+import org.apache.tika.metadata.Metadata;
+import org.apache.tika.parser.AutoDetectParser;
+import org.apache.tika.parser.ParseContext;
+import org.apache.tika.parser.Parser;
+import org.apache.tika.sax.BodyContentHandler;
+import org.apache.tika.sax.SafeContentHandler;
+import org.apache.tika.sax.SecureContentHandler;
+import org.xml.sax.ContentHandler;
+
+
+public class TikaTextExtractor extends AbstractTextExtractor implements TextExtractor {
+    private static final int BUFFER_SIZE = 32768;
+
+    public TikaTextExtractor() {
+        super();
+    }
+
+    public TikaTextExtractor(List<String> mimeTypes, PluginRegistry pluginRegistry) {
+        super(mimeTypes, pluginRegistry);
+    }
+
+    protected String getName() {
+        return getClass().getName();
+    }
+
+    public String getText(InputStream is) throws Exception {
+        // setup parser
+        Metadata metadata = new Metadata();
+        ParseContext context = new ParseContext();
+        Parser parser = new AutoDetectParser();
+        context.set(Parser.class, parser);
+        Writer bodyWriter = new StringWriter();
+
+        // pipe content through SecureContentHandler() for zip bomb
+        // prevention and through SafeContentHandler() to sort out
+        // illegal UTF-8 characters.
+        CountingInputStream cis = new CountingInputStream(is);
+        ContentHandler handler = new SecureContentHandler(new SafeContentHandler(new BodyContentHandler(bodyWriter)), cis);
+
+        // parse document
+        parser.parse(cis, handler, metadata, context);
+        String bodyContent = bodyWriter.toString();
+
+        // Unfortunately, the RTF parse in Tika 0.7 is a bit buggy: it
+        // places spaces (\x20) in places where they don't belong. In
+        // particular, it introduces spaces around every non-US-Ascii
+        // character. So, we have to do some post processing here. The
+        // outcome is not perfect, though.
+        if (metadata.get("Content-Type").compareTo("application/rtf") == 0) {
+            // expand space character between two non-US-Ascii chars into two white spaces
+            Pattern matchAdjacentUTF8Chars = Pattern.compile("([^\\u0000-\\u007F]) ([^\\u0000-\\u007F])", Pattern.CANON_EQ);
+            bodyContent = matchAdjacentUTF8Chars.matcher(bodyContent).replaceAll("$1  $2");
+
+            // eliminate spaces around UTF8 chars
+            Pattern matchUTF8CharBetweenSpaces = Pattern.compile(" ([^\\u0000-\\u007F]) ", Pattern.CANON_EQ);
+            bodyContent = matchUTF8CharBetweenSpaces.matcher(bodyContent).replaceAll("$1");
+        }
+
+        // process metadata
+        StringBuilder result = new StringBuilder();
+        for (String name : metadata.names()) {
+            if (name != "Content-Type") {
+                result.append(name).append(": ").append(metadata.get(name)).append("\n");
+            }
+        }
+        
+        return result.append("\n").append(bodyContent).toString();
+    }
+
+}
diff --git a/daisy/services/textextraction/impl/src/main/resources/DAISY-INF/classloader.xml b/daisy/services/textextraction/impl/src/main/resources/DAISY-INF/classloader.xml
index bcbc018..b01d2e2 100644
--- a/daisy/services/textextraction/impl/src/main/resources/DAISY-INF/classloader.xml
+++ b/daisy/services/textextraction/impl/src/main/resources/DAISY-INF/classloader.xml
@@ -18,15 +18,28 @@
 
     <artifact groupId="daisy" artifactId="daisy-util" version="2.5-dev" share="allowed"/>
 
-    <artifact groupId="pdfbox" artifactId="pdfbox" version="0.7.3" share="allowed"/>
-    
-    <!-- Same bouncycastle versions as shipped with pdfbox -->
-    <artifact groupId="bouncycastle" artifactId="bcprov-jdk14" version="136" share="allowed"/>
-    <artifact groupId="bouncycastle" artifactId="bcmail-jdk14" version="136" share="allowed"/>
-    
-    <artifact groupId="org.fontbox" artifactId="fontbox" version="0.1.0-dev" share="allowed"/>
     <artifact groupId="xpp3" artifactId="xpp3_min" version="1.1.3.4-RC8" share="allowed"/>
-    <artifact groupId="org.apache.poi" artifactId="poi" version="3.0.1-FINAL" share="allowed"/>
-    <artifact groupId="org.apache.poi" artifactId="poi-scratchpad" version="3.0.1-FINAL" share="allowed"/>
+    <artifact groupId="dom4j" artifactId="dom4j" version="1.6.1" share="allowed"/>
+    <artifact groupId="org.apache.tika" artifactId="tika-core" version="0.7" share="allowed"/>
+    <artifact groupId="org.apache.tika" artifactId="tika-parsers" version="0.7" share="allowed"/>
+    <artifact groupId="org.apache.commons" artifactId="commons-compress" version="1.0" share="allowed"/>
+    <artifact groupId="org.apache.pdfbox" artifactId="pdfbox" version="1.1.0" share="allowed"/>
+    <artifact groupId="org.apache.pdfbox" artifactId="fontbox" version="1.1.0" share="allowed"/>
+    <artifact groupId="org.apache.pdfbox" artifactId="jempbox" version="1.1.0" share="allowed"/>
+    <artifact groupId="org.bouncycastle" artifactId="bcmail-jdk15" version="1.45" share="allowed"/>
+    <artifact groupId="org.bouncycastle" artifactId="bcprov-jdk15" version="1.45" share="allowed"/>
+    <artifact groupId="org.apache.poi" artifactId="poi" version="3.6" share="allowed"/>
+    <artifact groupId="org.apache.poi" artifactId="poi-scratchpad" version="3.6" share="allowed"/>
+    <artifact groupId="org.apache.poi" artifactId="poi-ooxml" version="3.6" share="allowed"/>
+    <artifact groupId="org.apache.poi" artifactId="poi-ooxml-schemas" version="3.6" share="allowed"/>
+    <!--artifact groupId="org.apache.poi" artifactId="ooxml-schemas" version="1.1" share="allowed"/-->
+    <artifact groupId="xml-apis" artifactId="xml-apis" version="1.0.b2" share="allowed"/>
+    <artifact groupId="org.apache.geronimo.specs" artifactId="geronimo-stax-api_1.0_spec" version="1.0.1" share="allowed"/>
+    <artifact groupId="commons-logging" artifactId="commons-logging" version="1.1" share="allowed"/>
+    <artifact groupId="org.ccil.cowan.tagsoup" artifactId="tagsoup" version="1.2" share="allowed"/>
+    <artifact groupId="asm" artifactId="asm" version="1.5.3" share="allowed"/>
+    <artifact groupId="log4j" artifactId="log4j" version="1.2.14" share="allowed"/>
+    <artifact groupId="com.drewnoakes" artifactId="metadata-extractor" version="2.4.0-beta-1" share="allowed"/>
+    <artifact groupId="org.ccil.cowan.tagsoup" artifactId="tagsoup" version="1.2" share="allowed"/>
   </classpath>
-</classloader>
\ No newline at end of file
+</classloader>
diff --git a/daisy/services/textextraction/impl/src/main/resources/DAISY-INF/spring/applicationContext.xml b/daisy/services/textextraction/impl/src/main/resources/DAISY-INF/spring/applicationContext.xml
index 2a2c2da..284943f 100644
--- a/daisy/services/textextraction/impl/src/main/resources/DAISY-INF/spring/applicationContext.xml
+++ b/daisy/services/textextraction/impl/src/main/resources/DAISY-INF/spring/applicationContext.xml
@@ -48,34 +48,34 @@
     <constructor-arg ref="pluginRegistry"/>
   </bean>
 
-  <bean id="plaintext" class="org.outerj.daisy.textextraction.impl.PlainTextExtractor">
+  <!--bean id="plaintext" class="org.outerj.daisy.textextraction.impl.PlainTextExtractor">
     <constructor-arg>
       <list>
         <value>text/plain</value>
       </list>
     </constructor-arg>
     <constructor-arg ref="pluginRegistry"/>
-  </bean>
+  </bean-->
 
-  <bean id="pdf" class="org.outerj.daisy.textextraction.impl.PDFTextExtractor">
+  <!--bean id="pdf" class="org.outerj.daisy.textextraction.impl.PDFTextExtractor">
     <constructor-arg>
       <list>
         <value>application/pdf</value>
       </list>
     </constructor-arg>
     <constructor-arg ref="pluginRegistry"/>
-  </bean>
+  </bean-->
 
-  <bean id="openoffice" class="org.outerj.daisy.textextraction.impl.OpenOfficeTextExtractor">
+  <!--bean id="openoffice" class="org.outerj.daisy.textextraction.impl.OpenOfficeTextExtractor">
     <constructor-arg>
       <list>
         <value>application/vnd.sun.xml.writer</value>
       </list>
     </constructor-arg>
     <constructor-arg ref="pluginRegistry"/>
-  </bean>
+  </bean-->
 
-  <bean id="msword" class="org.outerj.daisy.textextraction.impl.MSWordTextExtractor">
+  <!--bean id="msword" class="org.outerj.daisy.textextraction.impl.MSWordTextExtractor">
     <constructor-arg>
       <list>
         <value>application/msword</value>
@@ -83,9 +83,9 @@
       </list>
     </constructor-arg>
     <constructor-arg ref="pluginRegistry"/>
-  </bean>
+  </bean-->
 
-  <bean id="powerpoint" class="org.outerj.daisy.textextraction.impl.MSPowerPointTextExtractor">
+  <!--bean id="powerpoint" class="org.outerj.daisy.textextraction.impl.MSPowerPointTextExtractor">
     <constructor-arg>
       <list>
         <value>application/mspowerpoint</value>
@@ -93,16 +93,159 @@
       </list>
     </constructor-arg>
     <constructor-arg ref="pluginRegistry"/>
-  </bean>
+  </bean-->
+
+  <!--bean id="msexcel" class="org.outerj.daisy.textextraction.impl.MSExcelTextExtractor">
+    <constructor-arg>
+      <list>
+        <value>application/msexcel</value>
+        <value>application/vnd.ms-excel</value>
+        <value>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</value>
+      </list>
+    </constructor-arg>
+    <constructor-arg ref="pluginRegistry"/>
+  </bean-->
+
+  <!--bean id="mswordOOXML" class="org.outerj.daisy.textextraction.impl.MSWordOOXMLTextExtractor">
+    <constructor-arg>
+      <list>
+        <value>application/vnd.openxmlformats-officedocument.wordprocessingml.document</value>
+      </list>
+    </constructor-arg>
+    <constructor-arg ref="pluginRegistry"/>
+  </bean-->
+
+  <!--bean id="powerpointOOXML" class="org.outerj.daisy.textextraction.impl.MSPowerPointOOXMLTextExtractor">
+    <constructor-arg>
+      <list>
+        <value>application/vnd.openxmlformats-officedocument.presentationml.presentation</value>
+      </list>
+    </constructor-arg>
+    <constructor-arg ref="pluginRegistry"/>
+  </bean-->
 
-  <bean id="msexcel" class="org.outerj.daisy.textextraction.impl.MSExcelTextExtractor">
+  <bean id="tika" class="org.outerj.daisy.textextraction.impl.TikaTextExtractor">
     <constructor-arg>
       <list>
+        <!-- plain text -->
+        <value>text/plain</value>
+
+        <!-- RichText RTF -->
+        <value>application/rtf</value>
+        <value>application/x-rtf</value>
+        <value>text/rtf</value>
+        <value>text/richtext</value>
+        <value>application/doc</value>
+        <value>application/x-soffice</value>
+
+        <!-- PDF and ePUB -->
+        <value>application/pdf</value>
+        <value>application/epub+zip</value>
+
+        <!-- MS Office -->
+        <value>application/msword</value>
+        <value>application/vnd.ms-word</value>
         <value>application/msexcel</value>
         <value>application/vnd.ms-excel</value>
+        <value>application/vnd.ms-excel.sheet.binary.macroenabled.12</value>
+        <value>application/mspowerpoint</value>
+        <value>application/vnd.ms-powerpoint</value>
+        <value>application/x-visio</value>
+        <value>application/vnd.visio</value>
+        <value>application/visio.drawing</value>
+        <value>application/vnd.visio</value>
+        <value>application/vnd.ms-outlook</value>
+        <value>application/x-tika-msoffice</value>
+
+        <!-- MS Office OOXML -->
+        <value>application/vnd.openxmlformats-officedocument.wordprocessingml.document</value>
+        <value>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</value>
+        <value>application/vnd.openxmlformats-officedocument.presentationml.presentation</value>
+
+        <!-- Open Office / ODF -->
+        <value>application/vnd.sun.xml.writer</value>
+        <value>application/vnd.oasis.opendocument.text</value>
+        <value>application/vnd.oasis.opendocument.graphics</value>
+        <value>application/vnd.oasis.opendocument.presentation</value>
+        <value>application/vnd.oasis.opendocument.spreadsheet</value>
+        <value>application/vnd.oasis.opendocument.chart</value>
+        <value>application/vnd.oasis.opendocument.image</value>
+        <value>application/vnd.oasis.opendocument.formula</value>
+        <value>application/vnd.oasis.opendocument.text-master</value>
+        <value>application/vnd.oasis.opendocument.text-web</value>
+        <value>application/vnd.oasis.opendocument.text-template</value>
+        <value>application/vnd.oasis.opendocument.graphics-template</value>
+        <value>application/vnd.oasis.opendocument.presentation-template</value>
+        <value>application/vnd.oasis.opendocument.spreadsheet-template</value>
+        <value>application/vnd.oasis.opendocument.chart-template</value>
+        <value>application/vnd.oasis.opendocument.image-template</value>
+        <value>application/vnd.oasis.opendocument.formula-template</value>
+        <value>application/x-vnd.oasis.opendocument.text</value>
+        <value>application/x-vnd.oasis.opendocument.graphics</value>
+        <value>application/x-vnd.oasis.opendocument.presentation</value>
+        <value>application/x-vnd.oasis.opendocument.spreadsheet</value>
+        <value>application/x-vnd.oasis.opendocument.chart</value>
+        <value>application/x-vnd.oasis.opendocument.image</value>
+        <value>application/x-vnd.oasis.opendocument.formula</value>
+        <value>application/x-vnd.oasis.opendocument.text-master</value>
+        <value>application/x-vnd.oasis.opendocument.text-web</value>
+        <value>application/x-vnd.oasis.opendocument.text-template</value>
+        <value>application/x-vnd.oasis.opendocument.graphics-template</value>
+        <value>application/x-vnd.oasis.opendocument.presentation-template</value>
+        <value>application/x-vnd.oasis.opendocument.spreadsheet-template</value>
+        <value>application/x-vnd.oasis.opendocument.chart-template</value>
+        <value>application/x-vnd.oasis.opendocument.image-template</value>
+        <value>application/x-vnd.oasis.opendocument.formula-template</value>
+
+        <!-- Archives and Compressed Files -->
+        <value>application/x-archive</value>
+        <value>application/x-compressed</value>
+        <value>application/x-bzip</value>
+        <value>application/x-bzip2</value>
+        <value>application/bzip2</value>
+        <value>application/x-cpio</value>
+        <value>application/tar</value>
+        <value>application/x-gtar</value>
+        <value>application/x-tar</value>
+        <value>application/x-gzip</value>
+        <value>application/zip</value>
+        <value>application/x-zip</value>
+        <value>application/x-zip-compressed</value>
+        <value>application/gzip-compressed</value>
+
+        <!-- mbox mailbox files -->
+        <value>application/mbox</value>
+        
+        <!-- Audio Files - extract metadata -->
+        <value>audio/x-aiff</value>
+        <value>audio/basic</value>
+        <value>audio/x-wav</value>
+        <value>application/x-midi</value>
+        <value>audio/midi</value>
+        <value>audio/mpeg</value>
+
+        <!-- Image Files - extract metadata -->
+        <value>image/bmp</value>
+        <value>image/gif</value>
+        <value>image/png</value>
+        <value>image/tiff</value>
+        <value>image/vnd.wap.wbmp</value>
+        <value>image/x-icon</value>
+        <value>image/x-psd</value>
+        <value>image/x-xcf</value>
+        <value>image/jpeg</value>
+        <value>image/pjpeg</value>
+        <value>image/svg+xml</value>
+
+        <!-- Flash Videos - extract metadata, text, etc. -->
+        <value>video/x-flv</value>
+
+        <!-- everything else - tika does auto-detection -->
+        <value>application/octet-stream</value>
       </list>
     </constructor-arg>
     <constructor-arg ref="pluginRegistry"/>
   </bean>
+  
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/daisy/services/workflow/api/pom.xml b/daisy/services/workflow/api/pom.xml
index 4156f37..f9b9cfb 100644
--- a/daisy/services/workflow/api/pom.xml
+++ b/daisy/services/workflow/api/pom.xml
@@ -29,8 +29,8 @@
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-api</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-workflow-xmlschema-bindings</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-util</artifactId><version>${project.version}</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
   </dependencies>
   <reporting>
diff --git a/daisy/services/workflow/client-impl/pom.xml b/daisy/services/workflow/client-impl/pom.xml
index f0fb08b..b7f4ae8 100644
--- a/daisy/services/workflow/client-impl/pom.xml
+++ b/daisy/services/workflow/client-impl/pom.xml
@@ -33,8 +33,8 @@
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-client-impl</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-common-impl</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-util</artifactId><version>${project.version}</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>commons-httpclient</groupId><artifactId>commons-httpclient</artifactId></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-spi</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
diff --git a/daisy/services/workflow/common-impl/pom.xml b/daisy/services/workflow/common-impl/pom.xml
index 84aaf2f..bbb103b 100644
--- a/daisy/services/workflow/common-impl/pom.xml
+++ b/daisy/services/workflow/common-impl/pom.xml
@@ -30,8 +30,8 @@
     <dependency><groupId>daisy</groupId><artifactId>daisy-workflow-xmlschema-bindings</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-util</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-api</artifactId><version>${project.version}</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
   </dependencies>
   <reporting>
diff --git a/daisy/services/workflow/server-impl/pom.xml b/daisy/services/workflow/server-impl/pom.xml
index 4bbd015..23d0937 100644
--- a/daisy/services/workflow/server-impl/pom.xml
+++ b/daisy/services/workflow/server-impl/pom.xml
@@ -30,8 +30,8 @@
     <dependency><groupId>daisy</groupId><artifactId>daisy-workflow-xmlschema-bindings</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-api</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-util</artifactId><version>${project.version}</version></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-spi</artifactId><version>${project.version}</version></dependency>
     <dependency><groupId>daisy</groupId><artifactId>daisy-repository-server-spi</artifactId><version>${project.version}</version></dependency>
diff --git a/daisy/services/workflow/xmlschema-bindings/pom.xml b/daisy/services/workflow/xmlschema-bindings/pom.xml
index 01ffcca..9d25601 100644
--- a/daisy/services/workflow/xmlschema-bindings/pom.xml
+++ b/daisy/services/workflow/xmlschema-bindings/pom.xml
@@ -24,8 +24,8 @@
     <version>2.5-dev</version>
   </parent>
   <dependencies>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId></dependency>
   </dependencies>
diff --git a/daisy/tools/archetypes/sample-project/src/main/resources/archetype-resources/pom.xml b/daisy/tools/archetypes/sample-project/src/main/resources/archetype-resources/pom.xml
index 7e79340..3061a0f 100644
--- a/daisy/tools/archetypes/sample-project/src/main/resources/archetype-resources/pom.xml
+++ b/daisy/tools/archetypes/sample-project/src/main/resources/archetype-resources/pom.xml
@@ -173,7 +173,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>xmlbeans-maven-plugin</artifactId>
-          <version>2.1.0</version>
+          <version>2.3.3</version>
           <executions>
             <execution>
               <goals>
@@ -253,7 +253,7 @@
       <dependency><groupId>daisy</groupId><artifactId>daisywiki-xmlschema-bindings</artifactId><version>${daisy.version}</version></dependency>
       <dependency><groupId>javax.servlet</groupId><artifactId>servlet-api</artifactId><version>2.4</version></dependency>
       <dependency><groupId>javax.annotation</groupId><artifactId>jsr250-api</artifactId><version>1.0</version></dependency>
-      <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId><version>2.1.0</version></dependency>
+      <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId><version>2.4.0</version></dependency>
       <dependency><groupId>org.apache.lucene</groupId><artifactId>lucene-core</artifactId><version>3.0.1</version></dependency>
       <dependency><groupId>org.apache.lucene</groupId><artifactId>lucene-analyzers</artifactId><version>3.0.1</version></dependency>
       <dependency><groupId>org.jbpm</groupId><artifactId>jbpm-jpdl</artifactId><version>3.2.1</version></dependency>
diff --git a/daisy/tools/daisy-maven-plugin/pom.xml b/daisy/tools/daisy-maven-plugin/pom.xml
index ad8ca66..42a17c9 100644
--- a/daisy/tools/daisy-maven-plugin/pom.xml
+++ b/daisy/tools/daisy-maven-plugin/pom.xml
@@ -126,7 +126,7 @@
     <dependency><groupId>org.codehaus.plexus</groupId><artifactId>plexus-utils</artifactId></dependency>
     <dependency><groupId>saxpath</groupId><artifactId>saxpath</artifactId></dependency>
     <dependency><groupId>stax</groupId><artifactId>stax-api</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xbean</artifactId></dependency>
-    <dependency><groupId>xmlbeans</groupId><artifactId>xmlpublic</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans</artifactId></dependency>
+    <dependency><groupId>org.apache.xmlbeans</groupId><artifactId>xmlbeans-xmlpublic</artifactId></dependency>
   </dependencies>
 </project>
\ No newline at end of file