JBossWS SVN: r18576 - in stack/cxf/branches/jbossws-cxf-3.1.2: src/main/scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-04-11 07:15:14 -0400 (Fri, 11 Apr 2014)
New Revision: 18576
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBPAPP-11084]:Revert jaxws-api version to 2.1.3 to include the jrs181-api.jar in the distribution
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2014-04-11 10:11:03 UTC (rev 18575)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2014-04-11 11:15:14 UTC (rev 18576)
@@ -65,7 +65,7 @@
<jaxb.api.version>2.1</jaxb.api.version>
<jaxb.impl.version>2.1.12.patch01</jaxb.impl.version>
<jaxrpc.api.version>1.1</jaxrpc.api.version>
- <jaxws.api.version>2.1-1</jaxws.api.version>
+ <jaxws.api.version>2.1.3</jaxws.api.version>
<juddi.version>2.0.1</juddi.version>
<jboss.jaxr.version>2.0.1</jboss.jaxr.version>
<apache.scout.version>1.1.1</apache.scout.version>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2014-04-11 10:11:03 UTC (rev 18575)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2014-04-11 11:15:14 UTC (rev 18576)
@@ -25,6 +25,7 @@
<include>org.jboss.ws.cxf:jbossws-cxf-factories:jar</include>
<include>org.apache.cxf:cxf-*</include>
<include>org.apache.cxf.xjcplugins:cxf-*</include>
+ <include>javax.jws:jsr181-api:jar</include>
<include>javax.xml.bind:jaxb-api:jar</include>
<include>com.sun.xml.bind:jaxb-impl:jar</include>
<include>com.sun.xml.bind:jaxb-xjc:jar</include>
10 years, 5 months
JBossWS SVN: r18575 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsse.
by jbossws-commits＠lists.jboss.org
Author: soul2zimate
Date: 2014-04-11 06:11:03 -0400 (Fri, 11 Apr 2014)
New Revision: 18575
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsse/RequireEncryption.java
Log:
JBPAPP-11082, revert serialVersionUID to avoid jaxrpc tests failures
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsse/RequireEncryption.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsse/RequireEncryption.java 2014-04-11 09:11:25 UTC (rev 18574)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsse/RequireEncryption.java 2014-04-11 10:11:03 UTC (rev 18575)
@@ -30,7 +30,7 @@
*/
public class RequireEncryption extends Targetable
{
- private static final long serialVersionUID = 3765798680988205648L;
+ private static final long serialVersionUID = 3765798680988205647L;
private boolean includeFaults;
10 years, 5 months
JBossWS SVN: r18573 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-04-10 05:29:19 -0400 (Thu, 10 Apr 2014)
New Revision: 18573
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Updating exclusions for AS 7.2
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2014-04-09 16:51:15 UTC (rev 18572)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-04-10 09:29:19 UTC (rev 18573)
@@ -709,6 +709,9 @@
<!-- [JBWS-3773][CXF-5602] HttpServletRequestSnapshot is not created for requests with WSA ReplyTo prop set -->
<exclude>org/jboss/test/ws/jaxws/cxf/jbws3773/**</exclude>
+
+ <!-- [WELD-1328] @WebServiceRef injection not working w/ Weld 1.x -->
+ <exclude>org/jboss/test/ws/jaxws/cxf/jbws3679/**</exclude>
</excludes>
</configuration>
</plugin>
10 years, 5 months
JBossWS SVN: r18572 - in stack/cxf/trunk: modules/testsuite and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-04-09 12:51:15 -0400 (Wed, 09 Apr 2014)
New Revision: 18572
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
Log:
Adding explicit java.inject test dependency as it's not there on AS 7.2
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2014-04-08 11:20:31 UTC (rev 18571)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-04-09 16:51:15 UTC (rev 18572)
@@ -92,6 +92,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-depchain</artifactId>
<type>pom</type>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2014-04-08 11:20:31 UTC (rev 18571)
+++ stack/cxf/trunk/pom.xml 2014-04-09 16:51:15 UTC (rev 18572)
@@ -110,6 +110,7 @@
<spring.version>3.0.7.RELEASE</spring.version>
<shrinkwrap.version>1.1.3</shrinkwrap.version>
<jaspi.api.version>1.0.0.Alpha1</jaspi.api.version>
+ <javax.inject.version>1</javax.inject.version>
</properties>
@@ -1289,6 +1290,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>${javax.inject.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-depchain</artifactId>
<version>${shrinkwrap.version}</version>
10 years, 5 months
JBossWS SVN: r18571 - thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-04-08 07:20:31 -0400 (Tue, 08 Apr 2014)
New Revision: 18571
Modified:
thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
Log:
[JBPAPP-10973]:@XmlJavaTypeAdapter ignored at package-info.java level when using Generics;backport CXF-4537
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java 2014-04-08 10:30:51 UTC (rev 18570)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java 2014-04-08 11:20:31 UTC (rev 18571)
@@ -31,6 +31,7 @@
import java.lang.reflect.TypeVariable;
import java.lang.reflect.WildcardType;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -54,7 +55,6 @@
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.service.model.UnwrappedOperationInfo;
-
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
@@ -67,6 +67,7 @@
private Set<Class<?>> classes;
private Collection<Object> typeReferences;
private Map<String, Object> unmarshallerProperties;
+ private Set<Class<?>> globalAdapters = new HashSet<Class<?>>();
public JAXBContextInitializer(ServiceInfo serviceInfo,
Set<Class<?>> classes,
@@ -220,7 +221,20 @@
addType(t);
}
}
-
+ if (clazz.getPackage() != null) {
+ XmlJavaTypeAdapters adapt = clazz.getPackage().getAnnotation(XmlJavaTypeAdapters.class);
+ if (adapt != null) {
+ for (XmlJavaTypeAdapter a : adapt.value()) {
+ globalAdapters.add(a.type());
+ }
+ for (XmlJavaTypeAdapter a : adapt.value()) {
+ Type t = Utils.getTypeFromXmlAdapter(a);
+ if (t != null) {
+ addType(t);
+ }
+ }
+ }
+ }
}
private void addType(Type cls) {
@@ -228,6 +242,9 @@
}
private void addType(Type cls, boolean allowArray) {
if (cls instanceof Class) {
+ if (globalAdapters.contains(cls)) {
+ return;
+ }
if (((Class)cls).isArray() && !allowArray) {
addClass(((Class)cls).getComponentType());
} else {
10 years, 5 months
JBossWS SVN: r18570 - stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-04-08 06:30:51 -0400 (Tue, 08 Apr 2014)
New Revision: 18570
Modified:
stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
Log:
Move JBossWSDestinationRegistryImpl addition to ServerBeanCustomizer (see CXF-5678)
Modified: stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2014-04-08 10:16:03 UTC (rev 18569)
+++ stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2014-04-08 10:30:51 UTC (rev 18570)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2012, 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.
*
@@ -40,7 +40,6 @@
import org.apache.cxf.resource.ResourceResolver;
import org.apache.cxf.service.factory.FactoryBeanListener;
import org.apache.cxf.service.factory.FactoryBeanListenerManager;
-import org.apache.cxf.transport.http.DestinationRegistry;
import org.apache.cxf.workqueue.AutomaticWorkQueue;
import org.apache.cxf.workqueue.AutomaticWorkQueueImpl;
import org.apache.cxf.workqueue.WorkQueueManager;
@@ -69,7 +68,6 @@
import org.jboss.wsf.stack.cxf.interceptor.NsCtxSelectorStoreInterceptor;
import org.jboss.wsf.stack.cxf.management.InstrumentationManagerExtImpl;
import org.jboss.wsf.stack.cxf.security.authentication.AutenticationMgrSubjectCreatingInterceptor;
-import org.jboss.wsf.stack.cxf.transport.JBossWSDestinationRegistryImpl;
/**
* A wrapper of the Bus for performing most of the configurations required on it by JBossWS
@@ -143,10 +141,6 @@
{
bus.getExtension(PolicyEngine.class).setAlternativeSelector(getAlternativeSelector(props));
}
- if (bus.getExtension(DestinationRegistry.class) == null)
- {
- bus.setExtension(new JBossWSDestinationRegistryImpl(), DestinationRegistry.class);
- }
setCXFManagement(bus, props); //*first* enabled cxf management if required, *then* add anything else which could be manageable (e.g. work queues)
setAdditionalWorkQueues(bus, props);
setWSDiscovery(bus, props);
Modified: stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
===================================================================
--- stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2014-04-08 10:16:03 UTC (rev 18569)
+++ stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2014-04-08 10:30:51 UTC (rev 18570)
@@ -26,6 +26,8 @@
import java.util.List;
import org.apache.cxf.frontend.ServerFactoryBean;
+import org.apache.cxf.transport.http.DestinationRegistry;
+import org.apache.cxf.transport.http.HTTPTransportFactory;
import org.jboss.ws.api.annotation.EndpointConfig;
import org.jboss.ws.api.util.ServiceLoader;
import org.jboss.ws.common.management.AbstractServerConfig;
@@ -43,6 +45,7 @@
import org.jboss.wsf.stack.cxf.deployment.EndpointImpl;
import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher;
import org.jboss.wsf.stack.cxf.security.authentication.AutenticationMgrSubjectCreatingInterceptor;
+import org.jboss.wsf.stack.cxf.transport.JBossWSDestinationRegistryImpl;
/**
*
@@ -88,6 +91,13 @@
}
}
}
+ if (beanInstance instanceof HTTPTransportFactory) {
+ HTTPTransportFactory factory = (HTTPTransportFactory) beanInstance;
+ DestinationRegistry oldRegistry = factory.getRegistry();
+ if (!(oldRegistry instanceof JBossWSDestinationRegistryImpl)) {
+ factory.setRegistry(new JBossWSDestinationRegistryImpl());
+ }
+ }
super.customize(beanInstance);
}
10 years, 5 months
JBossWS SVN: r18569 - stack/cxf/branches/asoldano.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-04-08 06:16:03 -0400 (Tue, 08 Apr 2014)
New Revision: 18569
Modified:
stack/cxf/branches/asoldano/pom.xml
Log:
Excluding banned geronimo jta api
Modified: stack/cxf/branches/asoldano/pom.xml
===================================================================
--- stack/cxf/branches/asoldano/pom.xml 2014-04-08 09:58:17 UTC (rev 18568)
+++ stack/cxf/branches/asoldano/pom.xml 2014-04-08 10:16:03 UTC (rev 18569)
@@ -433,6 +433,10 @@
<artifactId>geronimo-jms_1.1_spec</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</exclusion>
10 years, 5 months
JBossWS SVN: r18568 - stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172.
by jbossws-commits＠lists.jboss.org
Author: ehugonnet
Date: 2014-04-08 05:58:17 -0400 (Tue, 08 Apr 2014)
New Revision: 18568
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java
Log:
Fixing compilation issue after changes in SchemaExtractor.
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java 2014-04-08 09:24:06 UTC (rev 18567)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java 2014-04-08 09:58:17 UTC (rev 18568)
@@ -63,7 +63,7 @@
public void testSchemaValidationPositive() throws Exception
{
URL wsdlURL = getResourceURL("jaxws/jbws1172/WEB-INF/wsdl/TestService.wsdl");
- Map<String, byte[]> xsdStreams = new SchemaExtractor().getSchemas(wsdlURL);
+ Map<String, byte[]> xsdStreams = new SchemaExtractor(wsdlURL).getSchemas();
String inxml = "<tns:performTest xmlns:tns='http://www.my-company.it/ws/my-test'><Code>1000</Code></tns:performTest>";
new SchemaValidationHelper(xsdStreams).validateDocument(inxml);
}
@@ -71,7 +71,7 @@
public void testSchemaValidationNegative() throws Exception
{
URL wsdlURL = getResourceURL("jaxws/jbws1172/WEB-INF/wsdl/TestService.wsdl");
- Map<String, byte[]> xsdStreams = new SchemaExtractor().getSchemas(wsdlURL);
+ Map<String, byte[]> xsdStreams = new SchemaExtractor(wsdlURL).getSchemas();
String inxml = "<tns:performTest xmlns:tns='http://www.my-company.it/ws/my-test'><Code>2000</Code></tns:performTest>";
try
{
@@ -87,7 +87,7 @@
public void testEndpointWsdlValidation() throws Exception
{
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1172/noval?wsdl");
- Map<String, byte[]> xsdStreams = new SchemaExtractor().getSchemas(wsdlURL);
+ Map<String, byte[]> xsdStreams = new SchemaExtractor(wsdlURL).getSchemas();
String inxml = "<tns:performTest xmlns:tns='http://www.my-company.it/ws/my-test'><Code>1000</Code></tns:performTest>";
new SchemaValidationHelper(xsdStreams).validateDocument(inxml);
}
10 years, 5 months
JBossWS SVN: r18567 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-04-08 05:24:06 -0400 (Tue, 08 Apr 2014)
New Revision: 18567
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/CDIBeanClient.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3679/WEB-INF/beans.xml
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/JBWS3679TestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/ServletClient.java
Log:
Enriching [JBWS-3679] testcase to also verify @WebServiceRef injection in a CDI bean
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2014-04-07 14:55:13 UTC (rev 18566)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2014-04-08 09:24:06 UTC (rev 18567)
@@ -459,7 +459,11 @@
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3679.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/jbws3679/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/cxf/jbws3679/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/cxf/jbws3679/*TestCase.class"/>
</classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/jbws3679/WEB-INF">
+ <include name="beans.xml"/>
+ </webinf>
</war>
<!-- jaxws-cxf-jbws3713 -->
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/CDIBeanClient.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/CDIBeanClient.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/CDIBeanClient.java 2014-04-08 09:24:06 UTC (rev 18567)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2014, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed 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.
+ */
+package org.jboss.test.ws.jaxws.cxf.jbws3679;
+
+import java.io.IOException;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Named;
+import javax.xml.ws.WebServiceRef;
+
+@Named
+public class CDIBeanClient
+{
+ @WebServiceRef(value = EndpointOneService.class)
+ public EndpointOne endpointOne;
+
+ @PostConstruct
+ public void start() {
+ if (endpointOne == null) {
+ throw new RuntimeException("WebServiceRef not injected in CDI bean!");
+ }
+ }
+
+ public String performCall() {
+ return endpointOne.echo("cdiInput");
+ }
+}
\ No newline at end of file
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/CDIBeanClient.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/JBWS3679TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/JBWS3679TestCase.java 2014-04-07 14:55:13 UTC (rev 18566)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/JBWS3679TestCase.java 2014-04-08 09:24:06 UTC (rev 18567)
@@ -33,10 +33,15 @@
return new JBossWSTestSetup(JBWS3679TestCase.class, "jaxws-cxf-jbws3679.war");
}
- public void testSchemaImport() throws Exception
+ public void testServletClient() throws Exception
{
URL url = new URL(endpointAddress);
assertEquals("Echoded with:input", IOUtils.readAndCloseStream(url.openStream()));
}
+ public void testCDIClient() throws Exception
+ {
+ URL url = new URL(endpointAddress + "?client=CDI");
+ assertEquals("Echoded with:cdiInput", IOUtils.readAndCloseStream(url.openStream()));
+ }
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/ServletClient.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/ServletClient.java 2014-04-07 14:55:13 UTC (rev 18566)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3679/ServletClient.java 2014-04-08 09:24:06 UTC (rev 18567)
@@ -18,6 +18,7 @@
import java.io.IOException;
+import javax.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -28,11 +29,19 @@
{
private static final long serialVersionUID = 1L;
@WebServiceRef(value = EndpointOneService.class)
- public EndpointOne endpointOne;
+ private EndpointOne endpointOne;
+
+ @Inject
+ private CDIBeanClient cdiClient;
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
{
- res.getWriter().write(endpointOne.echo("input"));
+ String clientParam = req.getParameter("client");
+ if ("CDI".equals(clientParam)) {
+ res.getWriter().write(cdiClient.performCall());
+ } else {
+ res.getWriter().write(endpointOne.echo("input"));
+ }
}
}
\ No newline at end of file
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3679/WEB-INF/beans.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3679/WEB-INF/beans.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3679/WEB-INF/beans.xml 2014-04-08 09:24:06 UTC (rev 18567)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+</beans>
\ No newline at end of file
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3679/WEB-INF/beans.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
10 years, 5 months
JBossWS SVN: r18566 - in stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client: configuration and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-04-07 10:55:13 -0400 (Mon, 07 Apr 2014)
New Revision: 18566
Added:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/injection/
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/injection/JBossWSResourceInjectionResolver.java
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java
Log:
[JBWS-3786] @Resource injection not working on handlers attached to JAX-WS clients running in-container
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2014-04-03 10:32:26 UTC (rev 18565)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2014-04-07 14:55:13 UTC (rev 18566)
@@ -28,7 +28,9 @@
import org.apache.cxf.bus.CXFBusFactory;
import org.apache.cxf.bus.extension.ExtensionManagerBus;
import org.apache.cxf.configuration.Configurer;
+import org.apache.cxf.resource.ResourceManager;
import org.jboss.wsf.stack.cxf.client.ProviderImpl;
+import org.jboss.wsf.stack.cxf.client.injection.JBossWSResourceInjectionResolver;
/**
*
@@ -59,4 +61,10 @@
bus.initialize();
return bus;
}
+
+ protected void initializeBus(Bus bus) {
+ super.initializeBus(bus);
+ final ResourceManager resourceManager = bus.getExtension(ResourceManager.class);
+ resourceManager.addResourceResolver(JBossWSResourceInjectionResolver.getInstance());
+ }
}
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2014-04-03 10:32:26 UTC (rev 18565)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2014-04-07 14:55:13 UTC (rev 18566)
@@ -29,7 +29,9 @@
import org.apache.cxf.buslifecycle.BusLifeCycleListener;
import org.apache.cxf.buslifecycle.BusLifeCycleManager;
import org.apache.cxf.configuration.Configurer;
+import org.apache.cxf.resource.ResourceManager;
import org.jboss.wsf.stack.cxf.Loggers;
+import org.jboss.wsf.stack.cxf.client.injection.JBossWSResourceInjectionResolver;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.core.io.Resource;
@@ -147,6 +149,12 @@
configurer.setCustomizer(new BeanCustomizer());
bus.setExtension(configurer, Configurer.class);
}
+
+ protected void initializeBus(Bus bus) {
+ super.initializeBus(bus);
+ final ResourceManager resourceManager = bus.getExtension(ResourceManager.class);
+ resourceManager.addResourceResolver(JBossWSResourceInjectionResolver.getInstance());
+ }
void registerAppContextLifeCycleListener(final Bus bus, final BusApplicationContext bac)
{
Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/injection/JBossWSResourceInjectionResolver.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/injection/JBossWSResourceInjectionResolver.java (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/injection/JBossWSResourceInjectionResolver.java 2014-04-07 14:55:13 UTC (rev 18566)
@@ -0,0 +1,66 @@
+/*
+ * 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.wsf.stack.cxf.client.injection;
+
+import java.io.InputStream;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.apache.cxf.resource.ResourceResolver;
+
+/**
+ * A CXF ResourceResolver that tries looking up the specified resources in the JNDI
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 07-Apr-2014
+ */
+public class JBossWSResourceInjectionResolver implements ResourceResolver
+{
+ private static final JBossWSResourceInjectionResolver me = new JBossWSResourceInjectionResolver();
+
+ private JBossWSResourceInjectionResolver() {
+ //NOOP
+ }
+
+ public static JBossWSResourceInjectionResolver getInstance() {
+ return me;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public <T> T resolve(String resourceName, Class<T> resourceType)
+ {
+ try {
+ return (T)new InitialContext().lookup("java:comp/env/" + resourceName);
+ } catch (NamingException ne) {
+ return null;
+ }
+ }
+
+ @Override
+ public InputStream getAsStream(String name)
+ {
+ return null;
+ }
+
+}
Property changes on: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/injection/JBossWSResourceInjectionResolver.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
10 years, 5 months