JBossWS SVN: r2837 - branches/jbossws-1.2.1/build.
by jbossws-commits＠lists.jboss.org
Author: alex.guizar(a)jboss.com
Date: 2007-04-13 20:19:35 -0400 (Fri, 13 Apr 2007)
New Revision: 2837
Modified:
branches/jbossws-1.2.1/build/version.properties
Log:
JBWS-1602 upgraded to jBPM BPEL 1.1.0.Beta5
Modified: branches/jbossws-1.2.1/build/version.properties
===================================================================
--- branches/jbossws-1.2.1/build/version.properties 2007-04-13 21:57:20 UTC (rev 2836)
+++ branches/jbossws-1.2.1/build/version.properties 2007-04-14 00:19:35 UTC (rev 2837)
@@ -18,7 +18,7 @@
ibm-wsdl4j=1.6.2
javassist=3.5.0.CR1
jbossws-wsconsume-impl=2.0.0
-jbpm-bpel=1.1.0.Beta4
+jbpm-bpel=1.1.0.Beta5
sun-jaxb=2.0.3jboss
stax-api=1.0
19 years
JBossWS SVN: r2836 - branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-04-13 17:57:20 -0400 (Fri, 13 Apr 2007)
New Revision: 2836
Added:
branches/dlofthouse/JBWS-1093/
Log:
Recreate branch
Copied: branches/dlofthouse/JBWS-1093 (from rev 2835, trunk)
19 years
JBossWS SVN: r2835 - branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-04-13 17:55:52 -0400 (Fri, 13 Apr 2007)
New Revision: 2835
Removed:
branches/dlofthouse/JBWS-1093/
Log:
Remove old branch.
19 years
JBossWS SVN: r2834 - in trunk/jbossws-core/src/java/org/jboss/ws: core/jaxws/spi and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-04-13 13:33:29 -0400 (Fri, 13 Apr 2007)
New Revision: 2834
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/CommonMessageContext.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/extensions/xop/XOPContext.java
Log:
Prevent CCE in XOP handling
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/CommonMessageContext.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/CommonMessageContext.java 2007-04-13 17:23:32 UTC (rev 2833)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/CommonMessageContext.java 2007-04-13 17:33:29 UTC (rev 2834)
@@ -35,11 +35,9 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.jaxrpc.binding.SerializationContext;
import org.jboss.ws.core.server.PropertyCallback;
-import org.jboss.ws.core.soap.SOAPMessageImpl;
-import org.jboss.ws.core.soap.MessageContextAssociation;
+import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
-import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.xb.binding.NamespaceRegistry;
/**
@@ -51,11 +49,11 @@
public abstract class CommonMessageContext implements Map<String, Object>
{
private static Logger log = Logger.getLogger(CommonMessageContext.class);
-
+
// expandToDOM in the SOAPContentElement should not happen during normal operation
// This property should be set the message context when it is ok to do so.
public static String ALLOW_EXPAND_TO_DOM = "org.jboss.ws.allow.expand.dom";
-
+
public static String REMOTING_METADATA = "org.jboss.ws.remoting.metadata";
// The serialization context for this message ctx
@@ -202,8 +200,8 @@
ScopedProperty scopedProp = scopedProps.get(key);
if (log.isTraceEnabled())
- log.trace("get("+ key + "): " + scopedProp);
-
+ log.trace("get(" + key + "): " + scopedProp);
+
if (isValidInScope(scopedProp))
value = scopedProp.getValue();
@@ -219,7 +217,7 @@
ScopedProperty newProp = new ScopedProperty(key, value, currentScope);
if (log.isTraceEnabled())
log.trace("put: " + newProp);
-
+
scopedProps.put(key, newProp);
return prevProp != null ? prevProp.getValue() : null;
}
@@ -254,11 +252,10 @@
scopedProps.clear();
}
-
public boolean isModified()
{
// skip changes from XOP handler interactions
- if(XOPContext.isXOPEncodedRequest() && !XOPContext.isXOPMessage())
+ if (XOPContext.isXOPEncodedRequest() && !XOPContext.isXOPMessage())
{
log.debug("Disregard changes from XOP/Handler interactions");
return false;
@@ -385,7 +382,7 @@
return realValue;
}
-
+
public String toString()
{
return scope + ":" + name + "=" + value;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-04-13 17:23:32 UTC (rev 2833)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-04-13 17:33:29 UTC (rev 2834)
@@ -120,11 +120,11 @@
}
handlerResolver = new HandlerResolverImpl();
-
+
if (usRef != null)
{
serviceMetaData.setServiceRefName(usRef.getServiceRefName());
-
+
// Setup the service handlers
if (usRef.getHandlerChain() != null)
{
@@ -368,54 +368,37 @@
String seiName = epMetaData.getServiceEndpointInterfaceName();
QName portName = epMetaData.getPortName();
- if (usRef == null || usRef.getPortComponentRefs().size() == 0)
+ if (usRef == null)
{
- if (log.isDebugEnabled())
- log.debug("No port configuration for: " + portName);
+ log.debug("No port configuration for: " + portName);
return;
}
String configFile = usRef.getConfigFile();
String configName = usRef.getConfigName();
- boolean match = false;
- for (UnifiedPortComponentRefMetaData pi : usRef.getPortComponentRefs())
+ UnifiedPortComponentRefMetaData pcref = usRef.getPortComponentRef(seiName, portName);
+ if (pcref != null)
{
- String piSEI = pi.getServiceEndpointInterface();
- QName piPort = pi.getPortQName();
- match = (piSEI == null && piPort == null);
- if (match == false)
+ if (pcref.getConfigFile() != null)
+ configFile = pcref.getConfigFile();
+ if (pcref.getConfigName() != null)
+ configName = pcref.getConfigName();
+
+ BindingProvider bp = (BindingProvider)stub;
+ Map<String, Object> reqCtx = bp.getRequestContext();
+ for (UnifiedStubPropertyMetaData prop : pcref.getStubProperties())
{
- if (piSEI != null && piPort != null)
- match = seiName.equals(piSEI) && portName.equals(piPort);
- else match = seiName.equals(piSEI) || portName.equals(piPort);
+ log.debug("Set stub property: " + prop);
+ reqCtx.put(prop.getPropName(), prop.getPropValue());
}
- if (match == true)
- {
- if (pi.getConfigFile() != null)
- configFile = pi.getConfigFile();
- if (pi.getConfigName() != null)
- configName = pi.getConfigName();
-
- BindingProvider bp = (BindingProvider)stub;
- Map<String, Object> reqCtx = bp.getRequestContext();
- for (UnifiedStubPropertyMetaData prop : pi.getStubProperties())
- {
- log.debug("Set stub property: " + prop);
- reqCtx.put(prop.getPropName(), prop.getPropValue());
- }
- break;
- }
}
- if (match == false)
- if (log.isDebugEnabled())
- log.debug("No matching port configuration for: [portName=" + portName + ",seiName=" + seiName + "]");
-
- if (log.isDebugEnabled())
- log.debug("Configure Stub: [configName=" + configName + ",configFile=" + configFile + "]");
if (configName != null || configFile != null)
+ {
+ log.debug("Configure Stub: [configName=" + configName + ",configFile=" + configFile + "]");
stub.setConfigName(configName, configFile);
+ }
}
@Override
Modified: trunk/jbossws-core/src/java/org/jboss/ws/extensions/xop/XOPContext.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/extensions/xop/XOPContext.java 2007-04-13 17:23:32 UTC (rev 2833)
+++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/xop/XOPContext.java 2007-04-13 17:33:29 UTC (rev 2834)
@@ -37,6 +37,7 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.MessageAbstraction;
import org.jboss.ws.core.StubExt;
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.soap.NameImpl;
@@ -109,8 +110,8 @@
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
if (msgContext != null)
{
- SOAPMessageImpl soapMessage = (SOAPMessageImpl)msgContext.getSOAPMessage();
- String[] contentType = soapMessage.getMimeHeaders().getHeader("content-type");
+ MessageAbstraction message = msgContext.getMessageAbstraction();
+ String[] contentType = message.getMimeHeaders().getHeader("content-type");
if (contentType != null)
{
for (String value : contentType)
@@ -136,7 +137,7 @@
*/
public static boolean isMTOMEnabled()
{
- CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
+ CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
Boolean mtomEnabled = (Boolean)msgContext.get(StubExt.PROPERTY_MTOM_ENABLED);
return Boolean.TRUE.equals(mtomEnabled);
}
@@ -278,7 +279,8 @@
{
SOAPElement parentElement = xopElement.getParentElement();
- if(log.isDebugEnabled()) log.debug("Replace base64 representation on element [xmlName=" + parentElement.getLocalName() + "]");
+ if (log.isDebugEnabled())
+ log.debug("Replace base64 representation on element [xmlName=" + parentElement.getLocalName() + "]");
String base64 = xopElement.getValue();
byte[] data = SimpleTypeBindings.unmarshalBase64(base64);
@@ -300,7 +302,8 @@
{
SOAPElement xopInclude = xopElement.addChildElement(Constants.NAME_XOP_INCLUDE);
xopInclude.setAttribute("href", cid);
- if(log.isDebugEnabled()) log.debug("Restored xop:Include element on [xmlName=" + xopElement.getLocalName() + "]");
+ if (log.isDebugEnabled())
+ log.debug("Restored xop:Include element on [xmlName=" + xopElement.getLocalName() + "]");
XOPContext.setXOPMessage(true);
}
@@ -314,7 +317,8 @@
private static void replaceXOPInclude(SOAPElement parent, SOAPElement xopIncludeElement)
{
- if(log.isDebugEnabled()) log.debug("Replace xop:Include on element [xmlName=" + parent.getLocalName() + "]");
+ if (log.isDebugEnabled())
+ log.debug("Replace xop:Include on element [xmlName=" + parent.getLocalName() + "]");
String cid = xopIncludeElement.getAttribute("href");
byte[] data;
@@ -343,7 +347,8 @@
parent.setValue(base64);
parent.setAttributeNS(NS_XOP_JBOSSWS, "content-type", contentType);
- if(log.isDebugEnabled()) log.debug("Created base64 representation for content-type " + contentType);
+ if (log.isDebugEnabled())
+ log.debug("Created base64 representation for content-type " + contentType);
// cleanup the attachment part
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
@@ -357,7 +362,8 @@
if (null == removedPart)
throw new WSException("Unable to remove attachment part " + cid);
- if(log.isDebugEnabled()) log.debug("Removed attachment part " + cid);
+ if (log.isDebugEnabled())
+ log.debug("Removed attachment part " + cid);
// leave soap object model in a valid state
setXOPMessage(false);
19 years
JBossWS SVN: r2833 - trunk/jbossws-tests/src/java/org/jboss/test/ws/common/utils.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-04-13 13:23:32 -0400 (Fri, 13 Apr 2007)
New Revision: 2833
Modified:
trunk/jbossws-tests/src/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java
Log:
REmove dependency on jdk-1.5
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2007-04-13 16:51:24 UTC (rev 2832)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2007-04-13 17:23:32 UTC (rev 2833)
@@ -227,7 +227,7 @@
Element root = DOMUtils.createElement(new QName("http://somens", "Hello"));
assertEquals("http://somens", root.getNamespaceURI());
Element child = (Element)root.appendChild(DOMUtils.createElement(new QName("Sub")));
- child.setTextContent("World");
+ child.appendChild(DOMUtils.createTextNode("World"));
String xmlOut = DOMWriter.printNode(root, false);
assertEquals(xmlIn, xmlOut);
19 years
JBossWS SVN: r2832 - trunk/jbossws-core/src/java/org/jboss/ws/core.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-04-13 12:51:24 -0400 (Fri, 13 Apr 2007)
New Revision: 2832
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/CommonMessageContext.java
Log:
Fix broken XOP/Handler tests
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/CommonMessageContext.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/CommonMessageContext.java 2007-04-13 15:49:58 UTC (rev 2831)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/CommonMessageContext.java 2007-04-13 16:51:24 UTC (rev 2832)
@@ -39,6 +39,7 @@
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
+import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.xb.binding.NamespaceRegistry;
/**
@@ -256,6 +257,12 @@
public boolean isModified()
{
+ // skip changes from XOP handler interactions
+ if(XOPContext.isXOPEncodedRequest() && !XOPContext.isXOPMessage())
+ {
+ log.debug("Disregard changes from XOP/Handler interactions");
+ return false;
+ }
return isModified;
}
19 years
JBossWS SVN: r2831 - branches.
by jbossws-commits＠lists.jboss.org
Author: palin
Date: 2007-04-13 11:49:58 -0400 (Fri, 13 Apr 2007)
New Revision: 2831
Added:
branches/JBWS-515/
Log:
Branching from trunk (rev. 2830) to branches/JBWS-515 for WS-RM implementation
Copied: branches/JBWS-515 (from rev 2830, trunk)
19 years
JBossWS SVN: r2830 - in trunk: jbossws-core/src/java/org/jboss/ws/core/utils and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-04-13 10:18:51 -0400 (Fri, 13 Apr 2007)
New Revision: 2830
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java
trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
trunk/jbossws-tests/src/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml
Log:
Add support for jaxrpc stub-properties
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-04-13 11:23:45 UTC (rev 2829)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-04-13 14:18:51 UTC (rev 2830)
@@ -50,6 +50,7 @@
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedInitParamMetaData;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+import org.jboss.ws.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaData;
@@ -404,7 +405,7 @@
private Remote createProxy(Class seiClass, EndpointMetaData epMetaData) throws Exception
{
CallImpl call = new CallImpl(this, epMetaData);
- initCallProperties(call, seiClass.getName());
+ initStubProperties(call, seiClass.getName());
PortProxy handler = new PortProxy(call);
ClassLoader cl = epMetaData.getClassLoader();
@@ -413,6 +414,22 @@
return proxy;
}
+ private void initStubProperties(CallImpl call, String seiName)
+ {
+ // nothing to do
+ if (usrMetaData == null)
+ return;
+
+ for (UnifiedPortComponentRefMetaData upcRef : usrMetaData.getPortComponentRefs())
+ {
+ if (seiName.equals(upcRef.getServiceEndpointInterface()))
+ {
+ for (UnifiedStubPropertyMetaData prop : upcRef.getStubProperties())
+ call.setProperty(prop.getPropName(), prop.getPropValue());
+ }
+ }
+ }
+
private void initCallProperties(CallImpl call, String seiName)
{
// nothing to do
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-04-13 11:23:45 UTC (rev 2829)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-04-13 14:18:51 UTC (rev 2830)
@@ -205,7 +205,7 @@
}
}
- narrowPortSelection(serviceRef, serviceMetaData);
+ //narrowPortSelection(serviceRef, serviceMetaData);
/********************************************************
* Setup the Proxy that implements the service-interface
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2007-04-13 11:23:45 UTC (rev 2829)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2007-04-13 14:18:51 UTC (rev 2830)
@@ -208,7 +208,7 @@
return resolveQName(el, qualifiedName);
}
- /** Transform the giveen qualified name into a QName
+ /** Transform the given qualified name into a QName
*/
public static QName resolveQName(Element el, String qualifiedName)
{
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java 2007-04-13 11:23:45 UTC (rev 2829)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java 2007-04-13 14:18:51 UTC (rev 2830)
@@ -23,14 +23,15 @@
// $Id$
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+
import org.jboss.logging.Logger;
import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.xb.QNameBuilder;
import org.w3c.dom.Element;
-import javax.xml.namespace.QName;
-import java.util.Iterator;
-
/**
* The metdata data from service-ref element in web.xml, ejb-jar.xml, and
* application-client.xml.
@@ -85,20 +86,20 @@
{
Element pcrefElement = (Element)iterator.next();
String seiName = getOptionalElementContent(pcrefElement, "service-endpoint-interface");
- String portNameString = getOptionalElementContent(pcrefElement, "port-qname");
- QName portName = portNameString!=null ? QName.valueOf(portNameString) : null; // TODO: unify QName parsing
+ QName portName = getOptionalElementContentAsQName(pcrefElement, "port-qname");
UnifiedPortComponentRefMetaData pcref = sref.getPortComponentRef(seiName, portName);
- if (pcref == null && seiName!=null)
+ if (pcref == null && seiName != null)
{
// Its ok to only have the <port-component-ref> in jboss.xml and not in ejb-jar.xml
// if it has at least a SEI declared
pcref = new UnifiedPortComponentRefMetaData(sref);
+ pcref.importStandardXml(pcrefElement);
sref.addPortComponentRef(pcref);
- }
+ }
- if(pcref!=null) pcref.importJBossXml(pcrefElement);
-
+ if (pcref != null)
+ pcref.importJBossXml(pcrefElement);
}
// Parse the call-property elements
@@ -120,9 +121,6 @@
public void importJBossXml(Element root, UnifiedPortComponentRefMetaData pcref)
{
- // update or set SEI. It may be null when no std. DD is used.
- pcref.setServiceEndpointInterface(getOptionalElementContent(root, "service-endpoint-interface"));
-
// Look for call-property elements
Iterator iterator = DOMUtils.getChildElements(root, "call-property");
while (iterator.hasNext())
@@ -147,22 +145,22 @@
}
// portQName
- Element portQName = DOMUtils.getFirstChildElement(root, "port-qname");
- if(portQName!=null)
- pcref.setPortQName(QName.valueOf(getTextContent(portQName)));
+ QName portQName = getOptionalElementContentAsQName(root, "port-qname");
+ if (portQName != null)
+ pcref.setPortQName(portQName);
// config
Element configName = DOMUtils.getFirstChildElement(root, "config-name");
- if(configName!=null)
+ if (configName != null)
pcref.setConfigName(getTextContent(configName));
Element configFile = DOMUtils.getFirstChildElement(root, "config-file");
- if(configFile!=null)
+ if (configFile != null)
pcref.setConfigFile(getTextContent(configFile));
// service-endpoint-interface
Element sei = DOMUtils.getFirstChildElement(root, "service-endpoint-interface");
- if(sei!=null)
+ if (sei != null)
pcref.setServiceEndpointInterface(getTextContent(sei));
}
@@ -189,7 +187,7 @@
{
Element headerElement = (Element)iterator.next();
String content = getTextContent(headerElement);
- QName qname = QNameBuilder.buildQName(headerElement, content);
+ QName qname = DOMUtils.resolveQName(headerElement, content);
href.addSoapHeader(qname);
}
@@ -226,6 +224,17 @@
return getTextContent(DOMUtils.getFirstChildElement(element, childName));
}
+ private QName getOptionalElementContentAsQName(Element element, String childName)
+ {
+ QName qname = null;
+ String value = getOptionalElementContent(element, childName);
+ if (value != null)
+ {
+ qname = (value.startsWith("{") ? QName.valueOf(value) : DOMUtils.resolveQName(element, value));
+ }
+ return qname;
+ }
+
private String getTextContent(Element element)
{
String content = null;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-04-13 11:23:45 UTC (rev 2829)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-04-13 14:18:51 UTC (rev 2830)
@@ -123,10 +123,9 @@
if (targetPCRef == null)
{
log.warn("Cannot find port component ref: [sei=" + seiName + ",port=" + portQName + "]");
- if(seiName!=null)
+ if (seiName != null)
addPortComponentRef(pcref);
- else
- log.warn("Ingore port component ref without SEI declaration: " + pcref);
+ else log.warn("Ingore port component ref without SEI declaration: " + pcref);
targetPCRef = pcref;
}
Modified: trunk/jbossws-tests/src/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml
===================================================================
--- trunk/jbossws-tests/src/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml 2007-04-13 11:23:45 UTC (rev 2829)
+++ trunk/jbossws-tests/src/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml 2007-04-13 14:18:51 UTC (rev 2830)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.2//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_2.dtd">
<jboss-client>
<jndi-name>jbossws-client</jndi-name>
@@ -10,14 +10,14 @@
<config-name>Standard WSSecurity Client</config-name>
<port-component-ref>
<service-endpoint-interface>org.jboss.test.ws.jaxrpc.wsse.JaxRpcTestService</service-endpoint-interface>
- <call-property>
+ <stub-property>
<prop-name>javax.xml.rpc.security.auth.username</prop-name>
<prop-value>kermit</prop-value>
- </call-property>
- <call-property>
+ </stub-property>
+ <stub-property>
<prop-name>javax.xml.rpc.security.auth.password</prop-name>
<prop-value>thefrog</prop-value>
- </call-property>
+ </stub-property>
</port-component-ref>
<wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-wsse-username?wsdl</wsdl-override>
</service-ref>
19 years
JBossWS SVN: r2829 - in trunk/jbossws-core/src/java/org/jboss/ws: metadata/j2ee/serviceref and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-04-13 07:23:45 -0400 (Fri, 13 Apr 2007)
New Revision: 2829
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
Log:
Suppress port-component-ref's without SEI declaration
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-04-13 06:25:37 UTC (rev 2828)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-04-13 11:23:45 UTC (rev 2829)
@@ -233,7 +233,7 @@
}
catch (Exception ex)
{
- log.error("Cannot create service", ex);
+ log.error("Cannot create service", ex);
throw ex;
}
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java 2007-04-13 06:25:37 UTC (rev 2828)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java 2007-04-13 11:23:45 UTC (rev 2829)
@@ -23,14 +23,14 @@
// $Id$
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
+import org.jboss.logging.Logger;
import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.xb.QNameBuilder;
import org.w3c.dom.Element;
+import javax.xml.namespace.QName;
+import java.util.Iterator;
+
/**
* The metdata data from service-ref element in web.xml, ejb-jar.xml, and
* application-client.xml.
@@ -39,6 +39,8 @@
*/
public class ServiceRefMetaDataParser
{
+ private static final Logger log = Logger.getLogger(ServiceRefMetaDataParser.class);
+
public void importStandardXml(Element root, UnifiedServiceRefMetaData sref)
{
sref.setServiceRefName(getElementContent(root, "service-ref-name"));
@@ -84,16 +86,16 @@
Element pcrefElement = (Element)iterator.next();
String seiName = getOptionalElementContent(pcrefElement, "service-endpoint-interface");
String portNameString = getOptionalElementContent(pcrefElement, "port-qname");
- QName portName = portNameString!=null ? QName.valueOf(portNameString) : null; // TODO: unifiy QName parsing
+ QName portName = portNameString!=null ? QName.valueOf(portNameString) : null; // TODO: unify QName parsing
UnifiedPortComponentRefMetaData pcref = sref.getPortComponentRef(seiName, portName);
- /*if (pcref == null)
+ if (pcref == null && seiName!=null)
{
// Its ok to only have the <port-component-ref> in jboss.xml and not in ejb-jar.xml
+ // if it has at least a SEI declared
pcref = new UnifiedPortComponentRefMetaData(sref);
- pcref.importStandardXml(pcrefElement);
sref.addPortComponentRef(pcref);
- } */
+ }
if(pcref!=null) pcref.importJBossXml(pcrefElement);
@@ -110,7 +112,6 @@
}
}
-
public void importStandardXml(Element root, UnifiedPortComponentRefMetaData pcref)
{
pcref.setServiceEndpointInterface(getOptionalElementContent(root, "service-endpoint-interface"));
@@ -119,6 +120,9 @@
public void importJBossXml(Element root, UnifiedPortComponentRefMetaData pcref)
{
+ // update or set SEI. It may be null when no std. DD is used.
+ pcref.setServiceEndpointInterface(getOptionalElementContent(root, "service-endpoint-interface"));
+
// Look for call-property elements
Iterator iterator = DOMUtils.getChildElements(root, "call-property");
while (iterator.hasNext())
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-04-13 06:25:37 UTC (rev 2828)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-04-13 11:23:45 UTC (rev 2829)
@@ -123,7 +123,11 @@
if (targetPCRef == null)
{
log.warn("Cannot find port component ref: [sei=" + seiName + ",port=" + portQName + "]");
- addPortComponentRef(pcref);
+ if(seiName!=null)
+ addPortComponentRef(pcref);
+ else
+ log.warn("Ingore port component ref without SEI declaration: " + pcref);
+
targetPCRef = pcref;
}
19 years
JBossWS SVN: r2828 - trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-04-13 02:25:37 -0400 (Fri, 13 Apr 2007)
New Revision: 2828
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
Log:
Prevent double wrap of WebServiceException
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-04-12 18:17:38 UTC (rev 2827)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-04-13 06:25:37 UTC (rev 2828)
@@ -288,32 +288,33 @@
*/
private void handleRemoteException(OperationMetaData opMetaData, Exception ex)
{
- WebServiceException wsEx;
String bindingId = opMetaData.getEndpointMetaData().getBindingId();
if (bindingId.startsWith(SOAPBinding.SOAP11HTTP_BINDING) || bindingId.startsWith(SOAPBinding.SOAP12HTTP_BINDING))
{
if (ex instanceof SOAPFaultException)
{
- wsEx = (SOAPFaultException)ex;
+ throw (SOAPFaultException)ex;
}
+ else if (ex instanceof WebServiceException)
+ {
+ throw (WebServiceException)ex;
+ }
else
{
- wsEx = new WebServiceException(ex);
+ throw new WebServiceException(ex);
}
}
else if (HTTPBinding.HTTP_BINDING.equals(bindingId))
{
// FIXME: provide actual status code
- wsEx = new HTTPException(-1);
+ WebServiceException wsEx = new HTTPException(-1);
wsEx.initCause(ex);
+ throw wsEx;
}
else
{
throw new WebServiceException("Unsuported binding: " + bindingId, ex);
}
-
- // Throw the web service exception
- throw wsEx;
}
@Override
19 years