svn commit: r931596 - in /geronimo/server/trunk/plugins/connector-1_6: geronimo-connector-1_6/src/main/java/org/apache/geronimo/datasource/ geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/

[ga...@apache.org]

Author: gawor
Date: Wed Apr  7 15:56:35 2010
New Revision: 931596

URL: http://svn.apache.org/viewvc?rev=931596&view=rev
Log:
GERONIMO-5113: Do little string trimming just in case

Modified:
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/datasource/DataSourceGBean.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/datasource/DataSourceGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/datasource/DataSourceGBean.java?rev=931596&r1=931595&r2=931596&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/datasource/DataSourceGBean.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/datasource/DataSourceGBean.java Wed Apr  7 15:56:35 2010
@@ -186,7 +186,7 @@ public class DataSourceGBean implements 
           
     private String getOsgiJndiName() {
         if (dataSourceDescription.getProperties() != null) {
-            return dataSourceDescription.getProperties().get(ConnectionFactoryRegistration.OSGI_JNDI_SERVICE_NAME);
+            return dataSourceDescription.getProperties().remove(ConnectionFactoryRegistration.OSGI_JNDI_SERVICE_NAME);
         } else {
             return null;
         }        

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java?rev=931596&r1=931595&r2=931596&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/datasource/deployment/DataSourceBuilder.java Wed Apr  7 15:56:35 2010
@@ -284,27 +284,27 @@ public class DataSourceBuilder extends A
         dsDescription.setClassName(ds.getClassName().getStringValue());
         
         if (ds.isSetDescription()) {
-            dsDescription.setDescription(ds.getDescription().getStringValue());
+            dsDescription.setDescription(ds.getDescription().getStringValue().trim());
         }
         
         if (ds.isSetUrl()) {
-            dsDescription.setUrl(ds.getUrl().getStringValue());
+            dsDescription.setUrl(ds.getUrl().getStringValue().trim());
         }
         
         if (ds.isSetUser()) {
-            dsDescription.setUser(ds.getUser().getStringValue());
+            dsDescription.setUser(ds.getUser().getStringValue().trim());
         }
         
         if (ds.isSetPassword()) {
-            dsDescription.setPassword(ds.getPassword().getStringValue());
+            dsDescription.setPassword(ds.getPassword().getStringValue().trim());
         }
         
         if (ds.isSetDatabaseName()) {
-            dsDescription.setDatabaseName(ds.getDatabaseName().getStringValue());
+            dsDescription.setDatabaseName(ds.getDatabaseName().getStringValue().trim());
         }
         
         if (ds.isSetServerName()) {
-            dsDescription.setServerName(ds.getServerName().getStringValue());
+            dsDescription.setServerName(ds.getServerName().getStringValue().trim());
         }
         
         if (ds.isSetPortNumber()) {
@@ -319,7 +319,8 @@ public class DataSourceBuilder extends A
         if (props != null) {
             Map<String, String> properties = new HashMap<String, String>();
             for (PropertyType prop : props) {
-                properties.put(prop.getName().getStringValue(), prop.getValue().getStringValue());
+                properties.put(prop.getName().getStringValue().trim(), 
+                               prop.getValue().getStringValue().trim());
             }
             dsDescription.setProperties(properties);
         }