You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2010/05/27 04:38:16 UTC
svn commit: r948655 - in
/geronimo/server/branches/2.2/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment:
AbstractNamingBuilder.java EnvironmentEntryBuilder.java
Author: genspring
Date: Thu May 27 02:38:16 2010
New Revision: 948655
URL: http://svn.apache.org/viewvc?rev=948655&view=rev
Log:
GERONIMO-5330 env-entry values should not be trimmed
Modified:
geronimo/server/branches/2.2/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
geronimo/server/branches/2.2/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
Modified: geronimo/server/branches/2.2/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java?rev=948655&r1=948654&r2=948655&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java (original)
+++ geronimo/server/branches/2.2/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java Thu May 27 02:38:16 2010
@@ -229,6 +229,13 @@ public abstract class AbstractNamingBuil
return s == null ? null : s.trim();
}
+ protected static String getUntrimmedStringValue(org.apache.geronimo.xbeans.javaee.String string) {
+ if (string == null) {
+ return null;
+ }
+ return string.getStringValue();
+ }
+
protected static String getStringValue(XsdStringType string) {
if (string == null) {
return null;
@@ -236,6 +243,13 @@ public abstract class AbstractNamingBuil
String s = string.getStringValue();
return s == null ? null : s.trim();
}
+
+ protected static String getUntrimmedStringValue(XsdStringType string) {
+ if (string == null) {
+ return null;
+ }
+ return string.getStringValue();
+ }
public static AbstractNameQuery buildAbstractNameQuery(GerPatternType pattern, String type, String moduleType, Set interfaceTypes) {
return ENCConfigBuilder.buildAbstractNameQueryFromPattern(pattern, null, type, moduleType, interfaceTypes);
Modified: geronimo/server/branches/2.2/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java?rev=948655&r1=948654&r2=948655&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java (original)
+++ geronimo/server/branches/2.2/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java Thu May 27 02:38:16 2010
@@ -156,7 +156,7 @@ public class EnvironmentEntryBuilder ext
if (refs != null) {
for (XmlObject ref1 : refs) {
GerEnvEntryType ref = (GerEnvEntryType) ref1.copy().changeType(GerEnvEntryType.type);
- envEntryMap.put(ref.getEnvEntryName().trim(), ref.getEnvEntryValue().trim());
+ envEntryMap.put(ref.getEnvEntryName().trim(), ref.getEnvEntryValue());
}
}
return envEntryMap;