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 2007/12/08 08:56:17 UTC
svn commit: r602343 - in /openejb/trunk/openejb3/container/openejb-core/src:
main/java/org/apache/openejb/resource/jdbc/
main/resources/META-INF/org.apache.openejb/
test/java/org/apache/openejb/config/
Author: dblevins
Date: Fri Dec 7 23:56:16 2007
New Revision: 602343
URL: http://svn.apache.org/viewvc?rev=602343&view=rev
Log:
Made a factory for DataSource so JtaManaged vs non-JtaManaged can be set with a flag
Added:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
Modified:
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/config/ConfigureServiceTest.java
Added: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java?rev=602343&view=auto
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java (added)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java Fri Dec 7 23:56:16 2007
@@ -0,0 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.resource.jdbc;
+
+import javax.sql.DataSource;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class DataSourceFactory {
+ public static DataSource create(boolean managed){
+ if (managed){
+ return new BasicManagedDataSource();
+ } else {
+ return new BasicDataSource();
+ }
+ }
+}
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=602343&r1=602342&r2=602343&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 Fri Dec 7 23:56:16 2007
@@ -16,9 +16,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<!-- $Rev$ $Date$ -->
-
+
+<!-- $Rev$ $Date$ -->
+
<ServiceJar>
<!--
@@ -251,7 +251,11 @@
id="Default JDBC Database"
service="Resource"
types="javax.sql.DataSource, DataSource"
- class-name="org.apache.openejb.resource.jdbc.BasicManagedDataSource">
+ factory-name="create"
+ constructor="JtaManaged"
+ class-name="org.apache.openejb.resource.jdbc.DataSourceFactory">
+
+ JtaManaged = true
# Driver class name
@@ -431,7 +435,11 @@
id="Default Unmanaged JDBC Database"
service="Resource"
types="javax.sql.DataSource, DataSource"
- class-name="org.apache.openejb.resource.jdbc.BasicDataSource">
+ factory-name="create"
+ constructor="JtaManaged"
+ class-name="org.apache.openejb.resource.jdbc.DataSourceFactory">
+
+ JtaManaged = false
# Driver class name
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigureServiceTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigureServiceTest.java?rev=602343&r1=602342&r2=602343&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigureServiceTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/ConfigureServiceTest.java Fri Dec 7 23:56:16 2007
@@ -19,7 +19,11 @@
import junit.framework.TestCase;
import org.apache.openejb.assembler.classic.StatelessSessionContainerInfo;
import org.apache.openejb.assembler.classic.ContainerInfo;
+import org.apache.openejb.assembler.classic.ResourceInfo;
+import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.config.sys.Container;
+import org.apache.openejb.config.sys.Resource;
+import org.apache.openejb.loader.SystemInstance;
import java.net.URI;
import java.net.URLEncoder;