[jboss-cvs] JBossAS SVN: r88049 - in projects/jboss-osgi/bundles: jaxb and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-04-30 02:24:23 -0400 (Thu, 30 Apr 2009)
New Revision: 88049

Added:
   projects/jboss-osgi/bundles/jaxb/
Removed:
   projects/jboss-osgi/bundles/jaxb/src/main/java/org/
Modified:
   projects/jboss-osgi/bundles/jaxb/pom.xml
   projects/jboss-osgi/bundles/pom.xml
Log:
Add jaxb-bundle-2.1.10

Copied: projects/jboss-osgi/bundles/jaxb (from rev 87993, projects/jboss-osgi/bundles/apache-xerces)

Modified: projects/jboss-osgi/bundles/jaxb/pom.xml
===================================================================
--- projects/jboss-osgi/bundles/apache-xerces/pom.xml	2009-04-29 11:47:21 UTC (rev 87993)
+++ projects/jboss-osgi/bundles/jaxb/pom.xml	2009-04-30 06:24:23 UTC (rev 88049)
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <name>JBossOSGi Bundles - Apache Xerces</name>
+  <name>JBossOSGi Bundles - JAXB</name>
   <groupId>org.jboss.osgi.bundles</groupId>
-  <artifactId>apache-xerces-bundle</artifactId>
+  <artifactId>jaxb-bundle</artifactId>
   <packaging>bundle</packaging>
 
-  <version>2.9.1-SNAPSHOT</version>
+  <version>2.1.10-SNAPSHOT</version>
 
   <parent>
     <groupId>org.jboss.osgi.bundles</groupId>
@@ -16,43 +16,15 @@
   </parent>
 
   <properties>
-    <version.apache.xerces>2.9.1</version.apache.xerces>
-    <version.wutka.dtdparser>1.2.1</version.wutka.dtdparser>
-    <version.xml.resolver>1.2</version.xml.resolver>
+    <version.xml.bind>2.1.10</version.xml.bind>
   </properties>
 
   <dependencies>
     <dependency>
-      <groupId>apache-xerces</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>${version.apache.xerces}</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>${version.apache.xerces}</version>
-    </dependency>
-    <dependency>
-      <groupId>wutka-dtdparser</groupId>
-      <artifactId>dtdparser121</artifactId>
-      <version>${version.wutka.dtdparser}</version>
-    </dependency>
-    <dependency>
-      <groupId>xml-resolver</groupId>
-      <artifactId>xml-resolver</artifactId>
-      <version>${version.xml.resolver}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <scope>provided</scope>
-    </dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>${version.xml.bind}</version>
+    </dependency> 
   </dependencies>
 
   <build>
@@ -63,33 +35,36 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
-            <Bundle-Activator>org.jboss.osgi.apache.xerces.internal.XercesParserActivator</Bundle-Activator>
             <Private-Package>
-              org.jboss.osgi.apache.xerces.internal
             </Private-Package>
             <Import-Package>
+              <!-- system -->
+              javax.imageio*, 
               javax.xml.datatype, 
               javax.xml.namespace, 
               javax.xml.parsers, 
               javax.xml.transform*, 
               javax.xml.validation, 
-              org.w3c.dom*, 
+              org.w3c.dom, 
               org.xml.sax*,
 
-              <!-- osgi -->
-              org.osgi.framework, 
-              org.osgi.util.xml,
+              <!-- import -->
+              com.sun.xml.fastinfoset.*;resolution=optional, 
+              org.jvnet.*;resolution=optional,
               
               <!-- ignore -->
-              !sun.io, 
             </Import-Package>
+            <Embed-Transitive>true</Embed-Transitive>
             <Embed-Dependency>
-              dtdparser121;inline=false,
-              xercesImpl;inline=false,
-              xml-resolver;inline=false,
+              jaxb-impl;inline=false,
+              jaxb-api;inline=false,
+              stax-api;inline=false,
+              activation;inline=false,
             </Embed-Dependency>
             <_exportcontents>
-              *
+              javax.activation;version=1.1,
+              javax.xml.bind*;version=2.1,
+              javax.xml.stream*;version=1.0,
             </_exportcontents>
           </instructions>
         </configuration>

Modified: projects/jboss-osgi/bundles/pom.xml
===================================================================
--- projects/jboss-osgi/bundles/pom.xml	2009-04-30 06:22:01 UTC (rev 88048)
+++ projects/jboss-osgi/bundles/pom.xml	2009-04-30 06:24:23 UTC (rev 88049)
@@ -33,6 +33,7 @@
   <!-- Modules -->
   <modules>
     <module>apache-xerces</module>
+    <module>jaxb</module>
     <module>jboss-common-core</module>
     <module>jbossxb</module>
   </modules>