Author: rmannibucau
Date: Wed Mar 20 22:30:08 2013
New Revision: 1459083
URL: http://svn.apache.org/r1459083
Log:
TOMEE-839 @WebService shouldn't be taken into account for EJB interface
resolution. Thanks Mark for the patch.
Added:
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/webservices/WebServiceLocalBeanTest.java
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1459083&r1=1459082&r2=1459083&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Wed Mar 20 22:30:08 2013
@@ -3086,7 +3086,6 @@ public class AnnotationDeployer implemen
&& sessionBean.getRemote() == null
&& sessionBean.getLocalHome() == null
&& sessionBean.getLocal() == null
- && sessionBean.getServiceEndpoint() == null
&& all.local.isEmpty()
&& all.remote.isEmpty()
) {
Added:
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/webservices/WebServiceLocalBeanTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/webservices/WebServiceLocalBeanTest.java?rev=1459083&view=auto
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/webservices/WebServiceLocalBeanTest.java
(added)
+++
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/webservices/WebServiceLocalBeanTest.java
Wed Mar 20 22:30:08 2013
@@ -0,0 +1,77 @@
+/**
+ *
+ * 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.
+ */
+package org.apache.openejb.core.webservices;
+
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.testing.Module;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.ejb.EJB;
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(ApplicationComposer.class)
+public class WebServiceLocalBeanTest {
+ @EJB
+ private WebServiceImplicitLocalBean wslb;
+
+ @EJB
+ private WSLocal wsl;
+
+ @Module
+ public Class<?>[] classes() {
+ return new Class<?>[] { WSLocal.class, WebServiceLocal.class,
WebServiceImplicitLocalBean.class };
+ }
+
+ @Test
+ public void checkLocalBean() {
+ assertNotNull(wslb);
+ assertEquals("ok", wslb.str());
+ }
+
+ @Test
+ public void checkLocal() {
+ assertNotNull(wsl);
+ assertEquals("ok2", wsl.str());
+ }
+
+ @Stateless
+ @WebService
+ public static class WebServiceImplicitLocalBean {
+ public String str() {
+ return "ok";
+ }
+ }
+
+ @Stateless
+ @WebService
+ public static class WebServiceLocal implements WSLocal {
+ public String str() {
+ return "ok2";
+ }
+ }
+
+ //@WebService
+ public static interface WSLocal {
+ String str();
+ }
+}
