svn commit: r1051549 - in /openejb/trunk/openejb3/container/openejb-core/src: main/resources/META-INF/org.apache.openejb.embedded/ main/resources/META-INF/org.apache.openejb/ test/java/org/apache/openejb/resource/jdbc/

[jlmonteiro]

Author: jlmonteiro
Date: Tue Dec 21 16:41:11 2010
New Revision: 1051549

URL: http://svn.apache.org/viewvc?rev=1051549&view=rev
Log:
OPENEJB-1410 Dynamic DS. Add missing files. Thx Jacek!

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
    
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
    
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml?rev=1051549&r1=1051548&r2=1051549&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
 Tue Dec 21 16:41:11 2010
@@ -994,5 +994,16 @@
 
   </ServiceProvider>
 
+  <!--
+  # dynamic routing datasource
+  -->
+  <ServiceProvider
+          id="RoutedDataSource"
+          service="Resource" types="DataSource"
+          class-name="org.apache.openejb.resource.jdbc.RoutedDataSource">
+    Router
+  </ServiceProvider>
+
+
 
 </ServiceJar>

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml?rev=1051549&r1=1051548&r2=1051549&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
 Tue Dec 21 16:41:11 2010
@@ -1004,5 +1004,15 @@
 
   </ServiceProvider>
 
+  <!--
+  # dynamic routing datasource
+  -->
+  <ServiceProvider
+          id="RoutedDataSource"
+          service="Resource" types="DataSource"
+          class-name="org.apache.openejb.resource.jdbc.RoutedDataSource">
+    Router
+  </ServiceProvider>
+
 
 </ServiceJar>

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java?rev=1051549&r1=1051548&r2=1051549&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java
 Tue Dec 21 16:41:11 2010
@@ -90,7 +90,7 @@ public class DynamicDataSourceTest {
         resourceRouter.getProperties().setProperty("DefaultDataSourceName", 
"database1");
         assembler.createResource(config.configureService(resourceRouter, 
ResourceInfo.class));
 
-        Resource resourceRoutedDs = new Resource("Routed Datasource", 
"org.apache.openejb.resource.jdbc.Router", 
"org.apache.openejb.dynamicdatasource:RoutedDataSource");
+        Resource resourceRoutedDs = new Resource("Routed Datasource", 
"org.apache.openejb.resource.jdbc.Router", "RoutedDataSource");
         resourceRoutedDs.getProperties().setProperty("Router", "My Router");
         assembler.createResource(config.configureService(resourceRoutedDs, 
ResourceInfo.class));