Author: jharting Date: 2009-07-30 08:53:39 -0400 (Thu, 30 Jul 2009) New Revision: 3368 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/IsSheepInjected.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/IsSheepInjectedResponse.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/ObjectFactory.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/Sheep.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWS.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWSEndPoint.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWSEndPointService.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/package-info.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/web.xml Log: Added test for dependency injection into non-contextual instance of JAX-WS endpoint. Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2009-07-30 12:53:39 UTC (rev 3368) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, 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.jsr299.tck.tests.lookup.injection.non.contextual.ws; + +import javax.xml.ws.WebServiceRef; + +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Resource; +import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor; +import org.testng.annotations.Test; + +@Artifact +@IntegrationTest(runLocally = true) +@Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml") +@SpecVersion("20090625") +public class InjectionIntoWebServiceEndPointTest extends AbstractJSR299Test +{ + @WebServiceRef(wsdlLocation = "http://localhost:8080/org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest/TestWebService?wsdl") + SheepWSEndPointService service; + + @Test(groups = "ri-broken") + @SpecAssertion(section = "5.6", id = "e") + public void testInjectionIntoWebServiceEndpoint() throws Exception + { + service = new SheepWSEndPointService(); + SheepWS ws = service.getSheepWSPort(); + assert ws.isSheepInjected(); + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/IsSheepInjected.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/IsSheepInjected.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/IsSheepInjected.java 2009-07-30 12:53:39 UTC (rev 3368) @@ -0,0 +1,13 @@ + +package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "isSheepInjected") +public class IsSheepInjected { + + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/IsSheepInjectedResponse.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/IsSheepInjectedResponse.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/IsSheepInjectedResponse.java 2009-07-30 12:53:39 UTC (rev 3368) @@ -0,0 +1,25 @@ + +package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "isSheepInjectedResponse", propOrder = { + "_return" +}) +public class IsSheepInjectedResponse { + + @XmlElement(name = "return") + protected boolean _return; + + public boolean isReturn() { + return _return; + } + + public void setReturn(boolean value) { + this._return = value; + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/ObjectFactory.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/ObjectFactory.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/ObjectFactory.java 2009-07-30 12:53:39 UTC (rev 3368) @@ -0,0 +1,35 @@ + +package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + +@XmlRegistry +public class ObjectFactory { + + private final static QName _IsSheepInjected_QNAME = new QName("http://ws.contextual.non.injection.lookup.tests.tck.jsr299.jb...;, "isSheepInjected"); + private final static QName _IsSheepInjectedResponse_QNAME = new QName("http://ws.contextual.non.injection.lookup.tests.tck.jsr299.jb...;, "isSheepInjectedResponse"); + + public ObjectFactory() { + } + + public IsSheepInjected createIsSheepInjected() { + return new IsSheepInjected(); + } + + public IsSheepInjectedResponse createIsSheepInjectedResponse() { + return new IsSheepInjectedResponse(); + } + + @XmlElementDecl(namespace = "http://ws.contextual.non.injection.lookup.tests.tck.jsr299.jboss.org/", name = "isSheepInjected") + public JAXBElement<IsSheepInjected> createIsSheepInjected(IsSheepInjected value) { + return new JAXBElement<IsSheepInjected>(_IsSheepInjected_QNAME, IsSheepInjected.class, null, value); + } + + @XmlElementDecl(namespace = "http://ws.contextual.non.injection.lookup.tests.tck.jsr299.jboss.org/", name = "isSheepInjectedResponse") + public JAXBElement<IsSheepInjectedResponse> createIsSheepInjectedResponse(IsSheepInjectedResponse value) { + return new JAXBElement<IsSheepInjectedResponse>(_IsSheepInjectedResponse_QNAME, IsSheepInjectedResponse.class, null, value); + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/Sheep.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/Sheep.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/Sheep.java 2009-07-30 12:53:39 UTC (rev 3368) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws; + +public class Sheep +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWS.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWS.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWS.java 2009-07-30 12:53:39 UTC (rev 3368) @@ -0,0 +1,30 @@ + +package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws; + +import javax.jws.WebMethod; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.1.6 in JDK 6 + * Generated source version: 2.1 + * + */ +@WebService(name = "SheepWS", targetNamespace = "http://ws.contextual.non.injection.lookup.tests.tck.jsr299.jboss.org/") +@XmlSeeAlso({ + ObjectFactory.class +}) +public interface SheepWS { + + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "isSheepInjected", targetNamespace = "http://ws.contextual.non.injection.lookup.tests.tck.jsr299.jboss.org/", className = "org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.IsSheepInjected") + @ResponseWrapper(localName = "isSheepInjectedResponse", targetNamespace = "http://ws.contextual.non.injection.lookup.tests.tck.jsr299.jboss.org/", className = "org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.IsSheepInjectedResponse") + public boolean isSheepInjected(); + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWSEndPoint.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWSEndPoint.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWSEndPoint.java 2009-07-30 12:53:39 UTC (rev 3368) @@ -0,0 +1,17 @@ +package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws; + +import javax.enterprise.inject.Current; +import javax.jws.WebMethod; +import javax.jws.WebService; + +@WebService(name="SheepWS") +public class SheepWSEndPoint +{ + @Current + private Sheep sheep; + + @WebMethod + public boolean isSheepInjected() { + return (sheep != null); + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWSEndPointService.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWSEndPointService.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/SheepWSEndPointService.java 2009-07-30 12:53:39 UTC (rev 3368) @@ -0,0 +1,58 @@ + +package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws; + +import java.net.MalformedURLException; +import java.net.URL; +import java.util.logging.Logger; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; + + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.1.6 in JDK 6 + * Generated source version: 2.1 + * + */ +@WebServiceClient(name = "SheepWSEndPointService", targetNamespace = "http://ws.contextual.non.injection.lookup.tests.tck.jsr299.jboss.org/", wsdlLocation = "http://localhost:8080/org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest/TestWebService?wsdl") +public class SheepWSEndPointService + extends Service +{ + + private final static URL SHEEPWSENDPOINTSERVICE_WSDL_LOCATION; + private final static Logger logger = Logger.getLogger(org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.SheepWSEndPointService.class.getName()); + + static { + URL url = null; + try { + URL baseUrl; + baseUrl = org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.SheepWSEndPointService.class.getResource("."); + url = new URL(baseUrl, "http://localhost:8080/org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest/TestWebService?wsdl"); + } catch (MalformedURLException e) { + logger.warning("Failed to create URL for the wsdl Location: 'http://localhost:8080/org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest/TestWebService?wsdl', retrying as a local file"); + logger.warning(e.getMessage()); + } + SHEEPWSENDPOINTSERVICE_WSDL_LOCATION = url; + } + + public SheepWSEndPointService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public SheepWSEndPointService() { + super(SHEEPWSENDPOINTSERVICE_WSDL_LOCATION, new QName("http://ws.contextual.non.injection.lookup.tests.tck.jsr299.jb...;, "SheepWSEndPointService")); + } + + @WebEndpoint(name = "SheepWSPort") + public SheepWS getSheepWSPort() { + return super.getPort(new QName("http://ws.contextual.non.injection.lookup.tests.tck.jsr299.jb...;, "SheepWSPort"), SheepWS.class); + } + + @WebEndpoint(name = "SheepWSPort") + public SheepWS getSheepWSPort(WebServiceFeature... features) { + return super.getPort(new QName("http://ws.contextual.non.injection.lookup.tests.tck.jsr299.jb...;, "SheepWSPort"), SheepWS.class, features); + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/package-info.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/package-info.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/package-info.java 2009-07-30 12:53:39 UTC (rev 3368) @@ -0,0 +1,2 @@ +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://ws.contextual.non.injection.lookup.tests.tck.jsr299.jboss.org/") +package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws; Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/web.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/web.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/web.xml 2009-07-30 12:53:39 UTC (rev 3368) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.5" 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/web-app_2_5.xsd"> + <display-name>Dependency Injection Test</display-name> + <servlet> + <servlet-name>TestWebService</servlet-name> + <servlet-class>org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.SheepWSEndPoint</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet> + <servlet-name>JBoss Test Harness Test Runner</servlet-name> + <servlet-class>org.jboss.testharness.impl.runner.servlet.ServletTestRunner</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>TestWebService</servlet-name> + <url-pattern>/TestWebService</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>JBoss Test Harness Test Runner</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> + <session-config> + <session-timeout>10</session-timeout> + </session-config> +</web-app>