gdamour 2004/12/09 19:40:32
Modified:
modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr
AbstractCMRTest.java
Log:
Intermediate commit for EJB QL support.
Finders have been hooked in. Basic EJB QL queries work properly.
Revision Changes Path
1.4 +1 -51
openejb/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java
Index: AbstractCMRTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractCMRTest.java 1 Dec 2004 02:28:21 -0000 1.3
+++ AbstractCMRTest.java 10 Dec 2004 00:40:32 -0000 1.4
@@ -1,97 +1,50 @@
/* ====================================================================
-
* Redistribution and use of this software and associated documentation
-
* ("Software"), with or without modification, are permitted provided
-
* that the following conditions are met:
-
*
-
* 1. Redistributions of source code must retain copyright
-
* statements and notices. Redistributions must also contain a
-
* copy of this document.
-
*
-
* 2. Redistributions in binary form must reproduce this list of
-
* conditions and the following disclaimer in the documentation
-
* and/or other materials provided with the distribution.
-
*
-
* 3. The name "OpenEJB" must not be used to endorse or promote
-
* products derived from this Software without prior written
-
* permission of The OpenEJB Group. For written permission,
-
* please contact [EMAIL PROTECTED]
-
*
-
* 4. Products derived from this Software may not be called "OpenEJB"
-
* nor may "OpenEJB" appear in their names without prior written
-
* permission of The OpenEJB Group. OpenEJB is a registered
-
* trademark of The OpenEJB Group.
-
*
-
* 5. Due credit should be given to the OpenEJB Project
-
* (http://openejb.org/).
-
*
-
* THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
-
* ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-
* NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-
* THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-
* OF THE POSSIBILITY OF SUCH DAMAGE.
-
*
-
* ====================================================================
-
*
-
* This software consists of voluntary contributions made by many
-
* individuals on behalf of the OpenEJB Project. For more information
-
* please see <http://openejb.org/>.
-
*
-
* ====================================================================
-
*/
-
package org.openejb.deployment.entity.cmp.cmr;
@@ -99,7 +52,6 @@
import java.net.URI;
import java.sql.Connection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
import javax.management.MalformedObjectNameException;
@@ -286,9 +238,7 @@
builder.setSQLSchema(sqlSchema);
builder.setGlobalSchema(cacheSchema);
builder.setComponentContext(new ReadOnlyContext());
-// builder.setConnectionFactoryName("defaultDatasource");
builder.setTransactionManagerDelegate(tmDelegate);
- builder.setQueries(new HashMap());
GBeanMBean container = builder.createConfiguration();