JBossWS SVN: r2827 - 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-12 14:17:38 -0400 (Thu, 12 Apr 2007)
New Revision: 2827
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
Log:
Fix WebServiceException handling
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 14:32:15 UTC (rev 2826)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-04-12 18:17:38 UTC (rev 2827)
@@ -288,27 +288,32 @@
*/
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)
{
- throw (SOAPFaultException)ex;
+ wsEx = (SOAPFaultException)ex;
}
else
{
- throw new SOAPFaultException(ex);
+ wsEx = new WebServiceException(ex);
}
}
else if (HTTPBinding.HTTP_BINDING.equals(bindingId))
{
// FIXME: provide actual status code
- throw new HTTPException(-1);
+ wsEx = new HTTPException(-1);
+ wsEx.initCause(ex);
}
else
{
throw new WebServiceException("Unsuported binding: " + bindingId, ex);
}
+
+ // Throw the web service exception
+ throw wsEx;
}
@Override
17 years, 1 month
JBossWS SVN: r2826 - in trunk: jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-04-12 10:32:15 -0400 (Thu, 12 Apr 2007)
New Revision: 2826
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/umdm/EndpointMetaData.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
trunk/jbossws-tests/build.xml
Log:
Container managed port selection based on port-component-ref
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-12 09:11:42 UTC (rev 2825)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-04-12 14:32:15 UTC (rev 2826)
@@ -24,32 +24,6 @@
// $Id$
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.ObjectInputStream;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.rmi.Remote;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Properties;
-
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.RefAddr;
-import javax.naming.Reference;
-import javax.naming.spi.ObjectFactory;
-import javax.wsdl.Definition;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.JAXRPCException;
-import javax.xml.rpc.Service;
-
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
@@ -66,6 +40,20 @@
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
import org.jboss.ws.tools.wsdl.WSDL11DefinitionFactory;
+import javax.naming.*;
+import javax.naming.spi.ObjectFactory;
+import javax.wsdl.Definition;
+import javax.xml.namespace.QName;
+import javax.xml.rpc.JAXRPCException;
+import javax.xml.rpc.Service;
+import java.io.*;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.rmi.Remote;
+import java.util.*;
+
/**
* This ServiceObjectFactory reconstructs a javax.xml.rpc.Service
* for a given WSDL when the webservice client does a JNDI lookup
@@ -217,6 +205,8 @@
}
}
+ narrowPortSelection(serviceRef, serviceMetaData);
+
/********************************************************
* Setup the Proxy that implements the service-interface
********************************************************/
@@ -249,6 +239,78 @@
}
/**
+ * Narrow port selection tries to nail down available endpoints
+ * by <port-component-ref> declarations. A selection base upon
+ * Service.getPort(SEI) later on needs to be distinct to an endpoint, or in this case EndpointMetaData.
+ *
+ * @param serviceRef
+ * @param serviceMetaData
+ */
+ private void narrowPortSelection(UnifiedServiceRefMetaData serviceRef, ServiceMetaData serviceMetaData)
+ {
+ Map<String, List<UnifiedPortComponentRefMetaData>> seiGroups = new HashMap<String, List<UnifiedPortComponentRefMetaData>>();
+ for(UnifiedPortComponentRefMetaData pcref : serviceRef.getPortComponentRefs())
+ {
+ String sei = pcref.getServiceEndpointInterface();
+ if(null==seiGroups.get(sei))
+ seiGroups.put(sei, new ArrayList<UnifiedPortComponentRefMetaData>());
+ List<UnifiedPortComponentRefMetaData> group = seiGroups.get(sei);
+ group.add(pcref);
+
+ // Constraint#1: within a service-ref it's not allowed to use a SEI across different pcref's
+ if(group.size()>1)
+ throw new WSException("Within a <service-ref> it's not allowed to use a SEI across different <port-component-ref>'s: "+group);
+ }
+
+ // Constraint#2: A pcref may only match one EndpointMetaData
+ for( String sei : seiGroups.keySet())
+ {
+ // Narrow available endpoints by port-component-ref declaration
+ List<QName> narrowedEndpoints = new ArrayList<QName>();
+
+ List<UnifiedPortComponentRefMetaData> group = seiGroups.get(sei);
+ UnifiedPortComponentRefMetaData pcref = group.get(0); // distinct, see above Constraint#1
+
+ // Constraint#3: Port selection only applies when both SEI and QName are given
+ if(pcref.getServiceEndpointInterface()!=null && pcref.getPortQName()!=null)
+ {
+ List<QName> pcRef2EndpointMapping = new ArrayList<QName>();
+ for(EndpointMetaData epMeta : serviceMetaData.getEndpoints())
+ {
+ if(pcref.getServiceEndpointInterface().equals(epMeta.getServiceEndpointInterfaceName()))
+ {
+ pcRef2EndpointMapping.add(epMeta.getPortName());
+ }
+
+ }
+
+ for(QName q : pcRef2EndpointMapping)
+ {
+ EndpointMetaData mappedEndpoint = serviceMetaData.getEndpoint(q);
+ if(! pcref.getPortQName().equals( mappedEndpoint.getPortName()) )
+ narrowedEndpoints.add(q);
+ }
+
+ // Constraint: Dont exclude all of them ;)
+ if(pcRef2EndpointMapping.size()>0 && (pcRef2EndpointMapping.size() == narrowedEndpoints.size()))
+ throw new WSException("Failed to narrow available endpoints by <port-component-ref> declaration");
+
+ for(QName q : narrowedEndpoints)
+ {
+ EndpointMetaData removed = serviceMetaData.removeEndpoint(q);
+ log.debug("Narrowed endpoint " + q + "("+removed+")");
+ }
+ }
+ else
+ {
+ // TODO: In case there is more then one EMPD this should cause an exception
+ log.warn("Unable to narrow port selection for "+ pcref);
+ }
+
+ }
+ }
+
+ /**
* Setup the handler chain(s) for this service
*/
private void setupHandlerChain(ServiceImpl jaxrpcService) throws Exception
@@ -300,4 +362,5 @@
}
return wsdlDefinition;
}
+
}
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-12 09:11:42 UTC (rev 2825)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java 2007-04-12 14:32:15 UTC (rev 2826)
@@ -128,6 +128,39 @@
String value = getElementContent(propElement, "prop-value");
pcref.addCallProperty(new UnifiedCallPropertyMetaData(name, value));
}
+
+ // Look for stub-property elements
+ iterator = DOMUtils.getChildElements(root, "stub-property");
+ while (iterator.hasNext())
+ {
+ Element propElement = (Element)iterator.next();
+ String name = getElementContent(propElement, "prop-name");
+ String value = getElementContent(propElement, "prop-value");
+ UnifiedStubPropertyMetaData propMetaData = new UnifiedStubPropertyMetaData();
+ propMetaData.setPropName(name);
+ propMetaData.setPropValue(value);
+ pcref.addStubProperty(propMetaData);
+ }
+
+ // portQName
+ Element portQName = DOMUtils.getFirstChildElement(root, "port-qname");
+ if(portQName!=null)
+ pcref.setPortQName(QName.valueOf(getTextContent(portQName)));
+
+ // config
+ Element configName = DOMUtils.getFirstChildElement(root, "config-name");
+ if(configName!=null)
+ pcref.setConfigName(getTextContent(configName));
+
+ Element configFile = DOMUtils.getFirstChildElement(root, "config-file");
+ if(configFile!=null)
+ pcref.setConfigFile(getTextContent(configFile));
+
+ // service-endpoint-interface
+ Element sei = DOMUtils.getFirstChildElement(root, "service-endpoint-interface");
+ if(sei!=null)
+ pcref.setServiceEndpointInterface(getTextContent(sei));
+
}
public void importStandardXml(Element root, UnifiedHandlerMetaData href)
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-04-12 09:11:42 UTC (rev 2825)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-04-12 14:32:15 UTC (rev 2826)
@@ -734,7 +734,7 @@
boolean match;
if (seiName != null && portName != null)
- match = getServiceEndpointInterfaceName().equals(seiName) && portName.equals(portName);
+ match = getServiceEndpointInterfaceName().equals(seiName) && getPortName().equals(portName);
else match = getServiceEndpointInterfaceName().equals(seiName) || getPortName().equals(portName);
return match;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-04-12 09:11:42 UTC (rev 2825)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-04-12 14:32:15 UTC (rev 2826)
@@ -206,6 +206,11 @@
return endpoints.get(portName);
}
+ public EndpointMetaData removeEndpoint(QName portName)
+ {
+ return endpoints.remove(portName);
+ }
+
public EndpointMetaData getEndpointByServiceEndpointInterface(String seiName)
{
EndpointMetaData epMetaData = null;
Modified: trunk/jbossws-tests/build.xml
===================================================================
--- trunk/jbossws-tests/build.xml 2007-04-12 09:11:42 UTC (rev 2825)
+++ trunk/jbossws-tests/build.xml 2007-04-12 14:32:15 UTC (rev 2826)
@@ -464,7 +464,7 @@
<antcall target="tests-main">
<param name="include.wildcard" value="org/jboss/test/ws/*/samples/**/*TestCase.class"/>
<param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/>
- <param name="haltonfailure" value="true"/>
+ <param name="haltonfailure" value="false"/>
</antcall>
<antcall target="tests-report"/>
</target>
@@ -474,7 +474,7 @@
<antcall target="tests-main">
<param name="include.wildcard" value="org/jboss/test/ws/tools/**/*TestCase.class"/>
<param name="exclude.wildcard" value="no-wildcard-exclude-see-excludesfile"/>
- <param name="haltonfailure" value="true"/>
+ <param name="haltonfailure" value="false"/>
</antcall>
<antcall target="tests-report"/>
</target>
17 years, 1 month
JBossWS SVN: r2825 - in trunk/jbossws-core/src/java/org/jboss/ws: metadata/j2ee/serviceref and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-04-12 05:11:42 -0400 (Thu, 12 Apr 2007)
New Revision: 2825
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefObjectFactory.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
Log:
<port-component-ref> handling. Fix QName handling
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefObjectFactory.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefObjectFactory.java 2007-04-12 08:41:55 UTC (rev 2824)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefObjectFactory.java 2007-04-12 09:11:42 UTC (rev 2825)
@@ -103,9 +103,7 @@
}
else if (localName.equals("service-qname"))
{
- if (value.indexOf("{") != -1)
- ref.setServiceQName(QName.valueOf(value));
- else ref.setServiceQName(navigator.resolveQName(value));
+ ref.setServiceQName(getQNameValue(navigator, value));
}
/* JBoss properties */
@@ -137,6 +135,7 @@
if (localName.equals("port-component-ref"))
{
child = new UnifiedPortComponentRefMetaData(ref);
+ ref.addPortComponentRef((UnifiedPortComponentRefMetaData)child);
}
else if (localName.equals("handler"))
{
@@ -169,11 +168,9 @@
private void setValue(UnifiedPortComponentRefMetaData pcref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
- UnifiedServiceRefMetaData srefMetaData = pcref.getServiceRefMetaData();
if (localName.equals("service-endpoint-interface"))
{
pcref.setServiceEndpointInterface(value);
- srefMetaData.addPortComponentRef(pcref);
}
else if (localName.equals("enable-mtom"))
{
@@ -185,16 +182,7 @@
}
else if (localName.equals("port-qname"))
{
- QName portQName = QName.valueOf(value);
- pcref.setPortQName(portQName);
-
- String seiName = pcref.getServiceEndpointInterface();
- UnifiedPortComponentRefMetaData portComponentRef = srefMetaData.getPortComponentRef(seiName, portQName);
-
- if (portComponentRef == null)
- srefMetaData.addPortComponentRef(pcref);
- else
- portComponentRef.setPortQName(portQName);
+ pcref.setPortQName(getQNameValue(navigator, value));
}
else if (localName.equals("config-name"))
{
@@ -226,11 +214,11 @@
{
if (localName.equals("service-name-pattern"))
{
- ref.setServiceNamePattern(QName.valueOf(value));
+ ref.setServiceNamePattern(getQNameValue(navigator, value));
}
else if (localName.equals("port-name-pattern"))
{
- ref.setPortNamePattern(QName.valueOf(value));
+ ref.setPortNamePattern(getQNameValue(navigator, value));
}
else if (localName.equals("protocol-binding"))
{
@@ -250,7 +238,7 @@
}
else if (localName.equals("soap-header"))
{
- ref.addSoapHeader(navigator.resolveQName(value));
+ ref.addSoapHeader(getQNameValue(navigator, value));
}
else if (localName.equals("soap-role"))
{
@@ -308,4 +296,10 @@
ref.setPropValue(value);
}
}
+
+ private QName getQNameValue(UnmarshallingContext navigator, String value)
+ {
+ QName qname = (value.startsWith("{") ? QName.valueOf(value) : navigator.resolveQName(value));
+ return qname;
+ }
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2007-04-12 08:41:55 UTC (rev 2824)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2007-04-12 09:11:42 UTC (rev 2825)
@@ -23,13 +23,14 @@
// $Id$
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
import org.jboss.ws.integration.ServiceRefElement;
import org.w3c.dom.Element;
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.List;
-
/** The metdata data from service-ref/port-component-ref element in web.xml, ejb-jar.xml, and application-client.xml.
*
* @author Thomas.Diesler(a)jboss.org
@@ -67,7 +68,7 @@
configName = pcref.configName;
configFile = pcref.configFile;
callProperties = pcref.callProperties;
- stubProperties = pcref.stubProperties;
+ stubProperties = pcref.stubProperties;
}
public UnifiedServiceRefMetaData getServiceRefMetaData()
@@ -140,7 +141,7 @@
{
callProperties.add(callProp);
}
-
+
public List<UnifiedStubPropertyMetaData> getStubProperties()
{
return stubProperties;
@@ -155,7 +156,7 @@
{
stubProperties.add(stubProp);
}
-
+
public String getConfigFile()
{
return configFile;
@@ -188,23 +189,22 @@
public boolean matches(String seiName, QName portName)
{
- if(seiName==null && portName == null)
- throw new IllegalArgumentException("Cannot match " + this + " against seiName=null && portName=null."+
- "Looks like a broken service-ref setup");
+ if (seiName == null && portName == null)
+ throw new IllegalArgumentException("Cannot match against seiName=null && portName=null.");
boolean match = false;
// match against portName first
- if(portName!=null)
+ if (portName != null)
match = portName.equals(getPortQName());
// if it fails try seiName
- if (!match)
+ if (match == false)
match = seiName.equals(getServiceEndpointInterface());
return match;
}
-
+
public String toString()
{
StringBuilder str = new StringBuilder();
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-12 08:41:55 UTC (rev 2824)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-04-12 09:11:42 UTC (rev 2825)
@@ -117,17 +117,12 @@
for (UnifiedPortComponentRefMetaData pcref : sourceRef.getPortComponentRefs())
{
String seiName = pcref.getServiceEndpointInterface();
- if (seiName == null)
- {
- log.warn("*** Ignore <port-component-ref> with null <service-endpoint-interface>");
- //continue;
- }
+ QName portQName = pcref.getPortQName();
+ UnifiedPortComponentRefMetaData targetPCRef = getPortComponentRef(seiName, portQName);
- UnifiedPortComponentRefMetaData targetPCRef = getPortComponentRef(seiName, pcref.getPortQName());
-
if (targetPCRef == null)
{
- log.warn("Cannot find port component ref with SEI name: " + seiName);
+ log.warn("Cannot find port component ref: [sei=" + seiName + ",port=" + portQName + "]");
addPortComponentRef(pcref);
targetPCRef = pcref;
}
@@ -191,13 +186,14 @@
public UnifiedPortComponentRefMetaData getPortComponentRef(String seiName, QName portName)
{
UnifiedPortComponentRefMetaData matchingRef = null;
-
for (UnifiedPortComponentRefMetaData ref : portComponentRefs)
{
if (ref.matches(seiName, portName))
{
+ if (matchingRef != null)
+ log.warn("Multiple matching port component ref: [sei=" + seiName + ",port=" + portName + "]");
+
matchingRef = ref;
- break;
}
}
return matchingRef;
17 years, 1 month
JBossWS SVN: r2824 - trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-04-12 04:41:55 -0400 (Thu, 12 Apr 2007)
New Revision: 2824
Modified:
trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java
Log:
Remove support for multiple <port-component>
Modified: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java
===================================================================
--- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java 2007-04-12 08:04:20 UTC (rev 2823)
+++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java 2007-04-12 08:41:55 UTC (rev 2824)
@@ -92,13 +92,9 @@
ubmd.setEjbName(container.getEjbName());
ubmd.setEjbClass(container.getBeanClassName());
- EnterpriseBean dd = container.getXml();
-
- // TODO: How do we deal with this?
- if (dd.getPortComponents().size() > 1)
- throw new IllegalArgumentException("TODO: Cannot handle more than one port-component per bean");
-
- for (Ejb3PortComponent portComp : dd.getPortComponents())
+ EnterpriseBean bean = container.getXml();
+ Ejb3PortComponent portComp = (bean != null ? bean.getPortComponent() : null);
+ if (portComp != null)
{
UnifiedEjbPortComponentMetaData ejbPortComp = new UnifiedEjbPortComponentMetaData();
ejbPortComp.setPortComponentName(portComp.getPortComponentName());
17 years, 1 month
JBossWS SVN: r2823 - trunk/build.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-04-12 04:04:20 -0400 (Thu, 12 Apr 2007)
New Revision: 2823
Modified:
trunk/build/ant.properties.example
Log:
Remove Jason from the hudson mail recipients
Modified: trunk/build/ant.properties.example
===================================================================
--- trunk/build/ant.properties.example 2007-04-12 07:56:32 UTC (rev 2822)
+++ trunk/build/ant.properties.example 2007-04-12 08:04:20 UTC (rev 2823)
@@ -48,7 +48,7 @@
hudson.jboss40.build=jboss-4.0.5.SP1
hudson.jboss40.rev=HEAD
-hudson.mail.recipients=thomas.diesler(a)jboss.com, heiko.braun(a)jboss.com, jason.greene(a)jboss.com, alejandro.guizar(a)jboss.com
+hudson.mail.recipients=thomas.diesler(a)jboss.com, heiko.braun(a)jboss.com, alejandro.guizar(a)jboss.com
hudson.smtp.host=mail.navisite.com
# JBoss Repository
17 years, 1 month
JBossWS SVN: r2822 - trunk/build.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-04-12 03:56:32 -0400 (Thu, 12 Apr 2007)
New Revision: 2822
Modified:
trunk/build/ant.properties.example
Log:
Update repository references
Modified: trunk/build/ant.properties.example
===================================================================
--- trunk/build/ant.properties.example 2007-04-12 06:40:17 UTC (rev 2821)
+++ trunk/build/ant.properties.example 2007-04-12 07:56:32 UTC (rev 2822)
@@ -52,12 +52,12 @@
hudson.smtp.host=mail.navisite.com
# JBoss Repository
-#jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository
-jboss.repository=http://repository.jboss.com
+#jboss.repository=file:/home/tdiesler/svn/repository.jboss.org
+jboss.repository=http://repository.jboss.org
# JBossWS Release
jbossws.portal.content=/home/tdiesler/svn/jbossws/portal-content
-jboss.local.repository=/home/tdiesler/cvs/jboss.local.repository
+jboss.local.repository=/home/tdiesler/svn/repository.jboss.org
# Force thirdparty HTTP get
#force.thirdparty.get=true
17 years, 1 month
JBossWS SVN: r2821 - in trunk/jbossws-core: src/java/org/jboss/ws/core/client and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-04-12 02:40:17 -0400 (Thu, 12 Apr 2007)
New Revision: 2821
Modified:
trunk/jbossws-core/.classpath
trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefObjectFactory.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
Log:
Add service-ref debugging
Modified: trunk/jbossws-core/.classpath
===================================================================
--- trunk/jbossws-core/.classpath 2007-04-12 05:49:58 UTC (rev 2820)
+++ trunk/jbossws-core/.classpath 2007-04-12 06:40:17 UTC (rev 2821)
@@ -13,7 +13,7 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar" sourcepath="/home/tdiesler/cvs/JBossRemoting/tags/remoting_2_2_0_Alpha7/src/main"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar" sourcepath="/build/thirdparty/jboss-xml-binding-sources.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefObjectFactory.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefObjectFactory.java 2007-04-12 05:49:58 UTC (rev 2820)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefObjectFactory.java 2007-04-12 06:40:17 UTC (rev 2821)
@@ -77,7 +77,7 @@
else if (ref instanceof UnifiedStubPropertyMetaData)
setValue((UnifiedStubPropertyMetaData)ref, navigator, namespaceURI, localName, value);
}
-
+
private void setValue(UnifiedServiceRefMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
/* Standard properties */
@@ -103,10 +103,9 @@
}
else if (localName.equals("service-qname"))
{
- if(value.indexOf("{") != -1)
+ if (value.indexOf("{") != -1)
ref.setServiceQName(QName.valueOf(value));
- else
- ref.setServiceQName(navigator.resolveQName(value));
+ else ref.setServiceQName(navigator.resolveQName(value));
}
/* JBoss properties */
@@ -137,7 +136,7 @@
Object child = null;
if (localName.equals("port-component-ref"))
{
- child = new UnifiedPortComponentRefMetaData(ref);
+ child = new UnifiedPortComponentRefMetaData(ref);
}
else if (localName.equals("handler"))
{
@@ -168,42 +167,42 @@
return child;
}
- private void setValue(UnifiedPortComponentRefMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+ private void setValue(UnifiedPortComponentRefMetaData pcref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
+ UnifiedServiceRefMetaData srefMetaData = pcref.getServiceRefMetaData();
if (localName.equals("service-endpoint-interface"))
{
- ref.setServiceEndpointInterface(value);
- ref.getServiceRefMetaData().addPortComponentRef(ref);
+ pcref.setServiceEndpointInterface(value);
+ srefMetaData.addPortComponentRef(pcref);
}
else if (localName.equals("enable-mtom"))
{
- ref.setEnableMTOM(Boolean.valueOf(value));
+ pcref.setEnableMTOM(Boolean.valueOf(value));
}
else if (localName.equals("port-component-link"))
{
- ref.setPortComponentLink(value);
+ pcref.setPortComponentLink(value);
}
else if (localName.equals("port-qname"))
{
QName portQName = QName.valueOf(value);
- ref.setPortQName(portQName);
+ pcref.setPortQName(portQName);
- UnifiedPortComponentRefMetaData portComponentRef = ref.getServiceRefMetaData().getPortComponentRef(
- ref.getServiceEndpointInterface(), portQName
- );
+ String seiName = pcref.getServiceEndpointInterface();
+ UnifiedPortComponentRefMetaData portComponentRef = srefMetaData.getPortComponentRef(seiName, portQName);
- if(portComponentRef == null)
- ref.getServiceRefMetaData().addPortComponentRef(ref);
- else
+ if (portComponentRef == null)
+ srefMetaData.addPortComponentRef(pcref);
+ else
portComponentRef.setPortQName(portQName);
}
else if (localName.equals("config-name"))
{
- ref.setConfigName(value);
+ pcref.setConfigName(value);
}
else if (localName.equals("config-file"))
{
- ref.setConfigFile(value);
+ pcref.setConfigFile(value);
}
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java 2007-04-12 05:49:58 UTC (rev 2820)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java 2007-04-12 06:40:17 UTC (rev 2821)
@@ -31,7 +31,6 @@
import javax.xml.namespace.QName;
import org.jboss.ws.integration.ServiceRefElement;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC;
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS;
import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
@@ -45,7 +44,7 @@
public class UnifiedHandlerMetaData extends ServiceRefElement
{
private UnifiedHandlerChainMetaData handlerChain;
-
+
// The required <handler-name> element
private String handlerName;
// The required <handler-class> element
@@ -128,7 +127,7 @@
portNames.add(value);
}
- public HandlerMetaDataJAXRPC getHandlerMetaDataJAXRPC (HandlerType type)
+ public HandlerMetaDataJAXRPC getHandlerMetaDataJAXRPC(HandlerType type)
{
HandlerMetaDataJAXRPC hmd = new HandlerMetaDataJAXRPC(type);
hmd.setHandlerName(getHandlerName());
@@ -140,7 +139,7 @@
return hmd;
}
- public HandlerMetaDataJAXWS getHandlerMetaDataJAXWS (HandlerType type)
+ public HandlerMetaDataJAXWS getHandlerMetaDataJAXWS(HandlerType type)
{
HandlerMetaDataJAXWS hmd = new HandlerMetaDataJAXWS(type);
hmd.setHandlerName(getHandlerName());
@@ -159,4 +158,17 @@
{
new ServiceRefMetaDataParser().importStandardXml(root, this);
}
+
+ public String toString()
+ {
+ StringBuilder str = new StringBuilder();
+ str.append("\nUnifiedHandlerMetaData");
+ str.append("\n handlerName=" + handlerName);
+ str.append("\n handlerClass=" + handlerClass);
+ str.append("\n soapHeaders=" + soapHeaders);
+ str.append("\n soapRoles=" + soapRoles);
+ str.append("\n portNames=" + portNames);
+ str.append("\n initParams=" + initParams);
+ return str.toString();
+ }
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java 2007-04-12 05:49:58 UTC (rev 2820)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java 2007-04-12 06:40:17 UTC (rev 2821)
@@ -1,24 +1,24 @@
/*
-* 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.metadata.j2ee.serviceref;
// $Id$
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2007-04-12 05:49:58 UTC (rev 2820)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2007-04-12 06:40:17 UTC (rev 2821)
@@ -204,4 +204,19 @@
return match;
}
+
+ public String toString()
+ {
+ StringBuilder str = new StringBuilder();
+ str.append("\nUnifiedPortComponentRef");
+ str.append("\n serviceEndpointInterface=" + serviceEndpointInterface);
+ str.append("\n portQName=" + portQName);
+ str.append("\n enableMTOM=" + enableMTOM);
+ str.append("\n portComponentLink=" + portComponentLink);
+ str.append("\n callProperties=" + callProperties);
+ str.append("\n stubProperties=" + stubProperties);
+ str.append("\n configName=" + configName);
+ str.append("\n configFile=" + configFile);
+ return str.toString();
+ }
}
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-12 05:49:58 UTC (rev 2820)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-04-12 06:40:17 UTC (rev 2821)
@@ -49,7 +49,7 @@
private static Logger log = Logger.getLogger(UnifiedServiceRefMetaData.class);
private UnifiedVirtualFile vfsRoot;
-
+
// Standard properties
// The required <service-ref-name> element
@@ -188,26 +188,13 @@
return portComponentRefs;
}
- @Deprecated
- public UnifiedPortComponentRefMetaData getPortComponentRef(String seiName)
- {
- if (seiName == null)
- throw new IllegalArgumentException("SEI name cannot be null");
- for (UnifiedPortComponentRefMetaData ref : portComponentRefs)
- {
- if (seiName.equals(ref.getServiceEndpointInterface()))
- return ref;
- }
- return null;
- }
-
public UnifiedPortComponentRefMetaData getPortComponentRef(String seiName, QName portName)
{
UnifiedPortComponentRefMetaData matchingRef = null;
for (UnifiedPortComponentRefMetaData ref : portComponentRefs)
{
- if(ref.matches(seiName, portName))
+ if (ref.matches(seiName, portName))
{
matchingRef = ref;
break;
@@ -302,7 +289,7 @@
}
}
}
-
+
if (wsdlLocation == null && wsdlFile != null)
{
try
@@ -314,7 +301,7 @@
throw new WSException("Cannot find wsdl-file: " + wsdlFile, e);
}
}
-
+
return wsdlLocation;
}
@@ -386,7 +373,7 @@
public Object getAnnotatedElement()
{
return anElement;
-
+
}
public boolean isProcessed()
@@ -398,7 +385,7 @@
{
this.processed = flag;
}
-
+
public void setAnnotatedElement(Object anElement)
{
this.anElement = anElement;
@@ -409,10 +396,36 @@
{
new ServiceRefMetaDataParser().importStandardXml(root, this);
}
-
+
@Override
public void importJBossXml(Element root)
{
new ServiceRefMetaDataParser().importJBossXml(root, this);
}
+
+ public String toString()
+ {
+ StringBuilder str = new StringBuilder();
+ str.append("\nUnifiedServiceRef");
+ str.append("\n serviceRefName=" + serviceRefName);
+ str.append("\n serviceInterface=" + serviceInterface);
+ str.append("\n serviceImplClass=" + serviceImplClass);
+ str.append("\n serviceRefType=" + serviceRefType);
+ str.append("\n serviceQName=" + serviceQName);
+ str.append("\n anElement=" + anElement);
+ str.append("\n wsdlFile=" + wsdlFile);
+ str.append("\n wsdlOverride=" + wsdlOverride);
+ str.append("\n mappingFile=" + mappingFile);
+ str.append("\n configName=" + configName);
+ str.append("\n configFile=" + configFile);
+ str.append("\n callProperties=" + callProperties);
+ str.append("\n processed=" + processed);
+ str.append("\n handlerChains=" + handlerChains);
+ str.append("\n handlerChain=" + handlerChain);
+ for (UnifiedHandlerMetaData uhmd : handlers)
+ str.append(uhmd.toString());
+ for (UnifiedPortComponentRefMetaData pcref : portComponentRefs)
+ str.append(pcref.toString());
+ return str.toString();
+ }
}
17 years, 1 month
JBossWS SVN: r2820 - trunk/jbossws-core/src/java/org/jboss/ws/core/client.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-04-12 01:49:58 -0400 (Thu, 12 Apr 2007)
New Revision: 2820
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java
Log:
Debug remoting metadata
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2007-04-12 05:43:06 UTC (rev 2819)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2007-04-12 05:49:58 UTC (rev 2820)
@@ -154,6 +154,9 @@
try
{
+ if (log.isDebugEnabled())
+ log.debug("Remoting metadata: " + metadata);
+
// debug the outgoing message
MessageTrace.traceMessage("Outgoing Request Message", reqMessage);
17 years, 1 month
JBossWS SVN: r2819 - trunk/jbossws-core/src/java/org/jboss/ws/core/soap.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-04-12 01:43:06 -0400 (Thu, 12 Apr 2007)
New Revision: 2819
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java
Log:
Fix handling of XML processing instruction
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java 2007-04-11 22:21:53 UTC (rev 2818)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java 2007-04-12 05:43:06 UTC (rev 2819)
@@ -199,6 +199,7 @@
throw new IllegalStateException("Cannot find end of XML processing instruction");
off++;
+ len -= off;
}
while (len > 0)
17 years, 1 month
JBossWS SVN: r2818 - branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-04-11 18:21:53 -0400 (Wed, 11 Apr 2007)
New Revision: 2818
Removed:
branches/dlofthouse/X/
Log:
No longer required.
17 years, 1 month