JBossWS SVN: r18723 - stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-06-06 09:26:58 -0400 (Fri, 06 Jun 2014)
New Revision: 18723
Removed:
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/aegis.xsd
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/aegisTypes.xsd
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/java2wsbeans.xml
Log:
[JBWS-3686] Remove files not needed
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/aegis.xsd
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/aegis.xsd 2014-06-06 10:12:08 UTC (rev 18722)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/aegis.xsd 2014-06-06 13:26:58 UTC (rev 18723)
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="unqualified" attributeFormDefault="unqualified"
->
-
- <xsd:element name="mappings">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="mapping" type="mappingType" minOccurs="0" maxOccurs="unbounded" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:complexType name="mappingType">
- <xsd:choice minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="property" type="propertyType" />
- <xsd:element name="method" type="methodType" />
- <xsd:element name="component" type="componentTypeType" />
- </xsd:choice>
- <xsd:attribute name="uri" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
-
- <xsd:complexType name="propertyType">
- <xsd:attributeGroup ref="mappedType" />
- </xsd:complexType>
-
- <xsd:complexType name="methodType">
- <xsd:choice minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="return-type" type="return-typeType" />
- <xsd:element name="parameter" type="parameterType" />
- </xsd:choice>
- <xsd:attribute name="name" type="xsd:string" />
- <xsd:attribute name="ignore" type="xsd:boolean" />
- </xsd:complexType>
-
- <xsd:complexType name="return-typeType">
- <xsd:attributeGroup ref="mappedType" />
- </xsd:complexType>
-
- <xsd:complexType name="parameterType">
- <xsd:attribute name="index" type="xsd:int" />
- <xsd:attribute name="class" type="xsd:string" />
- <xsd:attributeGroup ref="mappedType" />
- </xsd:complexType>
-
- <xsd:complexType name="componentTypeType">
- <xsd:attribute name="class" type="xsd:string" />
- <xsd:attributeGroup ref="mappedType" />
- </xsd:complexType>
-
- <xsd:attributeGroup name="mappedType">
- <xsd:attribute name="name" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="typeName" type="xsd:string" />
- <xsd:attribute name="mappedName" type="xsd:string" />
- <xsd:attribute name="nillable" type="xsd:boolean" />
- <xsd:attribute name="flat" type="xsd:boolean" />
- <xsd:attribute name="ignore" type="xsd:boolean" />
- <xsd:attribute name="componentType" type="xsd:string" />
- <xsd:attribute name="keyType" type="xsd:string" />
- <xsd:attribute name="valueType" type="xsd:string" />
- <xsd:attribute name="minOccurs" type="xsd:int" />
- <xsd:attribute name="maxOccurs" type="xsd:string" />
- <xsd:attribute name="style">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="attribute" />
- <xsd:enumeration value="element" />
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- </xsd:attributeGroup>
-</xsd:schema>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/aegisTypes.xsd
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/aegisTypes.xsd 2014-06-06 10:12:08 UTC (rev 18722)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/aegisTypes.xsd 2014-06-06 13:26:58 UTC (rev 18723)
@@ -1,30 +0,0 @@
-<?xml version="1.0" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:aegisTypes="http://cxf.apache.org/aegisTypes"
- targetNamespace="http://cxf.apache.org/aegisTypes">
-
- <xs:simpleType name="char">
- <xs:restriction base="xs:short" >
- <xs:minInclusive value="0"/>
- </xs:restriction>
- </xs:simpleType>
-
-</xs:schema>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/java2wsbeans.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/java2wsbeans.xml 2014-06-06 10:12:08 UTC (rev 18722)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/java2wsbeans.xml 2014-06-06 13:26:58 UTC (rev 18723)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="JaxbDatabindingBean" class="org.apache.cxf.jaxb.JAXBDataBinding" scope="prototype" />
- <bean id="XmlbeansDatabindingBean" class="org.apache.cxf.xmlbeans.XmlBeansDataBinding" scope="prototype" />
- <bean id="SdoDatabindingBean" class="org.apache.cxf.sdo.SDODataBinding" scope="prototype" />
- <bean id="JaxwsServiceBuilderBean" class="org.apache.cxf.jaxws.JaxwsServiceBuilder" scope="prototype" />
- <bean id="SimpleServiceBuilderBean" class="org.apache.cxf.simple.SimpleServiceBuilder" scope="prototype" />
- <bean id="AegisDatabindingBean" class="org.apache.cxf.aegis.databinding.AegisDatabinding" scope="prototype" />
-</beans>
-
10 years, 7 months
JBossWS SVN: r18722 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-06-06 06:12:08 -0400 (Fri, 06 Jun 2014)
New Revision: 18722
Modified:
stack/cxf/trunk/pom.xml
Log:
[JBWS-3799] Upgrade to jaxb 2.2.7
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2014-06-06 02:38:48 UTC (rev 18721)
+++ stack/cxf/trunk/pom.xml 2014-06-06 10:12:08 UTC (rev 18722)
@@ -84,7 +84,7 @@
<jaxws-undertow-httpspi.version>1.0.1.Beta1</jaxws-undertow-httpspi.version>
<io.undertow.version>1.0.10.Final</io.undertow.version>
<jaxb.api.version>1.0.4.Final</jaxb.api.version>
- <jaxb.impl.version>2.2.6</jaxb.impl.version>
+ <jaxb.impl.version>2.2.7</jaxb.impl.version>
<jaxws.api.version>2.0.2.Final</jaxws.api.version>
<jsr181.api.version>1.0-MR1</jsr181.api.version>
<commons-collections.version>3.2.1</commons-collections.version>
10 years, 7 months
JBossWS SVN: r18721 - common/trunk/src/main/java/org/jboss/ws/common/deployment.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-06-05 22:38:48 -0400 (Thu, 05 Jun 2014)
New Revision: 18721
Modified:
common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointMetricsDeploymentAspect.java
Log:
[JBWS-3733]:Allow enabling/disabling endpoint metrics
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointMetricsDeploymentAspect.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointMetricsDeploymentAspect.java 2014-06-06 02:37:56 UTC (rev 18720)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointMetricsDeploymentAspect.java 2014-06-06 02:38:48 UTC (rev 18721)
@@ -21,12 +21,16 @@
*/
package org.jboss.ws.common.deployment;
+import org.jboss.ws.common.configuration.ConfigHelper;
import org.jboss.ws.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.management.EndpointMetrics;
import org.jboss.wsf.spi.management.EndpointMetricsFactory;
+import org.jboss.wsf.spi.management.ServerConfig;
+import org.jboss.wsf.spi.management.ServerConfigFactory;
+import org.jboss.wsf.spi.metadata.config.EndpointConfig;
/**
* A deployer that assigns the metrics to the Endpoint
@@ -40,10 +44,17 @@
public void start(Deployment dep)
{
EndpointMetricsFactory factory = SPIProvider.getInstance().getSPI(EndpointMetricsFactory.class);
- for (Endpoint ep : dep.getService().getEndpoints())
+ ServerConfigFactory scf = SPIProvider.getInstance().getSPI(ServerConfigFactory.class);
+ EndpointConfig defaultConfig = scf.getServerConfig().getEndpointConfig(EndpointConfig.STANDARD_ENDPOINT_CONFIG);
+ boolean enabled = Boolean.valueOf(defaultConfig.getProperty(EndpointConfig.STATISTICS_ENABLED));
+ if (enabled)
{
- EndpointMetrics metrics = factory.newEndpointMetrics();
- ep.setEndpointMetrics(metrics);
+ for (Endpoint ep : dep.getService().getEndpoints())
+ {
+
+ EndpointMetrics metrics = factory.newEndpointMetrics();
+ ep.setEndpointMetrics(metrics);
+ }
}
}
}
10 years, 7 months
JBossWS SVN: r18720 - spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-06-05 22:37:56 -0400 (Thu, 05 Jun 2014)
New Revision: 18720
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/EndpointConfig.java
Log:
[JBWS-3733]:Allow enabling/disabling endpoint metrics
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/EndpointConfig.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/EndpointConfig.java 2014-06-05 08:11:26 UTC (rev 18719)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/EndpointConfig.java 2014-06-06 02:37:56 UTC (rev 18720)
@@ -35,6 +35,7 @@
public class EndpointConfig extends AbstractCommonConfig
{
public static final String STANDARD_ENDPOINT_CONFIG = "Standard-Endpoint-Config";
+ public static final String STATISTICS_ENABLED = "statistics-enabled";
public EndpointConfig(String configName, List<UnifiedHandlerChainMetaData> preHandlerChains,
List<UnifiedHandlerChainMetaData> postHandlerChains, Map<String, String> properties,
10 years, 7 months
JBossWS SVN: r18719 - hudson/trunk.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-06-05 04:11:26 -0400 (Thu, 05 Jun 2014)
New Revision: 18719
Modified:
hudson/trunk/ant.properties.example
Log:
Updating QA box address
Modified: hudson/trunk/ant.properties.example
===================================================================
--- hudson/trunk/ant.properties.example 2014-06-05 08:05:36 UTC (rev 18718)
+++ hudson/trunk/ant.properties.example 2014-06-05 08:11:26 UTC (rev 18719)
@@ -13,7 +13,7 @@
# Hudson QA Environment
hudson.root=/data/workspace
-hudson.host=jbossws.jboss.org
+hudson.host=jbossws-qa.jboss.org
hudson.admin.port=8150
hudson.http.port=8180
10 years, 7 months
JBossWS SVN: r18718 - in hudson/trunk/hudson-home/users: jim.ma and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-06-05 04:05:36 -0400 (Thu, 05 Jun 2014)
New Revision: 18718
Added:
hudson/trunk/hudson-home/users/jim.ma/
hudson/trunk/hudson-home/users/jim.ma/config.xml
Log:
Adding jim.ma user
Added: hudson/trunk/hudson-home/users/jim.ma/config.xml
===================================================================
--- hudson/trunk/hudson-home/users/jim.ma/config.xml (rev 0)
+++ hudson/trunk/hudson-home/users/jim.ma/config.xml 2014-06-05 08:05:36 UTC (rev 18718)
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<user>
+ <fullName>config.xml</fullName>
+ <description>Jim Ma</description>
+ <properties>
+ <hudson.tasks.Mailer_-UserProperty>
+ <emailAddress>ema(a)redhat.com</emailAddress>
+ </hudson.tasks.Mailer_-UserProperty>
+ </properties>
+</user>
Property changes on: hudson/trunk/hudson-home/users/jim.ma/config.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
10 years, 7 months
JBossWS SVN: r18717 - hudson/trunk.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-06-05 04:02:28 -0400 (Thu, 05 Jun 2014)
New Revision: 18717
Modified:
hudson/trunk/ant.properties.example
Log:
Use WildFly 8.1.0.Final instead of CR2
Modified: hudson/trunk/ant.properties.example
===================================================================
--- hudson/trunk/ant.properties.example 2014-06-05 08:01:18 UTC (rev 18716)
+++ hudson/trunk/ant.properties.example 2014-06-05 08:02:28 UTC (rev 18717)
@@ -24,8 +24,8 @@
hudson.jboss800.rev=8.0.0.Final
hudson.jboss810.url=https://github.com/wildfly/wildfly
-hudson.jboss810.build=wildfly-8.1.0.CR2
-hudson.jboss810.rev=8.1.0.CR2
+hudson.jboss810.build=wildfly-8.1.0.Final
+hudson.jboss810.rev=8.1.0.Final
hudson.jboss900.url=https://github.com/wildfly/wildfly
hudson.jboss900.build=wildfly-9.0.0.Alpha1-SNAPSHOT
10 years, 7 months
JBossWS SVN: r18716 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-06-05 04:01:18 -0400 (Thu, 05 Jun 2014)
New Revision: 18716
Modified:
stack/cxf/trunk/pom.xml
Log:
Use WildFly 8.1.0.Final instead of CR2
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2014-06-04 16:20:34 UTC (rev 18715)
+++ stack/cxf/trunk/pom.xml 2014-06-05 08:01:18 UTC (rev 18716)
@@ -68,7 +68,7 @@
<jbossws.wildfly800.version>5.0.0-SNAPSHOT</jbossws.wildfly800.version>
<jbossws.wildfly810.version>5.0.0-SNAPSHOT</jbossws.wildfly810.version>
<wildfly800.version>8.0.0.Final</wildfly800.version>
- <wildfly810.version>8.1.0.CR2</wildfly810.version>
+ <wildfly810.version>8.1.0.Final</wildfly810.version>
<wildfly900.version>9.0.0.Alpha1-SNAPSHOT</wildfly900.version>
<ejb.api.version>1.0.2.Final</ejb.api.version>
<cxf.version>3.0.0</cxf.version>
10 years, 7 months
JBossWS SVN: r18715 - in stack/cxf/trunk/modules: testsuite/shared-tests/src/test/ant-import and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-06-04 12:20:34 -0400 (Wed, 04 Jun 2014)
New Revision: 18715
Added:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/MultipleEndpointService.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml
Log:
[JBWS-3798] @WebEndpoint name not considered when building up webservicerefs
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java 2014-06-04 06:42:26 UTC (rev 18714)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java 2014-06-04 16:20:34 UTC (rev 18715)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -29,13 +29,16 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Collection;
+import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.RespectBindingFeature;
import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
import javax.xml.ws.WebServiceFeature;
import javax.xml.ws.soap.AddressingFeature;
@@ -54,6 +57,8 @@
*/
public abstract class AbstractServiceObjectFactoryJAXWS
{
+ private static enum PortMatch {YES, NO, MAYBE};
+
public final Object getObjectInstance(UnifiedServiceRefMetaData serviceRef)
{
try
@@ -179,11 +184,11 @@
final QName portQName, final WebServiceFeature[] features, final String endpointAddress) throws NoSuchMethodException,
InstantiationException, IllegalAccessException, InvocationTargetException
{
- Object retVal = null;
-
Object port = null;
+ Object candidatePort = null;
if (serviceClass != Service.class)
{
+ final Set<Method> signatureMatchingMethods = new HashSet<Method>();
for (Method method : getDeclaredMethods(serviceClass))
{
String methodName = method.getName();
@@ -191,28 +196,51 @@
if (methodName.startsWith("get") && targetClass.isAssignableFrom(retType))
{
final Method targetMethod = getMethodFor(methodName, features, serviceClass);
+ signatureMatchingMethods.add(targetMethod);
+ }
+ }
+ for (Method method : signatureMatchingMethods)
+ {
+ PortMatch matchResult = portNameMatches(portQName, method);
+ if (matchResult.equals(PortMatch.YES)) {
final Object[] args = getArgumentsFor(features);
- port = targetMethod.invoke(target, args);
- retVal = port;
+ port = method.invoke(target, args);
break;
+ } else if (matchResult.equals(PortMatch.MAYBE)) {
+ final Object[] args = getArgumentsFor(features);
+ candidatePort = method.invoke(target, args);
}
}
}
-
if (port == null)
{
+ port = candidatePort;
+ }
+ if (port == null)
+ {
Method method = getMethodFor("getPort", portQName, features, serviceClass);
Object[] args = getArgumentsFor(portQName, features, targetClass);
port = method.invoke(target, args);
- retVal = port;
}
if (endpointAddress != null)
{
- ((BindingProvider) retVal).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointAddress);
+ ((BindingProvider) port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointAddress);
}
- return retVal;
+ return port;
}
+ private static PortMatch portNameMatches(final QName portQName, final Method targetMethod) {
+ final String portName = portQName != null ? portQName.getLocalPart() : null;
+ if (portName == null) { //no port specified, so we *might* have a valid match...
+ return PortMatch.MAYBE;
+ }
+ WebEndpoint webEndpointAnnotation = targetMethod.getAnnotation(WebEndpoint.class);
+ if (webEndpointAnnotation == null || webEndpointAnnotation.name() == null || webEndpointAnnotation.name().isEmpty()) {
+ return PortMatch.MAYBE; // no way to match, no port specified using @WebEndpoint
+ }
+ return webEndpointAnnotation.name().equals(portName) ? PortMatch.YES : PortMatch.NO;
+ }
+
private static Method[] getDeclaredMethods(final Class<?> cls) {
return AccessController.doPrivileged(new PrivilegedAction<Method[]>() {
public Method[] run() {
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml 2014-06-04 06:42:26 UTC (rev 18714)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml 2014-06-04 16:20:34 UTC (rev 18715)
@@ -497,6 +497,7 @@
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webserviceref/EndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/MultipleEndpointService.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webserviceref/Endpoint.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/>
<include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/>
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/MultipleEndpointService.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/MultipleEndpointService.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/MultipleEndpointService.java 2014-06-04 16:20:34 UTC (rev 18715)
@@ -0,0 +1,114 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.samples.webserviceref;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.WebServiceFeature;
+
+@WebServiceClient(name = "EndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "META-INF/wsdl/MultipleEndpoint.wsdl")
+public class MultipleEndpointService extends Service
+{
+
+ private final static URL ENDPOINTSERVICE_WSDL_LOCATION;
+ private final static WebServiceException ENDPOINTSERVICE_EXCEPTION;
+ private final static QName ENDPOINTSERVICE_QNAME = new QName("http://org.jboss.ws/wsref", "EndpointService");
+
+ static
+ {
+ URL url = null;
+ WebServiceException e = null;
+ url = MultipleEndpointService.class.getResource("bogusAddress"); //invalid address on purpose, to test JBWS-3015 via service7 in EJB3Client
+ if (url == null)
+ {
+ e = new WebServiceException("Cannot find wsdl, please put in classpath");
+ }
+ ENDPOINTSERVICE_WSDL_LOCATION = url;
+ ENDPOINTSERVICE_EXCEPTION = e;
+ }
+
+ public MultipleEndpointService()
+ {
+ super(__getWsdlLocation(), ENDPOINTSERVICE_QNAME);
+ }
+
+ public MultipleEndpointService(URL wsdlLocation)
+ {
+ super(wsdlLocation, ENDPOINTSERVICE_QNAME);
+ }
+
+ public MultipleEndpointService(URL wsdlLocation, QName serviceName)
+ {
+ super(wsdlLocation, serviceName);
+ }
+
+ /**
+ *
+ * @return
+ * returns Endpoint
+ */
+ @WebEndpoint(name = "EndpointPort")
+ public Endpoint getEndpointPort()
+ {
+ return super.getPort(new QName("http://org.jboss.ws/wsref", "EndpointPort"), Endpoint.class);
+ }
+
+ @WebEndpoint(name = "EndpointPort2")
+ public Endpoint getEndpointPort2()
+ {
+ return super.getPort(new QName("http://org.jboss.ws/wsref", "EndpointPort2"), Endpoint.class);
+ }
+
+ /**
+ *
+ * @param features
+ * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
+ * @return
+ * returns Endpoint
+ */
+ @WebEndpoint(name = "EndpointPort")
+ public Endpoint getEndpointPort(WebServiceFeature... features)
+ {
+ return super.getPort(new QName("http://org.jboss.ws/wsref", "EndpointPort"), Endpoint.class, features);
+ }
+
+ @WebEndpoint(name = "EndpointPort2")
+ public Endpoint getEndpointPort2(WebServiceFeature... features)
+ {
+ return super.getPort(new QName("http://org.jboss.ws/wsref", "EndpointPort2"), Endpoint.class, features);
+ }
+
+ private static URL __getWsdlLocation()
+ {
+ if (ENDPOINTSERVICE_EXCEPTION != null)
+ {
+ throw ENDPOINTSERVICE_EXCEPTION;
+ }
+ return ENDPOINTSERVICE_WSDL_LOCATION;
+ }
+
+}
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/MultipleEndpointService.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.java 2014-06-04 06:42:26 UTC (rev 18714)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.java 2014-06-04 16:20:34 UTC (rev 18715)
@@ -32,6 +32,7 @@
import javax.xml.ws.WebServiceException;
import javax.xml.ws.WebServiceRef;
import javax.xml.ws.WebServiceRefs;
+import javax.xml.ws.soap.SOAPFaultException;
import org.jboss.logging.Logger;
@@ -85,6 +86,12 @@
// Test on field with value
@WebServiceRef(value = EndpointService.class)
public Endpoint port3;
+
+ @WebServiceRef(value = MultipleEndpointService.class)
+ public Endpoint port7;
+
+ @WebServiceRef(value = MultipleEndpointService.class)
+ public Endpoint port8;
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
@@ -111,6 +118,7 @@
ports.add((Endpoint)iniCtx.lookup("java:comp/env/Port2"));
ports.add(port3);
ports.add((Endpoint)iniCtx.lookup("java:comp/env/" + getClass().getName() + "/port3"));
+ ports.add(port8);
}
catch (Exception ex)
{
@@ -124,6 +132,14 @@
if (inStr.equals(outStr) == false)
throw new WebServiceException("Invalid echo return: " + inStr);
}
+ try {
+ port7.echo("Foo");
+ throw new WebServiceException("Expected exception due to SOAP 1.2 message sent to a SOAP 1.1 endpoint");
+ } catch (SOAPFaultException sfe) {
+ if (!sfe.getMessage().contains("SOAP 1.2")) {
+ throw new WebServiceException("Expected reference to SOAP version mismatch in error message, but got: " + sfe.getMessage());
+ }
+ }
res.getWriter().print(inStr);
}
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl 2014-06-04 16:20:34 UTC (rev 18715)
@@ -0,0 +1,55 @@
+<!--
+ wsimport -d ../../../java -keep -p org.jboss.test.ws.jaxws.webserviceref META-INF/wsdl/Endpoint.wsdl
+-->
+<definitions name='EndpointService' targetNamespace='http://org.jboss.ws/wsref' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:soap12='http://schemas.xmlsoap.org/wsdl/soap12/' xmlns:tns='http://org.jboss.ws/wsref' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+
+ <message name='Endpoint_echo'>
+ <part name='arg0' type='xsd:string'/>
+ </message>
+ <message name='Endpoint_echoResponse'>
+ <part name='return' type='xsd:string'/>
+ </message>
+
+ <portType name='Endpoint'>
+ <operation name='echo' parameterOrder='arg0'>
+ <input message='tns:Endpoint_echo'/>
+ <output message='tns:Endpoint_echoResponse'/>
+ </operation>
+ </portType>
+
+ <binding name='EndpointBinding' type='tns:Endpoint'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+
+ <binding name='EndpointBinding2' type='tns:Endpoint'>
+ <soap12:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap12:operation soapAction=''/>
+ <input>
+ <soap12:body namespace='http://org.jboss.ws/wsref' use='literal'/>
+ </input>
+ <output>
+ <soap12:body namespace='http://org.jboss.ws/wsref' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+
+ <service name='EndpointService'>
+ <port binding='tns:EndpointBinding' name='EndpointPort'>
+ <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-webserviceref'/>
+ </port>
+ <port binding='tns:EndpointBinding2' name='EndpointPort2'>
+ <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-webserviceref'/>
+ </port>
+ </service>
+
+</definitions>
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml 2014-06-04 06:42:26 UTC (rev 18714)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml 2014-06-04 16:20:34 UTC (rev 18715)
@@ -84,5 +84,31 @@
<service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname>
<wsdl-override>WEB-INF/wsdl/Endpoint.wsdl</wsdl-override>
</service-ref>
+
+ <!--
+ @WebServiceRef(value = MultipleEndpointService.class)
+ -->
+ <service-ref>
+ <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/port7</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname>
+ <wsdl-override>WEB-INF/wsdl/MultipleEndpoint.wsdl</wsdl-override>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.Endpoint</service-endpoint-interface>
+ <port-qname>{http://org.jboss.ws/wsref}EndpointPort2</port-qname>
+ </port-component-ref>
+ </service-ref>
+ <!--
+ @WebServiceRef(value = MultipleEndpointService.class)
+ -->
+ <service-ref>
+ <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/port8</service-ref-name>
+ <service-qname>{http://org.jboss.ws/wsref}EndpointService</service-qname>
+ <wsdl-override>WEB-INF/wsdl/MultipleEndpoint.wsdl</wsdl-override>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.Endpoint</service-endpoint-interface>
+ <port-qname>{http://org.jboss.ws/wsref}EndpointPort</port-qname>
+ </port-component-ref>
+ </service-ref>
+
</jboss-web>
\ No newline at end of file
10 years, 7 months
JBossWS SVN: r18714 - stack/cxf/trunk/modules/dist/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-06-04 02:42:26 -0400 (Wed, 04 Jun 2014)
New Revision: 18714
Modified:
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-3789]:Add commons-codec jar in binary
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-06-03 14:54:22 UTC (rev 18713)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-06-04 06:42:26 UTC (rev 18714)
@@ -58,6 +58,7 @@
<include>commons-collections:commons-collections:jar</include>
<include>commons-beanutils:commons-beanutils:jar</include>
<include>commons-lang:commons-lang:jar</include>
+ <include>commons-codec:commons-codec:jar</include>
<include>jboss.jaxbintros:jboss-jaxb-intros</include>
<include>javax.xml.stream:stax-api:jar</include>
<include>javax.jws:jsr181-api:jar</include>
10 years, 7 months