JBossWS SVN: r5784 - in stack/metro/trunk: src/main/java/org/jboss/wsf/stack/metro/tools and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-23 02:58:54 -0500 (Sat, 23 Feb 2008)
New Revision: 5784
Modified:
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerImpl.java
stack/metro/trunk/version.properties
Log:
[JBWS-1990] adding SOAP 1.2 support to Metro integration
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerImpl.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerImpl.java 2008-02-22 20:22:11 UTC (rev 5783)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerImpl.java 2008-02-23 07:58:54 UTC (rev 5784)
@@ -42,6 +42,7 @@
{
private List<File> bindingFiles = null;
private File catalog = null;
+ private boolean extension;
private boolean generateSource = false;
private File outputDir = new File("output");
private File sourceDir = null;
@@ -61,7 +62,13 @@
this.catalog = catalog;
}
- @Override
+ @Override
+ public void setExtension(boolean extension)
+ {
+ this.extension = extension;
+ }
+
+ @Override
public void setGenerateSource(boolean generateSource) {
this.generateSource = generateSource;
}
@@ -118,6 +125,11 @@
args.add(catalog.getAbsolutePath());
}
+ if (extension)
+ {
+ args.add("-extension");
+ }
+
if (generateSource) {
args.add("-keep");
if (sourceDir != null) {
Modified: stack/metro/trunk/version.properties
===================================================================
--- stack/metro/trunk/version.properties 2008-02-22 20:22:11 UTC (rev 5783)
+++ stack/metro/trunk/version.properties 2008-02-23 07:58:54 UTC (rev 5784)
@@ -14,7 +14,7 @@
implementation.vendor.id=http://www.jboss.org
# Thirdparty library versions
-jbossws-spi=1.0.1.GA
+jbossws-spi=snapshot
jbossws-common=snapshot
jbossws-framework=snapshot
jbossws-jboss42=4.2.1.GA
16 years, 9 months
JBossWS SVN: r5783 - stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/mgmt.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-02-22 15:22:11 -0500 (Fri, 22 Feb 2008)
New Revision: 5783
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java
Log:
Fix JBWS-1965: Subscribe method on subscription manager - NullPointerException
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2008-02-22 19:46:26 UTC (rev 5782)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2008-02-22 20:22:11 UTC (rev 5783)
@@ -303,6 +303,9 @@
if (null == eventSource)
throw new SubscriptionError(EventingConstants.CODE_UNABLE_TO_PROCESS, "EventSource '" + eventSourceNS + "' not registered");
+ if (eventSource.getState() != EventSource.State.STARTED)
+ throw new SubscriptionError(EventingConstants.CODE_UNABLE_TO_PROCESS, "EventSource '" + eventSourceNS + "' not started");
+
// expiry constraints
if (expires != null)
{
16 years, 9 months
JBossWS SVN: r5782 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-02-22 14:46:26 -0500 (Fri, 22 Feb 2008)
New Revision: 5782
Modified:
stack/native/trunk/version.properties
Log:
Fix JBWS-1993: Test remoting 2.4.0.Beta1
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2008-02-22 19:36:49 UTC (rev 5781)
+++ stack/native/trunk/version.properties 2008-02-22 19:46:26 UTC (rev 5782)
@@ -31,7 +31,7 @@
# JBossAS-5.0
jboss-jbossxb-jboss50=2.0.0.CR5
-jboss-remoting-jboss50=2.2.2.SP4-brew
+jboss-remoting-jboss50=2.4.0.Beta1
# JBossAS-4.2
jboss-jbossxb-jboss42=1.0.0.SP1
16 years, 9 months
JBossWS SVN: r5781 - stack/native/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-02-22 14:36:49 -0500 (Fri, 22 Feb 2008)
New Revision: 5781
Modified:
stack/native/trunk/ant-import/build-setup.xml
stack/native/trunk/ant-import/build-thirdparty.xml
Log:
Enforce container specific libraries (jbossxb,remoting) at compile time
Modified: stack/native/trunk/ant-import/build-setup.xml
===================================================================
--- stack/native/trunk/ant-import/build-setup.xml 2008-02-22 19:23:03 UTC (rev 5780)
+++ stack/native/trunk/ant-import/build-setup.xml 2008-02-22 19:36:49 UTC (rev 5781)
@@ -83,7 +83,38 @@
<equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
</or>
</condition>
-
+
+ <!-- switch jbossxb dependening on container -->
+ <condition property="container-dependent.jbossxb.version" value="${jboss-jbossxb-jboss42}">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss421"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
+ </or>
+ </condition>
+ <condition property="container-dependent.jbossxb.version" value="${jboss-jbossxb-jboss50}">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
+ </or>
+ </condition>
+
+ <!-- switch remoting dependening on container -->
+ <condition property="container-dependent.remoting.version" value="${jboss-remoting-jboss42}">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss421"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
+ </or>
+ </condition>
+ <condition property="container-dependent.remoting.version" value="${jboss-remoting-jboss50}">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
+ </or>
+ </condition>
+
+
<available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/>
<!-- JDK Detection -->
Modified: stack/native/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/native/trunk/ant-import/build-thirdparty.xml 2008-02-22 19:23:03 UTC (rev 5780)
+++ stack/native/trunk/ant-import/build-thirdparty.xml 2008-02-22 19:36:49 UTC (rev 5781)
@@ -44,6 +44,9 @@
<target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty"
description="Gets the thirdparty libraries">
+ <echo>JBossXB: ${container-dependent.jbossxb.version}</echo>
+ <echo>Remoting: ${container-dependent.remoting.version}</echo>
+
<mkdir dir="${thirdparty.dir}"/>
<get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/>
@@ -82,8 +85,8 @@
<get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs.jar" dest="${thirdparty.dir}/jboss-vfs.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss42}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss42}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossxb/${container-dependent.jbossxb.version}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossxb/${container-dependent.jbossxb.version}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jaxbintros/${jaxbintros}/lib/jboss-jaxb-intros.jar" dest="${thirdparty.dir}/jboss-jaxb-intros.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/>
@@ -92,8 +95,8 @@
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip" dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip" dest="${thirdparty.dir}/jboss-deployers-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/remoting/${jboss-remoting-jboss42}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/remoting/${jboss-remoting-jboss42}/lib/jboss-remoting-src.jar" dest="${thirdparty.dir}/jboss-remoting-src.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/remoting/${container-dependent.remoting.version}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/remoting/${container-dependent.remoting.version}/lib/jboss-remoting-src.jar" dest="${thirdparty.dir}/jboss-remoting-src.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-client.jar" dest="${thirdparty.dir}/jbosssx-client.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx.jar" dest="${thirdparty.dir}/jbosssx.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-src.zip" dest="${thirdparty.dir}/jbosssx-src.zip" usetimestamp="true" verbose="true"/>
16 years, 9 months
JBossWS SVN: r5780 - in stack/native/trunk/src/main/java/org/jboss/ws: tools/wsdl and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-22 14:23:03 -0500 (Fri, 22 Feb 2008)
New Revision: 5780
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/Constants.java
stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java
stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java
Log:
[JBWS-1850] force jaxws:bindings WSDL extensions generation when proprietary documentation annotation is available
Modified: stack/native/trunk/src/main/java/org/jboss/ws/Constants.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/Constants.java 2008-02-22 19:20:31 UTC (rev 5779)
+++ stack/native/trunk/src/main/java/org/jboss/ws/Constants.java 2008-02-22 19:23:03 UTC (rev 5780)
@@ -107,6 +107,9 @@
/** WS-Addressing namespace uri **/
static final String URI_WS_ADDRESSING = "http://www.w3.org/2005/08/addressing";
+ /** JAX-WS binding customizations namespace uri **/
+ static final String URI_JAXWS_WSDL_CUSTOMIZATIONS = "http://java.sun.com/xml/ns/jaxws";
+
/**Style of WSDL */
static final String RPC_LITERAL = "RPC/Literal";
static final String DOCUMENT_LITERAL = "Document/Literal";
@@ -304,6 +307,10 @@
static final QName WSDL_ATTRIBUTE_WSP_POLICYURIS = new QName(URI_WS_POLICY, "PolicyURIs");
static final QName WSDL_ELEMENT_WSP_POLICYREFERENCE = new QName(URI_WS_POLICY, "PolicyReference");
+ static final QName WSDL_ELEMENT_JAXWS_BINDINGS = new QName(URI_JAXWS_WSDL_CUSTOMIZATIONS, "bindings");
+ static final QName WSDL_ELEMENT_JAXWS_CLASS = new QName(URI_JAXWS_WSDL_CUSTOMIZATIONS, "class");
+ static final QName WSDL_ELEMENT_JAXWS_METHOD = new QName(URI_JAXWS_WSDL_CUSTOMIZATIONS, "method");
+ static final QName WSDL_ELEMENT_JAXWS_JAVADOC = new QName(URI_JAXWS_WSDL_CUSTOMIZATIONS, "javadoc");
/** WSDL-2.0 exchange patterns */
static final String WSDL20_PATTERN_IN_ONLY = "http://www.w3.org/2004/08/wsdl/in-only";
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2008-02-22 19:20:31 UTC (rev 5779)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2008-02-22 19:23:03 UTC (rev 5780)
@@ -179,6 +179,7 @@
for (WSDLExtensibilityElement ext : extendable.getAllExtensibilityElements())
{
appendPolicyElements(builder, ext);
+ appendJAXWSCustomizationElements(builder, ext);
//add processing of further extensibility element types below
}
}
@@ -192,6 +193,14 @@
}
}
+ private void appendJAXWSCustomizationElements(StringBuilder builder, WSDLExtensibilityElement extElem)
+ {
+ if (Constants.URI_JAXWS_WSDL_CUSTOMIZATIONS.equalsIgnoreCase(extElem.getUri()))
+ {
+ appendElementSkippingKnownNs(builder, extElem.getElement());
+ }
+ }
+
private void appendElementSkippingKnownNs(StringBuilder builder, Element el)
{
builder.append("<"+el.getNodeName());
@@ -388,6 +397,7 @@
}
buffer.append(">");
appendDocumentation(buffer, intf.getDocumentationElement());
+ appendUnknownExtensibilityElements(buffer, intf);
appendPortOperations(buffer, intf);
buffer.append("</portType>");
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2008-02-22 19:20:31 UTC (rev 5779)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2008-02-22 19:23:03 UTC (rev 5780)
@@ -112,6 +112,22 @@
if (endpoint.getDocumentation() != null)
{
+ String prefix = wsdl.getPrefix(Constants.URI_JAXWS_WSDL_CUSTOMIZATIONS);
+ if (prefix == null)
+ {
+ prefix = "jaxws";
+ wsdl.registerNamespaceURI(Constants.URI_JAXWS_WSDL_CUSTOMIZATIONS, prefix);
+ }
+
+ Element javadocElement = DOMUtils.createElement(Constants.WSDL_ELEMENT_JAXWS_JAVADOC.getLocalPart(), prefix);
+ javadocElement.setTextContent(endpoint.getDocumentation());
+ Element classElement = DOMUtils.createElement(Constants.WSDL_ELEMENT_JAXWS_CLASS.getLocalPart(), prefix);
+ classElement.setAttribute("name", interfaceQName.getLocalPart());
+ classElement.appendChild(javadocElement);
+ Element bindingsElement = DOMUtils.createElement(Constants.WSDL_ELEMENT_JAXWS_BINDINGS.getLocalPart(), prefix);
+ bindingsElement.appendChild(classElement);
+ WSDLExtensibilityElement ext = new WSDLExtensibilityElement(Constants.URI_JAXWS_WSDL_CUSTOMIZATIONS, bindingsElement);
+ wsdlInterface.addExtensibilityElement(ext);
wsdlInterface.setDocumentationElement(new WSDLDocumentation(endpoint.getDocumentation()));
}
@@ -233,6 +249,22 @@
// process optional documentation
if (operation.getDocumentation() != null)
{
+ String prefix = wsdl.getPrefix(Constants.URI_JAXWS_WSDL_CUSTOMIZATIONS);
+ if (prefix == null)
+ {
+ prefix = "jaxws";
+ wsdl.registerNamespaceURI(Constants.URI_JAXWS_WSDL_CUSTOMIZATIONS, prefix);
+ }
+
+ Element javadocElement = DOMUtils.createElement(Constants.WSDL_ELEMENT_JAXWS_JAVADOC.getLocalPart(), prefix);
+ javadocElement.setTextContent(operation.getDocumentation());
+ Element methodElement = DOMUtils.createElement(Constants.WSDL_ELEMENT_JAXWS_METHOD.getLocalPart(), prefix);
+ methodElement.setAttribute("name", operation.getQName().getLocalPart());
+ methodElement.appendChild(javadocElement);
+ Element bindingsElement = DOMUtils.createElement(Constants.WSDL_ELEMENT_JAXWS_BINDINGS.getLocalPart(), prefix);
+ bindingsElement.appendChild(methodElement);
+ WSDLExtensibilityElement ext = new WSDLExtensibilityElement(Constants.URI_JAXWS_WSDL_CUSTOMIZATIONS, bindingsElement);
+ interfaceOperation.addExtensibilityElement(ext);
interfaceOperation.setDocumentationElement(new WSDLDocumentation(operation.getDocumentation()));
}
16 years, 9 months
JBossWS SVN: r5779 - stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1850.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-22 14:20:31 -0500 (Fri, 22 Feb 2008)
New Revision: 5779
Modified:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1850/JBWS1850TestCase.java
Log:
removing useless imports
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1850/JBWS1850TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1850/JBWS1850TestCase.java 2008-02-22 18:21:13 UTC (rev 5778)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1850/JBWS1850TestCase.java 2008-02-22 19:20:31 UTC (rev 5779)
@@ -21,10 +21,7 @@
*/
package org.jboss.test.ws.jaxws.jbws1850;
-import java.io.File;
-import java.io.FileInputStream;
import java.net.URL;
-import java.util.List;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
@@ -37,10 +34,8 @@
import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperation;
import org.jboss.ws.metadata.wsdl.WSDLService;
import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
-import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
-import org.w3c.dom.Element;
/**
* Test wsdl documentation
16 years, 9 months
JBossWS SVN: r5778 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP: src/main/java/org/jboss/ws/core/client and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-02-22 13:21:13 -0500 (Fri, 22 Feb 2008)
New Revision: 5778
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2000/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferService.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferServiceImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java
Log:
Fix JBPAPP-650, JBWS-2000: Missing chunked transfer encoding can cause OOME
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2008-02-22 17:30:02 UTC (rev 5777)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2008-02-22 18:21:13 UTC (rev 5778)
@@ -395,6 +395,14 @@
</metainf>
</jar>
+ <!-- jaxws-jbws2000 -->
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws2000.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2000/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws2000/*TestCase.class"/>
+ </fileset>
+ </jar>
+
<!-- jaxws namespace -->
<war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2008-02-22 17:30:02 UTC (rev 5777)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2008-02-22 18:21:13 UTC (rev 5778)
@@ -53,6 +53,7 @@
import org.jboss.ws.core.WSTimeoutException;
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.metadata.config.EndpointProperty;
+import org.jboss.ws.metadata.config.CommonConfig;
/**
* SOAPConnection implementation.
@@ -308,10 +309,10 @@
// May be overridden through endpoint config
if (msgContext != null)
{
- Properties epmdProps = msgContext.getEndpointMetaData().getProperties();
+ CommonConfig config = msgContext.getEndpointMetaData().getConfig();
// chunksize settings
- String chunkSizeValue = epmdProps.getProperty(EndpointProperty.CHUNKED_ENCODING_SIZE);
+ String chunkSizeValue = config.getProperty(EndpointProperty.CHUNKED_ENCODING_SIZE);
int chunkSize = chunkSizeValue != null ? Integer.valueOf(chunkSizeValue) : -1;
if (chunkSize > 0)
{
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java 2008-02-22 17:30:02 UTC (rev 5777)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java 2008-02-22 18:21:13 UTC (rev 5778)
@@ -165,7 +165,7 @@
}
else if(XmlMimeType.class == annotation.annotationType())
{
- XmlMimeType mimeTypeDecl = method.getAnnotation(XmlMimeType.class);
+ XmlMimeType mimeTypeDecl = ((XmlMimeType)annotation);
paramResult = new AttachmentScanResult(mimeTypeDecl.value(), AttachmentScanResult.Type.XOP);
}
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferService.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferService.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferService.java 2008-02-22 18:21:13 UTC (rev 5778)
@@ -0,0 +1,19 @@
+package org.jboss.test.ws.jaxws.jbws2000;
+
+
+import javax.activation.DataHandler;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.BindingType;
+import javax.xml.bind.annotation.XmlMimeType;
+
+@WebService(name = "FileTransferService", targetNamespace = "http://service.mtom.test.net/")
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED)
+@BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true")
+public interface FileTransferService
+{
+ @WebMethod
+ boolean transferFile(String fileName, @XmlMimeType("application/octet-stream") DataHandler contents);
+
+}
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferServiceImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferServiceImpl.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferServiceImpl.java 2008-02-22 18:21:13 UTC (rev 5778)
@@ -0,0 +1,50 @@
+package org.jboss.test.ws.jaxws.jbws2000;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.activation.DataHandler;
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+
+@Stateless
+@WebService(
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws2000.FileTransferService",
+ name = "FileTransfer",
+ targetNamespace = "http://service.mtom.test.net/"
+)
+public class FileTransferServiceImpl implements FileTransferService {
+
+ public boolean transferFile(String fileName, DataHandler contents) {
+ final List<File> tempFiles = new ArrayList<File>();
+ final File deploymentTempDirectory = getTempDirectory();
+ try {
+ FileOutputStream fileOutputStream = null;
+ try {
+ final File outputFile = new File(deploymentTempDirectory, fileName);
+
+ System.out.println("Write file '"+fileName+"' to dir " + deploymentTempDirectory);
+
+ fileOutputStream = new FileOutputStream(outputFile);
+ contents.writeTo(fileOutputStream);
+ tempFiles.add(outputFile);
+ } finally {
+ if (fileOutputStream != null) {
+ fileOutputStream.close();
+ }
+ }
+
+ return true;
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to schedule deployment", e);
+ }
+ }
+
+ private File getTempDirectory() {
+ final File deploymentTempDirectory = new File(System.getProperty("java.io.tmpdir"), Long.toString(System.currentTimeMillis()));
+ deploymentTempDirectory.mkdir();
+ return deploymentTempDirectory;
+ }
+}
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferServiceImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java 2008-02-22 18:21:13 UTC (rev 5778)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws2000;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.soap.SOAPBinding;
+import javax.activation.DataHandler;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+import org.jboss.test.ws.jaxws.samples.xop.doclit.GeneratorDataSource;
+
+/**
+ *
+ */
+public class JBWS2000TestCase extends JBossWSTest
+{
+
+ private static FileTransferService port;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2000TestCase.class, "jaxws-jbws2000.jar");
+ }
+
+ protected void setUp() throws Exception
+ {
+ if (port == null)
+ {
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2000/FileTransferServiceImpl?wsdl");
+ QName serviceName = new QName("http://service.mtom.test.net/", "FileTransferServiceImplService");
+ Service service = Service.create(wsdlURL, serviceName);
+ port = service.getPort(FileTransferService.class);
+
+ SOAPBinding binding = (SOAPBinding)((BindingProvider)port).getBinding();
+ binding.setMTOMEnabled(true);
+ }
+ }
+
+ public void testFileTransfer() throws Exception
+ {
+ GeneratorDataSource source = new GeneratorDataSource(1024 * 1204 * 150);
+ DataHandler dh = new DataHandler(source);
+
+ boolean success = port.transferFile("JBWS2000.data", dh);
+ assertTrue("Failed to transfer file", success);
+ }
+
+}
\ No newline at end of file
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 9 months
JBossWS SVN: r5777 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-02-22 12:30:02 -0500 (Fri, 22 Feb 2008)
New Revision: 5777
Modified:
stack/native/trunk/version.properties
Log:
Use spi snapshot
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2008-02-22 17:16:51 UTC (rev 5776)
+++ stack/native/trunk/version.properties 2008-02-22 17:30:02 UTC (rev 5777)
@@ -24,7 +24,7 @@
wscommons-policy=1.0
# Dependend integration projects
-jbossws-spi=1.0.1.GA
+jbossws-spi=snapshot
jbossws-common=snapshot
jbossws-framework=snapshot
jbossws-jboss42=4.2.1.GA
16 years, 9 months
JBossWS SVN: r5776 - in framework/trunk/src/test: resources/jaxws/smoke/tools/wsdl and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-02-22 12:16:51 -0500 (Fri, 22 Feb 2008)
New Revision: 5776
Added:
framework/trunk/src/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl
Modified:
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
Log:
[JBWS-1990] Support for SOAP 1.2 in wsconsume - test
Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2008-02-22 17:16:13 UTC (rev 5775)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2008-02-22 17:16:51 UTC (rev 5776)
@@ -21,24 +21,25 @@
*/
package org.jboss.test.ws.jaxws.smoke.tools;
-import junit.framework.TestCase;
-import org.jboss.wsf.spi.tools.WSContractConsumer;
-
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.PrintStream;
+import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
-import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.List;
-import java.lang.reflect.Method;
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceFeature;
+
+import junit.framework.TestCase;
+
+import org.jboss.wsf.spi.tools.WSContractConsumer;
+
/**
* Test the WSContractConsumer API across different implementations.
- * NOTE: All tests expect to be execurted below 'output/tests'.
+ * NOTE: All tests expect to be executed below 'output/tests'.
*
* @author Heiko.Braun(a)jboss.com
* @version $Revision$
@@ -287,6 +288,23 @@
}
+ /**
+ * Tests the SOAP 1.2 binding extension
+ *
+ */
+ public void testSOAP12Extension() throws Exception
+ {
+ consumer.setOutputDirectory(outputDirectory);
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testSOAP12Extension");
+ consumer.setGenerateSource(true);
+ consumer.setExtension(true);
+ consumer.consume("resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl");
+ File sei = new File("wsconsume/java/org/jboss/test/ws/tools/testSOAP12Extension/EndpointInterface.java");
+ assertTrue("SEI not generated", sei.exists());
+ File service = new File("wsconsume/java/org/jboss/test/ws/tools/testSOAP12Extension/TestService.java");
+ assertTrue("Service not generated", service.exists());
+ }
+
private void consumeWSDL() throws Exception
{
consumer.setOutputDirectory(outputDirectory);
Added: framework/trunk/src/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl
===================================================================
--- framework/trunk/src/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl (rev 0)
+++ framework/trunk/src/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl 2008-02-22 17:16:51 UTC (rev 5776)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<definitions name="TestService"
+ targetNamespace="http://www.openuri.org/2004/04/HelloWorld"
+ xmlns:tns="http://www.openuri.org/2004/04/HelloWorld"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/">
+ <types/>
+ <message name="EndpointInterface_echo">
+ <part name="String_1" type="xsd:string"/>
+ </message>
+ <message name="EndpointInterface_echoResponse">
+ <part name="result" type="xsd:string"/>
+ </message>
+ <portType name="EndpointInterface">
+ <operation name="echo" parameterOrder="String_1">
+ <input message="tns:EndpointInterface_echo"/>
+ <output message="tns:EndpointInterface_echoResponse"/>
+ </operation>
+ </portType>
+ <binding name="EndpointInterfaceBinding" type="tns:EndpointInterface">
+ <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
+ <operation name="echo">
+ <soap12:operation soapAction=""/>
+ <input>
+ <soap12:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/>
+ </input>
+ <output>
+ <soap12:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="TestService">
+ <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding">
+ <soap12:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+</definitions>
Property changes on: framework/trunk/src/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 9 months
JBossWS SVN: r5775 - stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-02-22 12:16:13 -0500 (Fri, 22 Feb 2008)
New Revision: 5775
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java
Log:
[JBWS-1990] Support for SOAP 1.2 in wsconsume
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2008-02-22 17:15:14 UTC (rev 5774)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2008-02-22 17:16:13 UTC (rev 5775)
@@ -43,6 +43,7 @@
{
private List<File> bindingFiles;
private File catalog;
+ private boolean extension;
private boolean generateSource;
private File outputDir = new File("output");
private File sourceDir;
@@ -65,6 +66,12 @@
}
@Override
+ public void setExtension(boolean extension)
+ {
+ this.extension = extension;
+ }
+
+ @Override
public void setGenerateSource(boolean generateSource)
{
this.generateSource = generateSource;
@@ -130,6 +137,11 @@
args.add(catalog.getAbsolutePath());
}
+ if (extension)
+ {
+ args.add("-extension");
+ }
+
if (generateSource)
{
args.add("-keep");
16 years, 9 months