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 2009/01/29 23:15:45 UTC
svn commit: r739046 - in /openejb/trunk/openejb3/container/openejb-core/src:
main/java/org/apache/openejb/config/ConfigurationFactory.java
test/java/org/apache/openejb/config/AutoConfigPersistenceUnitsTest.java
Author: dblevins
Date: Thu Jan 29 22:15:45 2009
New Revision: 739046
URL: http://svn.apache.org/viewvc?rev=739046&view=rev
Log:
OPENEJB-995: Whitespace in openejb.xml property values can cause issues
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigPersistenceUnitsTest.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=739046&r1=739045&r2=739046&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java Thu Jan 29 22:15:45 2009
@@ -689,7 +689,11 @@
if (service.getId() == null) service.setId(provider.getId());
- Properties overrides = getSystemProperties(service.getId(), provider.getService());
+ Properties overrides = trim(getSystemProperties(service.getId(), provider.getService()));
+
+ trim(service.getProperties());
+
+ trim(provider.getProperties());
logger.info("configureService.configuring", service.getId(), provider.getService(), provider.getId());
@@ -702,7 +706,7 @@
value = "<hidden>";
}
- logger.debug(key + "=" + value);
+ logger.debug("["+key + "=" + value+"]");
}
for (Map.Entry<Object, Object> entry : overrides.entrySet()) {
@@ -713,7 +717,7 @@
value = "<hidden>";
}
- logger.debug("Override " + key + "=" + value);
+ logger.debug("Override [" + key + "=" + value+"]");
}
}
@@ -756,6 +760,20 @@
}
}
+ private static Properties trim(Properties properties) {
+ for (Map.Entry<Object, Object> entry : properties.entrySet()) {
+ Object o = entry.getValue();
+ if (o instanceof String) {
+ String value = (String) o;
+ String trimmed = value.trim();
+ if (value.length() != trimmed.length()){
+ properties.put(entry.getKey(), trimmed);
+ }
+ }
+ }
+ return properties;
+ }
+
private <T extends ServiceInfo> void specialProcessing(T info) {
ServiceInfo serviceInfo = info;
TopicOrQueueDefaults.process(serviceInfo);
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigPersistenceUnitsTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigPersistenceUnitsTest.java?rev=739046&r1=739045&r2=739046&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigPersistenceUnitsTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigPersistenceUnitsTest.java Thu Jan 29 22:15:45 2009
@@ -48,6 +48,7 @@
private List<ResourceInfo> resources;
protected void setUp() throws Exception {
+ System.setProperty("log4j.category.OpenEJB.startup.config", "debug");
config = new ConfigurationFactory();
assembler = new Assembler();
@@ -999,7 +1000,7 @@
Resource resource = new Resource(id, "DataSource");
resource.getProperties().put("JdbcDriver", driver.getName());
resource.getProperties().put("JdbcUrl", url);
- resource.getProperties().put("JtaManaged", managed + "");
+ resource.getProperties().put("JtaManaged", managed + " "); // space should be trimmed later, this verifies that.
ResourceInfo resourceInfo = config.configureService(resource, ResourceInfo.class);