January 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r5475 - in framework/trunk: src/main/java/org/jboss/wsf/framework/serviceref and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-01-16 04:26:39 -0500 (Wed, 16 Jan 2008) New Revision: 5475 Modified: framework/trunk/framework.iml framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/ServiceRefObjectFactory.java Log: Fix JBWS1841: WebServiceRef injection from DD doesn't work. Added parsing of injection-target properties Modified: framework/trunk/framework.iml =================================================================== --- framework/trunk/framework.iml 2008-01-16 09:23:35 UTC (rev 5474) +++ framework/trunk/framework.iml 2008-01-16 09:26:39 UTC (rev 5475) @@ -21,15 +21,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jbossws-spi-src.zip!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/jboss-xml-binding.jar!/" /> </CLASSES> <JAVADOC /> @@ -39,15 +30,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jbossws-spi.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core.jar!/" /> </CLASSES> <JAVADOC /> @@ -171,6 +153,7 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module" module-name="spi" /> <orderEntryProperties /> </component> </module> Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/ServiceRefObjectFactory.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/ServiceRefObjectFactory.java 2008-01-16 09:23:35 UTC (rev 5474) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/ServiceRefObjectFactory.java 2008-01-16 09:26:39 UTC (rev 5475) @@ -37,6 +37,8 @@ import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; +import java.util.Set; + /** * A object model factory for <service-ref> * @@ -105,6 +107,14 @@ { ref.setServiceQName(getQNameValue(navigator, value)); } + else if (localName.equals("injection-target-class")) + { + ref.registerInjectionTarget(value); + } + else if (localName.equals("injection-target-name")) + { + ref.finalizeInjectionTarget(value); + } /* JBoss properties */ else if (localName.equals("service-impl-class")) @@ -151,7 +161,7 @@ { child = new UnifiedCallPropertyMetaData(); ref.addCallProperty((UnifiedCallPropertyMetaData)child); - } + } return child; }

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5474 - in spi/trunk/src/main/java/org/jboss/wsf/spi: serviceref and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-01-16 04:23:35 -0500 (Wed, 16 Jan 2008) New Revision: 5474 Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefMetaData.java Log: Fix JBWS1841: WebServiceRef injection from DD doesn't work. Added injection-target properties to ServiceRefMetaData Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2008-01-15 23:15:21 UTC (rev 5473) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2008-01-16 09:23:35 UTC (rev 5474) @@ -23,15 +23,6 @@ // $Id$ -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import javax.xml.namespace.QName; -import javax.xml.ws.WebServiceException; - import org.jboss.logging.Logger; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; @@ -39,6 +30,15 @@ import org.jboss.wsf.spi.serviceref.ServiceRefMetaData; import org.w3c.dom.Element; +import javax.xml.namespace.QName; +import javax.xml.ws.WebServiceException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; + /** * The metdata data from service-ref element in web.xml, ejb-jar.xml, and * application-client.xml. @@ -93,6 +93,9 @@ // A flag that should be set when this service-ref has been bound. private transient boolean processed; + // Maps 'injection-target-class' to 'injection-target-name' + private List<String[]> injectionTargets = new LinkedList<String[]>(); + public UnifiedServiceRefMetaData(UnifiedVirtualFile vfRoot) { this.vfsRoot = vfRoot; @@ -110,8 +113,8 @@ configFile = sourceRef.configFile; wsdlOverride = sourceRef.wsdlOverride; handlerChain = sourceRef.handlerChain; - callProperties = sourceRef.callProperties; - + callProperties = sourceRef.callProperties; + if (serviceQName == null && sourceRef.serviceQName != null) serviceQName = sourceRef.serviceQName; @@ -392,6 +395,22 @@ this.anElement = anElement; } + public void registerInjectionTarget(String classname) + { + this.injectionTargets.add( new String[]{classname, null} ); + } + + public void finalizeInjectionTarget(String propName) + { + int index = this.injectionTargets.isEmpty() ? 0 : this.injectionTargets.size() - 1; + this.injectionTargets.get(index)[1] = propName; + } + + public List<String[]> getInjectionTargets() + { + return this.injectionTargets; + } + @Override public void importStandardXml(Element root) { Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefMetaData.java 2008-01-15 23:15:21 UTC (rev 5473) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefMetaData.java 2008-01-16 09:23:35 UTC (rev 5474) @@ -23,10 +23,11 @@ // $Id$ +import org.w3c.dom.Element; + import java.io.Serializable; +import java.util.List; -import org.w3c.dom.Element; - /** * An abstract service-ref meta data object. * @@ -46,6 +47,8 @@ public abstract boolean isProcessed(); public abstract void setProcessed(boolean flag); + + public abstract List<String[]> getInjectionTargets(); @Deprecated public abstract void importStandardXml(Element element);

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5473 - stack/native/trunk/src/test/resources.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-01-15 18:15:21 -0500 (Tue, 15 Jan 2008) New Revision: 5473 Modified: stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt Log: Excluding ejb3 test from no.ejb3 conf tests Modified: stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt 2008-01-15 18:16:27 UTC (rev 5472) +++ stack/native/trunk/src/test/resources/test-excludes-jboss405.no.ejb3.txt 2008-01-15 23:15:21 UTC (rev 5473) @@ -27,6 +27,7 @@ org/jboss/test/ws/jaxws/jbws1822/** org/jboss/test/ws/jaxws/jbws1840/** org/jboss/test/ws/jaxws/jbws1845/** +org/jboss/test/ws/jaxws/jbws1850/** org/jboss/test/ws/jaxws/jbws1904/** org/jboss/test/ws/jaxws/namespace/** org/jboss/test/ws/jaxws/handlerlifecycle/**

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5472 - stack/native/trunk/ant-import.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-01-15 13:16:27 -0500 (Tue, 15 Jan 2008) New Revision: 5472 Modified: stack/native/trunk/ant-import/build-bin-dist.xml Log: Reverting build-bin-dist.xml erroneously committed Modified: stack/native/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/native/trunk/ant-import/build-bin-dist.xml 2008-01-15 18:14:04 UTC (rev 5471) +++ stack/native/trunk/ant-import/build-bin-dist.xml 2008-01-15 18:16:27 UTC (rev 5472) @@ -50,11 +50,6 @@ <include name="macros-deploy-framework.xml"/> <include name="macros-deploy-native.xml"/> </fileset> - <fileset dir="${core.distro.dir}"> - <include name="user-project-build.xml"/> - <include name="eclipse.project"/> - <include name="eclipse.classpath"/> - </fileset> </copy> <unzip dest="${bindist.bin.dir}" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5471 - in stack/native/trunk: ant-import-tests and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-01-15 13:14:04 -0500 (Tue, 15 Jan 2008) New Revision: 5471 Added: stack/native/trunk/src/main/java/org/jboss/ws/annotation/Documentation.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1850/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1850/JBWS1850TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1850/TestService.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1850/TestServiceImpl.java Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml stack/native/trunk/ant-import/build-bin-dist.xml stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java stack/native/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterface.java stack/native/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java Log: [JBWS-1850] Adding Documentation annotation Modified: stack/native/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/native/trunk/ant-import/build-bin-dist.xml 2008-01-15 03:40:29 UTC (rev 5470) +++ stack/native/trunk/ant-import/build-bin-dist.xml 2008-01-15 18:14:04 UTC (rev 5471) @@ -50,6 +50,11 @@ <include name="macros-deploy-framework.xml"/> <include name="macros-deploy-native.xml"/> </fileset> + <fileset dir="${core.distro.dir}"> + <include name="user-project-build.xml"/> + <include name="eclipse.project"/> + <include name="eclipse.classpath"/> + </fileset> </copy> <unzip dest="${bindist.bin.dir}" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/> Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-01-15 03:40:29 UTC (rev 5470) +++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-01-15 18:14:04 UTC (rev 5471) @@ -562,6 +562,13 @@ <exclude name="org/jboss/test/ws/jaxws/jbws1845/*TestCase.class"/> </fileset> </jar> + +  + <jar destfile="${tests.output.dir}/libs/jaxws-jbws1850.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1850/TestServiceImpl.class"/> + </fileset> + </jar>  <war destfile="${tests.output.dir}/libs/jaxws-jbws1854.war" webxml="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF/web.xml"> Added: stack/native/trunk/src/main/java/org/jboss/ws/annotation/Documentation.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/annotation/Documentation.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/annotation/Documentation.java 2008-01-15 18:14:04 UTC (rev 5471) @@ -0,0 +1,40 @@ +/* + * 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.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Annotation to be used to add wsdl:documentation elements to the generated wsdl. + * + * @author alessio.soldano(a)jboss.org + * @since 15-Jan-2008 + */ +(a)Target({ElementType.TYPE, ElementType.METHOD}) +(a)Retention(RetentionPolicy.RUNTIME) +public @interface Documentation +{ + public String content(); +} Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/annotation/Documentation.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2008-01-15 03:40:29 UTC (rev 5470) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2008-01-15 18:14:04 UTC (rev 5471) @@ -58,6 +58,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; +import org.jboss.ws.annotation.Documentation; import org.jboss.ws.core.jaxws.DynamicWrapperGenerator; import org.jboss.ws.core.jaxws.JAXBContextFactory; import org.jboss.ws.core.jaxws.WrapperGenerator; @@ -591,6 +592,11 @@ throw new IllegalArgumentException("@SOAPBinding must be specified using DOCUMENT style when placed on a method"); opMetaData.setParameterStyle(anBinding.parameterStyle()); } + + if (method.isAnnotationPresent(Documentation.class)) + { + opMetaData.setDocumentation(method.getAnnotation(Documentation.class).content()); + } epMetaData.addOperation(opMetaData); Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2008-01-15 03:40:29 UTC (rev 5470) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2008-01-15 18:14:04 UTC (rev 5471) @@ -37,6 +37,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; +import org.jboss.ws.annotation.Documentation; import org.jboss.ws.extensions.policy.annotation.PolicyAttachment; import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder; import org.jboss.ws.metadata.builder.MetaDataBuilder; @@ -136,6 +137,10 @@ // process config processEndpointConfig(dep, sepMetaData, sepClass, linkName); + // Process endpoint documentation + if (seiClass.isAnnotationPresent(Documentation.class)) + sepMetaData.setDocumentation(seiClass.getAnnotation(Documentation.class).content()); + // Process web methods processWebMethods(sepMetaData, seiClass); Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2008-01-15 03:40:29 UTC (rev 5470) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2008-01-15 18:14:04 UTC (rev 5471) @@ -150,6 +150,8 @@ private JAXBContextCache jaxbCache = new JAXBContextCache(); private List<BindingCustomization> bindingCustomization = new ArrayList<BindingCustomization>(); + + private String documentation; public EndpointMetaData(ServiceMetaData service, QName portName, QName portTypeName, Type type) { @@ -850,4 +852,14 @@ } return match; } + + public String getDocumentation() + { + return documentation; + } + + public void setDocumentation(String documentation) + { + this.documentation = documentation; + } } Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2008-01-15 03:40:29 UTC (rev 5470) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2008-01-15 18:14:04 UTC (rev 5471) @@ -66,6 +66,7 @@ private List<ParameterMetaData> parameters = new ArrayList<ParameterMetaData>(); private List<FaultMetaData> faults = new ArrayList<FaultMetaData>(); private ParameterMetaData returnParam; + private String documentation; public OperationMetaData(EndpointMetaData epMetaData, QName qname, String javaName) { @@ -512,4 +513,14 @@ } return buffer.toString(); } + + public String getDocumentation() + { + return documentation; + } + + public void setDocumentation(String documentation) + { + this.documentation = documentation; + } } Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterface.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterface.java 2008-01-15 03:40:29 UTC (rev 5470) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterface.java 2008-01-15 18:14:04 UTC (rev 5471) @@ -66,6 +66,8 @@ private Map<QName, WSDLInterfaceOperation> operations = new LinkedHashMap<QName, WSDLInterfaceOperation>(); /** Zero or more fault element information items */ private Map<QName, WSDLInterfaceFault> faults = new LinkedHashMap<QName, WSDLInterfaceFault>(); + + private WSDLDocumentation documentationElement; /** Construct a WSDL interface for a given WSDL definition */ public WSDLInterface(WSDLDefinitions wsdlDefinitions, QName name) @@ -158,4 +160,14 @@ { faults.put(fault.getName(), fault); } + + public WSDLDocumentation getDocumentationElement() + { + return documentationElement; + } + + public void setDocumentationElement(WSDLDocumentation documentationElement) + { + this.documentationElement = documentationElement; + } } Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java 2008-01-15 03:40:29 UTC (rev 5470) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java 2008-01-15 18:14:04 UTC (rev 5471) @@ -78,6 +78,8 @@ private ArrayList<WSDLInterfaceOperationOutfault> outfaults = new ArrayList<WSDLInterfaceOperationOutfault>(); /** Zero or more signature items */ private LinkedHashMap<String, WSDLRPCSignatureItem> rpcSignatureItems = new LinkedHashMap<String, WSDLRPCSignatureItem>(); + + private WSDLDocumentation documentationElement; public WSDLInterfaceOperation(WSDLInterface wsdlInterface, QName name) { @@ -277,4 +279,14 @@ } return c; } + + public WSDLDocumentation getDocumentationElement() + { + return documentationElement; + } + + public void setDocumentationElement(WSDLDocumentation documentationElement) + { + this.documentationElement = documentationElement; + } } Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2008-01-15 03:40:29 UTC (rev 5470) +++ stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2008-01-15 18:14:04 UTC (rev 5471) @@ -86,6 +86,7 @@ import org.jboss.ws.metadata.wsdl.WSDLBindingOperationInput; import org.jboss.ws.metadata.wsdl.WSDLBindingOperationOutput; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.metadata.wsdl.WSDLDocumentation; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.metadata.wsdl.WSDLExtensibilityElement; import org.jboss.ws.metadata.wsdl.WSDLInterface; @@ -652,6 +653,13 @@ { destInterface.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_EVENTSOURCE, eventSourceProp.getLocalPart())); } + + // documentation + Element documentationElement = srcPortType.getDocumentationElement(); + if (documentationElement != null && documentationElement.getTextContent() != null) + { + destInterface.setDocumentationElement(new WSDLDocumentation(documentationElement.getTextContent())); + } destWsdl.addInterface(destInterface); @@ -677,6 +685,13 @@ processPortTypeOperationOutput(srcWsdl, srcOperation, destOperation, srcPortType, destBinding); processPortTypeOperationFaults(srcOperation, destOperation, destInterface, destBinding); + + // documentation + Element documentationElement = srcOperation.getDocumentationElement(); + if (documentationElement != null && documentationElement.getTextContent() != null) + { + destOperation.setDocumentationElement(new WSDLDocumentation(documentationElement.getTextContent())); + } destInterface.addOperation(destOperation); } Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2008-01-15 03:40:29 UTC (rev 5470) +++ stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Writer.java 2008-01-15 18:14:04 UTC (rev 5471) @@ -40,6 +40,7 @@ import org.jboss.ws.metadata.wsdl.WSDLBindingOperationInput; import org.jboss.ws.metadata.wsdl.WSDLBindingOperationOutput; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.metadata.wsdl.WSDLDocumentation; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.metadata.wsdl.WSDLExtensibilityElement; import org.jboss.ws.metadata.wsdl.WSDLImport; @@ -386,6 +387,7 @@ buffer.append("'"); } buffer.append(">"); + appendDocumentation(buffer, intf.getDocumentationElement()); appendPortOperations(buffer, intf); buffer.append("</portType>"); } @@ -425,6 +427,7 @@ } buffer.append(">"); + appendDocumentation(buffer, operation.getDocumentationElement()); appendUnknownExtensibilityElements(buffer, operation); String opname = operation.getName().getLocalPart(); @@ -451,6 +454,16 @@ buffer.append("</operation>"); } } + + protected void appendDocumentation(StringBuilder buffer, WSDLDocumentation documentation) + { + if (documentation != null && documentation.getContent() != null) + { + buffer.append("<documentation>"); + buffer.append(documentation.getContent()); + buffer.append("</documentation>"); + } + } protected void appendBindings(StringBuilder buffer, String namespace) { Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2008-01-15 03:40:29 UTC (rev 5470) +++ stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2008-01-15 18:14:04 UTC (rev 5471) @@ -50,6 +50,7 @@ import org.jboss.ws.metadata.wsdl.WSDLBindingOperationInput; import org.jboss.ws.metadata.wsdl.WSDLBindingOperationOutput; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.metadata.wsdl.WSDLDocumentation; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.metadata.wsdl.WSDLExtensibilityElement; import org.jboss.ws.metadata.wsdl.WSDLImport; @@ -109,6 +110,11 @@ wsdl.addBinding(wsdlBinding); wsdlEndpoint.setBinding(bindingQName); + if (endpoint.getDocumentation() != null) + { + wsdlInterface.setDocumentationElement(new WSDLDocumentation(endpoint.getDocumentation())); + } + for (OperationMetaData operation : endpoint.getOperations()) { processOperation(wsdlInterface, wsdlBinding, operation); @@ -224,6 +230,12 @@ wsdlBinding.addFault(bindingFault); } + // process optional documentation + if (operation.getDocumentation() != null) + { + interfaceOperation.setDocumentationElement(new WSDLDocumentation(operation.getDocumentation())); + } + wsdlInterface.addOperation(interfaceOperation); wsdlBinding.addOperation(bindingOperation); } Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1850/JBWS1850TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1850/JBWS1850TestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1850/JBWS1850TestCase.java 2008-01-15 18:14:04 UTC (rev 5471) @@ -0,0 +1,95 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1850; + +import java.io.File; +import java.io.FileInputStream; +import java.net.URL; +import java.util.List; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.metadata.wsdl.WSDLEndpoint; +import org.jboss.ws.metadata.wsdl.WSDLInterface; +import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperation; +import org.jboss.ws.metadata.wsdl.WSDLService; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; +import org.w3c.dom.Element; + +/** + * Test wsdl documentation + * + * http://jira.jboss.org/jira/browse/JBWS-1850 + * + * @author alessio.soldano(a)jboss.com + * @since 15-Jan-2008 + */ +public class JBWS1850TestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1850"; + + private static TestService port; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1850TestCase.class, "jaxws-jbws1850.jar"); + } + + protected void setUp() throws Exception + { + if (port == null) + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + QName serviceName = new QName("http://org.jboss.ws/jbws1850", "TestEndpointService"); + port = Service.create(wsdlURL, serviceName).getPort(TestService.class); + } + } + + public void testWsdl() throws Exception + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + WSDLService wsdlService = wsdlDefinitions.getServices()[0]; + WSDLEndpoint wsdlEndpoint = wsdlService.getEndpoints()[0]; + WSDLInterface wsdlInterface = wsdlEndpoint.getInterface(); + assertNotNull(wsdlInterface.getDocumentationElement()); + assertEquals("This is a test service doing nothing special", wsdlInterface.getDocumentationElement().getContent()); + WSDLInterfaceOperation wsdlOperation = wsdlInterface.getOperations()[0]; + assertNotNull(wsdlOperation.getDocumentationElement()); + assertEquals("This is the useless test operation of the test service", wsdlOperation.getDocumentationElement().getContent()); + } + + public void testInvocation() + { + String retObj = port.test("Hello", "World"); + assertEquals("World", retObj); + + } +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1850/JBWS1850TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1850/TestService.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1850/TestService.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1850/TestService.java 2008-01-15 18:14:04 UTC (rev 5471) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1850; + +import javax.jws.WebMethod; +import javax.jws.WebService; + +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1850") +public interface TestService +{ + @WebMethod + public String test(String first, String second); +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1850/TestService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1850/TestServiceImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1850/TestServiceImpl.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1850/TestServiceImpl.java 2008-01-15 18:14:04 UTC (rev 5471) @@ -0,0 +1,43 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1850; + +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; + +import org.jboss.ws.annotation.Documentation; +import org.jboss.wsf.spi.annotation.WebContext; + +@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://org.jboss.ws/jbws1850") +@Stateless(name = "TestEndpoint") +@Documentation(content = "This is a test service doing nothing special") +@WebContext(contextRoot="/jaxws-jbws1850", urlPattern="/*") +public class TestServiceImpl +{ + @WebMethod + @Documentation(content = "This is the useless test operation of the test service") + public String test(String first, String second) + { + return second; + } +} Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1850/TestServiceImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5470 - stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto.

by jbossws-commits＠lists.jboss.org

Author: mageshbk(a)jboss.com Date: 2008-01-14 22:40:29 -0500 (Mon, 14 Jan 2008) New Revision: 5470 Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java Log: [JBWS-1937]-Fixed samples test case failure due to jboss.bind.address Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java 2008-01-14 13:10:49 UTC (rev 5469) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java 2008-01-15 03:40:29 UTC (rev 5470) @@ -77,12 +77,12 @@ } /** - * Get the JBoss server host from system property "jbosstest.server.host" + * Get the JBoss server host from system property "jboss.bind.address" * This defaults to "localhost" if the property is not set */ private String getServerHost() { - String hostName = System.getProperty("jbosstest.server.host", "localhost"); + String hostName = System.getProperty("jboss.bind.address", "localhost"); return hostName; }

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5469 - stack/native/trunk/src/main/etc.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-01-14 08:10:49 -0500 (Mon, 14 Jan 2008) New Revision: 5469 Modified: stack/native/trunk/src/main/etc/wsrunclient.bat stack/native/trunk/src/main/etc/wsrunclient.sh stack/native/trunk/src/main/etc/wstools.bat Log: [JBWS-1819] fixing batch and shell scripts issues Modified: stack/native/trunk/src/main/etc/wsrunclient.bat =================================================================== --- stack/native/trunk/src/main/etc/wsrunclient.bat 2008-01-11 23:19:46 UTC (rev 5468) +++ stack/native/trunk/src/main/etc/wsrunclient.bat 2008-01-14 13:10:49 UTC (rev 5469) @@ -38,19 +38,19 @@ set JBOSS_HOME=%DIRNAME%\.. rem Setup the java endorsed dirs -# Setup the java endorsed dirs +rem Setup the java endorsed dirs set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed -# Setup the client classpath +rem Setup the client classpath set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar -# JBossAS-5.0 subset of jbossall-client.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME/client/jboss-logging-spi.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME/client/jboss-common-core.jar +rem JBossAS-5.0 subset of jbossall-client.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-logging-spi.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-common-core.jar -# JBossAS-4.2 subset of jbossall-client.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME/client/jboss-common-client.jar +rem JBossAS-4.2 subset of jbossall-client.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-common-client.jar rem Execute the JVM "%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSRUNCLIENT_CLASSPATH%" %ARGS% Modified: stack/native/trunk/src/main/etc/wsrunclient.sh =================================================================== --- stack/native/trunk/src/main/etc/wsrunclient.sh 2008-01-11 23:19:46 UTC (rev 5468) +++ stack/native/trunk/src/main/etc/wsrunclient.sh 2008-01-14 13:10:49 UTC (rev 5469) @@ -33,7 +33,7 @@ while [ $# -ge 1 ]; do case $1 in "-classpath") WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$2"; shift;; - *) args="$args \"$1\"";; + *) args="$1";; esac shift done @@ -83,7 +83,7 @@ fi # Execute the JVM -eval "$JAVA" $JAVA_OPTS \ +"$JAVA" $JAVA_OPTS \ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ -Dlog4j.configuration=wstools-log4j.xml \ -classpath "$WSRUNCLIENT_CLASSPATH" \ Modified: stack/native/trunk/src/main/etc/wstools.bat =================================================================== --- stack/native/trunk/src/main/etc/wstools.bat 2008-01-11 23:19:46 UTC (rev 5468) +++ stack/native/trunk/src/main/etc/wstools.bat 2008-01-14 13:10:49 UTC (rev 5469) @@ -30,7 +30,7 @@ set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed rem Setup the wstools classpath -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;$JAVA_HOME/lib/tools.jar +set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JAVA_HOME%/lib/tools.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/activation.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar

16 years, 11 months

1
0
0 / 0

JBossWS SVN: r5468 - legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/resources/samples.

by jbossws-commits＠lists.jboss.org

Author: mageshbk(a)jboss.com Date: 2008-01-11 18:19:46 -0500 (Fri, 11 Jan 2008) New Revision: 5468 Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/resources/samples/build.xml Log: [JBWS-1900] JBWS-1937-Fixed samples test case failure Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/resources/samples/build.xml =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/resources/samples/build.xml 2008-01-11 13:05:49 UTC (rev 5467) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1900/jbossws-core/src/resources/samples/build.xml 2008-01-11 23:19:46 UTC (rev 5468) @@ -303,11 +303,19 @@ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsaddr/hello/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsaddr/replyto/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/> <move todir="${tests.output.dir}/wstools/java"> <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> </move> + <move todir="${tests.output.dir}/wstools/java"> + <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/hello/WEB-INF" includes="org/**"/> + </move> + <move todir="${tests.output.dir}/wstools/java"> + <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" includes="org/**"/> + </move>  <copy todir="${tests.output.dir}/resources">

16 years, 12 months

1
0
0 / 0

JBossWS SVN: r5467 - stack/native/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-01-11 08:05:49 -0500 (Fri, 11 Jan 2008) New Revision: 5467 Modified: stack/native/trunk/build.xml Log: Add documentation Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2008-01-11 10:56:48 UTC (rev 5466) +++ stack/native/trunk/build.xml 2008-01-11 13:05:49 UTC (rev 5467) @@ -11,6 +11,82 @@  + + <project default="main" basedir="." name="JBossWS-Native"> <property name="core.dir" value="${basedir}"/>

16 years, 12 months

1
0
0 / 0

JBossWS SVN: r5466 - stack/metro/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-01-11 05:56:48 -0500 (Fri, 11 Jan 2008) New Revision: 5466 Modified: stack/metro/trunk/.classpath Log: Fix eclipse classpath Modified: stack/metro/trunk/.classpath =================================================================== --- stack/metro/trunk/.classpath 2008-01-11 10:44:30 UTC (rev 5465) +++ stack/metro/trunk/.classpath 2008-01-11 10:56:48 UTC (rev 5466) @@ -20,7 +20,7 @@ <classpathentry kind="lib" path="thirdparty/stax-ex.jar"/> <classpathentry kind="lib" path="thirdparty/streambuffer.jar"/> <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/spi"/> - <classpathentry combineaccessrules="false" kind="src" path="/common"/> + <classpathentry kind="lib" path="thirdparty/jbossws-common.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath>

16 years, 12 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits January 2008