[cvs] openejb/src/facilities/org/openejb/admin/web DeployerBean.java

Modified:    src/facilities/org/openejb/admin/web Tag:
                      exp_branch-webadmin DeployerBean.java
Log:


  Made minor changes



By Tim Urberg, on 0103/02/15 08:33:30



Revision  Changes    Path
No                   revision


No                   revision


1.1.2.9   +33 -7     
openejb/src/facilities/org/openejb/admin/web/Attic/DeployerBean.java

Index: DeployerBean.java
===================================================================
RCS file: 
/cvsroot/openejb/openejb/src/facilities/org/openejb/admin/web/Attic/DeployerBean.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- DeployerBean.java   8 Feb 2003 16:07:13 -0000       1.1.2.8
+++ DeployerBean.java   15 Feb 2003 16:33:30 -0000      1.1.2.9
@@ -44,10 +44,13 @@
 package org.openejb.admin.web;
 
 import java.rmi.RemoteException;
+import java.util.ArrayList;
 import java.util.Vector;
 
 import javax.ejb.SessionContext;
 
+import org.openejb.DeploymentInfo;
+import org.openejb.OpenEJB;
 import org.openejb.OpenEJBException;
 import org.openejb.alt.config.Bean;
 import org.openejb.alt.config.ConfigUtils;
@@ -103,6 +106,7 @@
     private OpenejbJar openejbJar;
     private Vector beanList = new Vector();
     private boolean idsWritten = false;
+    private ArrayList usedBeanNames = new ArrayList();
 
     /** Creates a new instance of DeployerBean */
     public void ejbCreate() {
@@ -127,6 +131,12 @@
             // TODO: Better exception handling.
             e.printStackTrace();
         }
+        
+        //put all the used deployments into the array
+        DeploymentInfo[] deployments = OpenEJB.deployments();
+        for(int i=0; i<deployments.length; i++) {
+            this.usedBeanNames.add(deployments[i].getDeploymentID());
+        }
     }
 
     public void setBooleanValues(boolean[] booleanValues) {
@@ -191,8 +201,8 @@
             deploymentHTML.append(
                 "<table cellspacing=\"0\" cellpadding=\"2\" border=\"0\" 
width=\"100%\">\n");
             deploymentHTML.append("<tr align=\"left\">\n");
-            deploymentHTML.append("<th>Id</th>\n");
             deploymentHTML.append("<th>Name</th>\n");
+            deploymentHTML.append("<th>Id</th>\n");
             deploymentHTML.append("</tr>\n");
 
             //set the resource references
@@ -200,10 +210,10 @@
                 for (int j = 0; j < resourceRef.length; j++) {
                     link = new ResourceLink();
                     link.setResId(resourceRef[j][0]);
-                    
deploymentHTML.append("<tr>\n<td>").append(resourceRef[j][0]).append("</td>\n");
                     link.setResRefName(resourceRef[j][1]);
-                    
deploymentHTML.append("<td>").append(resourceRef[j][1]).append(
-                        "</td>\n</tr>\n");
+                    
deploymentHTML.append("<tr>\n<td>").append(resourceRef[j][1]).append(
+                        "</td>\n");
+                    
deploymentHTML.append("<td>").append(resourceRef[j][0]).append("</td>\n</tr>\n");
                     deployment.addResourceLink(link);
                 }
             }
@@ -213,9 +223,9 @@
                 for (int j = 0; j < ejbRef.length; j++) {
                     link = new ResourceLink();
                     link.setResId(ejbRef[j][0]);
-                    
deploymentHTML.append("<tr>\n<td>").append(ejbRef[j][0]).append("</td>\n");
                     link.setResRefName(ejbRef[j][1]);
-                    
deploymentHTML.append("<td>").append(ejbRef[j][1]).append("</td>\n</tr>\n");
+                    
deploymentHTML.append("<tr>\n<td>").append(ejbRef[j][1]).append("</td>\n");
+                    
deploymentHTML.append("<td>").append(ejbRef[j][0]).append("</td>\n</tr>\n");
                     deployment.addResourceLink(link);
                 }
             }
@@ -252,7 +262,23 @@
     }
 
     private String autoAssignDeploymentId(Bean bean) {
-        return bean.getEjbName();
+        String ejbName = bean.getEjbName();
+        String newEjbName;
+
+        //first check for the deployment id in the list
+        //and make sure that all the bean names are unique
+        if (this.usedBeanNames.contains(ejbName)) {
+            while(true) {
+                newEjbName = ejbName + (Long.MAX_VALUE * Math.random());
+                if (!this.usedBeanNames.contains(newEjbName)) {
+                    this.usedBeanNames.add(newEjbName);
+                    return newEjbName;
+                }
+            }
+        }
+
+        this.usedBeanNames.add(ejbName);
+        return ejbName;
     }
 
     private String autoAssignContainerId(Bean bean) throws OpenEJBException {





-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
http://OpenEJB.sf.net
OpenEJB-development mailing list
OpenEJB-development@xxxxxxxxxxxxxxxxxxxxx
https://lists.sourceforge.net/lists/listinfo/openejb-development