You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by xu...@apache.org on 2011/03/14 05:46:37 UTC
svn commit: r1081260 -
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java
Author: xuhaihong
Date: Mon Mar 14 04:46:36 2011
New Revision: 1081260
URL: http://svn.apache.org/viewvc?rev=1081260&view=rev
Log:
OPENEJB-1445 Provide moduleUri in contextData as well when generating the deploymentId (Patch from Shawn Jiang)
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java?rev=1081260&r1=1081259&r2=1081260&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java Mon Mar 14 04:46:36 2011
@@ -78,6 +78,7 @@ public class InitEjbDeployments implemen
private EjbModule deploy(EjbModule ejbModule, Map<String, String> contextData, Set<String> abstractSchemaNames) throws OpenEJBException {
contextData.put("moduleId", ejbModule.getModuleId());
+ contextData.put("moduleUri", ejbModule.getModuleUri().toString());
OpenejbJar openejbJar;
if (ejbModule.getOpenejbJar() != null) {
@@ -180,12 +181,12 @@ public class InitEjbDeployments implemen
private String formatDeploymentId(EnterpriseBean bean, Map<String, String> contextData, StringTemplate template) {
contextData.put("ejbType", bean.getClass().getSimpleName());
contextData.put("ejbClass", bean.getEjbClass());
-
- // we don't have the ejb class object (only the string name) so we have
+
+ // we don't have the ejb class object (only the string name) so we have
// to extract the simple name from the FQN of the class
int simpleNameIdx = bean.getEjbClass().lastIndexOf(".");
contextData.put("ejbClass.simpleName", bean.getEjbClass().substring(simpleNameIdx + 1));
-
+
contextData.put("ejbName", bean.getEjbName());
return template.apply(contextData);
}