geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r829260 - in /geronimo/server/branches/2.2/plugins: j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/ openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ openejb/geronimo-openejb/s...
Date Fri, 23 Oct 2009 22:15:27 GMT
Author: dblevins
Date: Fri Oct 23 22:15:26 2009
New Revision: 829260

URL: http://svn.apache.org/viewvc?rev=829260&view=rev
Log:
Part of GERONIMO-4918.
Still sorting out the locking issue, but these changes are generic singleton additions.

Added:
    geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/SingletonDeploymentGBean.java
  (with props)
Modified:
    geronimo/server/branches/2.2/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
    geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/BasicEjbDeploymentGBeanNameBuilder.java
    geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbContainer.java

Modified: geronimo/server/branches/2.2/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java?rev=829260&r1=829259&r2=829260&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
(original)
+++ geronimo/server/branches/2.2/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
Fri Oct 23 22:15:26 2009
@@ -39,6 +39,7 @@
     public static final String ENTITY_BEAN = "EntityBean";
     public static final String STATEFUL_SESSION_BEAN = "StatefulSessionBean";
     public static final String STATELESS_SESSION_BEAN = "StatelessSessionBean";
+    public static final String SINGLETON_SESSION_BEAN = "SingletonSessionBean";
     public static final String MESSAGE_DRIVEN_BEAN = "MessageDrivenBean";
     public static final String SERVLET = "Servlet";
     public static final String RESOURCE_ADAPTER = "ResourceAdapter";

Modified: geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/BasicEjbDeploymentGBeanNameBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/BasicEjbDeploymentGBeanNameBuilder.java?rev=829260&r1=829259&r2=829260&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/BasicEjbDeploymentGBeanNameBuilder.java
(original)
+++ geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/BasicEjbDeploymentGBeanNameBuilder.java
Fri Oct 23 22:15:26 2009
@@ -45,6 +45,9 @@
                 case STATEFUL:
                     type = NameFactory.STATEFUL_SESSION_BEAN;
                     break;
+                case SINGLETON:
+                    type = NameFactory.SINGLETON_SESSION_BEAN;
+                    break;
             }
         } else if (enterpriseBean instanceof EntityBean) {
             type = NameFactory.ENTITY_BEAN;

Modified: geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbContainer.java?rev=829260&r1=829259&r2=829260&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbContainer.java
(original)
+++ geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbContainer.java
Fri Oct 23 22:15:26 2009
@@ -94,6 +94,7 @@
 
     public static Class<? extends ContainerInfo> getInfoType(String type) {
         if ("STATELESS".equalsIgnoreCase(type)) return StatelessSessionContainerInfo.class;
+        if ("SINGLETON".equalsIgnoreCase(type)) return SingletonSessionContainerInfo.class;
         if ("STATEFUL".equalsIgnoreCase(type)) return StatefulSessionContainerInfo.class;
         if ("BMP_ENTITY".equalsIgnoreCase(type)) return BmpEntityContainerInfo.class;
         if ("CMP_ENTITY".equalsIgnoreCase(type)) return CmpEntityContainerInfo.class;

Added: geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/SingletonDeploymentGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/SingletonDeploymentGBean.java?rev=829260&view=auto
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/SingletonDeploymentGBean.java
(added)
+++ geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/SingletonDeploymentGBean.java
Fri Oct 23 22:15:26 2009
@@ -0,0 +1,42 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.openejb;
+
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+
+/**
+ * @version $Rev: 583409 $ $Date: 2007-10-10 11:38:51 +0200 (Wed, 10 Oct 2007) $
+ */
+public class SingletonDeploymentGBean {
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(EjbDeploymentGBean.class,
+                EjbDeploymentGBean.class,
+                EjbDeploymentGBean.GBEAN_INFO,
+                NameFactory.SINGLETON_SESSION_BEAN);
+
+        GBEAN_INFO = infoFactory.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+}
\ No newline at end of file

Propchange: geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/SingletonDeploymentGBean.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message