You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by ad...@apache.org on 2007/01/06 21:33:32 UTC
svn commit: r493564 - in
/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb:
assembler/classic/ assembler/spring/ core/entity/ core/mdb/ core/stateful/
core/stateless/
Author: adc
Date: Sat Jan 6 12:33:31 2007
New Revision: 493564
URL: http://svn.apache.org/viewvc?view=rev&rev=493564
Log:
Renamed a few classes
Added:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityENCReference.java (contents, props changed)
- copied, changed from r493505, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EncReference.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbENCReference.java
- copied, changed from r493505, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EncReference.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbENCUserTransaction.java
- copied, changed from r493505, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EncUserTransaction.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulENCReference.java (contents, props changed)
- copied, changed from r493505, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/EncReference.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulENCUserTransaction.java (contents, props changed)
- copied, changed from r493505, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/EncUserTransaction.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessENCReference.java (contents, props changed)
- copied, changed from r493505, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EncReference.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessENCUserTransaction.java (contents, props changed)
- copied, changed from r493505, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EncUserTransaction.java
Removed:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EncReference.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EncReference.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EncUserTransaction.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/EncReference.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/EncUserTransaction.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EncReference.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EncUserTransaction.java
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EncBuilder.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java?view=diff&rev=493564&r1=493563&r2=493564
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java Sat Jan 6 12:33:31 2007
@@ -169,11 +169,11 @@
Reference ref = new ObjectReference(proxy);
if (deployment.getComponentType() == BeanType.STATEFUL) {
- ref = new org.apache.openejb.core.stateful.EncReference(ref);
+ ref = new org.apache.openejb.core.stateful.StatefulENCReference(ref);
} else if (deployment.getComponentType() == BeanType.STATELESS) {
- ref = new org.apache.openejb.core.stateless.EncReference(ref);
+ ref = new org.apache.openejb.core.stateless.StatelessENCReference(ref);
} else {
- ref = new org.apache.openejb.core.entity.EncReference(ref);
+ ref = new org.apache.openejb.core.entity.EntityENCReference(ref);
}
return ref;
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java?view=diff&rev=493564&r1=493563&r2=493564
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java Sat Jan 6 12:33:31 2007
@@ -296,7 +296,7 @@
static class EntityRefereceWrapper extends ReferenceWrapper {
public Object wrap(Reference reference) {
- return new org.apache.openejb.core.entity.EncReference(reference);
+ return new org.apache.openejb.core.entity.EntityENCReference(reference);
}
public Object wrap(UserTransaction userTransaction) {
@@ -306,31 +306,31 @@
static class StatelessRefereceWrapper extends ReferenceWrapper {
public Object wrap(Reference reference) {
- return new org.apache.openejb.core.stateless.EncReference(reference);
+ return new org.apache.openejb.core.stateless.StatelessENCReference(reference);
}
public Object wrap(UserTransaction userTransaction) {
- return new org.apache.openejb.core.stateless.EncUserTransaction((CoreUserTransaction) userTransaction);
+ return new org.apache.openejb.core.stateless.StatelessENCUserTransaction((CoreUserTransaction) userTransaction);
}
}
static class StatefulRefereceWrapper extends ReferenceWrapper {
public Object wrap(Reference reference) {
- return new org.apache.openejb.core.stateful.EncReference(reference);
+ return new org.apache.openejb.core.stateful.StatefulENCReference(reference);
}
public Object wrap(UserTransaction userTransaction) {
- return new org.apache.openejb.core.stateful.EncUserTransaction((CoreUserTransaction) userTransaction);
+ return new org.apache.openejb.core.stateful.StatefulENCUserTransaction((CoreUserTransaction) userTransaction);
}
}
static class MessageDrivenRefereceWrapper extends ReferenceWrapper {
public Object wrap(Reference reference) {
- return new org.apache.openejb.core.mdb.EncReference(reference);
+ return new org.apache.openejb.core.mdb.MdbENCReference(reference);
}
public Object wrap(UserTransaction userTransaction) {
- return new org.apache.openejb.core.mdb.EncUserTransaction((CoreUserTransaction) userTransaction);
+ return new org.apache.openejb.core.mdb.MdbENCUserTransaction((CoreUserTransaction) userTransaction);
}
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EncBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EncBuilder.java?view=diff&rev=493564&r1=493563&r2=493564
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EncBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/EncBuilder.java Sat Jan 6 12:33:31 2007
@@ -27,7 +27,6 @@
import org.apache.openejb.SystemException;
import org.apache.openejb.BeanType;
import org.apache.openejb.core.CoreUserTransaction;
-import org.apache.openejb.core.CoreDeploymentInfo;
import org.apache.openejb.core.ivm.naming.IntraVmJndiReference;
import org.apache.openejb.core.ivm.naming.IvmContext;
import org.apache.openejb.core.ivm.naming.JndiReference;
@@ -204,7 +203,7 @@
static class EntityRefereceWrapper extends EncBuilder.ReferenceWrapper {
public Object wrap(Reference reference) {
- return new org.apache.openejb.core.entity.EncReference(reference);
+ return new org.apache.openejb.core.entity.EntityENCReference(reference);
}
public Object wrap(UserTransaction userTransaction) {
@@ -214,21 +213,21 @@
static class StatelessRefereceWrapper extends EncBuilder.ReferenceWrapper {
public Object wrap(Reference reference) {
- return new org.apache.openejb.core.stateless.EncReference(reference);
+ return new org.apache.openejb.core.stateless.StatelessENCReference(reference);
}
public Object wrap(UserTransaction userTransaction) {
- return new org.apache.openejb.core.stateless.EncUserTransaction((CoreUserTransaction) userTransaction);
+ return new org.apache.openejb.core.stateless.StatelessENCUserTransaction((CoreUserTransaction) userTransaction);
}
}
static class StatefulRefereceWrapper extends EncBuilder.ReferenceWrapper {
public Object wrap(Reference reference) {
- return new org.apache.openejb.core.stateful.EncReference(reference);
+ return new org.apache.openejb.core.stateful.StatefulENCReference(reference);
}
public Object wrap(UserTransaction userTransaction) {
- return new org.apache.openejb.core.stateful.EncUserTransaction((CoreUserTransaction) userTransaction);
+ return new org.apache.openejb.core.stateful.StatefulENCUserTransaction((CoreUserTransaction) userTransaction);
}
}
}
Copied: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityENCReference.java (from r493505, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EncReference.java)
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityENCReference.java?view=diff&rev=493564&p1=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EncReference.java&r1=493505&p2=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityENCReference.java&r2=493564
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EncReference.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityENCReference.java Sat Jan 6 12:33:31 2007
@@ -18,26 +18,28 @@
import javax.naming.NameNotFoundException;
+import org.apache.openejb.core.ivm.naming.ENCReference;
import org.apache.openejb.core.ivm.naming.Reference;
-/*
- This class is a wrapper for an Intra-VM EJB or Connector references in the
- JNDI ENC of a entity bean. When the getObject( ) method is invoked the
- Operation is checked to ensure that its is allowed for the bean's current state.
-*/
-public class EncReference extends org.apache.openejb.core.ivm.naming.ENCReference {
+/**
+ * This class is a wrapper for an Intra-VM EJB or Connector references in the
+ * JNDI ENC of a entity bean. When the getObject( ) method is invoked the
+ * Operation is checked to ensure that its is allowed for the bean's current state.
+ */
- public EncReference(Reference ref) {
+public class EntityENCReference extends ENCReference {
+
+ public EntityENCReference(Reference ref) {
super(ref);
}
- /*
- * This method is invoked by the ENCReference super class each time its
- * getObject() method is called within the container system. This checkOperation
- * method ensures that the entity bean is in the correct state before the super
- * class can return the requested reference object.
- */
+ /**
+ * This method is invoked by the ENCReference super class each time its
+ * getObject() method is called within the container system. This checkOperation
+ * method ensures that the entity bean is in the correct state before the super
+ * class can return the requested reference object.
+ */
public void checkOperation(byte operation) throws NameNotFoundException {
/* if( operation == Operations.OP_SET_CONTEXT ||
Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityENCReference.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityENCReference.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Copied: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbENCReference.java (from r493505, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EncReference.java)
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbENCReference.java?view=diff&rev=493564&p1=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EncReference.java&r1=493505&p2=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbENCReference.java&r2=493564
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EncReference.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbENCReference.java Sat Jan 6 12:33:31 2007
@@ -16,13 +16,15 @@
*/
package org.apache.openejb.core.mdb;
+import javax.naming.NameNotFoundException;
+
+import org.apache.openejb.core.ivm.naming.ENCReference;
import org.apache.openejb.core.ivm.naming.Reference;
-import javax.naming.NameNotFoundException;
-public class EncReference extends org.apache.openejb.core.ivm.naming.ENCReference {
+public class MdbENCReference extends ENCReference {
- public EncReference(Reference ref) {
+ public MdbENCReference(Reference ref) {
super(ref);
}
@@ -34,5 +36,4 @@
}
*/
}
-
}
Copied: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbENCUserTransaction.java (from r493505, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EncUserTransaction.java)
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbENCUserTransaction.java?view=diff&rev=493564&p1=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EncUserTransaction.java&r1=493505&p2=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbENCUserTransaction.java&r2=493564
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EncUserTransaction.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbENCUserTransaction.java Sat Jan 6 12:33:31 2007
@@ -16,32 +16,34 @@
*/
package org.apache.openejb.core.mdb;
+import javax.naming.NameNotFoundException;
+
+import org.apache.openejb.core.CoreUserTransaction;
import org.apache.openejb.core.Operations;
+import org.apache.openejb.core.ivm.naming.ENCReference;
import org.apache.openejb.core.ivm.naming.ObjectReference;
-import javax.naming.NameNotFoundException;
-
-/*
- This class is a wrapper for CoreUserTransaction reference in the
- JNDI ENC of a message driven bean. When the getObject( ) method is invoked the
- Operation is checked to ensure that its is allowed for the bean's current state.
-*/
-public class EncUserTransaction extends org.apache.openejb.core.ivm.naming.ENCReference {
+/**
+ * This class is a wrapper for CoreUserTransaction reference in the
+ * JNDI ENC of a message driven bean. When the getObject( ) method is invoked the
+ * Operation is checked to ensure that its is allowed for the bean's current state.
+ */
+public class MdbENCUserTransaction extends ENCReference {
- /*
- * This constructor take a new CoreUserTransaction object as the object reference
- */
- public EncUserTransaction(org.apache.openejb.core.CoreUserTransaction reference) {
+ /**
+ * This constructor take a new CoreUserTransaction object as the object reference
+ */
+ public MdbENCUserTransaction(CoreUserTransaction reference) {
super(new ObjectReference(reference));
}
- /*
- * This method is invoked by the ENCReference super class each time its
- * getObject() method is called within the container system. This checkOperation
- * method ensures that the message driven bean is in the correct state before the super
- * class can return the requested reference object.
- */
+ /**
+ * This method is invoked by the ENCReference super class each time its
+ * getObject() method is called within the container system. This checkOperation
+ * method ensures that the message driven bean is in the correct state before the super
+ * class can return the requested reference object.
+ */
public void checkOperation(byte operation) throws NameNotFoundException {
if (operation == Operations.OP_SET_CONTEXT) {
throw new NameNotFoundException("Operation Not Allowed");
Copied: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulENCReference.java (from r493505, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/EncReference.java)
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulENCReference.java?view=diff&rev=493564&p1=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/EncReference.java&r1=493505&p2=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulENCReference.java&r2=493564
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/EncReference.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulENCReference.java Sat Jan 6 12:33:31 2007
@@ -16,14 +16,16 @@
*/
package org.apache.openejb.core.stateful;
+import javax.naming.NameNotFoundException;
+
import org.apache.openejb.core.Operations;
+import org.apache.openejb.core.ivm.naming.ENCReference;
import org.apache.openejb.core.ivm.naming.Reference;
-import javax.naming.NameNotFoundException;
-public class EncReference extends org.apache.openejb.core.ivm.naming.ENCReference {
+public class StatefulENCReference extends ENCReference {
- public EncReference(Reference ref) {
+ public StatefulENCReference(Reference ref) {
super(ref);
}
@@ -32,7 +34,5 @@
if (operation == Operations.OP_AFTER_COMPLETION) {
throw new NameNotFoundException("Operation Not Allowed");
}
-
}
-
}
Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulENCReference.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulENCReference.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Copied: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulENCUserTransaction.java (from r493505, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/EncUserTransaction.java)
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulENCUserTransaction.java?view=diff&rev=493564&p1=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/EncUserTransaction.java&r1=493505&p2=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulENCUserTransaction.java&r2=493564
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/EncUserTransaction.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulENCUserTransaction.java Sat Jan 6 12:33:31 2007
@@ -16,38 +16,37 @@
*/
package org.apache.openejb.core.stateful;
-import org.apache.openejb.core.Operations;
-import org.apache.openejb.core.ivm.naming.ObjectReference;
-
import javax.naming.NameNotFoundException;
-/*
- This class is a wrapper for CoreUserTransaction reference in the
- JNDI ENC of a stateful bean. When the getObject( ) method is invoked the
- Operation is checked to ensure that its is allowed for the bean's current state.
-*/
+import org.apache.openejb.core.CoreUserTransaction;
+import org.apache.openejb.core.Operations;
+import org.apache.openejb.core.ivm.naming.ENCReference;
+import org.apache.openejb.core.ivm.naming.ObjectReference;
-public class EncUserTransaction extends org.apache.openejb.core.ivm.naming.ENCReference {
- /*
- * This constructor take a new CoreUserTransaction object as the object reference
- */
- public EncUserTransaction(org.apache.openejb.core.CoreUserTransaction reference) {
+/**
+ * This class is a wrapper for CoreUserTransaction reference in the
+ * JNDI ENC of a stateful bean. When the getObject( ) method is invoked the
+ * Operation is checked to ensure that its is allowed for the bean's current state.
+ */
+public class StatefulENCUserTransaction extends ENCReference {
+
+ /**
+ * This constructor take a new CoreUserTransaction object as the object reference
+ */
+ public StatefulENCUserTransaction(CoreUserTransaction reference) {
super(new ObjectReference(reference));
}
- /*
- * This method is invoked by the ENCReference super class each time its
- * getObject() method is called within the container system. This checkOperation
- * method ensures that the stateful bean is in the correct state before the super
- * class can return the requested reference object.
- */
+ /**
+ * This method is invoked by the ENCReference super class each time its
+ * getObject() method is called within the container system. This checkOperation
+ * method ensures that the stateful bean is in the correct state before the super
+ * class can return the requested reference object.
+ */
public void checkOperation(byte operation) throws NameNotFoundException {
- if (operation == Operations.OP_SET_CONTEXT || operation == Operations.OP_AFTER_COMPLETION || operation == Operations.OP_BEFORE_COMPLETION)
- {
+ if (operation == Operations.OP_SET_CONTEXT || operation == Operations.OP_AFTER_COMPLETION || operation == Operations.OP_BEFORE_COMPLETION) {
throw new NameNotFoundException("Operation Not Allowed");
}
-
}
-
}
Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulENCUserTransaction.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulENCUserTransaction.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Copied: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessENCReference.java (from r493505, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EncReference.java)
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessENCReference.java?view=diff&rev=493564&p1=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EncReference.java&r1=493505&p2=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessENCReference.java&r2=493564
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EncReference.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessENCReference.java Sat Jan 6 12:33:31 2007
@@ -16,18 +16,19 @@
*/
package org.apache.openejb.core.stateless;
+import javax.naming.NameNotFoundException;
+
+import org.apache.openejb.core.ivm.naming.ENCReference;
import org.apache.openejb.core.ivm.naming.Reference;
-import javax.naming.NameNotFoundException;
-public class EncReference extends org.apache.openejb.core.ivm.naming.ENCReference {
+public class StatelessENCReference extends ENCReference {
- public EncReference(Reference ref) {
+ public StatelessENCReference(Reference ref) {
super(ref);
}
public void checkOperation(byte operation) throws NameNotFoundException {
-
/*
if( operation != Operations.OP_BUSINESS ){
throw new NameNotFoundException("Operation Not Allowed");
Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessENCReference.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessENCReference.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Copied: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessENCUserTransaction.java (from r493505, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EncUserTransaction.java)
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessENCUserTransaction.java?view=diff&rev=493564&p1=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EncUserTransaction.java&r1=493505&p2=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessENCUserTransaction.java&r2=493564
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EncUserTransaction.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessENCUserTransaction.java Sat Jan 6 12:33:31 2007
@@ -16,32 +16,35 @@
*/
package org.apache.openejb.core.stateless;
+import javax.naming.NameNotFoundException;
+
+import org.apache.openejb.core.CoreUserTransaction;
import org.apache.openejb.core.Operations;
+import org.apache.openejb.core.ivm.naming.ENCReference;
import org.apache.openejb.core.ivm.naming.ObjectReference;
-import javax.naming.NameNotFoundException;
-/*
- This class is a wrapper for CoreUserTransaction reference in the
- JNDI ENC of a stateless bean. When the getObject( ) method is invoked the
- Operation is checked to ensure that its is allowed for the bean's current state.
-*/
-
-public class EncUserTransaction extends org.apache.openejb.core.ivm.naming.ENCReference {
-
- /*
- * This constructor take a new CoreUserTransaction object as the object reference
- */
- public EncUserTransaction(org.apache.openejb.core.CoreUserTransaction reference) {
+/**
+ * This class is a wrapper for CoreUserTransaction reference in the
+ * JNDI ENC of a stateless bean. When the getObject( ) method is invoked the
+ * Operation is checked to ensure that its is allowed for the bean's current state.
+ */
+
+public class StatelessENCUserTransaction extends ENCReference {
+
+ /**
+ * This constructor take a new CoreUserTransaction object as the object reference
+ */
+ public StatelessENCUserTransaction(CoreUserTransaction reference) {
super(new ObjectReference(reference));
}
- /*
- * This method is invoked by the ENCReference super class each time its
- * getObject() method is called within the container system. This checkOperation
- * method ensures that the stateless bean is in the correct state before the super
- * class can return the requested reference object.
- */
+ /**
+ * This method is invoked by the ENCReference super class each time its
+ * getObject() method is called within the container system. This checkOperation
+ * method ensures that the stateless bean is in the correct state before the super
+ * class can return the requested reference object.
+ */
public void checkOperation(byte operation) throws NameNotFoundException {
if (operation == Operations.OP_SET_CONTEXT) {
throw new NameNotFoundException("Operation Not Allowed");
Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessENCUserTransaction.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessENCUserTransaction.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Re: svn commit: r493564 - in /incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb: assembler/classic/ assembler/spring/ core/entity/ core/mdb/ core/stateful/ core/stateless/
Posted by "Alan D. Cabrera" <li...@toolazydogs.com>.
On Jan 6, 2007, at 12:50 PM, David Blevins wrote:
> This is cool. FYI, though we use camel case on acronyms. So MDB
> ENC Reference would be MdbEncReference. Either that or we agree to
> use all uppercase acronyms and then you need to rename
> MdbENCReference to MDBENCReference
Camel case it will be.
Regards,
Alan
Re: svn commit: r493564 - in /incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb: assembler/classic/ assembler/spring/ core/entity/ core/mdb/ core/stateful/ core/stateless/
Posted by David Blevins <da...@visi.com>.
This is cool. FYI, though we use camel case on acronyms. So MDB ENC
Reference would be MdbEncReference. Either that or we agree to use
all uppercase acronyms and then you need to rename MdbENCReference to
MDBENCReference
Aside from that I think it's great you're going through the code and
making it more understandable! Big thumbs up.
-David
On Jan 6, 2007, at 12:33 PM, adc@apache.org wrote:
> Author: adc
> Date: Sat Jan 6 12:33:31 2007
> New Revision: 493564
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=493564
> Log:
> Renamed a few classes
>
> Added:
> incubator/openejb/trunk/openejb3/container/openejb-core/src/
> main/java/org/apache/openejb/core/entity/EntityENCReference.java
> (contents, props changed)
> - copied, changed from r493505, incubator/openejb/trunk/
> openejb3/container/openejb-core/src/main/java/org/apache/openejb/
> core/entity/EncReference.java
> incubator/openejb/trunk/openejb3/container/openejb-core/src/
> main/java/org/apache/openejb/core/mdb/MdbENCReference.java
> - copied, changed from r493505, incubator/openejb/trunk/
> openejb3/container/openejb-core/src/main/java/org/apache/openejb/
> core/mdb/EncReference.java
> incubator/openejb/trunk/openejb3/container/openejb-core/src/
> main/java/org/apache/openejb/core/mdb/MdbENCUserTransaction.java
> - copied, changed from r493505, incubator/openejb/trunk/
> openejb3/container/openejb-core/src/main/java/org/apache/openejb/
> core/mdb/EncUserTransaction.java
> incubator/openejb/trunk/openejb3/container/openejb-core/src/
> main/java/org/apache/openejb/core/stateful/
> StatefulENCReference.java (contents, props changed)
> - copied, changed from r493505, incubator/openejb/trunk/
> openejb3/container/openejb-core/src/main/java/org/apache/openejb/
> core/stateful/EncReference.java
> incubator/openejb/trunk/openejb3/container/openejb-core/src/
> main/java/org/apache/openejb/core/stateful/
> StatefulENCUserTransaction.java (contents, props changed)
> - copied, changed from r493505, incubator/openejb/trunk/
> openejb3/container/openejb-core/src/main/java/org/apache/openejb/
> core/stateful/EncUserTransaction.java
> incubator/openejb/trunk/openejb3/container/openejb-core/src/
> main/java/org/apache/openejb/core/stateless/
> StatelessENCReference.java (contents, props changed)
> - copied, changed from r493505, incubator/openejb/trunk/
> openejb3/container/openejb-core/src/main/java/org/apache/openejb/
> core/stateless/EncReference.java
> incubator/openejb/trunk/openejb3/container/openejb-core/src/
> main/java/org/apache/openejb/core/stateless/
> StatelessENCUserTransaction.java (contents, props changed)
> - copied, changed from r493505, incubator/openejb/trunk/
> openejb3/container/openejb-core/src/main/java/org/apache/openejb/
> core/stateless/EncUserTransaction.java
> Removed:
> incubator/openejb/trunk/openejb3/container/openejb-core/src/
> main/java/org/apache/openejb/core/entity/EncReference.java
> incubator/openejb/trunk/openejb3/container/openejb-core/src/
> main/java/org/apache/openejb/core/mdb/EncReference.java
> incubator/openejb/trunk/openejb3/container/openejb-core/src/
> main/java/org/apache/openejb/core/mdb/EncUserTransaction.java
> incubator/openejb/trunk/openejb3/container/openejb-core/src/
> main/java/org/apache/openejb/core/stateful/EncReference.java
> incubator/openejb/trunk/openejb3/container/openejb-core/src/
> main/java/org/apache/openejb/core/stateful/EncUserTransaction.java
> incubator/openejb/trunk/openejb3/container/openejb-core/src/
> main/java/org/apache/openejb/core/stateless/EncReference.java
> incubator/openejb/trunk/openejb3/container/openejb-core/src/
> main/java/org/apache/openejb/core/stateless/EncUserTransaction.java
> Modified:
> incubator/openejb/trunk/openejb3/container/openejb-core/src/
> main/java/org/apache/openejb/assembler/classic/JndiBuilder.java
> incubator/openejb/trunk/openejb3/container/openejb-core/src/
> main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
> incubator/openejb/trunk/openejb3/container/openejb-core/src/
> main/java/org/apache/openejb/assembler/spring/EncBuilder.java