You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/05/06 05:51:40 UTC
svn commit: r941567 - in /geronimo/server/trunk/plugins:
j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/
openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/
Author: djencks
Date: Thu May 6 03:51:40 2010
New Revision: 941567
URL: http://svn.apache.org/viewvc?rev=941567&view=rev
Log:
a little bit of singleton support
Modified:
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/BasicEjbDeploymentGBeanNameBuilder.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java?rev=941567&r1=941566&r2=941567&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java Thu May 6 03:51:40 2010
@@ -40,6 +40,7 @@ public class NameFactory {
public static final String STATEFUL_SESSION_BEAN = "StatefulSessionBean";
public static final String STATELESS_SESSION_BEAN = "StatelessSessionBean";
public static final String MESSAGE_DRIVEN_BEAN = "MessageDrivenBean";
+ public static final String SINGLETON_BEAN = "SingletonBean";
public static final String SERVLET = "Servlet";
public static final String RESOURCE_ADAPTER = "ResourceAdapter";
public static final String JAVA_MAIL_RESOURCE = "JavaMailResource";
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/BasicEjbDeploymentGBeanNameBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/BasicEjbDeploymentGBeanNameBuilder.java?rev=941567&r1=941566&r2=941567&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/BasicEjbDeploymentGBeanNameBuilder.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/BasicEjbDeploymentGBeanNameBuilder.java Thu May 6 03:51:40 2010
@@ -26,6 +26,7 @@ import org.apache.openejb.jee.Enterprise
import org.apache.openejb.jee.EntityBean;
import org.apache.openejb.jee.MessageDrivenBean;
import org.apache.openejb.jee.SessionBean;
+import org.apache.openejb.jee.SingletonBean;
/**
*
@@ -45,6 +46,9 @@ public class BasicEjbDeploymentGBeanName
case STATEFUL:
type = NameFactory.STATEFUL_SESSION_BEAN;
break;
+ case SINGLETON:
+ type = NameFactory.SINGLETON_BEAN;
+ break;
}
} else if (enterpriseBean instanceof EntityBean) {
type = NameFactory.ENTITY_BEAN;
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java?rev=941567&r1=941566&r2=941567&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java Thu May 6 03:51:40 2010
@@ -47,6 +47,7 @@ import org.apache.geronimo.naming.deploy
import org.apache.geronimo.openejb.EntityDeploymentGBean;
import org.apache.geronimo.openejb.MessageDrivenDeploymentGBean;
import org.apache.geronimo.openejb.OpenEjbSystem;
+import org.apache.geronimo.openejb.SingletonDeploymentGBean;
import org.apache.geronimo.openejb.StatefulDeploymentGBean;
import org.apache.geronimo.openejb.StatelessDeploymentGBean;
import org.apache.geronimo.openejb.xbeans.ejbjar.OpenejbGeronimoEjbJarType;
@@ -108,6 +109,9 @@ public class EjbDeploymentBuilder {
case STATEFUL:
gbean = new GBeanData(abstractName, StatefulDeploymentGBean.GBEAN_INFO);
break;
+ case SINGLETON:
+ gbean = new GBeanData(abstractName, SingletonDeploymentGBean.GBEAN_INFO);
+ break;
}
} else if (enterpriseBean instanceof EntityBean) {
gbean = new GBeanData(abstractName, EntityDeploymentGBean.GBEAN_INFO);