aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPolina Genova2013-02-24 16:48:07 (EST)
committerVioleta Georgieva2013-02-24 16:48:07 (EST)
commitce088c16daacbd2bbdc59cd6809bd2be15b57055 (patch)
tree1831854827883b345317e3e401f37b08e1c65e6e
parent0a9c0dff319aa31e16ee0bc84dc65238a9287e66 (diff)
downloadorg.eclipse.virgo.eclipse-mirror-ce088c16daacbd2bbdc59cd6809bd2be15b57055.zip
org.eclipse.virgo.eclipse-mirror-ce088c16daacbd2bbdc59cd6809bd2be15b57055.tar.gz
org.eclipse.virgo.eclipse-mirror-ce088c16daacbd2bbdc59cd6809bd2be15b57055.tar.bz2
bug 400080: Fix the incorrect construction of URL in org.apache.openejb.config.AutoConfig.
-rwxr-xr-xhotfix/source/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/hotfix/source/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java b/hotfix/source/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
index 23648cc..058d657 100755
--- a/hotfix/source/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
+++ b/hotfix/source/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
@@ -89,6 +89,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
+import java.net.URLEncoder;
import static java.util.Arrays.asList;
import static org.apache.openejb.config.ServiceUtils.ANY;
@@ -219,12 +220,12 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
}
for (ClientModule clientModule : appModule.getClientModules()) {
- URI moduleURI = URI.create(clientModule.getModuleId());
+ URI moduleURI = URI.create(URLEncoder.encode(clientModule.getModuleId()));
processPersistenceRefs(clientModule.getApplicationClient(), clientModule, persistenceUnits, moduleURI);
}
for (WebModule webModule : appModule.getWebModules()) {
- URI moduleURI = URI.create(webModule.getModuleId());
+ URI moduleURI = URI.create(URLEncoder.encode(webModule.getModuleId()));
processPersistenceRefs(webModule.getWebApp(), webModule, persistenceUnits, moduleURI);
}
}
@@ -575,7 +576,7 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
}
for (WebModule webModule : appModule.getWebModules()) {
- URI moduleUri = URI.create(webModule.getModuleId());
+ URI moduleUri = URI.create(URLEncoder.encode(webModule.getModuleId()));
for (MessageDestinationRef ref : webModule.getWebApp().getMessageDestinationRef()) {
String destinationId = resolveDestinationId(ref, moduleUri, destinationResolver, destinationTypes);
if (destinationId != null) {
@@ -594,7 +595,7 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
continue;
}
- URI moduleUri = URI.create(ejbModule.getModuleId());
+ URI moduleUri = URI.create(URLEncoder.encode(ejbModule.getModuleId()));
OpenejbJar openejbJar = ejbModule.getOpenejbJar();
for (EnterpriseBean bean : ejbModule.getEjbJar().getEnterpriseBeans()) {