[jboss-cvs] JBossAS SVN: r109502 - in projects/metadata/common/trunk: src/main/java/org/jboss/metadata/annotation/creator/ws and 1 other directory.

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

Author: alessio.soldano at jboss.com
Date: 2010-11-27 09:39:00 -0500 (Sat, 27 Nov 2010)
New Revision: 109502

Modified:
   projects/metadata/common/trunk/pom.xml
   projects/metadata/common/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceHandlerChainProcessor.java
Log:
[JBWS-3169] Do not rely on jbossws-spi' jbossxb-related facilities directly (HandlersChainsObjectFactory)


Modified: projects/metadata/common/trunk/pom.xml
===================================================================
--- projects/metadata/common/trunk/pom.xml	2010-11-27 00:01:23 UTC (rev 109501)
+++ projects/metadata/common/trunk/pom.xml	2010-11-27 14:39:00 UTC (rev 109502)
@@ -255,7 +255,7 @@
     <dependency>
       <groupId>org.jboss.ws</groupId>
       <artifactId>jbossws-spi</artifactId>
-      <version>1.4.1.CR1</version>
+      <version>1.4.1.CR2</version>
     </dependency>
 
     <dependency>

Modified: projects/metadata/common/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceHandlerChainProcessor.java
===================================================================
--- projects/metadata/common/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceHandlerChainProcessor.java	2010-11-27 00:01:23 UTC (rev 109501)
+++ projects/metadata/common/trunk/src/main/java/org/jboss/metadata/annotation/creator/ws/WebServiceHandlerChainProcessor.java	2010-11-27 14:39:00 UTC (rev 109502)
@@ -30,7 +30,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -48,14 +47,12 @@
 import org.jboss.metadata.javaee.spec.ServiceReferenceHandlerChainsMetaData;
 import org.jboss.metadata.javaee.spec.ServiceReferenceHandlerMetaData;
 import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.HandlerChainsObjectFactory;
 import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaDataParser;
 import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData;
 import org.jboss.xb.binding.JBossXBException;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
 import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
 
 /**
@@ -140,13 +137,12 @@
     * @return ServiceReferenceHandlerChainsMetaData
     * @throws JBossXBException
     */
-   protected ServiceReferenceHandlerChainsMetaData unmarshall(InputStream in) throws JBossXBException
+   protected ServiceReferenceHandlerChainsMetaData unmarshall(InputStream in) throws IOException
    {
       if(in == null)
          throw new IllegalArgumentException("InputStream may not be null.");
       
-      Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
-      UnifiedHandlerChainsMetaData handlerChainsUMDM = (UnifiedHandlerChainsMetaData)unmarshaller.unmarshal(in, new HandlerChainsObjectFactory(), null);
+      UnifiedHandlerChainsMetaData handlerChainsUMDM = UnifiedHandlerChainsMetaDataParser.parse(in);
       return this.transform(handlerChainsUMDM);
    }