You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2010/10/16 02:25:46 UTC
svn commit: r1023158 - in /openejb/trunk/openejb3: ./
container/openejb-core/src/test/java/org/apache/openejb/config/
examples/alternate-descriptors/src/main/resources/META-INF/
server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/
Author: dblevins
Date: Sat Oct 16 00:25:46 2010
New Revision: 1023158
URL: http://svn.apache.org/viewvc?rev=1023158&view=rev
Log:
svn merge -r 1021989:1021990 https://svn.apache.org/repos/asf/openejb/branches/openejb-3.1.x
http://svn.apache.org/viewvc?view=revision&revision=1021990
------------------------------------------------------------------------
r1021990 | dblevins | 2010-10-12 20:52:56 -0700 (Tue, 12 Oct 2010) | 1 line
Log on debug when an EjbMetaData is sent to the client due to lookup
------------------------------------------------------------------------
Modified:
openejb/trunk/openejb3/ (props changed)
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-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
Propchange: openejb/trunk/openejb3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 16 00:25:46 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,1021979
+/openejb/branches/openejb-3.1.x:945409,945448,1004381,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990
/openejb/branches/openejb-jcdi:984659-985270
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:25:46 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,1021979
+/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,1021990
/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:25:46 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,1021979
+/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,1021990
/openejb/branches/openejb-jcdi/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:984659-985270
Modified: openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java?rev=1023158&r1=1023157&r2=1023158&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java (original)
+++ openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java Sat Oct 16 00:25:46 2010
@@ -373,7 +373,7 @@ class JndiRequestHandler {
null,
proxyInfo.getInterface());
metaData.loadProperties(beanContext.getProperties());
-
+ log(metaData);
res.setResult(metaData);
break;
}
@@ -397,6 +397,7 @@ class JndiRequestHandler {
metaData.setPrimaryKey(proxyInfo.getPrimaryKey());
metaData.loadProperties(beanContext.getProperties());
+ log(metaData);
res.setResult(metaData);
break;
}
@@ -421,6 +422,26 @@ class JndiRequestHandler {
}
+ private void log(EJBMetaDataImpl metaData) {
+ if (logger.isDebugEnabled()) {
+ final StringBuilder sb = new StringBuilder();
+ sb.append("Sending Ejb(");
+
+ sb.append("deployment-id").append("=");
+ sb.append(metaData.getDeploymentID());
+ sb.append(", properties=[");
+ final String delimiter = "|";
+ for (Map.Entry<Object, Object> entry : metaData.getProperties().entrySet()) {
+ sb.append(entry.getKey()).append("=").append(entry.getValue()).append(delimiter);
+ }
+ if (metaData.getProperties().size() > 1) {
+ sb.delete(sb.length() - delimiter.length(), sb.length());
+ }
+ sb.append("])");
+ logger.debug(sb.toString());
+ }
+ }
+
protected void updateServer(JNDIRequest req, JNDIResponse res, ProxyInfo proxyInfo) {
clusterableRequestHandler.updateServer(proxyInfo.getBeanContext(), req, res);
}