User: mnf999
Date: 01/12/18 21:50:12
Modified: src/main/org/jboss/ejb/plugins/cmp/jdbc
JDBCAbstractQueryCommand.java
JDBCReadAheadInterceptor.java
JDBCRelationInterceptor.java JDBCStoreManager.java
Log:
using the new Invocation and create()
Revision Changes Path
1.4 +1 -8
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCAbstractQueryCommand.java
Index: JDBCAbstractQueryCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCAbstractQueryCommand.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JDBCAbstractQueryCommand.java 2001/12/17 18:59:13 1.3
+++ JDBCAbstractQueryCommand.java 2001/12/19 05:50:11 1.4
@@ -42,7 +42,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Joe Shevland</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Justin Forder</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public abstract class JDBCAbstractQueryCommand implements JDBCQueryCommand {
private JDBCStoreManager manager;
@@ -155,14 +155,7 @@
} else {
ContainerInvoker invoker;
invoker = container.getContainerInvoker();
- try {
return invoker.getEntityCollection(finderResults);
- } catch(RemoteException e) {
- // this won't happen as the container invokers
- // don't actuall throw exceptions for this method
- // and this method does nothing remote
- throw new FinderException("Error obtaining ejbs: " + e);
- }
}
}
1.3 +5 -5
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCReadAheadInterceptor.java
Index: JDBCReadAheadInterceptor.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCReadAheadInterceptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JDBCReadAheadInterceptor.java 2001/11/24 22:31:09 1.2
+++ JDBCReadAheadInterceptor.java 2001/12/19 05:50:11 1.3
@@ -12,11 +12,11 @@
import org.jboss.ejb.EntityContainer;
import org.jboss.ejb.EntityPersistenceStore;
import org.jboss.ejb.EntityEnterpriseContext;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invocation;
import org.jboss.ejb.ListCacheKey;
import org.jboss.ejb.plugins.AbstractInterceptor;
import org.jboss.ejb.plugins.CMPPersistenceManager;
-import org.jboss.ejb.plugins.jrmp.interfaces.ReadAheadResult;
+import org.jboss.proxy.ejb.ReadAheadResult;
import org.jboss.util.CachePolicy;
import org.jboss.util.FinderResults;
@@ -26,7 +26,7 @@
* then invokes the given method on the container for all of them, gathers results
and returns them.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Oleg Nitz</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class JDBCReadAheadInterceptor extends AbstractInterceptor {
// Constants -----------------------------------------------------
@@ -53,7 +53,7 @@
// Interceptor implementation --------------------------------------
- public Object invoke(MethodInvocation mi) throws Exception {
+ public Object invoke(Invocation mi) throws Exception {
Object result = null;
if ((mi.getId() instanceof ListCacheKey) && (container instanceof
EntityContainer) &&
@@ -80,7 +80,7 @@
//storeManager.loadEntities(results, from, to);
rar.setMainResult(getNext().invoke(mi));
for (int i = from; i < to; i++) {
- rar.addAheadResult(container.invoke(new MethodInvocation(
+ rar.addAheadResult(container.invoke(new Invocation(
new CacheKey(ids.get(i)), mi.getMethod(), mi.getArguments(),
mi.getTransaction(), mi.getPrincipal(),
mi.getCredential())));
}
1.9 +3 -3
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCRelationInterceptor.java
Index: JDBCRelationInterceptor.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCRelationInterceptor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JDBCRelationInterceptor.java 2001/12/01 21:55:05 1.8
+++ JDBCRelationInterceptor.java 2001/12/19 05:50:12 1.9
@@ -17,7 +17,7 @@
import org.jboss.ejb.Container;
import org.jboss.ejb.EntityContainer;
import org.jboss.ejb.EntityEnterpriseContext;
-import org.jboss.ejb.MethodInvocation;
+import org.jboss.invocation.Invocation;
import org.jboss.ejb.plugins.AbstractInterceptor;
import org.jboss.ejb.plugins.CMPPersistenceManager;
import org.jboss.ejb.plugins.cmp.jdbc.bridge.CMRMessage;
@@ -32,7 +32,7 @@
* relationship. This interceptor also manages the relation table data.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Dain Sundstrom</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class JDBCRelationInterceptor extends AbstractInterceptor
{
@@ -97,7 +97,7 @@
// Interceptor implementation --------------------------------------
- public Object invoke(MethodInvocation mi) throws Exception
+ public Object invoke(Invocation mi) throws Exception
{
// We are going to work with the context a lot
EntityEnterpriseContext ctx =
1.21 +3 -3
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStoreManager.java
Index: JDBCStoreManager.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStoreManager.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- JDBCStoreManager.java 2001/12/04 06:30:53 1.20
+++ JDBCStoreManager.java 2001/12/19 05:50:12 1.21
@@ -57,7 +57,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Dain Sundstrom</a>
* @see org.jboss.ejb.EntityPersistenceStore
- * @version $Revision: 1.20 $
+ * @version $Revision: 1.21 $
*/
public class JDBCStoreManager implements EntityPersistenceStore {
@@ -163,7 +163,7 @@
//
// Store Manager Life Cycle Commands
//
- public void init() throws Exception {
+ public void create() throws Exception {
log.debug("Initializing CMP plugin for " +
container.getBeanMetaData().getEjbName());
@@ -216,7 +216,7 @@
readAheadLimit = metaData.getReadAhead().getLimit();
readAheadCache =
new LRUCachePolicy(2, metaData.getReadAhead().getCacheSize());
- readAheadCache.init();
+ readAheadCache.create();
}
tm = (TransactionManager) container.getTransactionManager();
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development