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(); + } }