[jboss-cvs] jboss-ejb3/src/main/org/jboss/ejb3 ...
Bill DeCoste
bdecoste at jboss.com
Mon Jul 24 17:28:30 EDT 2006
User: bdecoste
Date: 06/07/24 17:28:30
Modified: src/main/org/jboss/ejb3 Ejb3DescriptorHandler.java
Ejb3Deployment.java Ejb3AnnotationHandler.java
ServiceServerFactory.java JmxServiceServer.java
KernelServiceServer.java
Log:
MDB cleanup, standalone test for standard testcases, fixed class level @Resources jndi env bindings
Revision Changes Path
1.112 +2 -16 jboss-ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Ejb3DescriptorHandler.java
===================================================================
RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- Ejb3DescriptorHandler.java 23 Jun 2006 21:32:14 -0000 1.111
+++ Ejb3DescriptorHandler.java 24 Jul 2006 21:28:30 -0000 1.112
@@ -131,7 +131,7 @@
import org.jboss.metamodel.descriptor.SecurityRole;
/**
- * @version <tt>$Revision: 1.111 $</tt>
+ * @version <tt>$Revision: 1.112 $</tt>
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
* @author <a href="mailto:bill at jboss.com">Bill Burke</a>
*/
@@ -357,21 +357,7 @@
protected String getMDBDomainName(int ejbIndex)
{
- String domainName = defaultMDBDomain;
-
- MessageDrivenBean mdb = (MessageDrivenBean)ejbs.get(ejbIndex);
- if (mdb != null && isInflow(mdb))
- domainName = defaultMessagingInflowDrivenBeanDomain;
-
- return domainName;
- }
-
- protected boolean isInflow(MessageDrivenBean mdb)
- {
- if (mdb.getResourceAdaptorName() != null)
- return true;
-
- return super.isInflow(mdb);
+ return defaultMDBDomain;
}
protected MDB getMDB(int ejbIndex) throws Exception
1.50 +1 -7 jboss-ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Ejb3Deployment.java
===================================================================
RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- Ejb3Deployment.java 30 Jun 2006 01:55:37 -0000 1.49
+++ Ejb3Deployment.java 24 Jul 2006 21:28:30 -0000 1.50
@@ -51,7 +51,7 @@
* An EjbModule represents a collection of beans that are deployed as a unit.
*
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 1.49 $
+ * @version $Revision: 1.50 $
*/
public abstract class Ejb3Deployment
{
@@ -73,7 +73,6 @@
protected String defaultSLSBDomain = "Stateless Bean";
protected String defaultSFSBDomain = "Stateful Bean";
protected String defaultMDBDomain = "Message Driven Bean";
- protected String defaultMessageInflowDrivenDomain = "Message Inflow Driven Bean";
protected String defaultConsumerDomain = "Consumer Bean";
protected String defaultServiceDomain = "Service Bean";
protected InitialContext initialContext;
@@ -194,11 +193,6 @@
return defaultMDBDomain;
}
- public String getDefaultMessageInflowDrivenBeanDomain()
- {
- return defaultMessageInflowDrivenDomain;
- }
-
/**
* The default AOP domain for message driven beans.
*
1.40 +3 -25 jboss-ejb3/src/main/org/jboss/ejb3/Ejb3AnnotationHandler.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Ejb3AnnotationHandler.java
===================================================================
RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/Ejb3AnnotationHandler.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- Ejb3AnnotationHandler.java 20 Jun 2006 19:21:29 -0000 1.39
+++ Ejb3AnnotationHandler.java 24 Jul 2006 21:28:30 -0000 1.40
@@ -45,7 +45,7 @@
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
* @author <a href="mailto:bill at jboss.com">Bill Burke</a>
- * @version <tt>$Revision: 1.39 $</tt>
+ * @version <tt>$Revision: 1.40 $</tt>
*/
public class Ejb3AnnotationHandler implements Ejb3Handler
{
@@ -56,8 +56,6 @@
STATELESS, STATEFUL, MESSAGE_DRIVEN, ENTITY, SERVICE, CONSUMER
}
- ;
-
protected DeploymentUnit di;
protected ClassFile cf;
@@ -71,7 +69,6 @@
protected String defaultSLSBDomain;
protected String defaultSFSBDomain;
protected String defaultMDBDomain;
- protected String defaultMessagingInflowDrivenBeanDomain;
protected String defaultServiceDomain;
protected String defaultConsumerDomain;
protected Ejb3Deployment deployment;
@@ -88,7 +85,6 @@
defaultMDBDomain = deployment.getDefaultMDBDomain();
defaultServiceDomain = deployment.getDefaultServiceDomain();
defaultConsumerDomain = deployment.getDefaultConsumerDomain();
- defaultMessagingInflowDrivenBeanDomain = deployment.getDefaultMessageInflowDrivenBeanDomain();
}
public void setCtxProperties(Hashtable ctxProperties)
@@ -235,19 +231,7 @@
protected String getMDBDomainName(int ejbIndex)
{
- String domainName = defaultMDBDomain;
- // if (ejbClass.isAnnotationPresent(ResourceAdapter.class))
- domainName = defaultMessagingInflowDrivenBeanDomain;
-
- return domainName;
- }
-
- protected boolean isInflow(MessageDrivenBean mdb)
- {
- // if (ejbClass.isAnnotationPresent(ResourceAdapter.class))
- return true;
- // else
- // return false;
+ return defaultMDBDomain;
}
protected void createProxyFactories()
@@ -273,12 +257,6 @@
MDB container = new MDB(ejbNames.get(ejbIndex), (AspectManager) domain.getManager(), di.getClassLoader(), cf.getName(),
ctxProperties, di.getInterceptorInfoRepository(), deployment);
- /* if (domainName.equals(defaultMessagingInflowDrivenBeanDomain))
- {
- JBossMessageEndpointFactory factory = new JBossMessageEndpointFactory();
- factory.setContainer(container);
- container.setMessageEndpointFactory(factory);
- }*/
return container;
}
1.3 +10 -8 jboss-ejb3/src/main/org/jboss/ejb3/ServiceServerFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ServiceServerFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/ServiceServerFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ServiceServerFactory.java 30 Jun 2006 19:23:45 -0000 1.2
+++ ServiceServerFactory.java 24 Jul 2006 21:28:30 -0000 1.3
@@ -21,17 +21,19 @@
*/
package org.jboss.ejb3;
-import javax.management.MBeanServer;
import javax.management.MBeanServerConnection;
import org.jboss.kernel.Kernel;
+import org.jboss.logging.Logger;
/**
- * @version <tt>$Revision: 1.2 $</tt>
+ * @version <tt>$Revision: 1.3 $</tt>
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
*/
public class ServiceServerFactory
{
+ private static final Logger log = Logger.getLogger(ServiceServerFactory.class);
+
private static ServiceServer serviceServer = null;
private static Kernel kernel = null;
@@ -43,7 +45,7 @@
serviceServer = new KernelServiceServer(kernel);
else
{
- MBeanServer mbeanServer;
+ MBeanServerConnection mbeanServer;
try
{
@@ -53,7 +55,7 @@
catch (IllegalStateException e)
{
String adaptorName = System.getProperty("jbosstest.server.name", "jmx/invoker/RMIAdaptor");
- mbeanServer = (MBeanServer)InitialContextFactory.getInitialContext().lookup(adaptorName);
+ mbeanServer = (MBeanServerConnection)InitialContextFactory.getInitialContext().lookup(adaptorName);
serviceServer = new JmxServiceServer(mbeanServer);
}
}
1.2 +4 -4 jboss-ejb3/src/main/org/jboss/ejb3/JmxServiceServer.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JmxServiceServer.java
===================================================================
RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/JmxServiceServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- JmxServiceServer.java 20 Jun 2006 19:21:29 -0000 1.1
+++ JmxServiceServer.java 24 Jul 2006 21:28:30 -0000 1.2
@@ -21,18 +21,18 @@
*/
package org.jboss.ejb3;
-import javax.management.MBeanServer;
+import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
/**
- * @version <tt>$Revision: 1.1 $</tt>
+ * @version <tt>$Revision: 1.2 $</tt>
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
*/
public class JmxServiceServer implements ServiceServer
{
- protected MBeanServer server;
+ protected MBeanServerConnection server;
- public JmxServiceServer(MBeanServer server)
+ public JmxServiceServer(MBeanServerConnection server)
{
this.server = server;
}
1.2 +18 -3 jboss-ejb3/src/main/org/jboss/ejb3/KernelServiceServer.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: KernelServiceServer.java
===================================================================
RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/KernelServiceServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- KernelServiceServer.java 20 Jun 2006 19:21:29 -0000 1.1
+++ KernelServiceServer.java 24 Jul 2006 21:28:30 -0000 1.2
@@ -21,6 +21,8 @@
*/
package org.jboss.ejb3;
+import java.lang.reflect.Method;
+
import javax.management.ObjectName;
import org.jboss.kernel.Kernel;
@@ -31,7 +33,7 @@
import org.jboss.ejb3.embedded.resource.RARDeployment;
/**
- * @version <tt>$Revision: 1.1 $</tt>
+ * @version <tt>$Revision: 1.2 $</tt>
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
*/
public class KernelServiceServer implements ServiceServer
@@ -52,9 +54,22 @@
if (entry != null)
{
Object target = entry.getTarget();
+ if (target instanceof RARDeployment)
+ {
RARDeployment deployment = (RARDeployment)target;
return deployment.invoke(operationName, params, signature);
}
+ else
+ {
+ Class[] types = new Class[signature.length];
+ for (int i = 0; i < signature.length; ++i)
+ {
+ types[i] = Thread.currentThread().getContextClassLoader().loadClass(signature[i]);
+ }
+ Method method = target.getClass().getMethod(operationName, types);
+ return method.invoke(target, params);
+ }
+ }
return null;
}
More information about the jboss-cvs-commits
mailing list