svn commit: r1375408 - in /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config: InitEjbDeployments.java RemoteServer.java

[rmannibucau]

Author: rmannibucau
Date: Tue Aug 21 07:34:38 2012
New Revision: 1375408

URL: http://svn.apache.org/viewvc?rev=1375408&view=rev
Log:
consistent logging between "EJb(*" and "auto deploying ejb" lines

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java?rev=1375408&r1=1375407&r2=1375408&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java
 Tue Aug 21 07:34:38 2012
@@ -21,6 +21,8 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.openejb.jee.ManagedBean;
+import org.apache.openejb.jee.SessionBean;
 import org.apache.openejb.util.LogCategory;
 import org.apache.openejb.util.Messages;
 import org.apache.openejb.util.Logger;
@@ -113,7 +115,9 @@ public class InitEjbDeployments implemen
                     ejbDeployment.setDeploymentId(formatDeploymentId(bean, 
contextData, template));
                 } else {
                     ejbDeployment.setDeploymentId(formatDeploymentId(bean, 
contextData, template));
-                    logger.info("Auto-deploying ejb " + bean.getEjbName() + ": 
EjbDeployment(deployment-id=" + ejbDeployment.getDeploymentId() + ")");
+                    if (!(bean instanceof ManagedBean) || !((ManagedBean) 
bean).isHidden()) {
+                        logger.info("Auto-deploying ejb " + bean.getEjbName() 
+ ": EjbDeployment(deployment-id=" + ejbDeployment.getDeploymentId() + ")");
+                    }
                 }
 
                 openejbJar.getEjbDeployment().add(ejbDeployment);

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java?rev=1375408&r1=1375407&r2=1375408&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
 Tue Aug 21 07:34:38 2012
@@ -300,15 +300,19 @@ public class RemoteServer {
                                 end = true;
                             } catch (IllegalThreadStateException e) {
                                 i++;
+                                try {
+                                    Thread.sleep(Integer.getInteger("sleep", 
5000 * 60));
+                                } catch (InterruptedException e1) {
+                                    e1.printStackTrace();
+                                }
                                 if (i == 5) {
                                     try {
-                                        
Thread.sleep(Integer.getInteger("sleep", 5000 * 60));
                                         final Field f = 
server.getClass().getDeclaredField("pid");
                                         f.setAccessible(true);
                                         int pid = (Integer) f.get(server);
                                         
Pipe.pipe(Runtime.getRuntime().exec("kill -3 " + pid));
                                     } catch (Exception e1) {
-                                        e1.printStackTrace();  //To change 
body of catch statement use File | Settings | File Templates.
+                                        e1.printStackTrace();
                                     }
                                     i = 0;
                                 }