From 0ecb8e274f85b5946da929acbc2b78e6cdac6bc5 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman@redhat.com>
Date: Fri, 30 Nov 2012 13:24:53 +0100
Subject: [PATCH] [fedora] Missing module dependencies in mime4j,
 com.sun.xml.bind and org.apache.xerces after unbundling

---
 build/build.xml                                              |  4 +++-
 build/pom.xml                                                | 12 +++++++++++-
 .../system/layers/base/com/sun/xml/bind/main/module.xml      |  5 ++++-
 .../system/layers/base/org/apache/xerces/main/module.xml     |  2 ++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 8a24f45..66e110f 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -698,7 +698,9 @@
         </module-def>
 
         <module-def name="org.apache.james.mime4j">
-            <maven-resource group="org.apache.james" artifact="apache-mime4j"/>
+            <maven-resource group="org.apache.james" artifact="apache-mime4j-core"/>
+            <maven-resource group="org.apache.james" artifact="apache-mime4j-dom"/>
+            <maven-resource group="org.apache.james" artifact="apache-mime4j-storage"/>
         </module-def>
 
         <module-def name="org.apache.lucene">
diff --git a/build/pom.xml b/build/pom.xml
index e4ae335..3952872 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -603,7 +603,17 @@
 
                 <dependency>
                     <groupId>org.apache.james</groupId>
-                    <artifactId>apache-mime4j</artifactId>
+                    <artifactId>apache-mime4j-core</artifactId>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.james</groupId>
+                    <artifactId>apache-mime4j-dom</artifactId>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.james</groupId>
+                    <artifactId>apache-mime4j-storage</artifactId>
                 </dependency>
 
                 <dependency>
diff --git a/build/src/main/resources/modules/system/layers/base/com/sun/xml/bind/main/module.xml b/build/src/main/resources/modules/system/layers/base/com/sun/xml/bind/main/module.xml
index 839f6ad..7ceac17 100644
--- a/build/src/main/resources/modules/system/layers/base/com/sun/xml/bind/main/module.xml
+++ b/build/src/main/resources/modules/system/layers/base/com/sun/xml/bind/main/module.xml
@@ -28,7 +28,10 @@
     </properties>
 
     <resources>
-        <!-- Insert resources here -->
+      <!-- Unbundled from jaxb in Fedora -->
+      <resource-root path="istack-commons-runtime.jar"/>
+      <resource-root path="txw2.jar"/>
+      <!-- Insert resources here -->
     </resources>
 
     <dependencies>
diff --git a/build/src/main/resources/modules/system/layers/base/org/apache/xerces/main/module.xml b/build/src/main/resources/modules/system/layers/base/org/apache/xerces/main/module.xml
index 0c42c9c..61fd40d 100644
--- a/build/src/main/resources/modules/system/layers/base/org/apache/xerces/main/module.xml
+++ b/build/src/main/resources/modules/system/layers/base/org/apache/xerces/main/module.xml
@@ -25,6 +25,8 @@
 <module xmlns="urn:jboss:module:1.3" name="org.apache.xerces">
 
     <resources>
+        <!-- Unbundled from xerces in Fedora -->
+        <resource-root path="xml-commons-apis.jar"/>
         <!-- Insert resources here -->
     </resources>
 
-- 
1.9.0