tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r1023157 - in /openejb/trunk/openejb3: ./ container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ container/openejb-core/src/main/resources/org/apache/openejb/assembler/classic/ container/openejb-core/src/test/java/org/ap...
Date Sat, 16 Oct 2010 00:25:00 GMT
Author: dblevins
Date: Sat Oct 16 00:24:59 2010
New Revision: 1023157

URL: http://svn.apache.org/viewvc?rev=1023157&view=rev
Log:
svn merge -r 1021978:1021979 https://svn.apache.org/repos/asf/openejb/branches/openejb-3.1.x

http://svn.apache.org/viewvc?view=revision&revision=1021979
------------------------------------------------------------------------
r1021979 | dblevins | 2010-10-12 20:13:49 -0700 (Tue, 12 Oct 2010) | 2 lines

Beefed up logging slightly

------------------------------------------------------------------------

Modified:
    openejb/trunk/openejb3/   (props changed)
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
    openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/assembler/classic/Messages.properties
    openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
  (props changed)
    openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
  (props changed)
    openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/ConnectionManager.java

Propchange: openejb/trunk/openejb3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 16 00:24:59 2010
@@ -1,3 +1,3 @@
 /openejb/branches/openejb-3.1.1:779593
-/openejb/branches/openejb-3.1.x:945409,945448,1004381,1005322,1021880,1021903,1021955,1021961,1021965,1021975
+/openejb/branches/openejb-3.1.x:945409,945448,1004381,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979
 /openejb/branches/openejb-jcdi:984659-985270

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1023157&r1=1023156&r2=1023157&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
Sat Oct 16 00:24:59 2010
@@ -658,6 +658,11 @@ public class Assembler extends Assembler
                         Container container = deployment.getContainer();
                         container.deploy(deployment);
                         logger.info("createApplication.createdEjb", deployment.getDeploymentID(),
deployment.getEjbName(), container.getContainerID());
+                        if (logger.isDebugEnabled()) {
+                            for (Map.Entry<Object, Object> entry : deployment.getProperties().entrySet())
{
+                                logger.info("createApplication.createdEjb.property", deployment.getEjbName(),
entry.getKey(), entry.getValue());
+                            }
+                        }
                     } catch (Throwable t) {
                         throw new OpenEJBException("Error deploying '"+deployment.getEjbName()+"'.
 Exception: "+t.getClass()+": "+t.getMessage(), t);
                     }

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/assembler/classic/Messages.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/assembler/classic/Messages.properties?rev=1023157&r1=1023156&r2=1023157&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/assembler/classic/Messages.properties
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/assembler/classic/Messages.properties
Sat Oct 16 00:24:59 2010
@@ -62,6 +62,9 @@ createApplication.createdEjb = Created E
 # info("createApplication.startedEjb", beanInfo.ejbDeploymentId, beanInfo.ejbName, beanInfo.containerId);
 createApplication.startedEjb = Started Ejb(deployment-id={0}, ejb-name={1}, container={2})
 
+# info("createApplication.createdEjb.property", deployment.getEjbName(), entry.getKey(),
entry.getValue());
+createApplication.createdEjb.property = {0} property: {1} = {2}
+
 # info("createApplication.createLocalClient", clientClassName, clientInfo.moduleId);
 createApplication.createLocalClient = LocalClient(class={0}, module={1}) 
 

Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 16 00:24:59 2010
@@ -1,3 +1,3 @@
 /openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593
-/openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975
+/openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979
 /openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:984659-985270

Propchange: openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 16 00:24:59 2010
@@ -1,3 +1,3 @@
 /openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593
-/openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975
+/openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979
 /openejb/branches/openejb-jcdi/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:984659-985270

Modified: openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/ConnectionManager.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/ConnectionManager.java?rev=1023157&r1=1023156&r2=1023157&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/ConnectionManager.java
(original)
+++ openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/ConnectionManager.java
Sat Oct 16 00:24:59 2010
@@ -19,9 +19,12 @@ package org.apache.openejb.client;
 import java.io.IOException;
 import java.net.URI;
 import java.util.Properties;
+import java.util.logging.Logger;
 
 public class ConnectionManager {
 
+    private static final Logger logger = Logger.getLogger("OpenEJB.client");
+    
     private static Registry<ConnectionFactory> factories = Registry.create(ConnectionFactory.class);
     private static Registry<ConnectionStrategy> strategies = Registry.create(ConnectionStrategy.class);
 
@@ -61,7 +64,7 @@ public class ConnectionManager {
 
         if (strategy == null) throw new IOException("Unsupported ConnectionStrategy  \""
+ name + "\"");
 
-
+        logger.fine("connect: strategy=" + name + ", uri=" + server.getLocation() + ", strategy-impl="
+ strategy.getClass().getName());
         return strategy.connect(cluster, server);
     }
 
@@ -72,6 +75,7 @@ public class ConnectionManager {
 
         if (factory == null) throw new IOException("Unsupported ConnectionFactory URI scheme
 \"" + scheme + "\"");
 
+        logger.fine("connect: scheme=" + scheme + ", uri=" + uri + ", factory-impl=" + factory.getClass().getName());
         return factory.getConnection(uri);
     }
 



Mime
View raw message