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/19 05:59:41 UTC
svn commit: r497705 - in
/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core:
BaseSessionContext.java entity/EntityContext.java mdb/MdbContext.java
stateful/StatefulContext.java stateless/StatelessContext.java
Author: adc
Date: Thu Jan 18 20:59:40 2007
New Revision: 497705
URL: http://svn.apache.org/viewvc?view=rev&rev=497705
Log:
Incorporated David Blevin's suggestions
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/BaseSessionContext.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContext.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContext.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContext.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContext.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/BaseSessionContext.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/BaseSessionContext.java?view=diff&rev=497705&r1=497704&r2=497705
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/BaseSessionContext.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/BaseSessionContext.java Thu Jan 18 20:59:40 2007
@@ -139,7 +139,7 @@
/**
* Dependency injection methods (e.g., setSessionContext)
*/
- protected final static StatelessState INJECTION = new StatelessState() {
+ public static class InjectionStatelessState extends StatelessState {
public EJBLocalObject getEJBLocalObject() throws IllegalStateException {
throw new IllegalStateException();
@@ -212,12 +212,12 @@
public boolean isTimerAccessAllowed() {
return false;
}
- };
+ }
/**
* PostConstruct, Pre-Destroy lifecycle callback interceptor methods
*/
- protected final static StatelessState LIFECYCLE = new StatelessState() {
+ public static class LifecycleStatelessState extends StatelessState {
public MessageContext getMessageContext() throws IllegalStateException {
throw new IllegalStateException();
@@ -274,13 +274,13 @@
public boolean isTimerAccessAllowed() {
return false;
}
- };
+ }
/**
* Business method from business interface or component interface; business
* method interceptor method
*/
- protected final static StatelessState BUSINESS = new StatelessState() {
+ public static class BusinessStatelessState extends StatelessState {
public MessageContext getMessageContext() throws IllegalStateException {
throw new IllegalStateException();
@@ -289,12 +289,12 @@
public boolean isMessageContextAccessAllowed() {
return false;
}
- };
+ }
/**
* Timeout callback method
*/
- protected final static StatelessState TIMEOUT = new StatelessState() {
+ public static class TimeoutStatelessState extends StatelessState {
public Class getInvokedBusinessInterface() {
throw new IllegalStateException();
@@ -307,6 +307,6 @@
public boolean isMessageContextAccessAllowed() {
return false;
}
- };
+ }
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContext.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContext.java?view=diff&rev=497705&r1=497704&r2=497705
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContext.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityContext.java Thu Jan 18 20:59:40 2007
@@ -96,7 +96,7 @@
}
}
- protected final static EntityState CONTEXT = new EntityState() {
+ protected static class ContextEntityState extends EntityState {
public EJBLocalObject getEJBLocalObject() throws IllegalStateException {
throw new IllegalStateException();
@@ -161,9 +161,9 @@
public boolean isTimerAccessAllowed() {
return false;
}
- };
+ }
- protected final static EntityState CREATE = new EntityState() {
+ protected static class CreateEntityState extends EntityState {
public EJBLocalObject getEJBLocalObject() throws IllegalStateException {
throw new IllegalStateException();
@@ -192,9 +192,9 @@
public boolean isTimerAccessAllowed() {
return false;
}
- };
+ }
- protected final static EntityState LIFECYCLE_BUSINESS_TIMEOUT = new EntityState() {
+ protected static class LifecycleBusinessTimeoutEntityState extends EntityState {
public UserTransaction getUserTransaction(UserTransaction userTransaction) throws IllegalStateException {
throw new IllegalStateException();
@@ -207,9 +207,9 @@
public boolean isMessageContextAccessAllowed() {
return false;
}
- };
+ }
- protected final static EntityState FIND = new EntityState() {
+ protected static class FindEntityState extends EntityState {
public EJBLocalObject getEJBLocalObject() throws IllegalStateException {
throw new IllegalStateException();
@@ -242,9 +242,9 @@
public boolean isTimerAccessAllowed() {
return false;
}
- };
+ }
- protected final static EntityState HOME = new EntityState() {
+ protected static class HomeEntityState extends EntityState {
public EJBLocalObject getEJBLocalObject() throws IllegalStateException {
throw new IllegalStateException();
@@ -273,9 +273,9 @@
public boolean isTimerAccessAllowed() {
return false;
}
- };
+ }
- protected final static EntityState ACTIVATE_PASSIVATE = new EntityState() {
+ protected static class ActivatePassivateEntityState extends EntityState {
public Principal getCallerPrincipal(SecurityService securityService) {
throw new IllegalStateException();
@@ -324,21 +324,21 @@
public boolean isTimerAccessAllowed() {
return false;
}
- };
+ }
static {
- states[Operation.SET_CONTEXT.ordinal()] = CONTEXT;
- states[Operation.UNSET_CONTEXT.ordinal()] = CONTEXT;
- states[Operation.CREATE.ordinal()] = CREATE;
- states[Operation.POST_CREATE.ordinal()] = LIFECYCLE_BUSINESS_TIMEOUT;
- states[Operation.REMOVE.ordinal()] = LIFECYCLE_BUSINESS_TIMEOUT;
- states[Operation.FIND.ordinal()] = FIND;
- states[Operation.HOME.ordinal()] = HOME;
- states[Operation.ACTIVATE.ordinal()] = ACTIVATE_PASSIVATE;
- states[Operation.PASSIVATE.ordinal()] = ACTIVATE_PASSIVATE;
- states[Operation.LOAD.ordinal()] = LIFECYCLE_BUSINESS_TIMEOUT;
- states[Operation.STORE.ordinal()] = LIFECYCLE_BUSINESS_TIMEOUT;
- states[Operation.BUSINESS.ordinal()] = LIFECYCLE_BUSINESS_TIMEOUT;
- states[Operation.TIMEOUT.ordinal()] = LIFECYCLE_BUSINESS_TIMEOUT;
+ states[Operation.SET_CONTEXT.ordinal()] = new ContextEntityState();
+ states[Operation.UNSET_CONTEXT.ordinal()] = new ContextEntityState();
+ states[Operation.CREATE.ordinal()] = new CreateEntityState();
+ states[Operation.POST_CREATE.ordinal()] = new LifecycleBusinessTimeoutEntityState();
+ states[Operation.REMOVE.ordinal()] = new LifecycleBusinessTimeoutEntityState();
+ states[Operation.FIND.ordinal()] = new FindEntityState();
+ states[Operation.HOME.ordinal()] = new HomeEntityState();
+ states[Operation.ACTIVATE.ordinal()] = new ActivatePassivateEntityState();
+ states[Operation.PASSIVATE.ordinal()] = new ActivatePassivateEntityState();
+ states[Operation.LOAD.ordinal()] = new LifecycleBusinessTimeoutEntityState();
+ states[Operation.STORE.ordinal()] = new LifecycleBusinessTimeoutEntityState();
+ states[Operation.BUSINESS.ordinal()] = new LifecycleBusinessTimeoutEntityState();
+ states[Operation.TIMEOUT.ordinal()] = new LifecycleBusinessTimeoutEntityState();
}
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContext.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContext.java?view=diff&rev=497705&r1=497704&r2=497705
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContext.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContext.java Thu Jan 18 20:59:40 2007
@@ -45,7 +45,8 @@
/**
* Dependency injection methods (e.g., setMessageDrivenContext)
*/
- protected final static State INJECTION = new State() {
+ protected static class InjectionMdbState extends State {
+
public EJBHome getEJBHome() {
throw new IllegalStateException();
}
@@ -105,12 +106,13 @@
public boolean isTimerAccessAllowed() {
return false;
}
- };
+ }
/**
* PostConstruct, Pre-Destroy lifecycle callback interceptor methods
*/
- protected final static State LIFECYCLE = new State() {
+ protected static class LifecycleMdbState extends State {
+
public EJBHome getEJBHome() {
throw new IllegalStateException();
}
@@ -162,13 +164,14 @@
public boolean isTimerAccessAllowed() {
return super.isTimerAccessAllowed(); //todo: consider this autogenerated code
}
- };
+ }
/**
* Message listener method, business method interceptor method
* and imeout callback method
*/
- protected final static State BUSINESS_TIMEOUT = new State() {
+ protected static class BusinessTimeoutMdbState extends State {
+
public EJBHome getEJBHome() {
throw new IllegalStateException();
}
@@ -188,13 +191,13 @@
public boolean isUserTransactionAccessAllowed() {
return false;
}
- };
+ }
static {
- states[Operation.INJECTION.ordinal()] = INJECTION;
- states[Operation.LIFECYCLE.ordinal()] = LIFECYCLE;
- states[Operation.BUSINESS.ordinal()] = BUSINESS_TIMEOUT;
- states[Operation.TIMEOUT.ordinal()] = BUSINESS_TIMEOUT;
+ states[Operation.INJECTION.ordinal()] = new InjectionMdbState();
+ states[Operation.LIFECYCLE.ordinal()] = new LifecycleMdbState();
+ states[Operation.BUSINESS.ordinal()] = new BusinessTimeoutMdbState();
+ states[Operation.TIMEOUT.ordinal()] = new BusinessTimeoutMdbState();
}
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContext.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContext.java?view=diff&rev=497705&r1=497704&r2=497705
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContext.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContext.java Thu Jan 18 20:59:40 2007
@@ -38,9 +38,9 @@
}
static {
- states[Operation.INJECTION.ordinal()] = INJECTION;
- states[Operation.LIFECYCLE.ordinal()] = LIFECYCLE;
- states[Operation.BUSINESS.ordinal()] = BUSINESS;
- states[Operation.TIMEOUT.ordinal()] = TIMEOUT;
+ states[Operation.INJECTION.ordinal()] = new InjectionStatelessState();
+ states[Operation.LIFECYCLE.ordinal()] = new LifecycleStatelessState();
+ states[Operation.BUSINESS.ordinal()] = new BusinessStatelessState();
+ states[Operation.TIMEOUT.ordinal()] = new TimeoutStatelessState();
}
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContext.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContext.java?view=diff&rev=497705&r1=497704&r2=497705
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContext.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContext.java Thu Jan 18 20:59:40 2007
@@ -40,18 +40,18 @@
/**
* Business method from web service endpoint
*/
- private final static StatelessState BUSINESS_WS = new StatelessState() {
+ private static class BusinessWsStatelessState extends StatelessState {
public Class getInvokedBusinessInterface() {
throw new IllegalStateException();
}
- };
+ }
static {
- states[Operation.INJECTION.ordinal()] = INJECTION;
- states[Operation.LIFECYCLE.ordinal()] = LIFECYCLE;
- states[Operation.BUSINESS.ordinal()] = BUSINESS;
- states[Operation.BUSINESS_WS.ordinal()] = BUSINESS_WS;
- states[Operation.TIMEOUT.ordinal()] = TIMEOUT;
+ states[Operation.INJECTION.ordinal()] = new InjectionStatelessState();
+ states[Operation.LIFECYCLE.ordinal()] = new LifecycleStatelessState();
+ states[Operation.BUSINESS.ordinal()] = new BusinessStatelessState();
+ states[Operation.BUSINESS_WS.ordinal()] = new BusinessWsStatelessState();
+ states[Operation.TIMEOUT.ordinal()] = new TimeoutStatelessState();
}
}