JBossWS SVN: r5864 - stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-29 04:26:15 -0500 (Fri, 29 Feb 2008)
New Revision: 5864
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
Log:
[JBWS-1857] JAXBContext created for every wrapper type
Fix NPE with RPC endpoints
Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2008-02-29 09:16:37 UTC (rev 5863)
+++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2008-02-29 09:26:15 UTC (rev 5864)
@@ -672,9 +672,12 @@
if (factoryCreator instanceof JAXBAccessorFactoryCreator)
((JAXBAccessorFactoryCreator)factoryCreator).setJAXBContext(jaxbCtx);
- AccessorFactory factory = factoryCreator.create(paramMetaData);
- for (WrappedParameter wrapped : paramMetaData.getWrappedParameters())
- wrapped.setAccessor(factory.create(wrapped));
+ if (paramMetaData.getWrappedParameters() != null)
+ {
+ AccessorFactory factory = factoryCreator.create(paramMetaData);
+ for (WrappedParameter wParam : paramMetaData.getWrappedParameters())
+ wParam.setAccessor(factory.create(wParam));
+ }
}
// ---------------------------------------------------------------
16 years, 10 months
JBossWS SVN: r5863 - stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-29 04:16:37 -0500 (Fri, 29 Feb 2008)
New Revision: 5863
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
Log:
[JBWS-1857] JAXBContext created for every wrapper type
Fix NPE with JAXRPC clients
Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2008-02-29 08:56:48 UTC (rev 5862)
+++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2008-02-29 09:16:37 UTC (rev 5863)
@@ -620,22 +620,37 @@
private void eagerInitializeAccessors()
{
// Collect the list of all used types
+ boolean useJAXBAccessorFactory = false;
List<Class> types = new ArrayList<Class>();
for (OperationMetaData opMetaData : operations)
{
for (ParameterMetaData paramMetaData : opMetaData.getParameters())
{
+ AccessorFactoryCreator factoryCreator = paramMetaData.getAccessorFactoryCreator();
+ if (factoryCreator instanceof JAXBAccessorFactoryCreator)
+ useJAXBAccessorFactory = true;
+
types.add(paramMetaData.getJavaType());
}
ParameterMetaData retParam = opMetaData.getReturnParameter();
if (retParam != null)
+ {
+ AccessorFactoryCreator factoryCreator = retParam.getAccessorFactoryCreator();
+ if (factoryCreator instanceof JAXBAccessorFactoryCreator)
+ useJAXBAccessorFactory = true;
+
types.add(retParam.getJavaType());
+ }
}
// Create a JAXBContext for those types
- Class[] typeArr = new Class[types.size()];
- JAXBRIContext jaxbCtx = (JAXBRIContext)JAXBContextFactory.newInstance().createContext(types.toArray(typeArr));
+ JAXBRIContext jaxbCtx = null;
+ if (useJAXBAccessorFactory)
+ {
+ Class[] typeArr = new Class[types.size()];
+ jaxbCtx = (JAXBRIContext)JAXBContextFactory.newInstance().createContext(types.toArray(typeArr));
+ }
// Create the accessors using a shared JAXBContext
for (OperationMetaData opMetaData : operations)
@@ -655,14 +670,12 @@
{
AccessorFactoryCreator factoryCreator = paramMetaData.getAccessorFactoryCreator();
if (factoryCreator instanceof JAXBAccessorFactoryCreator)
- {
((JAXBAccessorFactoryCreator)factoryCreator).setJAXBContext(jaxbCtx);
- AccessorFactory factory = factoryCreator.create(paramMetaData);
- for (WrappedParameter wrapped : paramMetaData.getWrappedParameters())
- wrapped.setAccessor(factory.create(wrapped));
- }
+
+ AccessorFactory factory = factoryCreator.create(paramMetaData);
+ for (WrappedParameter wrapped : paramMetaData.getWrappedParameters())
+ wrapped.setAccessor(factory.create(wrapped));
}
-
// ---------------------------------------------------------------
// Configuration provider impl
16 years, 10 months
JBossWS SVN: r5862 - stack/native/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-29 03:56:48 -0500 (Fri, 29 Feb 2008)
New Revision: 5862
Modified:
stack/native/trunk/ant-import/macros-deploy-native.xml
Log:
DEploy jbossws-jboss421.jar to client for AS421
Modified: stack/native/trunk/ant-import/macros-deploy-native.xml
===================================================================
--- stack/native/trunk/ant-import/macros-deploy-native.xml 2008-02-29 08:52:45 UTC (rev 5861)
+++ stack/native/trunk/ant-import/macros-deploy-native.xml 2008-02-29 08:56:48 UTC (rev 5862)
@@ -183,10 +183,10 @@
<copy todir="${deploy.dir}/client" overwrite="true">
<fileset dir="@{stacklibs}">
<patternset refid="client.patternset"/>
- <include name="jbossws-jboss421.jar"/>
</fileset>
<fileset dir="@{thirdpartylibs}">
<patternset refid="client.patternset"/>
+ <include name="jbossws-jboss421.jar"/>
<include name="jboss-xml-binding.jar"/>
</fileset>
</copy>
16 years, 10 months
JBossWS SVN: r5861 - stack/cxf/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-29 03:52:45 -0500 (Fri, 29 Feb 2008)
New Revision: 5861
Modified:
stack/cxf/trunk/ant-import/macros-deploy-cxf.xml
Log:
Deploy spi, common, framework to client
Modified: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml
===================================================================
--- stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-29 08:52:37 UTC (rev 5860)
+++ stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-29 08:52:45 UTC (rev 5861)
@@ -18,6 +18,9 @@
Exceptions must be defined in the individual deploy macros.
-->
<patternset id="client.patternset">
+ <include name="jbossws-common.jar"/>
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-spi.jar"/>
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
16 years, 10 months
JBossWS SVN: r5860 - stack/metro/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-29 03:52:37 -0500 (Fri, 29 Feb 2008)
New Revision: 5860
Modified:
stack/metro/trunk/ant-import/macros-deploy-metro.xml
Log:
Deploy spi, common, framework to client
Modified: stack/metro/trunk/ant-import/macros-deploy-metro.xml
===================================================================
--- stack/metro/trunk/ant-import/macros-deploy-metro.xml 2008-02-29 08:46:44 UTC (rev 5859)
+++ stack/metro/trunk/ant-import/macros-deploy-metro.xml 2008-02-29 08:52:37 UTC (rev 5860)
@@ -18,7 +18,10 @@
Exceptions must be defined in the individual deploy macros.
-->
<patternset id="client.patternset">
+ <include name="jbossws-common.jar"/>
+ <include name="jbossws-framework.jar"/>
<include name="jbossws-metro-client.jar"/>
+ <include name="jbossws-spi.jar"/>
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
16 years, 10 months
JBossWS SVN: r5859 - stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-02-29 03:46:44 -0500 (Fri, 29 Feb 2008)
New Revision: 5859
Modified:
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java
Log:
Implement WSDL request handling
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java 2008-02-29 08:46:10 UTC (rev 5858)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/RequestHandlerImpl.java 2008-02-29 08:46:44 UTC (rev 5859)
@@ -29,6 +29,7 @@
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.invocation.EndpointAssociation;
+import org.jboss.wsf.common.IOUtils;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -40,6 +41,7 @@
import java.io.OutputStream;
import java.io.Writer;
import java.util.Properties;
+import java.net.URL;
/**
* A request handler
@@ -196,7 +198,34 @@
public void handleWSDLRequest(Endpoint endpoint, OutputStream outStream, InvocationContext context)
{
- throw new IllegalArgumentException("JBWS-1869: Not implemented");
+ InputStream inStream = null;
+
+ try
+ {
+ String epAddress = endpoint.getAddress();
+ if (epAddress == null)
+ throw new IllegalArgumentException("Invalid endpoint address: " + epAddress);
+
+ URL wsdlUrl = new URL(epAddress + "?wsdl");
+ inStream = wsdlUrl.openStream();
+ IOUtils.copyStream(outStream, inStream);
+ }
+ catch (IOException e)
+ {
+ throw new WebServiceException("Failed to process WSDL request: " + e.getMessage(), e);
+ }
+ finally
+ {
+ try
+ {
+ if(inStream!=null)inStream.close();
+ if(outStream!=null)outStream.close();
+ }
+ catch (IOException e)
+ {
+ //
+ }
+ }
}
/**
16 years, 10 months
JBossWS SVN: r5858 - stack/cxf/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-29 03:46:10 -0500 (Fri, 29 Feb 2008)
New Revision: 5858
Modified:
stack/cxf/trunk/ant-import/build-setup.xml
Log:
jboss50x.available.file=jboss-client.jar
Modified: stack/cxf/trunk/ant-import/build-setup.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-setup.xml 2008-02-29 08:46:01 UTC (rev 5857)
+++ stack/cxf/trunk/ant-import/build-setup.xml 2008-02-29 08:46:10 UTC (rev 5858)
@@ -54,8 +54,8 @@
<property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
<property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
- <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
- <property name="jboss501.available.file" value="${jboss501.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/>
+ <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/>
<available property="jboss422.available" file="${jboss422.available.file}"/>
<available property="jboss423.available" file="${jboss423.available.file}"/>
16 years, 10 months
JBossWS SVN: r5857 - stack/metro/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-29 03:46:01 -0500 (Fri, 29 Feb 2008)
New Revision: 5857
Modified:
stack/metro/trunk/ant-import/build-setup.xml
Log:
jboss50x.available.file=jboss-client.jar
Modified: stack/metro/trunk/ant-import/build-setup.xml
===================================================================
--- stack/metro/trunk/ant-import/build-setup.xml 2008-02-29 08:43:56 UTC (rev 5856)
+++ stack/metro/trunk/ant-import/build-setup.xml 2008-02-29 08:46:01 UTC (rev 5857)
@@ -54,8 +54,8 @@
<property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
<property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
- <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
- <property name="jboss501.available.file" value="${jboss501.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/>
+ <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/>
<available property="jboss422.available" file="${jboss422.available.file}"/>
<available property="jboss423.available" file="${jboss423.available.file}"/>
16 years, 10 months
JBossWS SVN: r5856 - stack/native/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-29 03:43:56 -0500 (Fri, 29 Feb 2008)
New Revision: 5856
Modified:
stack/native/trunk/ant-import/build-setup.xml
Log:
jboss501.available.file=jboss-client.jar
Modified: stack/native/trunk/ant-import/build-setup.xml
===================================================================
--- stack/native/trunk/ant-import/build-setup.xml 2008-02-29 08:39:08 UTC (rev 5855)
+++ stack/native/trunk/ant-import/build-setup.xml 2008-02-29 08:43:56 UTC (rev 5856)
@@ -61,8 +61,8 @@
<property name="jboss421.available.file" value="${jboss421.client}/jboss-client.jar"/>
<property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
<property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
- <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
- <property name="jboss501.available.file" value="${jboss501.client}/jboss-ejb3-core.jar"/>
+ <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/>
+ <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/>
<available property="jboss421.available" file="${jboss421.available.file}"/>
<available property="jboss422.available" file="${jboss422.available.file}"/>
16 years, 10 months
JBossWS SVN: r5855 - stack/native/trunk/ant-import.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-29 03:39:08 -0500 (Fri, 29 Feb 2008)
New Revision: 5855
Modified:
stack/native/trunk/ant-import/build-setup.xml
Log:
jboss501.available.file=jboss-ejb3-core.jar
Modified: stack/native/trunk/ant-import/build-setup.xml
===================================================================
--- stack/native/trunk/ant-import/build-setup.xml 2008-02-28 19:06:49 UTC (rev 5854)
+++ stack/native/trunk/ant-import/build-setup.xml 2008-02-29 08:39:08 UTC (rev 5855)
@@ -62,7 +62,7 @@
<property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
<property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
<property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/>
- <property name="jboss501.available.file" value="${jboss501.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss501.available.file" value="${jboss501.client}/jboss-ejb3-core.jar"/>
<available property="jboss421.available" file="${jboss421.available.file}"/>
<available property="jboss422.available" file="${jboss422.available.file}"/>
16 years, 10 months