Branch: refs/heads/1.1 Home: https://github.com/weld/core Commit: 7ede77ed055be9b08b66063e34ca3ba83b690775 https://github.com/weld/core/commit/7ede77ed055be9b08b66063e34ca3ba83b690775 Author: Tomas Remes <tremes(a)redhat.com&gt; Date: 2015-04-14 (Tue, 14 Apr 2015) Changed paths: R tests-arquillian/src/test/java/org/jboss/weld/tests/resources/ws/ResourceProducer.java R tests-arquillian/src/test/java/org/jboss/weld/tests/resources/ws/Translator.java R tests-arquillian/src/test/java/org/jboss/weld/tests/resources/ws/TranslatorEndpoint.java R tests-arquillian/src/test/java/org/jboss/weld/tests/resources/ws/TranslatorEndpointService.java R tests-arquillian/src/test/java/org/jboss/weld/tests/resources/ws/True.java R tests-arquillian/src/test/java/org/jboss/weld/tests/resources/ws/WebServiceResourceTest.java R tests-arquillian/src/test/resources/org/jboss/weld/tests/resources/ws/web.xml Log Message: ----------- WELD-1798 & WELD-1923 remove the WebServiceResourceTest. Conflicts: tests-arquillian/src/test/java/org/jboss/weld/tests/resources/ws/ResourceProducer.java tests-arquillian/src/test/java/org/jboss/weld/tests/resources/ws/TranslatorEndpointService.java tests-arquillian/src/test/java/org/jboss/weld/tests/ws/interceptors/EJB3EndpointImpl.java tests-arquillian/src/test/java/org/jboss/weld/tests/ws/interceptors/EndpointIface.java tests-arquillian/src/test/java/org/jboss/weld/tests/ws/interceptors/POJOEndpointImpl.java tests-arquillian/src/test/java/org/jboss/weld/tests/ws/interceptors/WebServiceInterceptorTest.java