svn commit: r1160155 - in /geronimo/server/trunk/plugins/corba: geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbSSLBeanGBean.java j2ee-corba-yoko/src/main/plan/plan.xml

[ha...@apache.org]

Author: hanhongfang
Date: Mon Aug 22 09:14:49 2011
New Revision: 1160155

URL: http://svn.apache.org/viewvc?rev=1160155&view=rev
Log:
GERONIMO-6116 differentiate the two "OpenEJB ORB Adapter" displayed in "Linstening on Ports" after server startup.

Added:
    geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbSSLBeanGBean.java   (with props)
Modified:
    geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml

Added: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbSSLBeanGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbSSLBeanGBean.java?rev=1160155&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbSSLBeanGBean.java (added)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbSSLBeanGBean.java Mon Aug 22 09:14:49 2011
@@ -0,0 +1,45 @@
+/**
+ *  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.corba;
+
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.openejb.OpenEjbSystem;
+
+/**
+ * 
+ *
+ * @version $Rev$ $Date$
+ */
+public class CORBAEjbSSLBeanGBean {
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(CORBAEjbSSLBeanGBean.class, "OpenEJB SSL ORB Adapter", CORBAEjbBean.class, CORBABeanGBean.GBEAN_INFO, NameFactory.CORBA_SERVICE);
+
+        infoBuilder.addReference("OpenEjbSystem", OpenEjbSystem.class);
+
+        infoBuilder.setConstructor(new String[]{"abstractName", "ConfigAdapter", "host", "port", "classLoader", "NameService", "OpenEjbSystem", "SSLConfig"});
+
+        GBEAN_INFO = infoBuilder.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+}

Propchange: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbSSLBeanGBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbSSLBeanGBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbSSLBeanGBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml?rev=1160155&r1=1160154&r2=1160155&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml Mon Aug 22 09:14:49 2011
@@ -56,7 +56,7 @@
     </gbean>
 
     <!-- connections require SSL, no client cert, client logs in with password, no identity token -->
-    <gbean name="Server" class="org.apache.geronimo.corba.CORBAEjbBeanGBean">
+    <gbean name="Server" class="org.apache.geronimo.corba.CORBAEjbSSLBeanGBean">
         <attribute name="host">${planORBSSLHost}</attribute>
         <attribute name="port">${planORBSSLPort}</attribute>
         <reference name="ConfigAdapter">