axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sc...@apache.org
Subject svn commit: r556713 - /webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedPlusMethodMarshaller.java
Date Mon, 16 Jul 2007 20:05:33 GMT
Author: scheu
Date: Mon Jul 16 13:05:32 2007
New Revision: 556713

URL: http://svn.apache.org/viewvc?view=rev&rev=556713
Log:
Contributor: Rich Scheuerle
Minor changes to the DocLitWrappedPlusMethodMarshaller to use the package key to build the
JAXBContext.

Modified:
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedPlusMethodMarshaller.java

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedPlusMethodMarshaller.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedPlusMethodMarshaller.java?view=diff&rev=556713&r1=556712&r2=556713
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedPlusMethodMarshaller.java
(original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedPlusMethodMarshaller.java
Mon Jul 16 13:05:32 2007
@@ -305,10 +305,11 @@
             MarshalServiceRuntimeDescription marshalDesc =
                     MethodMarshallerUtils.getMarshalDesc(endpointDesc);
             TreeSet<String> packages = marshalDesc.getPackages();
+            String packagesKey = marshalDesc.getPackagesKey();
 
             // In usage=WRAPPED, there will be a single JAXB block inside the body.
             // Get this block
-            JAXBBlockContext blockContext = new JAXBBlockContext(packages);
+            JAXBBlockContext blockContext = new JAXBBlockContext(packages, packagesKey);
             JAXBBlockFactory factory =
                     (JAXBBlockFactory)FactoryRegistry.getFactory(JAXBBlockFactory.class);
             Block block = message.getBodyBlock(blockContext, factory);
@@ -442,6 +443,7 @@
             MarshalServiceRuntimeDescription marshalDesc =
                     MethodMarshallerUtils.getMarshalDesc(endpointDesc);
             TreeSet<String> packages = marshalDesc.getPackages();
+            String packagesKey = marshalDesc.getPackagesKey();
 
             // Create the message 
             MessageFactory mf = (MessageFactory)FactoryRegistry.getFactory(MessageFactory.class);
@@ -539,7 +541,7 @@
                     (JAXBBlockFactory)FactoryRegistry.getFactory(JAXBBlockFactory.class);
 
             Block block = factory.createFrom(object,
-                                             new JAXBBlockContext(packages),
+                                             new JAXBBlockContext(packages, packagesKey),
                                              wrapperQName);  // The factory will get the
qname from the value
             m.setBodyBlock(block);
 
@@ -574,6 +576,7 @@
         MarshalServiceRuntimeDescription marshalDesc =
                 MethodMarshallerUtils.getMarshalDesc(endpointDesc);
         TreeSet<String> packages = marshalDesc.getPackages();
+        String packagesKey = marshalDesc.getPackagesKey();
 
         // Note all exceptions are caught and rethrown with a WebServiceException
         try {
@@ -654,7 +657,7 @@
             JAXBBlockFactory factory =
                     (JAXBBlockFactory)FactoryRegistry.getFactory(JAXBBlockFactory.class);
             Block block = factory.createFrom(object,
-                                             new JAXBBlockContext(packages),
+                                             new JAXBBlockContext(packages, packagesKey),
                                              wrapperQName);  // The factory will get the
qname from the value
             m.setBodyBlock(block);
 



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message