JBossWS SVN: r2690 - trunk/jbossws-core/src/java/org/jboss/ws/core/soap.
by jbossws-commits＠lists.jboss.org
Author: alex.guizar(a)jboss.com
Date: 2007-03-27 01:05:34 -0400 (Tue, 27 Mar 2007)
New Revision: 2690
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageImpl.java
Log:
JBCTS-468 implemented SAAJ 1.3 methods in SOAPMessage
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2007-03-27 04:02:27 UTC (rev 2689)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2007-03-27 05:05:34 UTC (rev 2690)
@@ -41,7 +41,6 @@
import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart;
-import org.jboss.util.NotImplementedException;
import org.jboss.ws.WSException;
import org.jboss.ws.core.soap.attachment.AttachmentPartImpl;
import org.jboss.ws.core.soap.attachment.CIDGenerator;
@@ -142,13 +141,14 @@
String contentId = part.getContentId();
if (contentId.equals(cid))
{
- attachments.remove(part);
- return part;
+ attachments.remove(part);
+ return part;
}
}
return null;
}
+
public AttachmentPart getAttachmentByPartName(String partName)
{
for (AttachmentPart part : attachments)
@@ -428,14 +428,74 @@
@Override
public AttachmentPart getAttachment(SOAPElement element) throws SOAPException
{
- //TODO: SAAJ 1.3
- throw new NotImplementedException();
+ String ref = element.getAttribute("href");
+
+ if (ref.length() == 0)
+ {
+ ref = element.getValue();
+ if (ref == null || ref.length() == 0)
+ return null;
+ }
+
+ return getAttachmentByRef(ref);
}
+ private AttachmentPart getAttachmentByRef(String ref) throws SOAPException
+ {
+ AttachmentPart attachment;
+ if (ref.startsWith("cid:"))
+ {
+ /* SwA 2000-12-11 section 3: if a Content-ID header is present, then an absolute URI
+ * label for the part is formed using the CID URI scheme
+ *
+ * WS-I AP 1.0 section 3.5: when using the CID URI scheme, the syntax and rules defined
+ * in RFC 2392 apply.
+ */
+ String cid = '<' + ref.substring("cid:".length()) + '>';
+ attachment = getAttachmentByContentId(cid);
+ }
+ else
+ {
+ /* SwA 2000-12-11 section 3: If a Content-Location header is present with an absolute URI
+ * value then that URI is a label for the part
+ */
+ attachment = getAttachmentByContentLocation(ref);
+ }
+
+ if (attachment == null)
+ {
+ // autogenerated CID based on part name
+ attachment = getAttachmentByPartName(ref);
+ }
+
+ return attachment;
+ }
+
+ /**
+ * Looks for the first {@linkplain AttachmentPart attachment} where the
+ * {@linkplain AttachmentPart#getContentLocation() content location} matches the
+ * given <code>location</code>.
+ * @param location the content location to match
+ * @return the matching attachment or <code>null</code> if no match was found
+ */
+ private AttachmentPart getAttachmentByContentLocation(String location)
+ {
+ for (AttachmentPart attachment : attachments)
+ {
+ if (location.equals(attachment.getContentLocation()))
+ return attachment;
+ }
+ return null;
+ }
+
@Override
public void removeAttachments(MimeHeaders headers)
{
- //TODO: SAAJ 1.3
- throw new NotImplementedException();
+ /* this code exploits the fact that MimeMatchingAttachmentsIterator.next() returns null
+ * rather than throwing an exception when there are no more elements
+ */
+ Iterator attachmentItr = new MimeMatchingAttachmentsIterator(headers, attachments);
+ while (attachmentItr.next() != null)
+ attachmentItr.remove();
}
}
17 years, 9 months
- 1
- 0
JBossWS SVN: r2689 - in trunk: build/ant-import and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2007-03-27 00:02:27 -0400 (Tue, 27 Mar 2007)
New Revision: 2689
Modified:
trunk/build/ant-import/build-deploy.xml
trunk/build/version.properties
trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMWriter.java
trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java
Log:
Fix JBCTS-450
Fix DOMWriter.normalize()
Modified: trunk/build/ant-import/build-deploy.xml
===================================================================
--- trunk/build/ant-import/build-deploy.xml 2007-03-26 23:52:53 UTC (rev 2688)
+++ trunk/build/ant-import/build-deploy.xml 2007-03-27 04:02:27 UTC (rev 2689)
@@ -62,6 +62,7 @@
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
+ <include name="wsdl4j.jar"/>
<include name="jbossws-wsconsume-impl.jar"/>
</fileset>
</copy>
@@ -280,4 +281,4 @@
<delete dir="${tomcat.webapps.dir}/jbossws"/>
</target>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties 2007-03-26 23:52:53 UTC (rev 2688)
+++ trunk/build/version.properties 2007-03-27 04:02:27 UTC (rev 2689)
@@ -15,7 +15,7 @@
# thirdparty library versions that are referenced in component-info.xml
apache-xmlsec=1.3.0
-ibm-wsdl4j=1.5.2jboss
+ibm-wsdl4j=1.6.2
javassist=3.5.0.CR1
jboss-jbossxb=2.0.0.CR1
jboss-microcontainer=2.0.0.Beta3
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMWriter.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMWriter.java 2007-03-26 23:52:53 UTC (rev 2688)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMWriter.java 2007-03-27 04:02:27 UTC (rev 2689)
@@ -564,6 +564,11 @@
str.append(""");
break;
}
+ case '\'':
+ {
+ str.append("'");
+ break;
+ }
case '\r':
case '\n':
{
Modified: trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java 2007-03-26 23:52:53 UTC (rev 2688)
+++ trunk/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11DefinitionFactory.java 2007-03-27 04:02:27 UTC (rev 2689)
@@ -27,6 +27,7 @@
import javax.wsdl.Definition;
import javax.wsdl.WSDLException;
+import javax.wsdl.extensions.ExtensionRegistry;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
@@ -58,6 +59,8 @@
{
WSDLFactory wsdlFactory = WSDLFactory.newInstance();
wsdlReader = wsdlFactory.newWSDLReader();
+ // Allow unknown extensions (jaxws/jaxb binding elements)
+ wsdlReader.setExtensionRegistry(new ExtensionRegistry());
wsdlReader.setFeature(WSDL11DefinitionFactory.FEATURE_VERBOSE, false);
}
@@ -88,8 +91,8 @@
// Set EntityResolver in patched version of wsdl4j-1.5.2jboss
// [TODO] show the usecase that needs this
// ((WSDLReaderImpl)wsdlReader).setEntityResolver(entityResolver);
-
Definition wsdlDefinition = wsdlReader.readWSDL(new WSDLLocatorImpl(entityResolver, wsdlLocation));
+
return wsdlDefinition;
}
}
17 years, 9 months
- 1
- 0
JBossWS SVN: r2687 - in branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws: core/jaxrpc/binding and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-26 18:22:44 -0400 (Mon, 26 Mar 2007)
New Revision: 2687
Modified:
branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java
branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java
branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SerializerSupport.java
branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/soap/ObjectContent.java
branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java
Log:
Fix soap array serializer
Modified: branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java
===================================================================
--- branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-03-26 17:47:39 UTC (rev 2686)
+++ branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-03-26 22:22:44 UTC (rev 2687)
@@ -722,8 +722,6 @@
}
Name soapName = new NameImpl(xmlName.getLocalPart(), xmlName.getPrefix(), xmlName.getNamespaceURI());
- if (paramMetaData.isSOAPArrayParam())
- soapName = new NameImpl("Array", Constants.PREFIX_SOAP11_ENC, Constants.URI_SOAP11_ENC);
SOAPContentElement contentElement;
if (soapElement instanceof SOAPHeader)
Modified: branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java
===================================================================
--- branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java 2007-03-26 17:47:39 UTC (rev 2686)
+++ branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java 2007-03-26 22:22:44 UTC (rev 2687)
@@ -30,6 +30,8 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
+import org.jboss.ws.core.soap.NameImpl;
+import org.jboss.ws.core.soap.SOAPContentElement;
import org.jboss.ws.core.soap.XMLFragment;
import org.jboss.ws.core.utils.JavaUtils;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
@@ -46,10 +48,10 @@
// provide logging
private static final Logger log = Logger.getLogger(SOAPArraySerializer.class);
+ private ParameterMetaData paramMetaData;
private SerializerSupport compSerializer;
private NullValueSerializer nullSerializer;
private boolean isArrayComponentType;
- private boolean xsiNamespaceInserted;
private StringBuilder buffer;
public SOAPArraySerializer() throws BindingException
@@ -57,16 +59,26 @@
nullSerializer = new NullValueSerializer();
}
- /**
- */
+ public Result serialize(SOAPContentElement soapElement, SerializationContext serContext) throws BindingException
+ {
+ paramMetaData = soapElement.getParamMetaData();
+ QName xmlName = soapElement.getElementQName();
+ QName xmlType = soapElement.getXmlType();
+ Object value = soapElement.getObjectValue();
+ NamedNodeMap attributes = soapElement.getAttributes();
+ return serialize(xmlName, xmlType, value, serContext, attributes);
+ }
+
public Result serialize(QName xmlName, QName xmlType, Object value, SerializationContext serContext, NamedNodeMap attributes) throws BindingException
{
- if(log.isDebugEnabled()) log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + ",valueType=" + value.getClass().getName() + "]");
+ log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + ",valueType=" + value.getClass().getName() + "]");
try
{
- ParameterMetaData paramMetaData = (ParameterMetaData)serContext.getProperty(ParameterMetaData.class.getName());
+ if (paramMetaData == null)
+ throw new IllegalStateException("Use serialize(SOAPContenentElement, SerializationContext)");
+
+ QName compXmlName = paramMetaData.getXmlName();
QName compXmlType = paramMetaData.getSOAPArrayCompType();
- QName compXmlName = paramMetaData.getXmlName();
Class javaType = paramMetaData.getJavaType();
Class compJavaType = javaType.getComponentType();
@@ -88,7 +100,7 @@
throw new WSException("Cannot obtain component xmlType for: " + compJavaType);
// Get the component type serializer factory
- if(log.isDebugEnabled()) log.debug("Get component serializer for: [javaType=" + compJavaType.getName() + ",xmlType=" + compXmlType + "]");
+ log.debug("Get component serializer for: [javaType=" + compJavaType.getName() + ",xmlType=" + compXmlType + "]");
SerializerFactoryBase compSerializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(compJavaType, compXmlType);
if (compSerializerFactory == null)
{
@@ -105,36 +117,41 @@
if (JavaUtils.isPrimitive(value.getClass()))
value = JavaUtils.getWrapperValueArray(value);
- buffer = new StringBuilder("<" + Constants.PREFIX_SOAP11_ENC + ":Array "+
- "xmlns:"+Constants.PREFIX_SOAP11_ENC+"='http://schemas.xmlsoap.org/soap/encoding/' ");
+ String nodeName = new NameImpl(compXmlName).getQualifiedName();
- if (value instanceof Object[])
- {
- Object[] objArr = (Object[])value;
- String arrayDim = "" + objArr.length;
+ buffer = new StringBuilder("<" + nodeName + " xmlns:" + Constants.PREFIX_SOAP11_ENC + "='http://schemas.xmlsoap.org/soap/encoding/' ");
- // Get multiple array dimension
- Object[] subArr = (Object[])value;
- while (isArrayComponentType == false && subArr.length > 0 && subArr[0] instanceof Object[])
- {
- subArr = (Object[])subArr[0];
- arrayDim += "," + subArr.length;
- }
+ if (!(value instanceof Object[]))
+ throw new WSException("Unsupported array type: " + javaType);
- compXmlType = serContext.getNamespaceRegistry().registerQName(compXmlType);
- String arrayType = Constants.PREFIX_SOAP11_ENC + ":arrayType='" + compXmlType.getPrefix() + ":" + compXmlType.getLocalPart() + "[" + arrayDim + "]'";
- String compns = " xmlns:" + compXmlType.getPrefix() + "='" + compXmlType.getNamespaceURI() + "'";
- buffer.append(arrayType + compns + ">");
+ Object[] objArr = (Object[])value;
+ String arrayDim = "" + objArr.length;
- serializeArrayComponents(compXmlName, compXmlType, serContext, objArr);
- }
- else
+ // Get multiple array dimension
+ Object[] subArr = (Object[])value;
+ while (isArrayComponentType == false && subArr.length > 0 && subArr[0] instanceof Object[])
{
- throw new WSException("Unsupported array type: " + javaType);
+ subArr = (Object[])subArr[0];
+ arrayDim += "," + subArr.length;
}
- buffer.append("</" + Constants.PREFIX_SOAP11_ENC + ":Array>");
- if(log.isDebugEnabled()) log.debug("serialized: " + buffer);
+ compXmlType = serContext.getNamespaceRegistry().registerQName(compXmlType);
+ compXmlName = serContext.getNamespaceRegistry().registerQName(compXmlName);
+ String arrayType = Constants.PREFIX_SOAP11_ENC + ":arrayType='" + compXmlType.getPrefix() + ":" + compXmlType.getLocalPart() + "[" + arrayDim + "]'";
+
+ buffer.append(arrayType);
+ buffer.append(" xmlns:" + Constants.PREFIX_XSI + "='" + Constants.NS_SCHEMA_XSI + "'");
+ buffer.append(" xmlns:" + compXmlType.getPrefix() + "='" + compXmlType.getNamespaceURI() + "'");
+ if (compXmlName.getNamespaceURI().length() > 0 && compXmlName.getNamespaceURI().equals(compXmlType.getNamespaceURI()) == false)
+ buffer.append(" xmlns:" + compXmlName.getPrefix() + "='" + compXmlName.getNamespaceURI() + "'");
+
+ buffer.append(">");
+
+ serializeArrayComponents(compXmlName, compXmlType, serContext, objArr);
+
+ buffer.append("</" + nodeName + ">");
+
+ log.debug("serialized: " + buffer);
return stringToResult(buffer.toString());
}
catch (RuntimeException e)
@@ -147,13 +164,13 @@
}
}
- private void serializeArrayComponents(QName compXmlName, QName compXmlType, SerializationContext serContext, Object[] objArr) throws BindingException
+ private void serializeArrayComponents(QName xmlName, QName xmlType, SerializationContext serContext, Object[] objArr) throws BindingException
{
for (Object compValue : objArr)
{
if (isArrayComponentType == false && compValue instanceof Object[])
{
- serializeArrayComponents(compXmlName, compXmlType, serContext, (Object[])compValue);
+ serializeArrayComponents(xmlName, xmlType, serContext, (Object[])compValue);
}
else
{
@@ -163,15 +180,9 @@
if (compValue == null)
{
ser = nullSerializer;
- if (xsiNamespaceInserted == false)
- {
- xsiNamespaceInserted = true;
- int insIndex = ("<" + Constants.PREFIX_SOAP11_ENC + ":Array ").length();
- buffer.insert(insIndex, "xmlns:" + Constants.PREFIX_XSI + "='" + Constants.NS_SCHEMA_XSI + "' ");
- }
}
- Result result = ser.serialize(compXmlName, compXmlType, compValue, serContext, null);
+ Result result = ser.serialize(new QName("item"), xmlType, compValue, serContext, null);
XMLFragment fragment = new XMLFragment(result);
buffer.append(fragment.toStringFragment());
}
Modified: branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SerializerSupport.java
===================================================================
--- branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SerializerSupport.java 2007-03-26 17:47:39 UTC (rev 2686)
+++ branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SerializerSupport.java 2007-03-26 22:22:44 UTC (rev 2687)
@@ -34,6 +34,7 @@
import org.jboss.util.NotImplementedException;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
+import org.jboss.ws.core.soap.SOAPContentElement;
import org.jboss.ws.core.utils.IOUtils;
import org.jboss.xb.binding.NamespaceRegistry;
import org.w3c.dom.NamedNodeMap;
@@ -48,24 +49,37 @@
*/
public abstract class SerializerSupport implements Serializer
{
+
+ public Result serialize(SOAPContentElement soapElement, SerializationContext serContext) throws BindingException
+ {
+ QName xmlName = soapElement.getElementQName();
+ QName xmlType = soapElement.getXmlType();
+ NamedNodeMap attributes = soapElement.getAttributes();
+ Object objectValue = soapElement.getObjectValue();
+ return serialize(xmlName, xmlType, objectValue, serContext, attributes);
+ }
+
/** Serialize an object value to an XML fragment
*
* @param xmlName The root element name of the resulting fragment
* @param xmlType The associated schema type
* @param value The value to serialize
* @param serContext The serialization context
- * @param attributes TODO
* @param attributes The attributes on this element
*/
public abstract Result serialize(QName xmlName, QName xmlType, Object value, SerializationContext serContext, NamedNodeMap attributes) throws BindingException;
- protected Result stringToResult(String xmlFragment) {
+ protected Result stringToResult(String xmlFragment)
+ {
BufferedStreamResult result = null;
- try {
+ try
+ {
ByteArrayInputStream in = new ByteArrayInputStream(xmlFragment.getBytes());
result = new BufferedStreamResult();
IOUtils.copyStream(result.getOutputStream(), in);
- } catch (IOException e) {
+ }
+ catch (IOException e)
+ {
WSException.rethrow(e);
}
@@ -74,7 +88,8 @@
/** Wrap the value string in a XML fragment with the given name
*/
- protected String wrapValueStr(QName xmlName, String valueStr, NamespaceRegistry nsRegistry, Set<String> additionalNamespaces, NamedNodeMap attributes, boolean normalize)
+ protected String wrapValueStr(QName xmlName, String valueStr, NamespaceRegistry nsRegistry, Set<String> additionalNamespaces, NamedNodeMap attributes,
+ boolean normalize)
{
String nsURI = xmlName.getNamespaceURI();
String localPart = xmlName.getLocalPart();
@@ -125,7 +140,7 @@
}
else
{
- if(normalize)
+ if (normalize)
valueStr = normalize(valueStr);
xmlFragment = "<" + elName + nsAttr + ">" + valueStr + "</" + elName + ">";
}
Modified: branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/soap/ObjectContent.java
===================================================================
--- branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/soap/ObjectContent.java 2007-03-26 17:47:39 UTC (rev 2686)
+++ branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/soap/ObjectContent.java 2007-03-26 22:22:44 UTC (rev 2687)
@@ -123,7 +123,6 @@
{
QName xmlType = container.getXmlType();
Class javaType = container.getJavaType();
- QName xmlName = container.getElementQName();
log.debug("getXMLFragment from Object [xmlType=" + xmlType + ",javaType=" + javaType + "]");
@@ -132,7 +131,6 @@
throw new WSException("MessageContext not available");
SerializationContext serContext = msgContext.getSerializationContext();
- serContext.setProperty(ParameterMetaData.class.getName(), container.getParamMetaData());
serContext.setJavaType(javaType);
TypeMappingImpl typeMapping = serContext.getTypeMapping();
@@ -150,7 +148,8 @@
ser = new NullValueSerializer();
}
- Result result = ser.serialize(xmlName, xmlType, getObjectValue(), serContext, null);
+ Result result = ser.serialize(container, serContext);
+
xmlFragment = new XMLFragment(result);
log.debug("xmlFragment: " + xmlFragment);
}
Modified: branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java
===================================================================
--- branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-03-26 17:47:39 UTC (rev 2686)
+++ branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-03-26 22:22:44 UTC (rev 2687)
@@ -40,8 +40,8 @@
import org.jboss.ws.core.jaxws.DynamicWrapperGenerator;
import org.jboss.ws.core.utils.HolderUtils;
import org.jboss.ws.core.utils.JavaUtils;
+import org.jboss.ws.extensions.xop.jaxws.AttachmentScanResult;
import org.jboss.ws.extensions.xop.jaxws.ReflectiveAttachmentRefScanner;
-import org.jboss.ws.extensions.xop.jaxws.AttachmentScanResult;
import org.jboss.ws.metadata.acessor.ReflectiveMethodAccessor;
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
@@ -548,29 +548,30 @@
buffer.append("\n xmlName=" + getXmlName());
buffer.append("\n partName=" + getPartName());
buffer.append("\n xmlType=" + getXmlType());
+
+ if (soapArrayParam)
+ buffer.append("\n soapArrayCompType=" + soapArrayCompType);
+
buffer.append("\n javaType=" + getJavaTypeName());
buffer.append("\n mode=" + getMode());
buffer.append("\n inHeader=" + isInHeader());
buffer.append("\n index=" + index);
- if (soapArrayParam)
- buffer.append("\n soapArrayCompType=" + soapArrayCompType);
-
if (isSwA())
{
buffer.append("\n isSwA=" + isSwA());
buffer.append("\n mimeTypes=" + getMimeTypes());
}
- if (wrappedParameters != null)
- buffer.append("\n wrappedParameters=" + wrappedParameters);
-
if (isXOP())
{
buffer.append("\n isXOP=" + isXOP());
buffer.append("\n mimeTypes=" + getMimeTypes());
}
+ if (wrappedParameters != null)
+ buffer.append("\n wrappedParameters=" + wrappedParameters);
+
return buffer.toString();
}
}
17 years, 9 months
- 1
- 0
JBossWS SVN: r2686 - in branches/jbossws-1.2.1: jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/jbossxb and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-26 13:47:39 -0400 (Mon, 26 Mar 2007)
New Revision: 2686
Added:
branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/encoded/href/HRefHandler.java
Removed:
branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/encoded/href/HrefHandler.java
Modified:
branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java
branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java
branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBUnmarshaller.java
branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPContentElement.java
branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/soap/XMLContent.java
branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeUnmarshallerTestCase.java
branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java
branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestImpl.java
branches/jbossws-1.2.1/jbossws-tests/src/resources/common/jbossxb/ComplexTypesService_RPC.xsd
branches/jbossws-1.2.1/jbossws-tests/src/resources/jaxrpc/encoded/href/META-INF/application-client.xml
branches/jbossws-1.2.1/jbossws-tests/src/resources/jaxrpc/encoded/href/WEB-INF/webservices.xml
Log:
Fix missing ns declarations when transforming DOMSource. Add support for SOAP Arrays using href
Modified: branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java
===================================================================
--- branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java 2007-03-26 13:09:51 UTC (rev 2685)
+++ branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java 2007-03-26 17:47:39 UTC (rev 2686)
@@ -24,17 +24,25 @@
// $Id$
import java.io.ByteArrayOutputStream;
+import java.util.Iterator;
import javax.xml.namespace.QName;
import javax.xml.rpc.encoding.Deserializer;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPElement;
import javax.xml.transform.Source;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
+import org.jboss.logging.Logger;
import org.jboss.util.NotImplementedException;
import org.jboss.ws.WSException;
+import org.jboss.ws.core.soap.SOAPContentElement;
+import org.jboss.ws.core.utils.DOMWriter;
import org.jboss.ws.core.utils.XMLPredefinedEntityReferenceResolver;
+import org.w3c.dom.Node;
/** The base class for all Deserializers.
*
@@ -43,7 +51,54 @@
*/
public abstract class DeserializerSupport implements Deserializer
{
+ private static final Logger log = Logger.getLogger(DeserializerSupport.class);
+ public Object deserialize(SOAPContentElement soapElement, SerializationContext serContext) throws BindingException
+ {
+ QName xmlName = soapElement.getElementQName();
+ QName xmlType = soapElement.getXmlType();
+
+ SOAPContentElement refElement = getElementForHRef(soapElement);
+ if (refElement != null)
+ {
+ soapElement = refElement;
+ xmlName = refElement.getElementQName();
+ }
+
+ Source source = soapElement.getXMLFragment().getSource();
+ return deserialize(xmlName, xmlType, source, serContext);
+ }
+
+ protected SOAPContentElement getElementForHRef(SOAPElement soapElement)
+ {
+ SOAPContentElement refElement = null;
+ if (soapElement.getAttribute("href").length() > 0)
+ {
+ String refID = soapElement.getAttribute("href");
+ log.debug("Resolve soap encoded href: " + refID);
+
+ SOAPElement parentElement = soapElement.getParentElement();
+ while ((parentElement instanceof SOAPBody) == false)
+ parentElement = parentElement.getParentElement();
+
+ SOAPBody soapBody = (SOAPBody)parentElement;
+ Iterator it = soapBody.getChildElements();
+ while (it.hasNext())
+ {
+ SOAPElement auxElement = (SOAPElement)it.next();
+ if (refID.equals("#" + auxElement.getAttribute("id")))
+ {
+ refElement = (SOAPContentElement)auxElement;
+ break;
+ }
+ }
+
+ if (refElement == null)
+ log.warn("Cannot find referrenced element: " + refID);
+ }
+ return refElement;
+ }
+
/** Deserialize an XML fragment to an object value
*
* @param xmlName The root element name of the resulting fragment
@@ -53,22 +108,45 @@
*/
public abstract Object deserialize(QName xmlName, QName xmlType, Source xmlFragment, SerializationContext serContext) throws BindingException;
+ // TODO: remove when JBossXB supports unmarshall(Source)
+ // http://jira.jboss.org/jira/browse/JBXB-100
protected static String sourceToString(Source source)
{
String xmlFragment = null;
-
- try {
- TransformerFactory tf = TransformerFactory.newInstance();
- ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
- StreamResult streamResult = new StreamResult(baos);
- tf.newTransformer().transform(source, streamResult);
- xmlFragment = new String(baos.toByteArray());
- if (xmlFragment.startsWith("<?xml"))
+ try
+ {
+ if (source instanceof DOMSource)
{
- int index = xmlFragment.indexOf(">");
- xmlFragment = xmlFragment.substring(index + 1);
+ Node node = ((DOMSource)source).getNode();
+ xmlFragment = DOMWriter.printNode(node, false);
}
- } catch (TransformerException e) {
+ else
+ {
+ // Note, this code will not handler namespaces correctly that
+ // are defined on a parent of the DOMSource
+ //
+ // <env:Envelope xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ // <env:Body>
+ // <myMethod>
+ // <param xsi:type='xsd:string'>Hello World!</param>
+ // </myMethod>
+ // </env:Body>
+ // </env:Envelope>
+ //
+ TransformerFactory tf = TransformerFactory.newInstance();
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
+ StreamResult streamResult = new StreamResult(baos);
+ tf.newTransformer().transform(source, streamResult);
+ xmlFragment = new String(baos.toByteArray());
+ if (xmlFragment.startsWith("<?xml"))
+ {
+ int index = xmlFragment.indexOf(">");
+ xmlFragment = xmlFragment.substring(index + 1);
+ }
+ }
+ }
+ catch (TransformerException e)
+ {
WSException.rethrow(e);
}
Modified: branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java
===================================================================
--- branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java 2007-03-26 13:09:51 UTC (rev 2685)
+++ branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java 2007-03-26 17:47:39 UTC (rev 2686)
@@ -29,13 +29,16 @@
import java.util.StringTokenizer;
import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPElement;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
import org.jboss.logging.Logger;
+import org.jboss.util.NotImplementedException;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
+import org.jboss.ws.core.soap.SOAPContentElement;
import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.JavaUtils;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
@@ -52,30 +55,32 @@
// provide logging
private static final Logger log = Logger.getLogger(SOAPArrayDeserializer.class);
- private DeserializerSupport compDeserializer;
+ private DeserializerSupport componentDeserializer;
- public SOAPArrayDeserializer() throws BindingException
+ public Object deserialize(QName xmlName, QName xmlType, Source xmlFragment, SerializationContext serContext) throws BindingException
{
+ throw new NotImplementedException("Use deserialize(SOAPContenentElement, SerializationContext)");
}
- public Object deserialize(QName xmlName, QName xmlType, Source xmlFragment, SerializationContext serContext) throws BindingException {
- return deserialize(xmlName, xmlType, sourceToString(xmlFragment), serContext);
- }
+ public Object deserialize(SOAPContentElement soapElement, SerializationContext serContext) throws BindingException
+ {
+ QName xmlName = soapElement.getElementQName();
+ QName xmlType = soapElement.getXmlType();
- /**
- */
- private Object deserialize(QName xmlName, QName xmlType, String xmlFragment, SerializationContext serContext) throws BindingException
- {
- if(log.isDebugEnabled()) log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]");
+ SOAPContentElement refElement = getElementForHRef(soapElement);
+ if (refElement != null)
+ soapElement = refElement;
+
+ log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]");
+
try
{
ParameterMetaData paramMetaData = (ParameterMetaData)serContext.getProperty(ParameterMetaData.class.getName());
QName compXmlType = paramMetaData.getSOAPArrayCompType();
QName compXmlName = paramMetaData.getXmlName();
- Element arrayElement = DOMUtils.parse(xmlFragment);
- int[] arrDims = getDimensionsFromAttribute(arrayElement);
- Class compJavaType = getComponentTypeFromAttribute(arrayElement, serContext);
+ int[] arrDims = getDimensionsFromAttribute(soapElement);
+ Class compJavaType = getComponentTypeFromAttribute(soapElement, serContext);
Object[] retArray = (Object[])Array.newInstance(compJavaType, arrDims);
TypeMappingImpl typeMapping = serContext.getTypeMapping();
@@ -89,23 +94,25 @@
throw new WSException("Cannot obtain component xmlType for: " + compJavaType);
// Get the component type deserializer factory
- if(log.isDebugEnabled()) log.debug("Get component deserializer for: [javaType=" + compJavaType.getName() + ",xmlType=" + compXmlType + "]");
+ log.debug("Get component deserializer for: [javaType=" + compJavaType.getName() + ",xmlType=" + compXmlType + "]");
+
DeserializerFactoryBase compDeserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(compJavaType, compXmlType);
if (compDeserializerFactory == null)
{
log.warn("Cannot obtain component deserializer for: [javaType=" + compJavaType.getName() + ",xmlType=" + compXmlType + "]");
compDeserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(null, compXmlType);
}
+
if (compDeserializerFactory == null)
throw new WSException("Cannot obtain component deserializer for: " + compXmlType);
// Get the component type deserializer
- compDeserializer = (DeserializerSupport)compDeserializerFactory.getDeserializer();
+ componentDeserializer = (DeserializerSupport)compDeserializerFactory.getDeserializer();
if (arrDims.length < 1 || 2 < arrDims.length)
throw new WSException("Unsupported array dimensions: " + Arrays.asList(arrDims));
- Iterator it = DOMUtils.getChildElements(arrayElement);
+ Iterator it = soapElement.getChildElements();
if (arrDims.length == 1)
{
Object[] subArr = retArray;
@@ -120,7 +127,7 @@
}
}
- if(log.isDebugEnabled()) log.debug("deserialized: " + retArray.getClass().getName());
+ log.debug("deserialized: " + retArray.getClass().getName());
return retArray;
}
catch (RuntimeException e)
@@ -141,9 +148,17 @@
Object compValue = null;
if (it.hasNext())
{
- Element childElement = (Element)it.next();
- Source compXMLFragment = new DOMSource(childElement);
- compValue = compDeserializer.deserialize(compXmlName, compXmlType, compXMLFragment, serContext);
+ SOAPElement childElement = (SOAPElement)it.next();
+
+ Source source = new DOMSource(childElement);
+ SOAPContentElement refElement = getElementForHRef(childElement);
+ if (refElement != null)
+ {
+ source = refElement.getXMLFragment().getSource();
+ compXmlName = refElement.getElementQName();
+ }
+
+ compValue = componentDeserializer.deserialize(compXmlName, compXmlType, source, serContext);
compValue = JavaUtils.getWrapperValueArray(compValue);
}
subArr[i] = compValue;
Modified: branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBUnmarshaller.java
===================================================================
--- branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBUnmarshaller.java 2007-03-26 13:09:51 UTC (rev 2685)
+++ branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBUnmarshaller.java 2007-03-26 17:47:39 UTC (rev 2686)
@@ -1,34 +1,36 @@
/*
-* 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.
-*/
+ * 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.ws.core.jaxrpc.binding.jbossxb;
+// $Id$
+
import java.io.InputStream;
/**
* @author Heiko Braun <heiko.braun(a)jboss.com>
- * @version $Id$
* @since Jul 5, 2006
*/
-public interface JBossXBUnmarshaller {
+public interface JBossXBUnmarshaller
+{
Object unmarshal(InputStream is) throws UnmarshalException;
Object getProperty(String name);
Modified: branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
===================================================================
--- branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-03-26 13:09:51 UTC (rev 2685)
+++ branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-03-26 17:47:39 UTC (rev 2686)
@@ -217,7 +217,6 @@
while(isSOAPEncoded && itBody.hasNext())
{
Element srcElement = (Element)itBody.next();
- registerNamespacesLocally(srcElement);
Name name = new NameImpl(srcElement.getLocalName(), srcElement.getPrefix(), srcElement.getNamespaceURI());
SOAPContentElement destElement = new SOAPContentElement(name);
@@ -237,7 +236,6 @@
soapBody.removeContents();
Element srcElement = (Element)domBodyElement;
- registerNamespacesLocally(srcElement);
QName beName = DOMUtils.getElementQName(domBodyElement);
SOAPContentElement destElement = new SOAPBodyElementDoc(beName);
@@ -263,7 +261,6 @@
while (itBodyElement.hasNext())
{
Element srcElement = (Element)itBodyElement.next();
- registerNamespacesLocally(srcElement);
Name name = new NameImpl(srcElement.getLocalName(), srcElement.getPrefix(), srcElement.getNamespaceURI());
SOAPContentElement destElement = new SOAPContentElement(name);
@@ -340,25 +337,4 @@
}
return child;
}
-
- /**
- * Register globally available namespaces on element level.
- * This is necessary to ensure that each xml fragment is valid.
- */
- private void registerNamespacesLocally(Element srcElement)
- {
- String nsURI = srcElement.getNamespaceURI();
- if (nsURI != null && nsURI.length() > 0)
- {
- String prefix = srcElement.getPrefix();
- if (prefix == null)
- {
- srcElement.setAttribute("xmlns", nsURI);
- }
- else
- {
- srcElement.setAttribute("xmlns:" + prefix, nsURI);
- }
- }
- }
}
Modified: branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPContentElement.java
===================================================================
--- branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPContentElement.java 2007-03-26 13:09:51 UTC (rev 2685)
+++ branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPContentElement.java 2007-03-26 17:47:39 UTC (rev 2686)
@@ -103,7 +103,7 @@
this.soapContent = new DOMContent(this);
}
- ParameterMetaData getParamMetaData()
+ public ParameterMetaData getParamMetaData()
{
if (paramMetaData == null)
throw new IllegalStateException("Parameter meta data not available");
Modified: branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/soap/XMLContent.java
===================================================================
--- branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/soap/XMLContent.java 2007-03-26 13:09:51 UTC (rev 2685)
+++ branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/core/soap/XMLContent.java 2007-03-26 17:47:39 UTC (rev 2686)
@@ -28,15 +28,12 @@
import java.io.InputStream;
import java.lang.reflect.Array;
import java.lang.reflect.Method;
-import java.util.Iterator;
import java.util.List;
import javax.activation.DataHandler;
import javax.activation.DataSource;
import javax.xml.namespace.QName;
import javax.xml.soap.Name;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPBodyElement;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
import javax.xml.transform.Source;
@@ -142,37 +139,7 @@
DeserializerFactoryBase deserializerFactory = getDeserializerFactory(typeMapping, javaType, xmlType);
DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
- Source source = xmlFragment.getSource();
-
- // Get the rpc/encoded referenced content
- if (opMetaData.isRPCEncoded() && container.getAttribute("href").length() > 0)
- {
- String refID = container.getAttribute("href");
- log.debug("Resolve soap encoded href: " + refID);
- SOAPElement parentElement = container.getParentElement();
- if (parentElement instanceof SOAPBodyElement)
- {
- SOAPContentElement refElement = null;
-
- SOAPBody soapBody = (SOAPBody)parentElement.getParentElement();
- Iterator it = soapBody.getChildElements();
- while (it.hasNext())
- {
- SOAPElement soapElement = (SOAPElement)it.next();
- if (refID.equals("#" + soapElement.getAttribute("id")))
- {
- refElement = (SOAPContentElement)soapElement;
- source = refElement.getXMLFragment().getSource();
- break;
- }
- }
-
- if (refElement == null)
- log.warn("Cannot find referrenced element: " + refID);
- }
- }
-
- obj = des.deserialize(container.getElementQName(), xmlType, source, serContext);
+ obj = des.deserialize(container, serContext);
if (obj != null)
{
Class objType = obj.getClass();
Modified: branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeUnmarshallerTestCase.java
===================================================================
--- branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeUnmarshallerTestCase.java 2007-03-26 13:09:51 UTC (rev 2685)
+++ branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/common/jbossxb/complex/ComplexTypeUnmarshallerTestCase.java 2007-03-26 17:47:39 UTC (rev 2686)
@@ -50,7 +50,7 @@
/** Get the URL to the defining schema */
protected XSModel getSchemaModel(QName xmlType, Class javaType) throws Exception
{
- File xsdFile = new File("resources/common/jbossxb/ComplexTypesService_RPC.xsd");
+ File xsdFile = new File("../src/resources/common/jbossxb/ComplexTypesService_RPC.xsd");
assertTrue(xsdFile.exists());
return new JavaToXSD().parseSchema(xsdFile.toURL());
@@ -110,8 +110,8 @@
public void testCompositeType() throws Exception
{
- String xmlStr = "<ns1:CompositeType_1 xmlns:ns1='" + TARGET_NAMESPACE
- + "' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" +
+ String xmlStr =
+ "<ns1:CompositeType_1 xmlns:ns1='" + TARGET_NAMESPACE + "' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" +
" <composite>" +
" <composite xsi:nil='1'/>" +
" <dateTime xsi:nil='1'/>" +
@@ -119,10 +119,10 @@
" <qname xsi:nil='1'/>" +
" <string>Hello Sub World!</string>" +
" </composite>" +
+ " <string xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='xsd:string' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>Hello World!</string>" +
+ " <qname xsi:nil='1'/>" +
+ " <integer>100</integer>" +
" <dateTime xsi:nil='1'/>" +
- " <integer>100</integer>" +
- " <qname xsi:nil='1'/>" +
- " <string>Hello World!</string>" +
"</ns1:CompositeType_1>";
QName xmlName = new QName(TARGET_NAMESPACE, "CompositeType_1", "ns1");
Copied: branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/encoded/href/HRefHandler.java (from rev 2682, branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/encoded/href/HrefHandler.java)
===================================================================
--- branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/encoded/href/HRefHandler.java (rev 0)
+++ branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/encoded/href/HRefHandler.java 2007-03-26 17:47:39 UTC (rev 2686)
@@ -0,0 +1,124 @@
+/*
+ * 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.jaxrpc.encoded.href;
+
+import java.io.ByteArrayInputStream;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.JAXRPCException;
+import javax.xml.rpc.handler.GenericHandler;
+import javax.xml.rpc.handler.HandlerInfo;
+import javax.xml.rpc.handler.MessageContext;
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPMessage;
+
+import org.jboss.logging.Logger;
+
+public class HRefHandler extends GenericHandler
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(HRefHandler.class);
+
+ private static boolean hrefEncoding;
+
+ protected QName[] headers;
+
+ public QName[] getHeaders()
+ {
+ return headers;
+ }
+
+ public void init(HandlerInfo info)
+ {
+ log.info("init: " + info);
+ headers = info.getHeaders();
+ }
+
+ public static void setHrefEncoding(boolean flag)
+ {
+ hrefEncoding = flag;
+ }
+
+ public boolean handleRequest(MessageContext msgContext)
+ {
+ log.info("handleRequest");
+
+ if (hrefEncoding)
+ {
+ try
+ {
+ String envStr =
+ "<env:Envelope xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
+ "<env:Body env:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/' xmlns:enc='http://schemas.xmlsoap.org/soap/encoding/'>" +
+ "<ns1:base64BinaryTest xmlns:ns1='http://marshalltestservice.org/wsdl'>" +
+ "<arrayOfbyte_1 href='#ID1'/>" +
+ "</ns1:base64BinaryTest>" +
+ "<enc:base64 id='ID1' xsi:type='enc:base64'>SHJlZkVuY29kZWRSZXF1ZXN0</enc:base64>" +
+ "</env:Body>" +
+ "</env:Envelope>";
+
+ MessageFactory factory = MessageFactory.newInstance();
+ SOAPMessage reqMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes()));
+ ((SOAPMessageContext)msgContext).setMessage(reqMessage);
+ }
+ catch (Exception e)
+ {
+ throw new JAXRPCException(e);
+ }
+ }
+
+ return true;
+ }
+
+
+ public boolean handleResponse(MessageContext msgContext)
+ {
+ log.info("handleResponse");
+
+ if (hrefEncoding)
+ {
+ try
+ {
+ String envStr =
+ "<env:Envelope xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
+ "<env:Body env:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/' xmlns:enc='http://schemas.xmlsoap.org/soap/encoding/'>" +
+ "<ns1:base64BinaryTestResponse xmlns:ns1='http://marshalltestservice.org/wsdl'>" +
+ "<result href='#ID1'/>" +
+ "</ns1:base64BinaryTestResponse>" +
+ "<enc:base64 id='ID1' xsi:type='enc:base64'>SHJlZkVuY29kZWRSZXNwb25zZQ==</enc:base64>" +
+ "</env:Body>" +
+ "</env:Envelope>";
+
+ MessageFactory factory = MessageFactory.newInstance();
+ SOAPMessage resMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes()));
+ ((SOAPMessageContext)msgContext).setMessage(resMessage);
+ }
+ catch (Exception e)
+ {
+ throw new JAXRPCException(e);
+ }
+ }
+
+ return true;
+ }
+}
Deleted: branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/encoded/href/HrefHandler.java
===================================================================
--- branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/encoded/href/HrefHandler.java 2007-03-26 13:09:51 UTC (rev 2685)
+++ branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/encoded/href/HrefHandler.java 2007-03-26 17:47:39 UTC (rev 2686)
@@ -1,124 +0,0 @@
-/*
- * 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.jaxrpc.encoded.href;
-
-import java.io.ByteArrayInputStream;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.JAXRPCException;
-import javax.xml.rpc.handler.GenericHandler;
-import javax.xml.rpc.handler.HandlerInfo;
-import javax.xml.rpc.handler.MessageContext;
-import javax.xml.rpc.handler.soap.SOAPMessageContext;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPMessage;
-
-import org.jboss.logging.Logger;
-
-public class HrefHandler extends GenericHandler
-{
- // Provide logging
- private static Logger log = Logger.getLogger(HrefHandler.class);
-
- private static boolean hrefEncoding;
-
- protected QName[] headers;
-
- public QName[] getHeaders()
- {
- return headers;
- }
-
- public void init(HandlerInfo info)
- {
- log.info("init: " + info);
- headers = info.getHeaders();
- }
-
- public static void setHrefEncoding(boolean flag)
- {
- hrefEncoding = flag;
- }
-
- public boolean handleRequest(MessageContext msgContext)
- {
- log.info("handleRequest");
-
- if (hrefEncoding)
- {
- try
- {
- String envStr =
- "<env:Envelope xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
- "<env:Body env:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/' xmlns:enc='http://schemas.xmlsoap.org/soap/encoding/'>" +
- "<ns1:base64BinaryTest xmlns:ns1='http://marshalltestservice.org/wsdl'>" +
- "<arrayOfbyte_1 href='#ID1'/>" +
- "</ns1:base64BinaryTest>" +
- "<enc:base64 id='ID1' xsi:type='enc:base64'>SHJlZkVuY29kZWRSZXF1ZXN0</enc:base64>" +
- "</env:Body>" +
- "</env:Envelope>";
-
- MessageFactory factory = MessageFactory.newInstance();
- SOAPMessage reqMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes()));
- ((SOAPMessageContext)msgContext).setMessage(reqMessage);
- }
- catch (Exception e)
- {
- throw new JAXRPCException(e);
- }
- }
-
- return true;
- }
-
-
- public boolean handleResponse(MessageContext msgContext)
- {
- log.info("handleResponse");
-
- if (hrefEncoding)
- {
- try
- {
- String envStr =
- "<env:Envelope xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
- "<env:Body env:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/' xmlns:enc='http://schemas.xmlsoap.org/soap/encoding/'>" +
- "<ns1:base64BinaryTestResponse xmlns:ns1='http://marshalltestservice.org/wsdl'>" +
- "<result href='#ID1'/>" +
- "</ns1:base64BinaryTestResponse>" +
- "<enc:base64 id='ID1' xsi:type='enc:base64'>SHJlZkVuY29kZWRSZXNwb25zZQ==</enc:base64>" +
- "</env:Body>" +
- "</env:Envelope>";
-
- MessageFactory factory = MessageFactory.newInstance();
- SOAPMessage resMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes()));
- ((SOAPMessageContext)msgContext).setMessage(resMessage);
- }
- catch (Exception e)
- {
- throw new JAXRPCException(e);
- }
- }
-
- return true;
- }
-}
Modified: branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java
===================================================================
--- branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java 2007-03-26 13:09:51 UTC (rev 2685)
+++ branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java 2007-03-26 17:47:39 UTC (rev 2686)
@@ -65,7 +65,7 @@
public void testHrefMessage() throws Exception
{
- HrefHandler.setHrefEncoding(true);
+ HRefHandler.setHrefEncoding(true);
byte[] retObj = port.base64BinaryTest("HandlerReplacesThis".getBytes());
assertEquals("HrefEncodedResponse", new String(retObj));
}
Modified: branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestImpl.java
===================================================================
--- branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestImpl.java 2007-03-26 13:09:51 UTC (rev 2685)
+++ branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestImpl.java 2007-03-26 17:47:39 UTC (rev 2686)
@@ -20,7 +20,7 @@
if (message == null && message.length() == 0)
throw new IllegalStateException("Incommig message is null");
- HrefHandler.setHrefEncoding("HrefEncodedRequest".equals(message));
+ HRefHandler.setHrefEncoding("HrefEncodedRequest".equals(message));
return byteArray;
}
}
Modified: branches/jbossws-1.2.1/jbossws-tests/src/resources/common/jbossxb/ComplexTypesService_RPC.xsd
===================================================================
--- branches/jbossws-1.2.1/jbossws-tests/src/resources/common/jbossxb/ComplexTypesService_RPC.xsd 2007-03-26 13:09:51 UTC (rev 2685)
+++ branches/jbossws-1.2.1/jbossws-tests/src/resources/common/jbossxb/ComplexTypesService_RPC.xsd 2007-03-26 17:47:39 UTC (rev 2686)
@@ -23,13 +23,13 @@
</complexType>
<complexType name="Composite">
- <sequence>
+ <all>
<element name="composite" type="tns:Composite" nillable="true"/>
<element name="dateTime" type="dateTime" nillable="true"/>
<element name="integer" type="integer" nillable="true"/>
<element name="qname" type="QName" nillable="true"/>
<element name="string" type="string" nillable="true"/>
- </sequence>
+ </all>
</complexType>
</schema>
Modified: branches/jbossws-1.2.1/jbossws-tests/src/resources/jaxrpc/encoded/href/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.2.1/jbossws-tests/src/resources/jaxrpc/encoded/href/META-INF/application-client.xml 2007-03-26 13:09:51 UTC (rev 2685)
+++ branches/jbossws-1.2.1/jbossws-tests/src/resources/jaxrpc/encoded/href/META-INF/application-client.xml 2007-03-26 17:47:39 UTC (rev 2686)
@@ -17,7 +17,7 @@
</port-component-ref>
<handler>
<handler-name>HrefHandler</handler-name>
- <handler-class>org.jboss.test.ws.jaxrpc.encoded.href.HrefHandler</handler-class>
+ <handler-class>org.jboss.test.ws.jaxrpc.encoded.href.HRefHandler</handler-class>
</handler>
</service-ref>
Modified: branches/jbossws-1.2.1/jbossws-tests/src/resources/jaxrpc/encoded/href/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.2.1/jbossws-tests/src/resources/jaxrpc/encoded/href/WEB-INF/webservices.xml 2007-03-26 13:09:51 UTC (rev 2685)
+++ branches/jbossws-1.2.1/jbossws-tests/src/resources/jaxrpc/encoded/href/WEB-INF/webservices.xml 2007-03-26 17:47:39 UTC (rev 2686)
@@ -19,7 +19,7 @@
</service-impl-bean>
<handler>
<handler-name>HrefHandler</handler-name>
- <handler-class>org.jboss.test.ws.jaxrpc.encoded.href.HrefHandler</handler-class>
+ <handler-class>org.jboss.test.ws.jaxrpc.encoded.href.HRefHandler</handler-class>
</handler>
</port-component>
</webservice-description>
17 years, 9 months
- 1
- 0
JBossWS SVN: r2685 - in branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws: metadata/wsdl and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-26 09:09:51 -0400 (Mon, 26 Mar 2007)
New Revision: 2685
Modified:
branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java
branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLBindingOperation.java
branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java
branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java
Log:
Add support for operation namespace defined on wsdl biniding
Modified: branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java
===================================================================
--- branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-03-26 09:34:42 UTC (rev 2684)
+++ branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-03-26 13:09:51 UTC (rev 2685)
@@ -160,6 +160,16 @@
QName opQName = wsdlOperation.getName();
String opName = opQName.getLocalPart();
+ WSDLBindingOperation wsdlBindingOperation = wsdlOperation.getBindingOperation();
+ if (wsdlBindingOperation == null)
+ log.warn("Could not locate binding operation for:" + opQName);
+
+ // Change operation according namespace defined on binding
+ // <soap:body use="encoded" namespace="http://MarshallTestW2J.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ String namespaceURI = wsdlBindingOperation.getNamespaceURI();
+ if (namespaceURI != null)
+ opQName = new QName(namespaceURI, opName);
+
// Set java method name
String javaName = opName.substring(0, 1).toLowerCase() + opName.substring(1);
ServiceEndpointMethodMapping seiMethodMapping = null;
@@ -186,8 +196,6 @@
opMetaData.setOneWay(true);
// Set the operation SOAPAction
- WSDLBinding wsdlBinding = wsdlDefinitions.getBindingByInterfaceName(wsdlInterface.getName());
- WSDLBindingOperation wsdlBindingOperation = wsdlBinding.getOperationByRef(opQName);
if (wsdlBindingOperation != null)
opMetaData.setSOAPAction(wsdlBindingOperation.getSOAPAction());
@@ -214,7 +222,8 @@
}
}
- private ParameterMetaData buildInputParameter(OperationMetaData opMetaData, WSDLInterfaceOperation wsdlOperation, ServiceEndpointMethodMapping seiMethodMapping, TypeMappingImpl typeMapping, String partName, QName xmlName, QName xmlType, int pos, boolean optional)
+ private ParameterMetaData buildInputParameter(OperationMetaData opMetaData, WSDLInterfaceOperation wsdlOperation, ServiceEndpointMethodMapping seiMethodMapping,
+ TypeMappingImpl typeMapping, String partName, QName xmlName, QName xmlType, int pos, boolean optional)
{
WSDLRPCSignatureItem item = wsdlOperation.getRpcSignatureitem(partName);
if (item != null)
@@ -276,7 +285,8 @@
return inMetaData;
}
- private ParameterMetaData buildOutputParameter(OperationMetaData opMetaData, WSDLInterfaceOperation wsdlOperation, ServiceEndpointMethodMapping seiMethodMapping, int pos, String partName, QName xmlName, QName xmlType, TypeMappingImpl typeMapping, boolean optional)
+ private ParameterMetaData buildOutputParameter(OperationMetaData opMetaData, WSDLInterfaceOperation wsdlOperation, ServiceEndpointMethodMapping seiMethodMapping,
+ int pos, String partName, QName xmlName, QName xmlType, TypeMappingImpl typeMapping, boolean optional)
{
// Default is first listed output
boolean hasReturnMapping = opMetaData.getReturnParameter() == null;
@@ -364,7 +374,8 @@
return outMetaData;
}
- private int processBindingParameters(OperationMetaData opMetaData, WSDLInterfaceOperation wsdlOperation, ServiceEndpointMethodMapping seiMethodMapping, TypeMappingImpl typeMapping, WSDLBindingOperation bindingOperation, int wsdlPosition)
+ private int processBindingParameters(OperationMetaData opMetaData, WSDLInterfaceOperation wsdlOperation, ServiceEndpointMethodMapping seiMethodMapping,
+ TypeMappingImpl typeMapping, WSDLBindingOperation bindingOperation, int wsdlPosition)
{
WSDLBindingOperationInput bindingInput = bindingOperation.getInputs()[0];
for (WSDLSOAPHeader header : bindingInput.getSoapHeaders())
@@ -373,7 +384,8 @@
QName xmlType = lookupSchemaType(wsdlOperation, xmlName);
String partName = header.getPartName();
- ParameterMetaData pmd = buildInputParameter(opMetaData, wsdlOperation, seiMethodMapping, typeMapping, partName, xmlName, xmlType, wsdlPosition++, !header.isIncludeInSignature());
+ ParameterMetaData pmd = buildInputParameter(opMetaData, wsdlOperation, seiMethodMapping, typeMapping, partName, xmlName, xmlType, wsdlPosition++, !header
+ .isIncludeInSignature());
if (pmd != null)
pmd.setInHeader(true);
}
@@ -391,7 +403,8 @@
return wsdlPosition;
}
- private int processBindingOutputParameters(OperationMetaData opMetaData, WSDLInterfaceOperation wsdlOperation, ServiceEndpointMethodMapping seiMethodMapping, TypeMappingImpl typeMapping, WSDLBindingOperation bindingOperation, int wsdlPosition)
+ private int processBindingOutputParameters(OperationMetaData opMetaData, WSDLInterfaceOperation wsdlOperation, ServiceEndpointMethodMapping seiMethodMapping,
+ TypeMappingImpl typeMapping, WSDLBindingOperation bindingOperation, int wsdlPosition)
{
WSDLBindingOperationOutput bindingOutput = bindingOperation.getOutputs()[0];
for (WSDLSOAPHeader header : bindingOutput.getSoapHeaders())
@@ -408,7 +421,8 @@
{
QName xmlType = lookupSchemaType(wsdlOperation, xmlName);
- ParameterMetaData pmd = buildOutputParameter(opMetaData, wsdlOperation, seiMethodMapping, wsdlPosition, partName, xmlName, xmlType, typeMapping, !header.isIncludeInSignature());
+ ParameterMetaData pmd = buildOutputParameter(opMetaData, wsdlOperation, seiMethodMapping, wsdlPosition, partName, xmlName, xmlType, typeMapping, !header
+ .isIncludeInSignature());
if (pmd != null)
{
pmd.setInHeader(true);
@@ -490,17 +504,17 @@
String ns = xmlType.getNamespaceURI() != null ? xmlType.getNamespaceURI() : "";
XSTypeDefinition xsType = schemaModel.getTypeDefinition(localPart, ns);
XOPScanner scanner = new XOPScanner();
- if(scanner.findXOPTypeDef(xsType)!=null | (localPart.equals("base64Binary")&&ns.equals(Constants.NS_SCHEMA_XSD)))
+ if (scanner.findXOPTypeDef(xsType) != null | (localPart.equals("base64Binary") && ns.equals(Constants.NS_SCHEMA_XSD)))
{
// FIXME: read the xmime:contentType from the element declaration
// See SchemaUtils#findXOPTypeDef(XSTypeDefinition typeDef) for details
/*
- FIXME: the classloader is not set yet
- paramMetaData.setXopContentType(
- MimeUtils.resolveMimeType(paramMetaData.getJavaType())
- );
- */
+ FIXME: the classloader is not set yet
+ paramMetaData.setXopContentType(
+ MimeUtils.resolveMimeType(paramMetaData.getJavaType())
+ );
+ */
paramMetaData.setXOP(true);
@@ -581,7 +595,9 @@
}
}
- private int processDocElement(OperationMetaData operation, WSDLInterfaceOperation wsdlOperation, WSDLBindingOperation bindingOperation, ServiceEndpointMethodMapping seiMethodMapping, TypeMappingImpl typeMapping, List<WrappedParameter> wrappedParameters, List<WrappedParameter> wrappedResponseParameters)
+ private int processDocElement(OperationMetaData operation, WSDLInterfaceOperation wsdlOperation, WSDLBindingOperation bindingOperation,
+ ServiceEndpointMethodMapping seiMethodMapping, TypeMappingImpl typeMapping, List<WrappedParameter> wrappedParameters,
+ List<WrappedParameter> wrappedResponseParameters)
{
WSDLInterfaceOperationInput input = wsdlOperation.getInputs()[0];
WSDLBindingOperationInput bindingInput = bindingOperation.getInputs()[0];
@@ -606,7 +622,6 @@
ParameterMetaData inMetaData = new ParameterMetaData(operation, xmlName, xmlType, javaTypeName);
operation.addParameter(inMetaData);
-
// Set the variable names
if (inMetaData.getOperationMetaData().isDocumentWrapped())
{
@@ -618,7 +633,6 @@
if (javaXmlTypeMapping == null)
throw new WSException("Cannot obtain java/xml type mapping for: " + xmlType);
-
Map<String, String> variableMap = createVariableMappingMap(javaXmlTypeMapping.getVariableMappings());
for (MethodParamPartsMapping partMapping : seiMethodMapping.getMethodParamPartsMappings())
{
@@ -639,17 +653,15 @@
if (variable == null)
throw new IllegalArgumentException("Could not determine variable name for element: " + elementName);
- WrappedParameter wrapped = new WrappedParameter(new QName(elementName), partMapping.getParamType(), variable,
- partMapping.getParamPosition());
+ WrappedParameter wrapped = new WrappedParameter(new QName(elementName), partMapping.getParamType(), variable, partMapping.getParamPosition());
-
String parameterMode = wsdlMessageMapping.getParameterMode();
if (parameterMode == null || parameterMode.length() < 2)
throw new IllegalArgumentException("Invalid parameter mode for element: " + elementName);
- if (! "OUT".equals(parameterMode))
+ if (!"OUT".equals(parameterMode))
wrappedParameters.add(wrapped);
- if (! "IN".equals(parameterMode))
+ if (!"IN".equals(parameterMode))
{
wrapped.setHolder(true);
// wrapped parameters can not be shared between request/response objects (accessors)
@@ -738,9 +750,8 @@
return isWrapParameters;
}
- private int processOutputDocElement(OperationMetaData opMetaData, WSDLInterfaceOperation wsdlOperation,
- ServiceEndpointMethodMapping seiMethodMapping, TypeMappingImpl typeMapping, List<WrappedParameter> wrappedResponseParameters,
- int wsdlPosition)
+ private int processOutputDocElement(OperationMetaData opMetaData, WSDLInterfaceOperation wsdlOperation, ServiceEndpointMethodMapping seiMethodMapping,
+ TypeMappingImpl typeMapping, List<WrappedParameter> wrappedResponseParameters, int wsdlPosition)
{
WSDLInterfaceOperationOutput opOutput = wsdlOperation.getOutputs()[0];
QName xmlName = opOutput.getElement();
Modified: branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLBindingOperation.java
===================================================================
--- branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLBindingOperation.java 2007-03-26 09:34:42 UTC (rev 2684)
+++ branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLBindingOperation.java 2007-03-26 13:09:51 UTC (rev 2685)
@@ -57,6 +57,8 @@
private String encodingStyle = Constants.URI_LITERAL_ENC;
/** WSDL-1.1, soapAction attribute from the soap:operation element */
private String soapAction;
+ /** WSDL-1.1, namespaceURI attribute from the soap:body element */
+ private String namespaceURI;
/** A OPTIONAL set of Binding Message Reference components */
private List<WSDLBindingOperationInput> inputs = new ArrayList<WSDLBindingOperationInput>();
@@ -104,6 +106,16 @@
this.soapAction = soapAction;
}
+ public String getNamespaceURI()
+ {
+ return namespaceURI;
+ }
+
+ public void setNamespaceURI(String namespaceURI)
+ {
+ this.namespaceURI = namespaceURI;
+ }
+
public WSDLBindingOperationInput[] getInputs()
{
WSDLBindingOperationInput[] arr = new WSDLBindingOperationInput[inputs.size()];
Modified: branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java
===================================================================
--- branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java 2007-03-26 09:34:42 UTC (rev 2684)
+++ branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java 2007-03-26 13:09:51 UTC (rev 2685)
@@ -257,9 +257,6 @@
return null;
WSDLBindingOperation bindingOperation = binding.getOperationByRef(getName());
- if (bindingOperation == null)
- return null;
-
return bindingOperation;
}
Modified: branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
===================================================================
--- branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-03-26 09:34:42 UTC (rev 2684)
+++ branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-03-26 13:09:51 UTC (rev 2685)
@@ -1008,18 +1008,18 @@
private void processBindingOperation(Definition srcWsdl, WSDLBinding destBinding, String bindingStyle, BindingOperation srcBindingOperation) throws WSDLException
{
- String srcBindingName = srcBindingOperation.getName();
- log.trace("processBindingOperation: " + srcBindingName);
+ String srcOperationName = srcBindingOperation.getName();
+ log.trace("processBindingOperation: " + srcOperationName);
WSDLInterface destInterface = destBinding.getInterface();
String namespaceURI = destInterface.getName().getNamespaceURI();
WSDLBindingOperation destBindingOperation = new WSDLBindingOperation(destBinding);
- QName refQName = new QName(namespaceURI, srcBindingName);
+ QName refQName = new QName(namespaceURI, srcOperationName);
destBindingOperation.setRef(refQName);
destBinding.addOperation(destBindingOperation);
- String opName = srcBindingName;
+ String opName = srcOperationName;
WSDLInterfaceOperation destIntfOperation = destInterface.getOperation(opName);
// Process soap:operation@soapAction, soap:operation@style
@@ -1066,7 +1066,6 @@
{
log.trace("processBindingInput");
- QName soap11Body = new QName(Constants.NS_SOAP11, "body");
List<ExtensibilityElement> extList = srcBindingInput.getExtensibilityElements();
WSDLBindingOperationInput input = new WSDLBindingOperationInput(destBindingOperation);
destBindingOperation.addInput(input);
@@ -1091,7 +1090,7 @@
}
};
- processBindingReference(srcWsdl, destBindingOperation, destIntfOperation, soap11Body, extList, input, srcBindingOperation, cb);
+ processBindingReference(srcWsdl, destBindingOperation, destIntfOperation, extList, input, srcBindingOperation, cb);
}
private void processBindingOutput(Definition srcWsdl, WSDLBindingOperation destBindingOperation, final WSDLInterfaceOperation destIntfOperation,
@@ -1099,7 +1098,6 @@
{
log.trace("processBindingInput");
- QName soap11Body = new QName(Constants.NS_SOAP11, "body");
List<ExtensibilityElement> extList = srcBindingOutput.getExtensibilityElements();
WSDLBindingOperationOutput output = new WSDLBindingOperationOutput(destBindingOperation);
destBindingOperation.addOutput(output);
@@ -1125,20 +1123,28 @@
}
};
- processBindingReference(srcWsdl, destBindingOperation, destIntfOperation, soap11Body, extList, output, srcBindingOperation, cb);
+ processBindingReference(srcWsdl, destBindingOperation, destIntfOperation, extList, output, srcBindingOperation, cb);
}
- private void processBindingReference(Definition srcWsdl, WSDLBindingOperation destBindingOperation, WSDLInterfaceOperation destIntfOperation, QName soap11Body,
- List<ExtensibilityElement> extList, WSDLBindingMessageReference reference, BindingOperation srcBindingOperation, ReferenceCallback callback)
+ private void processBindingReference(Definition srcWsdl, WSDLBindingOperation destBindingOperation, WSDLInterfaceOperation destIntfOperation, List<ExtensibilityElement> extList,
+ WSDLBindingMessageReference reference, BindingOperation srcBindingOperation, ReferenceCallback callback)
throws WSDLException
{
for (ExtensibilityElement extElement : extList)
{
QName elementType = extElement.getElementType();
- if (soap11Body.equals(elementType) || SOAP12_BODY.equals(elementType))
+ if (extElement instanceof SOAPBody)
{
processEncodingStyle(extElement, destBindingOperation);
+
+ // <soap:body use="encoded" namespace="http://MarshallTestW2J.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+ String namespaceURI = ((SOAPBody)extElement).getNamespaceURI();
+ destBindingOperation.setNamespaceURI(namespaceURI);
}
+ else if (SOAP12_BODY.equals(elementType))
+ {
+ processEncodingStyle(extElement, destBindingOperation);
+ }
else if (extElement instanceof SOAPHeader)
{
SOAPHeader header = (SOAPHeader)extElement;
Modified: branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java
===================================================================
--- branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2007-03-26 09:34:42 UTC (rev 2684)
+++ branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2007-03-26 13:09:51 UTC (rev 2685)
@@ -282,10 +282,10 @@
private WSDLBindingMessageReference getBindingReference(WSDLInterfaceMessageReference reference)
{
- WSDLInterfaceOperation operation = reference.getWsdlOperation();
- WSDLInterface wsdlInterface = operation.getWsdlInterface();
+ WSDLInterfaceOperation wsdlOperation = reference.getWsdlOperation();
+ WSDLInterface wsdlInterface = wsdlOperation.getWsdlInterface();
WSDLBinding binding = wsdlInterface.getWsdlDefinitions().getBindingByInterfaceName(wsdlInterface.getName());
- WSDLBindingOperation bindingOperation = binding.getOperationByRef(operation.getName());
+ WSDLBindingOperation bindingOperation = binding.getOperationByRef(wsdlOperation.getName());
WSDLBindingMessageReference[] bindingReferences;
if (reference instanceof WSDLInterfaceOperationInput)
17 years, 9 months
- 1
- 0
JBossWS SVN: r2684 - branches/jbossws-1.2.1/jbossws-core/src/resources/samples.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-26 05:34:42 -0400 (Mon, 26 Mar 2007)
New Revision: 2684
Modified:
branches/jbossws-1.2.1/jbossws-core/src/resources/samples/build.xml
Log:
Fix missing handler defs in samples binaries
Modified: branches/jbossws-1.2.1/jbossws-core/src/resources/samples/build.xml
===================================================================
--- branches/jbossws-1.2.1/jbossws-core/src/resources/samples/build.xml 2007-03-26 09:14:01 UTC (rev 2683)
+++ branches/jbossws-1.2.1/jbossws-core/src/resources/samples/build.xml 2007-03-26 09:34:42 UTC (rev 2684)
@@ -382,6 +382,14 @@
<copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/jndi.properties"/>
<copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/log4j.xml"/>
+ <!-- copy handler definitions -->
+ <copy todir="${tests.output.dir}/classes">
+ <fileset dir="${tests.java.dir}">
+ <include name="**/*.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- copy non binary files -->
<copy todir="${tests.output.dir}/resources">
<fileset dir="${tests.resources.dir}">
<include name="**/*.wsdl"/>
17 years, 9 months
- 1
- 0
JBossWS SVN: r2683 - branches/jbossws-1.2.1/jbossws-core/src/resources/samples.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-26 05:14:01 -0400 (Mon, 26 Mar 2007)
New Revision: 2683
Modified:
branches/jbossws-1.2.1/jbossws-core/src/resources/samples/ant.properties.example
Log:
4.2.0.GA
Modified: branches/jbossws-1.2.1/jbossws-core/src/resources/samples/ant.properties.example
===================================================================
--- branches/jbossws-1.2.1/jbossws-core/src/resources/samples/ant.properties.example 2007-03-26 08:53:08 UTC (rev 2682)
+++ branches/jbossws-1.2.1/jbossws-core/src/resources/samples/ant.properties.example 2007-03-26 09:14:01 UTC (rev 2683)
@@ -3,7 +3,7 @@
# Required JBoss Home
jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2
-jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3
+jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA
jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
# The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat]
17 years, 9 months
- 1
- 0
JBossWS SVN: r2682 - branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/metadata/umdm.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-26 04:53:08 -0400 (Mon, 26 Mar 2007)
New Revision: 2682
Modified:
branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/metadata/umdm/FaultMetaData.java
Log:
Remove dependency on jdk15 API
Modified: branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/metadata/umdm/FaultMetaData.java
===================================================================
--- branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2007-03-26 08:08:32 UTC (rev 2681)
+++ branches/jbossws-1.2.1/jbossws-core/src/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2007-03-26 08:53:08 UTC (rev 2682)
@@ -63,16 +63,16 @@
private QName xmlType;
private String javaTypeName;
private String faultBeanName;
- private Class<? extends Exception> javaType;
- private Class<?> faultBean;
+ private Class javaType;
+ private Class faultBean;
private Method faultInfoMethod;
- private Constructor<? extends Exception> serviceExceptionConstructor;
+ private Constructor serviceExceptionConstructor;
private Method[] serviceExceptionGetters;
private WrappedParameter[] faultBeanProperties;
- private Class<?>[] propertyTypes;
+ private Class[] propertyTypes;
public FaultMetaData(OperationMetaData operation, QName xmlName, QName xmlType, String javaTypeName)
{
@@ -123,7 +123,7 @@
/** Load the java type.
* It should only be cached during eager initialization.
*/
- public Class<? extends Exception> getJavaType()
+ public Class getJavaType()
{
if (javaType != null)
return javaType;
@@ -134,8 +134,9 @@
try
{
ClassLoader loader = opMetaData.getEndpointMetaData().getClassLoader();
- Class<?> genericType = JavaUtils.loadJavaType(javaTypeName, loader);
- Class<? extends Exception> exceptionType = genericType.asSubclass(Exception.class);
+ Class exceptionType = JavaUtils.loadJavaType(javaTypeName, loader);
+ if (Exception.class.isAssignableFrom(exceptionType) == false)
+ throw new IllegalStateException("Is not assignable to exception: " + exceptionType);
if (opMetaData.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData().isEagerInitialized())
{
@@ -258,7 +259,7 @@
String[] propertyNames = xmlType.propOrder();
int propertyCount = propertyNames.length;
- propertyTypes = new Class<?>[propertyCount];
+ propertyTypes = new Class[propertyCount];
faultBeanProperties = new WrappedParameter[propertyCount];
serviceExceptionGetters = new Method[propertyCount];
@@ -269,7 +270,7 @@
try
{
PropertyDescriptor propertyDescriptor = new PropertyDescriptor(propertyName, faultBean);
- Class<?> propertyType = propertyDescriptor.getPropertyType();
+ Class propertyType = propertyDescriptor.getPropertyType();
WrappedParameter faultBeanProperty = new WrappedParameter(null, propertyType.getName(), propertyName, i);
faultBeanProperty.setAccessor(accessorFactory.create(faultBeanProperty));
@@ -310,11 +311,11 @@
}
}
- private AccessorFactory getAccessorFactory(Class<?> faultBean)
+ private AccessorFactory getAccessorFactory(Class faultBean)
{
// This should catch all cases due to the constraints that JAX-WS puts on the fault bean
// However, if issues arrise then switch this to a full jaxb reflection library
- XmlAccessorType type = faultBean.getAnnotation(XmlAccessorType.class);
+ XmlAccessorType type = (XmlAccessorType)faultBean.getAnnotation(XmlAccessorType.class);
if (type != null && type.value() == XmlAccessType.FIELD)
return ReflectiveFieldAccessor.FACTORY_CREATOR.create(this);
@@ -380,7 +381,7 @@
* (i.e. does it match the pattern in JAX-WS 2.5)? */
if (faultInfoMethod != null)
{
- serviceException = serviceExceptionConstructor.newInstance(message, faultBean);
+ serviceException = (Exception)serviceExceptionConstructor.newInstance(message, faultBean);
}
else
{
@@ -395,7 +396,7 @@
propertyValues[i] = faultBeanProperties[i].accessor().get(faultBean);
log.debug("constructing " + javaType.getSimpleName() + ": " + Arrays.toString(propertyValues));
- serviceException = serviceExceptionConstructor.newInstance(propertyValues);
+ serviceException = (Exception)serviceExceptionConstructor.newInstance(propertyValues);
}
}
catch (InstantiationException e)
17 years, 9 months
- 1
- 0
JBossWS SVN: r2681 - branches/jbossws-1.2.1/build/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-26 04:08:32 -0400 (Mon, 26 Mar 2007)
New Revision: 2681
Modified:
branches/jbossws-1.2.1/build/ant-import/build-samples.xml
Log:
Fix samples build
Modified: branches/jbossws-1.2.1/build/ant-import/build-samples.xml
===================================================================
--- branches/jbossws-1.2.1/build/ant-import/build-samples.xml 2007-03-26 07:59:27 UTC (rev 2680)
+++ branches/jbossws-1.2.1/build/ant-import/build-samples.xml 2007-03-26 08:08:32 UTC (rev 2681)
@@ -43,14 +43,14 @@
<fileset dir="${tests.dir}">
<include name="ant-import/build-samples-jaxrpc.xml"/>
<include name="ant-import/build-samples-jaxws.xml"/>
- <include name="src/main/etc/*"/>
- <include name="src/main/java/org/jboss/test/ws/jaxrpc/samples/**"/>
- <include name="src/main/java/org/jboss/test/ws/jaxws/samples/**"/>
- <include name="src/main/java/org/jboss/test/ws/*"/>
- <include name="src/main/resources/jaxrpc/samples/**"/>
- <include name="src/main/resources/jaxrpc/samples-override/**"/>
- <include name="src/main/resources/jaxws/samples/**"/>
- <include name="src/main/resources/*excludes.txt"/>
+ <include name="src/etc/*"/>
+ <include name="src/java/org/jboss/test/ws/jaxrpc/samples/**"/>
+ <include name="src/java/org/jboss/test/ws/jaxws/samples/**"/>
+ <include name="src/java/org/jboss/test/ws/*"/>
+ <include name="src/resources/jaxrpc/samples/**"/>
+ <include name="src/resources/jaxrpc/samples-override/**"/>
+ <include name="src/resources/jaxws/samples/**"/>
+ <include name="src/resources/*excludes.txt"/>
</fileset>
</copy>
@@ -63,8 +63,9 @@
<mkdir dir="${build.src.samples.dir}/lib"/>
<copy todir="${build.src.samples.dir}/lib">
<fileset dir="${core.output.lib.dir}">
+ <include name="jbossws-integration.jar"/>
+ <include name="jbossws-client.jar"/>
<include name="jbossws-core.jar"/>
- <include name="jbossws-client.jar"/>
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
17 years, 9 months
- 1
- 0
JBossWS SVN: r2680 - in branches/jbossws-1.2.1/jbossws-core/src/resources/samples: ant-import and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-26 03:59:27 -0400 (Mon, 26 Mar 2007)
New Revision: 2680
Modified:
branches/jbossws-1.2.1/jbossws-core/src/resources/samples/ant-import/build-thirdparty.xml
branches/jbossws-1.2.1/jbossws-core/src/resources/samples/version.properties
Log:
Fix referrence to wsconsume
Modified: branches/jbossws-1.2.1/jbossws-core/src/resources/samples/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-1.2.1/jbossws-core/src/resources/samples/ant-import/build-thirdparty.xml 2007-03-24 23:07:59 UTC (rev 2679)
+++ branches/jbossws-1.2.1/jbossws-core/src/resources/samples/ant-import/build-thirdparty.xml 2007-03-26 07:59:27 UTC (rev 2680)
@@ -37,7 +37,7 @@
<get src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer" dest="${thirdparty.dir}/ejb3.deployer.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.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/jbossws-wsconsume-impl/${jbossws-wsconsume}/lib/jbossws-wsconsume-impl.jar" dest="${thirdparty.dir}/jbossws-wsconsume-impl.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume-impl}/lib/jbossws-wsconsume-impl.jar" dest="${thirdparty.dir}/jbossws-wsconsume-impl.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" />
<get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/>
Modified: branches/jbossws-1.2.1/jbossws-core/src/resources/samples/version.properties
===================================================================
--- branches/jbossws-1.2.1/jbossws-core/src/resources/samples/version.properties 2007-03-24 23:07:59 UTC (rev 2679)
+++ branches/jbossws-1.2.1/jbossws-core/src/resources/samples/version.properties 2007-03-26 07:59:27 UTC (rev 2680)
@@ -17,7 +17,7 @@
jboss-jbossxb=@jboss-jbossxb@
jboss-security=@jboss-security@
jbossas-core-libs=@jbossas-core-libs@
-jbossws-wsconsume=@jbossws-wsconsume@
+jbossws-wsconsume-impl=@jbossws-wsconsume-impl@
oswego-concurrent=@oswego-concurrent@
stax-api=@stax-api@
sun-jaf=@sun-jaf@
17 years, 9 months
- 1
- 0