This is an automated email from the ASF dual-hosted git repository.

jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/master by this push:
     new 9179d4f  Correcting bean name
     new 9497f24  Merge remote-tracking branch 'apache/master'
9179d4f is described below

commit 9179d4fa28e489a43b0a963a89ae2fff8c08d4b6
Author: Jonathan Gallimore <j...@jrg.me.uk>
AuthorDate: Thu Feb 14 14:45:05 2019 +0000

    Correcting bean name
---
 .../arquillian/tests/cmp/sample/ejb-jar.xml        | 52 +++++++++++-----------
 .../openejb/arquillian/tests/cmp/sample/web.xml    |  4 +-
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/ejb-jar.xml
 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/ejb-jar.xml
index 8b39053..9e32d43 100644
--- 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/ejb-jar.xml
+++ 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/ejb-jar.xml
@@ -21,31 +21,31 @@
          xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd";>
   <display-name>RosterJAR</display-name>
   <enterprise-beans>
-    <session>
-      <ejb-name>RosterBean</ejb-name>
-      
<home>org.apache.openejb.arquillian.tests.cmp.sample.MoviesBusinessHome</home>
-      
<remote>org.apache.openejb.arquillian.tests.cmp.sample.MoviesBusiness</remote>
-      
<ejb-class>org.apache.openejb.arquillian.tests.cmp.sample.MoviesBusinessBean</ejb-class>
-      <session-type>Stateless</session-type>
-      <transaction-type>Container</transaction-type>
-      <ejb-local-ref>
-        <ejb-ref-name>ejb/Actor</ejb-ref-name>
-        <ejb-ref-type>Entity</ejb-ref-type>
-        
<local-home>org.apache.openejb.arquillian.tests.cmp.sample.LocalActorHome</local-home>
-        
<local>org.apache.openejb.arquillian.tests.cmp.sample.LocalActor</local>
-        <ejb-link>ActorBean</ejb-link>
-      </ejb-local-ref>
-      <ejb-local-ref>
-        <ejb-ref-name>ejb/Movie</ejb-ref-name>
-        <ejb-ref-type>Entity</ejb-ref-type>
-        
<local-home>org.apache.openejb.arquillian.tests.cmp.sample.LocalMovieHome</local-home>
-        
<local>org.apache.openejb.arquillian.tests.cmp.sample.LocalMovie</local>
-        <ejb-link>MovieBean</ejb-link>
-      </ejb-local-ref>
-      <security-identity>
-        <use-caller-identity/>
-      </security-identity>
-    </session>
+  <session>
+    <ejb-name>MoviesBean</ejb-name>
+    
<home>org.apache.openejb.arquillian.tests.cmp.sample.MoviesBusinessHome</home>
+    
<remote>org.apache.openejb.arquillian.tests.cmp.sample.MoviesBusiness</remote>
+    
<ejb-class>org.apache.openejb.arquillian.tests.cmp.sample.MoviesBusinessBean</ejb-class>
+    <session-type>Stateless</session-type>
+    <transaction-type>Container</transaction-type>
+    <ejb-local-ref>
+      <ejb-ref-name>ejb/Actor</ejb-ref-name>
+      <ejb-ref-type>Entity</ejb-ref-type>
+      
<local-home>org.apache.openejb.arquillian.tests.cmp.sample.LocalActorHome</local-home>
+      <local>org.apache.openejb.arquillian.tests.cmp.sample.LocalActor</local>
+      <ejb-link>ActorBean</ejb-link>
+    </ejb-local-ref>
+    <ejb-local-ref>
+      <ejb-ref-name>ejb/Movie</ejb-ref-name>
+      <ejb-ref-type>Entity</ejb-ref-type>
+      
<local-home>org.apache.openejb.arquillian.tests.cmp.sample.LocalMovieHome</local-home>
+      <local>org.apache.openejb.arquillian.tests.cmp.sample.LocalMovie</local>
+      <ejb-link>MovieBean</ejb-link>
+    </ejb-local-ref>
+    <security-identity>
+      <use-caller-identity/>
+    </security-identity>
+  </session>
     <entity>
       <ejb-name>MovieBean</ejb-name>
       
<local-home>org.apache.openejb.arquillian.tests.cmp.sample.LocalMovieHome</local-home>
@@ -138,7 +138,7 @@
   <assembly-descriptor>
     <container-transaction>
       <method>
-        <ejb-name>RosterBean</ejb-name>
+        <ejb-name>MoviesBean</ejb-name>
         <method-intf>Remote</method-intf>
         <method-name>*</method-name>
       </method>
diff --git 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/web.xml
 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/web.xml
index 68cbacb..03de133 100644
--- 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/web.xml
+++ 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/web.xml
@@ -24,12 +24,12 @@
          id="WebApp_ID" version="2.5">
 
     <servlet>
-        <servlet-name>RosterServlet</servlet-name>
+        <servlet-name>MoviesServlet</servlet-name>
         
<servlet-class>org.apache.openejb.arquillian.tests.cmp.sample.MoviesServlet</servlet-class>
     </servlet>
 
     <servlet-mapping>
-        <servlet-name>RosterServlet</servlet-name>
+        <servlet-name>MoviesServlet</servlet-name>
         <url-pattern>/*</url-pattern>
     </servlet-mapping>
 

Reply via email to