svn commit: r1171390 - in /openejb/trunk/openejb3/container/openejb-core/src: main/java/org/apache/openejb/config/AnnotationDeployer.java test/java/org/apache/openejb/assembler/classic/DataSourceDefinitionTest.java

[rm...@apache.org]

Author: rmannibucau
Date: Fri Sep 16 05:49:13 2011
New Revision: 1171390

URL: http://svn.apache.org/viewvc?rev=1171390&view=rev
Log:
small typo in datasource creation

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
    openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/DataSourceDefinitionTest.java

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1171390&r1=1171389&r2=1171390&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Fri Sep 16 05:49:13 2011
@@ -3895,7 +3895,7 @@ public class AnnotationDeployer implemen
             if (existing != null) return;
 
             // Optional properties
-            if (d.databaseName() != "") dataSource.setDatabaseName(d.databaseName());
+            if (!d.databaseName().isEmpty()) dataSource.setDatabaseName(d.databaseName());
             if (d.initialPoolSize() != -1) dataSource.setInitialPoolSize(d.initialPoolSize());
             if (d.isolationLevel() != -1) dataSource.setIsolationLevel(IsolationLevel.fromFlag(d.isolationLevel()));
             if (d.loginTimeout() != 0) dataSource.setLoginTimeout(d.loginTimeout());
@@ -3903,11 +3903,11 @@ public class AnnotationDeployer implemen
             if (d.maxPoolSize() != -1) dataSource.setMaxPoolSize(d.maxPoolSize());
             if (d.maxStatements() != -1) dataSource.setMaxStatements(d.maxStatements());
             if (d.minPoolSize() != -1) dataSource.setMinPoolSize(d.minPoolSize());
-            if (d.password() != "") dataSource.setPassword(d.password());
+            if (!d.password().isEmpty()) dataSource.setPassword(d.password());
             if (d.portNumber() != -1) dataSource.setPortNumber(d.portNumber());
-            if (d.serverName() != "localhost") dataSource.setServerName(d.serverName());
-            if (d.url() != "") dataSource.setUrl(d.url());
-            if (d.user() != "") dataSource.setUrl(d.user());
+            if (!"localhost".equals(d.serverName())) dataSource.setServerName(d.serverName());
+            if (!d.url().isEmpty()) dataSource.setUrl(d.url());
+            if (!d.user().isEmpty()) dataSource.setUser(d.user());
 
             for (String s : d.properties()) {
                 final String key = s.substring(0, s.indexOf('='));

Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/DataSourceDefinitionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/DataSourceDefinitionTest.java?rev=1171390&r1=1171389&r2=1171390&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/DataSourceDefinitionTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/DataSourceDefinitionTest.java Fri Sep 16 05:49:13 2011
@@ -74,8 +74,8 @@ public class DataSourceDefinitionTest {
     })
     @Stateless
     public static class DatasourceDefinitionsBean {
-        @Resource(name = "java:comp/env/superMegaDS") private DataSource mega;
-        @Resource(name = "java:comp/env/superGigaDS") private DataSource giga;
+        @Resource(lookup = "java:comp/env/superMegaDS") private DataSource mega;
+        @Resource(lookup = "java:comp/env/superGigaDS") private DataSource giga;
 
         public DataSource getMega() {
             return mega;
@@ -114,6 +114,7 @@ public class DataSourceDefinitionTest {
         assertEquals("Movies.getMovies()", 0, movies.getMovies().size());
 
         Connection connection = dataSource.getConnection();
+        connection.setAutoCommit(true);
         connection.prepareStatement("DROP TABLE movie").execute();
 //        assertEquals("configuration should be ok - class", "org.hsqldb.jdbc.jdbcDataSource", dataSource.getClass().getName());
 //        assertEqualsByReflection("configuration should be ok - user", dataSource, "user", user);