[jboss-svn-commits] JBL Code SVN: r37972 - in labs/jbossesb/trunk/product: services/soap and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Mar 30 11:18:52 EDT 2012
Author: mageshbk at jboss.com
Date: 2012-03-30 11:18:51 -0400 (Fri, 30 Mar 2012)
New Revision: 37972
Added:
labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise3/serialize.xjb
Modified:
labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise3/build.xml
labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise3/wise-core.properties
labs/jbossesb/trunk/product/services/soap/aop/java/org/jboss/internal/soa/esb/soap/wise/WSDynamicClientJaxbAspect.java
labs/jbossesb/trunk/product/services/soap/aop/java/org/jboss/internal/soa/esb/soap/wise/WSMethodParameterMappingAspect.java
labs/jbossesb/trunk/product/services/soap/build.xml
labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SOAPClient.java
Log:
[JBESB-3770] - Fixed Wise quickstarts regression.
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise3/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise3/build.xml 2012-03-30 14:15:50 UTC (rev 37971)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise3/build.xml 2012-03-30 15:18:51 UTC (rev 37972)
@@ -5,7 +5,7 @@
${line.separator}
</description>
- <property name="additional.deploys" value="wise-core.properties,smooks-handler.xml" />
+ <property name="additional.deploys" value="wise-core.properties,smooks-handler.xml,serialize.xjb" />
<!-- Import the base Ant build script... -->
<import file="../conf/base-build.xml"/>
Added: labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise3/serialize.xjb
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise3/serialize.xjb (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise3/serialize.xjb 2012-03-30 15:18:51 UTC (rev 37972)
@@ -0,0 +1,6 @@
+<jxb:bindings version="1.0" xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <jxb:globalBindings>
+ <jxb:serializable/>
+ </jxb:globalBindings>
+</jxb:bindings>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise3/wise-core.properties
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise3/wise-core.properties 2012-03-30 14:15:50 UTC (rev 37971)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_consumer_wise3/wise-core.properties 2012-03-30 15:18:51 UTC (rev 37972)
@@ -3,3 +3,4 @@
wise.keepGeneratedSources=true
wise.wsImporter.verbose=true
wise.targetPackage=org.jboss.soa.esb.samples.quickstart.webservice_consumer_wise3.generated
+wise.jaxb.bindings=serialize.xjb
Modified: labs/jbossesb/trunk/product/services/soap/aop/java/org/jboss/internal/soa/esb/soap/wise/WSDynamicClientJaxbAspect.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/aop/java/org/jboss/internal/soa/esb/soap/wise/WSDynamicClientJaxbAspect.java 2012-03-30 14:15:50 UTC (rev 37971)
+++ labs/jbossesb/trunk/product/services/soap/aop/java/org/jboss/internal/soa/esb/soap/wise/WSDynamicClientJaxbAspect.java 2012-03-30 15:18:51 UTC (rev 37972)
@@ -76,7 +76,7 @@
URL url = Thread.currentThread().getContextClassLoader().getResource(binding);
String protocol = url.getProtocol();
URI fileName = url.toURI();
- if (protocol.equals("vfszip")) {
+ if (!protocol.equals("file")) {
// Move to temp dir from the archive
fileName = transferBindingFile(tempDir, url, binding);
}
Modified: labs/jbossesb/trunk/product/services/soap/aop/java/org/jboss/internal/soa/esb/soap/wise/WSMethodParameterMappingAspect.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/aop/java/org/jboss/internal/soa/esb/soap/wise/WSMethodParameterMappingAspect.java 2012-03-30 14:15:50 UTC (rev 37971)
+++ labs/jbossesb/trunk/product/services/soap/aop/java/org/jboss/internal/soa/esb/soap/wise/WSMethodParameterMappingAspect.java 2012-03-30 15:18:51 UTC (rev 37972)
@@ -104,52 +104,55 @@
RequestWrapper wrapper = method.getAnnotation(RequestWrapper.class);
if (wrapper != null)
{
- // Unwrap
String name = wrapper.localName();
- ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
- try
+ Object target = params.get(name);
+ if (target != null)
{
- Thread.currentThread().setContextClassLoader(wsMethod.getEndpoint().getClassLoader());
- Class<?> wrapperClass = wsMethod.getEndpoint().getClassLoader().loadClass(wrapper.className());
- Annotation[][] annotations = method.getParameterAnnotations();
- Object target = params.get(name);
- for (int i = 0; i < annotations.length; i++)
+ // Unwrap
+ ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
+ try
{
- for (int j = 0; j < annotations[i].length; j++)
+ Thread.currentThread().setContextClassLoader(wsMethod.getEndpoint().getClassLoader());
+ Class<?> wrapperClass = wsMethod.getEndpoint().getClassLoader().loadClass(wrapper.className());
+ Annotation[][] annotations = method.getParameterAnnotations();
+ for (int i = 0; i < annotations.length; i++)
{
- if ((annotations[i][j] instanceof WebParam))
+ for (int j = 0; j < annotations[i].length; j++)
{
- WebParam webParaAnno = (WebParam)annotations[i][j];
- final Enum<Mode> mode = webParaAnno.mode();
- String paramName = webParaAnno.name();
- if ((mode == Mode.INOUT) || (mode == Mode.IN))
+ if ((annotations[i][j] instanceof WebParam))
{
- String methodName = "get" + paramName.substring(0,1).toUpperCase() + paramName.substring(1);
- Method paramMethod = wrapperClass.getMethod(methodName, new Class<?>[0]);
- Object value = paramMethod.invoke(target, new Object[0]);
- if (mode == Mode.INOUT)
+ WebParam webParaAnno = (WebParam)annotations[i][j];
+ final Enum<Mode> mode = webParaAnno.mode();
+ String paramName = webParaAnno.name();
+ if ((mode == Mode.INOUT) || (mode == Mode.IN))
{
- params.put(paramName, new Holder(value));
+ String methodName = "get" + paramName.substring(0,1).toUpperCase() + paramName.substring(1);
+ Method paramMethod = wrapperClass.getMethod(methodName, new Class<?>[0]);
+ Object value = paramMethod.invoke(target, new Object[0]);
+ if (mode == Mode.INOUT)
+ {
+ params.put(paramName, new Holder(value));
+ }
+ else
+ {
+ params.put(paramName, value);
+ }
}
- else
+ else
{
- params.put(paramName, value);
+ params.put(paramName, new Holder());
}
+ break;
}
- else
- {
- params.put(paramName, new Holder());
- }
- break;
}
}
}
+ finally
+ {
+ // restore the original classloader
+ Thread.currentThread().setContextClassLoader(oldLoader);
+ }
}
- finally
- {
- // restore the original classloader
- Thread.currentThread().setContextClassLoader(oldLoader);
- }
}
}
}
Modified: labs/jbossesb/trunk/product/services/soap/build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/soap/build.xml 2012-03-30 14:15:50 UTC (rev 37971)
+++ labs/jbossesb/trunk/product/services/soap/build.xml 2012-03-30 15:18:51 UTC (rev 37972)
@@ -186,7 +186,10 @@
<target name="service-esb" depends="base-esb">
<copy todir="${build.dir}/${ant.project.name}.esb">
<fileset dir="${esb.root.dir}/build/lib"
- includes="jaxws-rt*.jar jaxb-xjc*.jar"/>
+ includes="jaxws-rt*.jar"/>
+ <!-- Need to include the compatible version according to server -->
+ <fileset dir="${esb.product.lib.ext}/endorsed"
+ includes="jaxb-impl*.jar jaxb-xjc*.jar"/>
<fileset file="${aop.jar}"/>
</copy>
Modified: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SOAPClient.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SOAPClient.java 2012-03-30 14:15:50 UTC (rev 37971)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SOAPClient.java 2012-03-30 15:18:51 UTC (rev 37972)
@@ -494,7 +494,7 @@
public String toString()
{
return "Wise SOAPClient [wsdl=" + wsdl + ", soapAction=" + soapAction + ", endPointName=" + endPointName + ", serviceName=" + serviceName + ", smooksRequestMapperURL=" + smooksRequestMapperURL + ", smooksResponseMapperURL=" + smooksResponseMapperURL
- + ", wiseProps=" + wiseProps.toString() + "] ";
+ + ", wiseProps=" + ((wiseProps != null)? wiseProps.toString() : "") + "] ";
}
String getOperationName()
More information about the jboss-svn-commits
mailing list