You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/10/24 10:36:49 UTC
svn commit: r1188041 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
Author: rmannibucau
Date: Mon Oct 24 08:36:49 2011
New Revision: 1188041
URL: http://svn.apache.org/viewvc?rev=1188041&view=rev
Log:
OPENEJB-1330 on trunk the app client id was not used as it should have been
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java?rev=1188041&r1=1188040&r2=1188041&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java Mon Oct 24 08:36:49 2011
@@ -294,7 +294,7 @@ class AppInfoBuilder {
clientInfo.localClients.addAll(clientModule.getLocalClients());
clientInfo.remoteClients.addAll(clientModule.getRemoteClients());
clientInfo.callbackHandler = applicationClient.getCallbackHandler();
- clientInfo.moduleId = getClientModuleId(clientModule);
+ clientInfo.moduleId = clientModule.getModuleId();
clientInfo.watchedResources.addAll(clientModule.getWatchedResources());
clientInfo.validationInfo = ValidatorBuilder.getInfo(clientModule.getValidationConfig());
clientInfo.uniqueId = clientModule.getUniqueId();
@@ -723,17 +723,6 @@ class AppInfoBuilder {
}
}
- private static String getClientModuleId(ClientModule clientModule) {
- String jarLocation = clientModule.getJarLocation();
- File file = new File(jarLocation);
- String name = file.getName();
- if (name.endsWith(".jar") || name.endsWith(".zip")) {
- name = name.replaceFirst("....$", "");
- }
- return name;
- }
-
-
private List<PortInfo> configureWebservices(Webservices webservices) {
List<PortInfo> portMap = new ArrayList<PortInfo>();
if (webservices == null) {