You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2006/11/29 12:47:22 UTC
svn commit: r480540 - in /incubator/openejb/branches/v2_2/openejb2/modules:
openejb-builder/src/test/java/org/apache/openejb/deployment/entity/
openejb-builder/src/test/resources/plans/
openejb-core/src/main/java/org/apache/openejb/entity/cmp/
Author: jlaskowski
Date: Wed Nov 29 03:47:11 2006
New Revision: 480540
URL: http://svn.apache.org/viewvc?view=rev&rev=480540
Log:
Temporary fix for "OPENEJB-384 Deployment doesn't ensure queries defined for ejbSelect methods" - ejbSelects methods commented out
Modified:
incubator/openejb/branches/v2_2/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockCMPEJB.java
incubator/openejb/branches/v2_2/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockHome.java
incubator/openejb/branches/v2_2/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockLocalHome.java
incubator/openejb/branches/v2_2/openejb2/modules/openejb-builder/src/test/resources/plans/plan1.xml
incubator/openejb/branches/v2_2/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/entity/cmp/TranqlEjbCmpEngine.java
Modified: incubator/openejb/branches/v2_2/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockCMPEJB.java
URL: http://svn.apache.org/viewvc/incubator/openejb/branches/v2_2/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockCMPEJB.java?view=diff&rev=480540&r1=480539&r2=480540
==============================================================================
--- incubator/openejb/branches/v2_2/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockCMPEJB.java (original)
+++ incubator/openejb/branches/v2_2/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockCMPEJB.java Wed Nov 29 03:47:11 2006
@@ -27,8 +27,6 @@
import javax.ejb.TimerService;
/**
- *
- *
* @version $Revision$ $Date$
*/
public abstract class MockCMPEJB implements EntityBean, TimedObject {
@@ -49,22 +47,22 @@
return i + 1;
}
- public String ejbHomeSingleSelect(Integer i) throws FinderException {
- try {
- String s = ejbSelectSingleValue(i);
- return s;
- } catch (FinderException e) {
- throw e;
- }
- }
-
- public Collection ejbHomeMultiSelect(Integer i) throws FinderException {
- return ejbSelectMultiValue(i);
- }
-
- public Collection ejbHomeMultiObject(Integer i) throws FinderException {
- return ejbSelectMultiObject(i);
- }
+// public String ejbHomeSingleSelect(Integer i) throws FinderException {
+// try {
+// String s = ejbSelectSingleValue(i);
+// return s;
+// } catch (FinderException e) {
+// throw e;
+// }
+// }
+
+// public Collection ejbHomeMultiSelect(Integer i) throws FinderException {
+// return ejbSelectMultiValue(i);
+// }
+
+// public Collection ejbHomeMultiObject(Integer i) throws FinderException {
+// return ejbSelectMultiObject(i);
+// }
public int intMethod(int i) {
return 1 + i + ((Integer) context.getPrimaryKey()).intValue();
@@ -74,9 +72,9 @@
return field;
}
- public abstract String ejbSelectSingleValue(Integer i) throws FinderException;
- public abstract Collection ejbSelectMultiValue(Integer i) throws FinderException;
- public abstract Collection ejbSelectMultiObject(Integer i) throws FinderException;
+// public abstract String ejbSelectSingleValue(Integer i) throws FinderException;
+// public abstract Collection ejbSelectMultiValue(Integer i) throws FinderException;
+// public abstract Collection ejbSelectMultiObject(Integer i) throws FinderException;
public abstract Integer getId();
public abstract void setId(Integer i);
Modified: incubator/openejb/branches/v2_2/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockHome.java
URL: http://svn.apache.org/viewvc/incubator/openejb/branches/v2_2/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockHome.java?view=diff&rev=480540&r1=480539&r2=480540
==============================================================================
--- incubator/openejb/branches/v2_2/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockHome.java (original)
+++ incubator/openejb/branches/v2_2/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockHome.java Wed Nov 29 03:47:11 2006
@@ -23,8 +23,6 @@
import javax.ejb.FinderException;
/**
- *
- *
* @version $Revision$ $Date$
*/
public interface MockHome extends EJBHome {
@@ -34,9 +32,9 @@
int intMethod(int i) throws RemoteException;
- String singleSelect(Integer i) throws FinderException, RemoteException;
+// String singleSelect(Integer i) throws FinderException, RemoteException;
- Collection multiSelect(Integer i) throws FinderException, RemoteException;
+// Collection multiSelect(Integer i) throws FinderException, RemoteException;
- Collection multiObject(Integer i) throws FinderException, RemoteException;
+// Collection multiObject(Integer i) throws FinderException, RemoteException;
}
Modified: incubator/openejb/branches/v2_2/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockLocalHome.java
URL: http://svn.apache.org/viewvc/incubator/openejb/branches/v2_2/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockLocalHome.java?view=diff&rev=480540&r1=480539&r2=480540
==============================================================================
--- incubator/openejb/branches/v2_2/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockLocalHome.java (original)
+++ incubator/openejb/branches/v2_2/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/entity/MockLocalHome.java Wed Nov 29 03:47:11 2006
@@ -31,9 +31,9 @@
int intMethod(int i);
- String singleSelect(Integer i) throws FinderException;
+// String singleSelect(Integer i) throws FinderException;
- Collection multiSelect(Integer i) throws FinderException;
+// Collection multiSelect(Integer i) throws FinderException;
- Collection multiObject(Integer i) throws FinderException;
+// Collection multiObject(Integer i) throws FinderException;
}
Modified: incubator/openejb/branches/v2_2/openejb2/modules/openejb-builder/src/test/resources/plans/plan1.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/branches/v2_2/openejb2/modules/openejb-builder/src/test/resources/plans/plan1.xml?view=diff&rev=480540&r1=480539&r2=480540
==============================================================================
--- incubator/openejb/branches/v2_2/openejb2/modules/openejb-builder/src/test/resources/plans/plan1.xml (original)
+++ incubator/openejb/branches/v2_2/openejb2/modules/openejb-builder/src/test/resources/plans/plan1.xml Wed Nov 29 03:47:11 2006
@@ -16,6 +16,8 @@
limitations under the License.
-->
+<!-- $Rev$ $Date$ -->
+
<openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
<environment>
Modified: incubator/openejb/branches/v2_2/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/entity/cmp/TranqlEjbCmpEngine.java
URL: http://svn.apache.org/viewvc/incubator/openejb/branches/v2_2/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/entity/cmp/TranqlEjbCmpEngine.java?view=diff&rev=480540&r1=480539&r2=480540
==============================================================================
--- incubator/openejb/branches/v2_2/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/entity/cmp/TranqlEjbCmpEngine.java (original)
+++ incubator/openejb/branches/v2_2/openejb2/modules/openejb-core/src/main/java/org/apache/openejb/entity/cmp/TranqlEjbCmpEngine.java Wed Nov 29 03:47:11 2006
@@ -246,8 +246,9 @@
queries.add(new TranqlSingleValuedQuery(query, command, null, query.getSelectedEJB(), identityDefinerBuilder));
}
}
- if(list.size() != 0)
+ if(list.size() != 0) {
throw new IllegalArgumentException("Could not find entry for ejbSelect method " + ((InterfaceMethodSignature)list.get(0)).getMethodName()+" in ejb descriptor");
+ }
return queries;
}
@@ -293,8 +294,9 @@
queries.add(new TranqlSingleValuedQuery(query, commands[0], commands[1], ejb, identityDefinerBuilder));
}
}
- if(list.size() != 0)
+ if(list.size() != 0) {
throw new IllegalArgumentException("Could not find entry for finder method " + ((InterfaceMethodSignature)list.get(0)).getMethodName()+" in ejb descriptor");
+ }
return queries;
}