From: Bhakti Mehta <Bhakti.Mehta_at_Sun.COM>
Date: Wed, 01 Apr 2009 15:19:57 -0700

Hi Jerome/Sahoo/Jane,
Please can you review the following changes. This is to integrate metro
2.0 in v3. I have modified the QL to test with these changes so will
also send those changes to Ming/Sherry for review.

Please let me know by tomorrow morning PST so I can commit these in the
v3 workspace
Thanks,
Bhakti

Index: pom.xml
===================================================================
--- pom.xml (revision 25817)
+++ pom.xml (working copy)
@@ -140,8 +140,8 @@
        
 <glassfish-corba.version>3.0.0-b018</glassfish-corba.version>
     <uc-pkg-client.version>1.0.7-15.1269</uc-pkg-client.version>
     <ucbootstrap.version>0.0.0.15</ucbootstrap.version>
- <webservices.version>1.4</webservices.version>
- <jaxb.version>2.1.9</jaxb.version>
+ <webservices.version>2.0-b03</webservices.version>
+ <jaxb.version>2.2-promoted-b9</jaxb.version>
         
<javax-persistence-api.version>2.0.0-M1</javax-persistence-api.version>
         <dbschema.version>RELEASE60</dbschema.version>
         <!-- osgi version string must start with a number. Manually
mapping above dbschema.version to osgi.version here -->
Index: distributions/glassfish/pom.xml
===================================================================
--- distributions/glassfish/pom.xml (revision 25817)
+++ distributions/glassfish/pom.xml (working copy)
@@ -120,21 +120,26 @@
         </dependency>
         <dependency>
             <groupId>com.sun.xml.ws</groupId>
- <artifactId>webservices</artifactId>
+ <artifactId>webservices-osgi</artifactId>
             <version>${webservices.version}</version>
- <classifier>osgi</classifier>
             <type>jar</type>
         </dependency>
         <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>webservices-api-osgi</artifactId>
+ <version>${webservices.version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
             <groupId>org.glassfish.webservices</groupId>
             <artifactId>jsr109-impl</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
            <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb</artifactId>
+ <artifactId>jaxb-osgi</artifactId>
            <version>${jaxb.version}</version>
- <classifier>osgi</classifier>
+ <type>jar</type>
         </dependency>
         <dependency>
            <groupId>org.glassfish.security</groupId>
Index: packager/metro/pom.xml
===================================================================
--- packager/metro/pom.xml (revision 25817)
+++ packager/metro/pom.xml (working copy)
@@ -98,15 +98,18 @@
        </dependency>
        <dependency>
           <groupId>com.sun.xml.ws</groupId>
- <artifactId>webservices</artifactId>
+ <artifactId>webservices-osgi</artifactId>
            <version>${webservices.version}</version>
- <classifier>osgi</classifier>
        </dependency>
        <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>webservices-api-osgi</artifactId>
+ <version>${webservices.version}</version>
+ </dependency>
+ <dependency>
           <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb</artifactId>
+ <artifactId>jaxb-osgi</artifactId>
        <version>${jaxb.version}</version>
- <classifier>osgi</classifier>
        </dependency>
        <dependency>
            <groupId>org.glassfish.security</groupId>
Index: webservices/jsr109-impl/pom.xml
===================================================================
--- webservices/jsr109-impl/pom.xml (revision 25817)
+++ webservices/jsr109-impl/pom.xml (working copy)
@@ -139,15 +139,18 @@
         </dependency>
         <dependency>
            <groupId>com.sun.xml.ws</groupId>
- <artifactId>webservices</artifactId>
+ <artifactId>webservices-osgi</artifactId>
             <version>${webservices.version}</version>
- <classifier>osgi</classifier>
         </dependency>
         <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>webservices-api-osgi</artifactId>
+ <version>${webservices.version}</version>
+ </dependency>
+ <dependency>
            <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb</artifactId>
+ <artifactId>jaxb-osgi</artifactId>
             <version>${jaxb.version}</version>
- <classifier>osgi</classifier>
         </dependency>
         <dependency>
            <groupId>org.glassfish</groupId>
Index: security/webservices.security/pom.xml
===================================================================
--- security/webservices.security/pom.xml (revision 25817)
+++ security/webservices.security/pom.xml (working copy)
@@ -113,15 +113,18 @@
         </dependency>-->
         <dependency>
            <groupId>com.sun.xml.ws</groupId>
- <artifactId>webservices</artifactId>
+ <artifactId>webservices-osgi</artifactId>
             <version>${webservices.version}</version>
- <classifier>osgi</classifier>
         </dependency>
         <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>webservices-api-osgi</artifactId>
+ <version>${webservices.version}</version>
+ </dependency>
+ <dependency>
            <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb</artifactId>
+ <artifactId>jaxb-osgi</artifactId>
             <version>${jaxb.version}</version>
- <classifier>osgi</classifier>
         </dependency>
         <!--<dependency>
            <groupId>org.glassfish</groupId>