You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2006/11/21 19:41:17 UTC
svn commit: r477809 [1/2] - in /incubator/openejb/trunk/openejb2/itests: ./
openejb-itests-core/
openejb-itests-core/src/main/java/org/apache/openejb/test/beans/
openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp/
openejb-itests-core/...
Author: dblevins
Date: Tue Nov 21 10:41:16 2006
New Revision: 477809
URL: http://svn.apache.org/viewvc?view=rev&rev=477809
Log:
Patch from Prasad Kashyap OPENEJB-305: Update itest plans
Thanks Prasad!
Modified:
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/pom.xml
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/Calculator.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/CalculatorBean.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/CalculatorHome.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/Database.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/DatabaseHome.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/Employee.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/EmployeeBean.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/EmployeeHome.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/ShoppingCart.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/ShoppingCartBean.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmp2Bean.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmpBean.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmp2Bean.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/cmrmapping/ManyOwningSideBean.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/cmrmapping/ManyOwningSideLocalHome.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/cmrmapping/OneInverseSideLocalHome.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/cmrmapping/OneOwningSideLocalHome.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/model/AddressBean.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/petstore/AddressEJB.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/interop/slsb/InteropHome.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/security/sfsb/BasicStatefulBean.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/stateless/BeanTxStatelessBean.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/stateless/SoapEncodedStatelessEndpoint.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/resources/META-INF/ejb-jar.xml
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/resources/META-INF/openejb-jar.xml
incubator/openejb/trunk/openejb2/itests/pom.xml
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/pom.xml?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/pom.xml (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/pom.xml Tue Nov 21 10:41:16 2006
@@ -46,10 +46,23 @@
<goals>
<goal>test-jar</goal>
</goals>
- </execution>
- </executions>
+ <configuration>
+ <archive>
+ <!-- Do not include META-INF/maven to avoid long file problems on windows -->
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
</build>
<dependencies>
<dependency>
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/Calculator.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/Calculator.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/Calculator.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/Calculator.java Tue Nov 21 10:41:16 2006
@@ -24,4 +24,4 @@
public int sub(int a, int b) throws RemoteException;
-}
\ No newline at end of file
+}
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/CalculatorBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/CalculatorBean.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/CalculatorBean.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/CalculatorBean.java Tue Nov 21 10:41:16 2006
@@ -132,4 +132,4 @@
}
}
-
\ No newline at end of file
+
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/CalculatorHome.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/CalculatorHome.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/CalculatorHome.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/CalculatorHome.java Tue Nov 21 10:41:16 2006
@@ -22,4 +22,4 @@
public Calculator create( ) throws RemoteException;
-}
\ No newline at end of file
+}
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/Database.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/Database.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/Database.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/Database.java Tue Nov 21 10:41:16 2006
@@ -23,4 +23,4 @@
public void executeQuery(String statement) throws RemoteException, java.sql.SQLException;
public boolean execute(String statement) throws RemoteException, java.sql.SQLException;
-}
\ No newline at end of file
+}
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/DatabaseHome.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/DatabaseHome.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/DatabaseHome.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/DatabaseHome.java Tue Nov 21 10:41:16 2006
@@ -22,4 +22,4 @@
public Database create( ) throws javax.ejb.CreateException, RemoteException;
-}
\ No newline at end of file
+}
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/Employee.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/Employee.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/Employee.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/Employee.java Tue Nov 21 10:41:16 2006
@@ -33,4 +33,4 @@
throws RemoteException;
}
-
\ No newline at end of file
+
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/EmployeeBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/EmployeeBean.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/EmployeeBean.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/EmployeeBean.java Tue Nov 21 10:41:16 2006
@@ -210,4 +210,4 @@
public void unsetEntityContext(){}
}
-
\ No newline at end of file
+
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/EmployeeHome.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/EmployeeHome.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/EmployeeHome.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/EmployeeHome.java Tue Nov 21 10:41:16 2006
@@ -29,4 +29,4 @@
public Employee findByPrimaryKey(Integer primkey)
throws javax.ejb.FinderException, java.rmi.RemoteException;
-}
\ No newline at end of file
+}
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/ShoppingCart.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/ShoppingCart.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/ShoppingCart.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/ShoppingCart.java Tue Nov 21 10:41:16 2006
@@ -30,4 +30,4 @@
public void doJdbcCall() throws RemoteException;
-}
\ No newline at end of file
+}
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/ShoppingCartBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/ShoppingCartBean.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/ShoppingCartBean.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/beans/ShoppingCartBean.java Tue Nov 21 10:41:16 2006
@@ -188,4 +188,4 @@
}
}
}
-
\ No newline at end of file
+
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmp2Bean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmp2Bean.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmp2Bean.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmp2Bean.java Tue Nov 21 10:41:16 2006
@@ -66,15 +66,32 @@
* Maps to BasicCmpHome.create
*/
public Integer ejbCreate(String name) throws CreateException {
+ ejbCreate(new Integer(key++),name);
+ return null;
+ }
+
+ /**
+ * Maps to BasicCmpHome.create
+ */
+ public Integer ejbCreate(Integer keyInt, String name) throws CreateException {
testAllowedOperations("ejbCreate");
StringTokenizer st = new StringTokenizer(name, " ");
setFirstName(st.nextToken());
setLastName(st.nextToken());
- setId(new Integer(key++));
+ if (keyInt == null) {
+ setId(new Integer(key++));
+ }
+ else {
+ setId(keyInt);
+ }
return null;
}
public void ejbPostCreate(String name) {
+ ejbPostCreate(null, name );
+ }
+
+ public void ejbPostCreate(Integer anInt, String name) {
testAllowedOperations("ejbPostCreate");
}
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmpBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmpBean.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmpBean.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmpBean.java Tue Nov 21 10:41:16 2006
@@ -71,19 +71,37 @@
return x + y;
}
+
/**
* Maps to BasicCmpHome.create
*/
public Integer ejbCreate(String name) throws CreateException {
+ ejbCreate(new Integer(key++),name);
+ return null;
+ }
+
+ /**
+ * Maps to BasicCmpHome.create
+ */
+ public Integer ejbCreate(Integer keyInt, String name) throws CreateException {
testAllowedOperations("ejbCreate");
StringTokenizer st = new StringTokenizer(name, " ");
firstName = st.nextToken();
lastName = st.nextToken();
- id = new Integer(key++);
+ if (keyInt == null) {
+ id = new Integer(key++);
+ }
+ else {
+ id = keyInt;
+ }
return null;
}
public void ejbPostCreate(String name) {
+ ejbPostCreate(null, name );
+ }
+
+ public void ejbPostCreate(Integer anInt, String name) {
testAllowedOperations("ejbPostCreate");
}
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmp2Bean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmp2Bean.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmp2Bean.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp/BasicCmp2Bean.java Tue Nov 21 10:41:16 2006
@@ -16,6 +16,8 @@
*/
package org.apache.openejb.test.entity.cmp;
+import java.sql.Date;
+import java.util.GregorianCalendar;
import java.util.Hashtable;
import java.util.Properties;
import java.util.StringTokenizer;
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/cmrmapping/ManyOwningSideBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/cmrmapping/ManyOwningSideBean.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/cmrmapping/ManyOwningSideBean.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/cmrmapping/ManyOwningSideBean.java Tue Nov 21 10:41:16 2006
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.test.entity.cmp2.cmrmapping;
+import java.util.Collection;
import javax.ejb.CreateException;
import javax.ejb.FinderException;
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/cmrmapping/ManyOwningSideLocalHome.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/cmrmapping/ManyOwningSideLocalHome.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/cmrmapping/ManyOwningSideLocalHome.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/cmrmapping/ManyOwningSideLocalHome.java Tue Nov 21 10:41:16 2006
@@ -28,4 +28,4 @@
public ManyOwningSideLocal create(Integer id, Integer field1) throws CreateException;
public ManyOwningSideLocal findByPrimaryKey(CompoundPK pk) throws FinderException;
-}
\ No newline at end of file
+}
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/cmrmapping/OneInverseSideLocalHome.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/cmrmapping/OneInverseSideLocalHome.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/cmrmapping/OneInverseSideLocalHome.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/cmrmapping/OneInverseSideLocalHome.java Tue Nov 21 10:41:16 2006
@@ -28,4 +28,4 @@
public OneInverseSideLocal create(Integer id) throws CreateException;
public OneInverseSideLocal findByPrimaryKey(Integer id) throws FinderException;
-}
\ No newline at end of file
+}
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/cmrmapping/OneOwningSideLocalHome.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/cmrmapping/OneOwningSideLocalHome.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/cmrmapping/OneOwningSideLocalHome.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/cmrmapping/OneOwningSideLocalHome.java Tue Nov 21 10:41:16 2006
@@ -28,4 +28,4 @@
public OneOwningSideLocal create(Integer id, Integer field1) throws CreateException;
public OneOwningSideLocal findByPrimaryKey(CompoundPK pk) throws FinderException;
-}
\ No newline at end of file
+}
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/model/AddressBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/model/AddressBean.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/model/AddressBean.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/model/AddressBean.java Tue Nov 21 10:41:16 2006
@@ -16,6 +16,8 @@
*/
package org.apache.openejb.test.entity.cmp2.model;
+import java.util.Set;
+
import javax.ejb.CreateException;
import javax.ejb.EntityBean;
import javax.ejb.EntityContext;
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/petstore/AddressEJB.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/petstore/AddressEJB.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/petstore/AddressEJB.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/entity/cmp2/petstore/AddressEJB.java Tue Nov 21 10:41:16 2006
@@ -20,6 +20,8 @@
import javax.ejb.EntityContext;
import javax.ejb.RemoveException;
import javax.ejb.CreateException;
+import javax.naming.NamingException;
+import javax.naming.InitialContext;
/**
* @version $Revision$ $Date$
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/interop/slsb/InteropHome.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/interop/slsb/InteropHome.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/interop/slsb/InteropHome.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/interop/slsb/InteropHome.java Tue Nov 21 10:41:16 2006
@@ -20,6 +20,8 @@
import javax.ejb.CreateException;
import javax.ejb.EJBHome;
+import org.apache.openejb.test.security.slsb.BasicStateless;
+
/**
* @version $Revision$ $Date$
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/security/sfsb/BasicStatefulBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/security/sfsb/BasicStatefulBean.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/security/sfsb/BasicStatefulBean.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/security/sfsb/BasicStatefulBean.java Tue Nov 21 10:41:16 2006
@@ -81,7 +81,14 @@
return sessionContext.isCallerInRole(roleName);
}
+ public void ejbCreate() {
+ }
+
public void ejbCreate(String name) {
+ this.name = name;
+ }
+
+ public void ejbCreate(Integer anInt, String name) {
this.name = name;
}
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java Tue Nov 21 10:41:16 2006
@@ -22,7 +22,9 @@
import javax.ejb.EJBException;
import javax.ejb.SessionContext;
+import javax.ejb.CreateException;
import javax.naming.InitialContext;
+import javax.naming.NamingException;
import javax.sql.DataSource;
import javax.transaction.UserTransaction;
import javax.transaction.HeuristicMixedException;
@@ -32,6 +34,8 @@
import javax.transaction.NotSupportedException;
import org.apache.openejb.test.ApplicationException;
+import org.apache.openejb.test.stateful.BasicStatefulObject;
+import org.apache.openejb.test.stateful.BasicStatefulHome;
import org.apache.openejb.test.object.OperationsPolicy;
/**
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/stateless/BeanTxStatelessBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/stateless/BeanTxStatelessBean.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/stateless/BeanTxStatelessBean.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/stateless/BeanTxStatelessBean.java Tue Nov 21 10:41:16 2006
@@ -25,9 +25,13 @@
import javax.ejb.EJBException;
import javax.ejb.SessionContext;
import javax.naming.InitialContext;
+import javax.naming.NamingException;
import javax.sql.DataSource;
import javax.transaction.RollbackException;
import javax.transaction.UserTransaction;
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.SystemException;
import org.apache.openejb.test.object.Account;
import org.apache.openejb.test.object.Transaction;
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/stateless/SoapEncodedStatelessEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/stateless/SoapEncodedStatelessEndpoint.java?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/stateless/SoapEncodedStatelessEndpoint.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/org/apache/openejb/test/stateless/SoapEncodedStatelessEndpoint.java Tue Nov 21 10:41:16 2006
@@ -18,11 +18,18 @@
import java.rmi.RemoteException;
+import javax.ejb.EJBHome;
+import javax.ejb.EJBMetaData;
+import javax.ejb.EJBObject;
+import javax.ejb.Handle;
+
+import org.apache.openejb.test.object.ObjectGraph;
+
/**
*
*/
public interface SoapEncodedStatelessEndpoint extends java.rmi.Remote {
-
+
public String returnStringObject(String data) throws RemoteException;
public Boolean returnBooleanObject(Boolean data) throws RemoteException;
public boolean returnBooleanPrimitive(boolean data) throws RemoteException;
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/resources/META-INF/ejb-jar.xml?view=diff&rev=477809&r1=477808&r2=477809
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/resources/META-INF/ejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/resources/META-INF/ejb-jar.xml Tue Nov 21 10:41:16 2006
@@ -1,20 +1,4 @@
<?xml version="1.0" encoding="US-ASCII"?>
-<!--
- 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.
--->
<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -58,9 +42,15 @@
<prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>false</reentrant>
<cmp-version>1.x</cmp-version>
- <cmp-field><field-name>id</field-name></cmp-field>
- <cmp-field><field-name>firstName</field-name></cmp-field>
- <cmp-field><field-name>lastName</field-name></cmp-field>
+ <cmp-field>
+ <field-name>id</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>firstName</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>lastName</field-name>
+ </cmp-field>
<primkey-field>id</primkey-field>
<resource-ref>
<description>
@@ -90,9 +80,15 @@
<prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>false</reentrant>
<cmp-version>1.x</cmp-version>
- <cmp-field><field-name>id</field-name></cmp-field>
- <cmp-field><field-name>firstName</field-name></cmp-field>
- <cmp-field><field-name>lastName</field-name></cmp-field>
+ <cmp-field>
+ <field-name>id</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>firstName</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>lastName</field-name>
+ </cmp-field>
<primkey-field>id</primkey-field>
</entity>
@@ -114,9 +110,15 @@
<prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>false</reentrant>
<cmp-version>1.x</cmp-version>
- <cmp-field><field-name>id</field-name></cmp-field>
- <cmp-field><field-name>firstName</field-name></cmp-field>
- <cmp-field><field-name>lastName</field-name></cmp-field>
+ <cmp-field>
+ <field-name>id</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>firstName</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>lastName</field-name>
+ </cmp-field>
<primkey-field>id</primkey-field>
<env-entry>
<env-entry-name>entity/references/JNDI_access_to_java_comp_env</env-entry-name>
@@ -166,9 +168,15 @@
<prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>false</reentrant>
<cmp-version>1.x</cmp-version>
- <cmp-field><field-name>id</field-name></cmp-field>
- <cmp-field><field-name>firstName</field-name></cmp-field>
- <cmp-field><field-name>lastName</field-name></cmp-field>
+ <cmp-field>
+ <field-name>id</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>firstName</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>lastName</field-name>
+ </cmp-field>
<primkey-field>id</primkey-field>
<env-entry>
<env-entry-name>entity/cmp/references/Boolean</env-entry-name>
@@ -261,9 +269,15 @@
<prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>false</reentrant>
<cmp-version>1.x</cmp-version>
- <cmp-field><field-name>id</field-name></cmp-field>
- <cmp-field><field-name>firstName</field-name></cmp-field>
- <cmp-field><field-name>lastName</field-name></cmp-field>
+ <cmp-field>
+ <field-name>id</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>firstName</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>lastName</field-name>
+ </cmp-field>
<primkey-field>id</primkey-field>
<ejb-ref>
<ejb-ref-name>cmp/rmi-iiop/home</ejb-ref-name>
@@ -309,9 +323,15 @@
<reentrant>false</reentrant>
<cmp-version>2.x</cmp-version>
<abstract-schema-name>BasicCmp2</abstract-schema-name>
- <cmp-field><field-name>id</field-name></cmp-field>
- <cmp-field><field-name>firstName</field-name></cmp-field>
- <cmp-field><field-name>lastName</field-name></cmp-field>
+ <cmp-field>
+ <field-name>id</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>firstName</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>lastName</field-name>
+ </cmp-field>
<primkey-field>id</primkey-field>
<resource-ref>
<description>
@@ -329,7 +349,7 @@
</method-params>
</query-method>
<ejb-ql>
- <![CDATA[SELECT OBJECT(a) FROM BasicCmp2 AS a WHERE a.lastName = ?1]]>
+ <![CDATA[SELECT OBJECT(a) FROM BasicCmp2 AS a WHERE a.lastName = ?1]]>
</ejb-ql>
</query>
<query>
@@ -338,7 +358,7 @@
<method-params/>
</query-method>
<ejb-ql>
- <![CDATA[SELECT OBJECT(a) FROM BasicCmp2 AS a WHERE 1 = 0]]>
+ <![CDATA[SELECT OBJECT(a) FROM BasicCmp2 AS a WHERE 1 = 0]]>
</ejb-ql>
</query>
</entity>
@@ -361,9 +381,15 @@
<prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>false</reentrant>
<abstract-schema-name>AOBasicCmp2</abstract-schema-name>
- <cmp-field><field-name>id</field-name></cmp-field>
- <cmp-field><field-name>firstName</field-name></cmp-field>
- <cmp-field><field-name>lastName</field-name></cmp-field>
+ <cmp-field>
+ <field-name>id</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>firstName</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>lastName</field-name>
+ </cmp-field>
<primkey-field>id</primkey-field>
<env-entry>
<env-entry-name>entity/references/JNDI_access_to_java_comp_env</env-entry-name>
@@ -401,7 +427,7 @@
</method-params>
</query-method>
<ejb-ql>
- <![CDATA[SELECT OBJECT(a) FROM AOBasicCmp2 AS a WHERE a.lastName = ?1]]>
+ <![CDATA[SELECT OBJECT(a) FROM AOBasicCmp2 AS a WHERE a.lastName = ?1]]>
</ejb-ql>
</query>
<query>
@@ -410,7 +436,7 @@
<method-params/>
</query-method>
<ejb-ql>
- <![CDATA[SELECT OBJECT(a) FROM AOBasicCmp2 AS a WHERE 1 = 0]]>
+ <![CDATA[SELECT OBJECT(a) FROM AOBasicCmp2 AS a WHERE 1 = 0]]>
</ejb-ql>
</query>
</entity>
@@ -433,9 +459,15 @@
<prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>false</reentrant>
<abstract-schema-name>EncCmp2</abstract-schema-name>
- <cmp-field><field-name>id</field-name></cmp-field>
- <cmp-field><field-name>firstName</field-name></cmp-field>
- <cmp-field><field-name>lastName</field-name></cmp-field>
+ <cmp-field>
+ <field-name>id</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>firstName</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>lastName</field-name>
+ </cmp-field>
<primkey-field>id</primkey-field>
<env-entry>
<env-entry-name>entity/cmp/references/Boolean</env-entry-name>
@@ -528,9 +560,15 @@
<prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>false</reentrant>
<abstract-schema-name>Cmp2RmiIiop</abstract-schema-name>
- <cmp-field><field-name>id</field-name></cmp-field>
- <cmp-field><field-name>firstName</field-name></cmp-field>
- <cmp-field><field-name>lastName</field-name></cmp-field>
+ <cmp-field>
+ <field-name>id</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>firstName</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>lastName</field-name>
+ </cmp-field>
<primkey-field>id</primkey-field>
<ejb-ref>
<ejb-ref-name>cmp/rmi-iiop/home</ejb-ref-name>
@@ -1312,14 +1350,6 @@
- <!--
- ########################################################
- ### ##
- ## CMR Mapping Beans ##
- ## ###
- ########################################################
- -->
-
<entity>
<ejb-name>OneOwningSideBean</ejb-name>
<local-home>org.apache.openejb.test.entity.cmp2.cmrmapping.OneOwningSideLocalHome</local-home>
@@ -1330,8 +1360,12 @@
<reentrant>false</reentrant>
<cmp-version>2.x</cmp-version>
<abstract-schema-name>Order</abstract-schema-name>
- <cmp-field><field-name>id</field-name></cmp-field>
- <cmp-field><field-name>field1</field-name></cmp-field>
+ <cmp-field>
+ <field-name>id</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>field1</field-name>
+ </cmp-field>
</entity>
<entity>
@@ -1344,7 +1378,9 @@
<reentrant>false</reentrant>
<cmp-version>2.x</cmp-version>
<abstract-schema-name>Order</abstract-schema-name>
- <cmp-field><field-name>id</field-name></cmp-field>
+ <cmp-field>
+ <field-name>id</field-name>
+ </cmp-field>
<primkey-field>id</primkey-field>
</entity>
@@ -1358,8 +1394,12 @@
<reentrant>false</reentrant>
<cmp-version>2.x</cmp-version>
<abstract-schema-name>Order</abstract-schema-name>
- <cmp-field><field-name>id</field-name></cmp-field>
- <cmp-field><field-name>field1</field-name></cmp-field>
+ <cmp-field>
+ <field-name>id</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>field1</field-name>
+ </cmp-field>
<query>
<query-method>
<method-name>ejbSelectSomething</method-name>
@@ -1401,169 +1441,32 @@
</ejb-local-ref>
</session>
- <!--
- ########################################################
- ### ##
- ## CMP2 Petstore Beans ##
- ## ###
- ########################################################
- -->
<entity>
- <display-name>AddressEJB</display-name>
- <ejb-name>AddressEJB</ejb-name>
- <local-home>org.apache.openejb.test.entity.cmp2.petstore.AddressLocalHome</local-home>
- <local>org.apache.openejb.test.entity.cmp2.petstore.AddressLocal</local>
- <ejb-class>org.apache.openejb.test.entity.cmp2.petstore.AddressEJB</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>java.lang.Object</prim-key-class>
- <reentrant>False</reentrant>
- <cmp-version>2.x</cmp-version>
- <abstract-schema-name>Address</abstract-schema-name>
- <cmp-field>
- <description>no description</description>
- <field-name>street</field-name>
- </cmp-field>
- <cmp-field>
- <description>no description</description>
- <field-name>city</field-name>
- </cmp-field>
- <security-identity>
- <description></description>
- <use-caller-identity></use-caller-identity>
- </security-identity>
- </entity>
-
- <!--
- ########################################################
- ### ##
- ## CMP2 Prefetch Beans ##
- ## ###
- ########################################################
- -->
- <entity>
- <ejb-name>AddressBean</ejb-name>
- <local-home>org.apache.openejb.test.entity.cmp2.model.AddressLocalHome</local-home>
- <local>org.apache.openejb.test.entity.cmp2.model.AddressLocal</local>
- <ejb-class>org.apache.openejb.test.entity.cmp2.model.AddressBean</ejb-class>
+ <display-name>AddressEJB</display-name>
+ <ejb-name>AddressEJB</ejb-name>
+ <local-home>org.apache.openejb.test.entity.cmp2.petstore.AddressLocalHome</local-home>
+ <local>org.apache.openejb.test.entity.cmp2.petstore.AddressLocal</local>
+ <ejb-class>org.apache.openejb.test.entity.cmp2.petstore.AddressEJB</ejb-class>
<persistence-type>Container</persistence-type>
- <prim-key-class>java.lang.Integer</prim-key-class>
+ <prim-key-class>java.lang.Object</prim-key-class>
<reentrant>false</reentrant>
<cmp-version>2.x</cmp-version>
<abstract-schema-name>Address</abstract-schema-name>
- <cmp-field><field-name>id</field-name></cmp-field>
- <cmp-field><field-name>street</field-name></cmp-field>
- <cmp-field><field-name>city</field-name></cmp-field>
- <primkey-field>id</primkey-field>
- </entity>
-
- <entity>
- <ejb-name>LineItemBean</ejb-name>
- <local-home>org.apache.openejb.test.entity.cmp2.model.LineItemLocalHome</local-home>
- <local>org.apache.openejb.test.entity.cmp2.model.LineItemLocal</local>
- <ejb-class>org.apache.openejb.test.entity.cmp2.model.LineItemBean</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>java.lang.Integer</prim-key-class>
- <reentrant>false</reentrant>
- <cmp-version>2.x</cmp-version>
- <abstract-schema-name>LineItem</abstract-schema-name>
- <cmp-field><field-name>id</field-name></cmp-field>
- <cmp-field><field-name>quantity</field-name></cmp-field>
- <primkey-field>id</primkey-field>
- </entity>
-
- <entity>
- <ejb-name>OrderBean</ejb-name>
- <local-home>org.apache.openejb.test.entity.cmp2.model.OrderLocalHome</local-home>
- <local>org.apache.openejb.test.entity.cmp2.model.OrderLocal</local>
- <ejb-class>org.apache.openejb.test.entity.cmp2.model.OrderBean</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>java.lang.Integer</prim-key-class>
- <reentrant>false</reentrant>
- <cmp-version>2.x</cmp-version>
- <abstract-schema-name>Order</abstract-schema-name>
- <cmp-field><field-name>id</field-name></cmp-field>
- <cmp-field><field-name>reference</field-name></cmp-field>
- <primkey-field>id</primkey-field>
- <query>
- <query-method>
- <method-name>findPrefetchAll</method-name>
- <method-params>
- <method-param>java.lang.Integer</method-param>
- </method-params>
- </query-method>
- <ejb-ql>
- <![CDATA[SELECT OBJECT(o) FROM Order AS o WHERE o.id = ?1]]>
- </ejb-ql>
- </query>
- </entity>
-
- <entity>
- <ejb-name>ProductBean</ejb-name>
- <local-home>org.apache.openejb.test.entity.cmp2.model.ProductLocalHome</local-home>
- <local>org.apache.openejb.test.entity.cmp2.model.ProductLocal</local>
- <ejb-class>org.apache.openejb.test.entity.cmp2.model.ProductBean</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>java.lang.Integer</prim-key-class>
- <reentrant>false</reentrant>
- <cmp-version>2.x</cmp-version>
- <abstract-schema-name>Product</abstract-schema-name>
- <cmp-field><field-name>id</field-name></cmp-field>
- <cmp-field><field-name>name</field-name></cmp-field>
- <cmp-field><field-name>productType</field-name></cmp-field>
- <primkey-field>id</primkey-field>
+ <cmp-field>
+ <description>no description</description>
+ <field-name>street</field-name>
+ </cmp-field>
+ <cmp-field>
+ <description>no description</description>
+ <field-name>city</field-name>
+ </cmp-field>
+ <security-identity>
+ <description></description>
+ <use-caller-identity></use-caller-identity>
+ </security-identity>
</entity>
- <session>
- <ejb-name>PrefetchFacadeBean</ejb-name>
- <home>org.apache.openejb.test.entity.cmp2.prefetch.PrefetchFacadeHome</home>
- <remote>org.apache.openejb.test.entity.cmp2.prefetch.PrefetchFacadeObject</remote>
- <ejb-class>org.apache.openejb.test.entity.cmp2.prefetch.PrefetchFacadeBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Bean</transaction-type>
- <ejb-local-ref>
- <ejb-ref-name>ejb/Address</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>org.apache.openejb.test.entity.cmp2.model.AddressLocalHome</local-home>
- <local>org.apache.openejb.test.entity.cmp2.model.AddressLocal</local>
- <ejb-link>AddressBean</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <ejb-ref-name>ejb/LineItem</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>org.apache.openejb.test.entity.cmp2.model.LineItemLocalHome</local-home>
- <local>org.apache.openejb.test.entity.cmp2.model.LineItemLocal</local>
- <ejb-link>LineItemBean</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <ejb-ref-name>ejb/Order</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>org.apache.openejb.test.entity.cmp2.model.OrderLocalHome</local-home>
- <local>org.apache.openejb.test.entity.cmp2.model.OrderLocal</local>
- <ejb-link>OrderBean</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <ejb-ref-name>ejb/Product</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>org.apache.openejb.test.entity.cmp2.model.ProductLocalHome</local-home>
- <local>org.apache.openejb.test.entity.cmp2.model.ProductLocal</local>
- <ejb-link>ProductBean</ejb-link>
- </ejb-local-ref>
- <resource-ref>
- <res-ref-name>jdbc/CMPDatasource</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- </resource-ref>
- </session>
-
- <!--
- ########################################################
- ### ##
- ## CMP2 Storage Beans ##
- ## ###
- ########################################################
- -->
-
- <entity>
+ <entity>
<ejb-name>StorageBean</ejb-name>
<home>org.apache.openejb.test.entity.cmp2.model.StorageHome</home>
<remote>org.apache.openejb.test.entity.cmp2.model.StorageRemote</remote>
@@ -1587,15 +1490,6 @@
</enterprise-beans>
<relationships>
-
- <!--
- ########################################################
- ### ##
- ## CMR Mapping Relationships ##
- ## ###
- ########################################################
- -->
-
<ejb-relation>
<ejb-relationship-role>
<multiplicity>One</multiplicity>
@@ -1636,89 +1530,6 @@
</cmr-field>
</ejb-relationship-role>
</ejb-relation>
-
- <!--
- ########################################################
- ### ##
- ## CMP2 Prefetch Relationships ##
- ## ###
- ########################################################
- -->
-
- <ejb-relation>
- <ejb-relationship-role>
- <multiplicity>Many</multiplicity>
- <relationship-role-source>
- <ejb-name>OrderBean</ejb-name>
- </relationship-role-source>
- <cmr-field>
- <cmr-field-name>shippingAddress</cmr-field-name>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <multiplicity>One</multiplicity>
- <relationship-role-source>
- <ejb-name>AddressBean</ejb-name>
- </relationship-role-source>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation>
- <ejb-relationship-role>
- <multiplicity>Many</multiplicity>
- <relationship-role-source>
- <ejb-name>OrderBean</ejb-name>
- </relationship-role-source>
- <cmr-field>
- <cmr-field-name>billingAddress</cmr-field-name>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <multiplicity>One</multiplicity>
- <relationship-role-source>
- <ejb-name>AddressBean</ejb-name>
- </relationship-role-source>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation>
- <ejb-relationship-role>
- <multiplicity>One</multiplicity>
- <relationship-role-source>
- <ejb-name>OrderBean</ejb-name>
- </relationship-role-source>
- <cmr-field>
- <cmr-field-name>lineItems</cmr-field-name>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <multiplicity>Many</multiplicity>
- <relationship-role-source>
- <ejb-name>LineItemBean</ejb-name>
- </relationship-role-source>
- <cmr-field>
- <cmr-field-name>order</cmr-field-name>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation>
- <ejb-relationship-role>
- <multiplicity>One</multiplicity>
- <relationship-role-source>
- <ejb-name>ProductBean</ejb-name>
- </relationship-role-source>
- <cmr-field>
- <cmr-field-name>lineItems</cmr-field-name>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <multiplicity>Many</multiplicity>
- <relationship-role-source>
- <ejb-name>LineItemBean</ejb-name>
- </relationship-role-source>
- <cmr-field>
- <cmr-field-name>product</cmr-field-name>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
</relationships>
<assembly-descriptor>
@@ -1760,6 +1571,86 @@
</method>
</method-permission>
+ <method-permission>
+ <unchecked />
+ <method>
+ <ejb-name>AddressEJB</ejb-name>
+ <method-intf>Local</method-intf>
+ <method-name>getCity</method-name>
+ <method-params />
+ </method>
+ <method>
+ <ejb-name>AddressEJB</ejb-name>
+ <method-intf>Local</method-intf>
+ <method-name>getStreet</method-name>
+ <method-params />
+ </method>
+ <method>
+ <ejb-name>AddressEJB</ejb-name>
+ <method-intf>Local</method-intf>
+ <method-name>getPrimaryKey</method-name>
+ <method-params />
+ </method>
+ <method>
+ <ejb-name>AddressEJB</ejb-name>
+ <method-intf>LocalHome</method-intf>
+ <method-name>remove</method-name>
+ <method-params>
+ <method-param>java.lang.Object</method-param>
+ </method-params>
+ </method>
+ <method>
+ <ejb-name>AddressEJB</ejb-name>
+ <method-intf>LocalHome</method-intf>
+ <method-name>create</method-name>
+ <method-params />
+ </method>
+ <method>
+ <ejb-name>AddressEJB</ejb-name>
+ <method-intf>Local</method-intf>
+ <method-name>getEJBLocalHome</method-name>
+ <method-params />
+ </method>
+ <method>
+ <ejb-name>AddressEJB</ejb-name>
+ <method-intf>Local</method-intf>
+ <method-name>isIdentical</method-name>
+ <method-params>
+ <method-param>javax.ejb.EJBLocalObject</method-param>
+ </method-params>
+ </method>
+ <method>
+ <ejb-name>AddressEJB</ejb-name>
+ <method-intf>Local</method-intf>
+ <method-name>remove</method-name>
+ <method-params />
+ </method>
+ <method>
+ <ejb-name>AddressEJB</ejb-name>
+ <method-intf>Local</method-intf>
+ <method-name>setStreet</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ </method-params>
+ </method>
+ <method>
+ <ejb-name>AddressEJB</ejb-name>
+ <method-intf>Local</method-intf>
+ <method-name>setCity</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ </method-params>
+ </method>
+ <method>
+ <ejb-name>AddressEJB</ejb-name>
+ <method-intf>LocalHome</method-intf>
+ <method-name>findByPrimaryKey</method-name>
+ <method-params>
+ <method-param>java.lang.Object</method-param>
+ </method-params>
+ </method>
+ </method-permission>
+
<container-transaction>
<method>
<ejb-name>BasicStatefulBean</ejb-name>
@@ -1869,6 +1760,7 @@
<trans-attribute>Never</trans-attribute>
</container-transaction>
+
<container-transaction>
<method>
<ejb-name>SessionFacadeBean</ejb-name>
@@ -1907,14 +1799,6 @@
<trans-attribute>Never</trans-attribute>
</container-transaction>
-
- <!--
- ########################################################
- ### ##
- ## CMR Mapping Assembly ##
- ## ###
- ########################################################
- -->
<container-transaction>
<method>
<ejb-name>OneOwningSideBean</ejb-name>
@@ -1937,93 +1821,8 @@
<trans-attribute>Supports</trans-attribute>
</container-transaction>
- <!--
- ########################################################
- ### ##
- ## CMP2 Petstore Assembly ##
- ## ###
- ########################################################
- -->
+
- <method-permission>
- <unchecked/>
- <method>
- <ejb-name>AddressEJB</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>getCity</method-name>
- <method-params/>
- </method>
- <method>
- <ejb-name>AddressEJB</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>getStreet</method-name>
- <method-params/>
- </method>
- <method>
- <ejb-name>AddressEJB</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>getPrimaryKey</method-name>
- <method-params/>
- </method>
- <method>
- <ejb-name>AddressEJB</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>remove</method-name>
- <method-params>
- <method-param>java.lang.Object</method-param>
- </method-params>
- </method>
- <method>
- <ejb-name>AddressEJB</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>create</method-name>
- <method-params/>
- </method>
- <method>
- <ejb-name>AddressEJB</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>getEJBLocalHome</method-name>
- <method-params/>
- </method>
- <method>
- <ejb-name>AddressEJB</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>isIdentical</method-name>
- <method-params>
- <method-param>javax.ejb.EJBLocalObject</method-param>
- </method-params>
- </method>
- <method>
- <ejb-name>AddressEJB</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>remove</method-name>
- <method-params/>
- </method>
- <method>
- <ejb-name>AddressEJB</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>setStreet</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <method>
- <ejb-name>AddressEJB</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>setCity</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <method>
- <ejb-name>AddressEJB</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>findByPrimaryKey</method-name>
- <method-params>
- <method-param>java.lang.Object</method-param>
- </method-params>
- </method>
- </method-permission>
<container-transaction>
<method>
<ejb-name>AddressEJB</ejb-name>
@@ -2040,7 +1839,7 @@
<ejb-name>AddressEJB</ejb-name>
<method-intf>Local</method-intf>
<method-name>getCity</method-name>
- <method-params/>
+ <method-params />
</method>
<trans-attribute>Required</trans-attribute>
</container-transaction>
@@ -2049,7 +1848,7 @@
<ejb-name>AddressEJB</ejb-name>
<method-intf>Local</method-intf>
<method-name>remove</method-name>
- <method-params/>
+ <method-params />
</method>
<trans-attribute>Required</trans-attribute>
</container-transaction>
@@ -2058,7 +1857,7 @@
<ejb-name>AddressEJB</ejb-name>
<method-intf>Local</method-intf>
<method-name>getStreet</method-name>
- <method-params/>
+ <method-params />
</method>
<trans-attribute>Required</trans-attribute>
</container-transaction>
@@ -2073,52 +1872,6 @@
</method>
<trans-attribute>Required</trans-attribute>
</container-transaction>
-
-
- <!--
- ########################################################
- ### ##
- ## CMP2 Prefetch Assembly ##
- ## ###
- ########################################################
- -->
-
- <container-transaction>
- <method>
- <ejb-name>AddressBean</ejb-name>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Supports</trans-attribute>
- </container-transaction>
- <container-transaction>
- <method>
- <ejb-name>LineItemBean</ejb-name>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Supports</trans-attribute>
- </container-transaction>
- <container-transaction>
- <method>
- <ejb-name>OrderBean</ejb-name>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Supports</trans-attribute>
- </container-transaction>
- <container-transaction>
- <method>
- <ejb-name>ProductBean</ejb-name>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Supports</trans-attribute>
- </container-transaction>
-
- <!--
- ########################################################
- ### ##
- ## CMP2 Storage Assembly ##
- ## ###
- ########################################################
- -->
<container-transaction>
<method>