[jboss-cvs] JBossAS SVN: r57253 - in branches/JBoss_4_0_3_SP1_CP: server/src/main/org/jboss/ejb/plugins/cmp/ejbql testsuite/imports testsuite/src/main/org/jboss/test/cmp2 testsuite/src/main/org/jboss/test/cmp2/jbas1665 testsuite/src/resources/cmp2 testsuite/src/resources/cmp2/jbas1665 testsuite/src/resources/cmp2/jbas1665/META-INF
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 27 23:08:02 EDT 2006
Author: ryan.campbell at jboss.com
Date: 2006-09-27 23:08:01 -0400 (Wed, 27 Sep 2006)
New Revision: 57253
Added:
branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/cmp2/jbas1665/
branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/cmp2/jbas1665/JBAS1665UnitTestCase.java
branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/cmp2/jbas1665/OrderBean.java
branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/cmp2/jbas1665/OrderLocal.java
branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/cmp2/jbas1665/OrderLocalHome.java
branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/cmp2/jbas1665/
branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/cmp2/jbas1665/META-INF/
branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/cmp2/jbas1665/META-INF/ejb-jar.xml
branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/cmp2/jbas1665/META-INF/jboss.xml
branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/cmp2/jbas1665/META-INF/jbosscmp-jdbc.xml
Removed:
branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/cmp2/jbas1665/JBAS1665UnitTestCase.java
branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/cmp2/jbas1665/OrderBean.java
branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/cmp2/jbas1665/OrderLocal.java
branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/cmp2/jbas1665/OrderLocalHome.java
branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/cmp2/jbas1665/META-INF/
branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/cmp2/jbas1665/META-INF/ejb-jar.xml
branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/cmp2/jbas1665/META-INF/jboss.xml
branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/cmp2/jbas1665/META-INF/jbosscmp-jdbc.xml
Modified:
branches/JBoss_4_0_3_SP1_CP/server/src/main/org/jboss/ejb/plugins/cmp/ejbql/EJBQLParser.jjt
branches/JBoss_4_0_3_SP1_CP/server/src/main/org/jboss/ejb/plugins/cmp/ejbql/JBossQLParser.jjt
branches/JBoss_4_0_3_SP1_CP/testsuite/imports/test-jars.xml
Log:
ASPATCH-69: JBAS-2945: EJB-QL compiler (parser) confused by Order abstract-schema
Modified: branches/JBoss_4_0_3_SP1_CP/server/src/main/org/jboss/ejb/plugins/cmp/ejbql/EJBQLParser.jjt
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/server/src/main/org/jboss/ejb/plugins/cmp/ejbql/EJBQLParser.jjt 2006-09-28 02:26:09 UTC (rev 57252)
+++ branches/JBoss_4_0_3_SP1_CP/server/src/main/org/jboss/ejb/plugins/cmp/ejbql/EJBQLParser.jjt 2006-09-28 03:08:01 UTC (rev 57253)
@@ -1,9 +1,24 @@
/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
options {
BUILD_NODE_FILES=false;
@@ -149,7 +164,7 @@
ASTOrderBy OrderByClause() #OrderBy :
{}
{
- <ORDER> <BY> OrderByPathExpression() ( <COMMA> OrderByPathExpression() ) *
+ <ORDER_BY> OrderByPathExpression() ( <COMMA> OrderByPathExpression() ) *
{ return jjtThis; }
}
@@ -899,8 +914,7 @@
// EJB QL 2.1 tokens
-| < ORDER: "ORDER" >
-| < BY: "BY" >
+| < ORDER_BY: "ORDER BY" >
| < ASC: "ASC" >
| < DESC: "DESC" >
| < COUNT: "COUNT" >
Modified: branches/JBoss_4_0_3_SP1_CP/server/src/main/org/jboss/ejb/plugins/cmp/ejbql/JBossQLParser.jjt
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/server/src/main/org/jboss/ejb/plugins/cmp/ejbql/JBossQLParser.jjt 2006-09-28 02:26:09 UTC (rev 57252)
+++ branches/JBoss_4_0_3_SP1_CP/server/src/main/org/jboss/ejb/plugins/cmp/ejbql/JBossQLParser.jjt 2006-09-28 03:08:01 UTC (rev 57253)
@@ -1,9 +1,24 @@
/*
- * JBoss, the OpenSource J2EE webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
options {
BUILD_NODE_FILES=false;
@@ -160,7 +175,7 @@
ASTOrderBy OrderByClause() #OrderBy :
{}
{
- <ORDER> <BY> OrderByPathExpression() ( <COMMA> OrderByPathExpression() ) *
+ <ORDER_BY> OrderByPathExpression() ( <COMMA> OrderByPathExpression() ) *
{ return jjtThis; }
}
@@ -993,12 +1008,11 @@
| < WHERE: "WHERE" >
| < MEMBER: "MEMBER" >
| < ASC: "ASC" >
-| < BY: "BY" >
| < DESC: "DESC" >
| < LCASE: "LCASE" >
| < LIMIT: "LIMIT" >
| < OFFSET: "OFFSET" >
-| < ORDER: "ORDER" >
+| < ORDER_BY: "ORDER BY" >
| < UCASE: "UCASE" >
| < MOD: "MOD" >
}
Modified: branches/JBoss_4_0_3_SP1_CP/testsuite/imports/test-jars.xml
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/testsuite/imports/test-jars.xml 2006-09-28 02:26:09 UTC (rev 57252)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/imports/test-jars.xml 2006-09-28 03:08:01 UTC (rev 57253)
@@ -1314,7 +1314,20 @@
<patternset refid="ejbrunner.set"/>
</zipfileset>
</jar>
-
+
+ <!-- build cmp2-jbas1665.jar -->
+ <jar destfile="${build.lib}/cmp2-jbas1665.jar">
+ <fileset dir="${build.classes}">
+ <patternset refid="jboss.test.util.ejb.set"/>
+ <include name="org/jboss/test/cmp2/jbas1665/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/cmp2/jbas1665">
+ <include name="**/*.*"/>
+ </fileset>
+ <zipfileset src="${junit.junit.lib}/junit.jar"
+ includes="junit/**/*.*"/>
+ </jar>
+
<!-- build cmp2-keygen.jar -->
<jar destfile="${build.lib}/cmp2-keygen.jar">
<fileset dir="${build.classes}">
Copied: branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/cmp2/jbas1665 (from rev 57252, branches/JBoss_4_0_3_SP1_JBAS-2945/testsuite/src/main/org/jboss/test/cmp2/jbas1665)
Deleted: branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/cmp2/jbas1665/JBAS1665UnitTestCase.java
===================================================================
--- branches/JBoss_4_0_3_SP1_JBAS-2945/testsuite/src/main/org/jboss/test/cmp2/jbas1665/JBAS1665UnitTestCase.java 2006-09-28 02:26:09 UTC (rev 57252)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/cmp2/jbas1665/JBAS1665UnitTestCase.java 2006-09-28 03:08:01 UTC (rev 57253)
@@ -1,74 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.cmp2.jbas1665;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import org.jboss.test.JBossTestCase;
-import org.jboss.test.util.ejb.EJBTestCase;
-import junit.framework.Test;
-
-/**
- * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
- * @version <tt>$Revision$</tt>
- */
-public class JBAS1665UnitTestCase
- extends EJBTestCase
-{
- public static Test suite() throws Exception
- {
- return JBossTestCase.getDeploySetup(JBAS1665UnitTestCase.class, "cmp2-jbas1665.jar");
- }
-
- public JBAS1665UnitTestCase(String methodName)
- {
- super(methodName);
- }
-
- protected void setUp() throws Exception
- {
- getOrderLocalHome().create(new Integer(1), "order");
- }
-
- protected void tearDown() throws Exception
- {
- getOrderLocalHome().remove(new Integer(1));
- }
-
- public void testJBAS1665() throws Throwable
- {
- java.util.Collection all = getOrderLocalHome().findAll();
- assertEquals(1, all.size());
- }
-
- private OrderLocalHome getOrderLocalHome()
- throws NamingException
- {
- return (OrderLocalHome)lookup(OrderLocalHome.JNDI_NAME);
- }
-
- private Object lookup(String name) throws NamingException
- {
- InitialContext ic = new InitialContext();
- return ic.lookup(name);
- }
-}
Copied: branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/cmp2/jbas1665/JBAS1665UnitTestCase.java (from rev 57252, branches/JBoss_4_0_3_SP1_JBAS-2945/testsuite/src/main/org/jboss/test/cmp2/jbas1665/JBAS1665UnitTestCase.java)
Deleted: branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/cmp2/jbas1665/OrderBean.java
===================================================================
--- branches/JBoss_4_0_3_SP1_JBAS-2945/testsuite/src/main/org/jboss/test/cmp2/jbas1665/OrderBean.java 2006-09-28 02:26:09 UTC (rev 57252)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/cmp2/jbas1665/OrderBean.java 2006-09-28 03:08:01 UTC (rev 57253)
@@ -1,107 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.cmp2.jbas1665;
-
-
-import javax.ejb.EntityBean;
-import javax.ejb.EntityContext;
-import javax.ejb.RemoveException;
-import javax.ejb.CreateException;
-
-
-/**
- * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
- * @version <tt>$Revision$</tt>
- */
-public abstract class OrderBean implements EntityBean
-{
- // CMP accessors --------------------------------------------
- /**
- * @ejb.pk-field
- * @ejb.persistent-field
- * @ejb.interface-method
- */
- public abstract Integer getId();
-
- public abstract void setId(Integer id);
-
- /**
- * @ejb.persistent-field
- * @ejb.interface-method
- */
- public abstract String getName();
-
- /**
- * @ejb.interface-method
- */
- public abstract void setName(String name);
-
- /**
- * @throws javax.ejb.CreateException
- * @ejb.create-method
- */
- public Integer ejbCreate(Integer id, String name)
- throws CreateException
- {
- setId(id);
- setName(name);
- return null;
- }
-
- public void ejbPostCreate(Integer id, String name)
- {
- }
-
- /**
- * @param ctx The new entityContext value
- */
- public void setEntityContext(EntityContext ctx)
- {
- }
-
- /**
- * Unset the associated entity context.
- */
- public void unsetEntityContext()
- {
- }
-
- public void ejbActivate()
- {
- }
-
- public void ejbLoad()
- {
- }
-
- public void ejbPassivate()
- {
- }
-
- public void ejbRemove() throws RemoveException
- {
- }
-
- public void ejbStore()
- {
- }
-}
Copied: branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/cmp2/jbas1665/OrderBean.java (from rev 57252, branches/JBoss_4_0_3_SP1_JBAS-2945/testsuite/src/main/org/jboss/test/cmp2/jbas1665/OrderBean.java)
Deleted: branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/cmp2/jbas1665/OrderLocal.java
===================================================================
--- branches/JBoss_4_0_3_SP1_JBAS-2945/testsuite/src/main/org/jboss/test/cmp2/jbas1665/OrderLocal.java 2006-09-28 02:26:09 UTC (rev 57252)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/cmp2/jbas1665/OrderLocal.java 2006-09-28 03:08:01 UTC (rev 57253)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.cmp2.jbas1665;
-
-public interface OrderLocal
- extends javax.ejb.EJBLocalObject
-{
- public Integer getId( ) ;
-
- public String getName( ) ;
-
- public void setName( String name ) ;
-}
Copied: branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/cmp2/jbas1665/OrderLocal.java (from rev 57252, branches/JBoss_4_0_3_SP1_JBAS-2945/testsuite/src/main/org/jboss/test/cmp2/jbas1665/OrderLocal.java)
Deleted: branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/cmp2/jbas1665/OrderLocalHome.java
===================================================================
--- branches/JBoss_4_0_3_SP1_JBAS-2945/testsuite/src/main/org/jboss/test/cmp2/jbas1665/OrderLocalHome.java 2006-09-28 02:26:09 UTC (rev 57252)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/cmp2/jbas1665/OrderLocalHome.java 2006-09-28 03:08:01 UTC (rev 57253)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.cmp2.jbas1665;
-
-public interface OrderLocalHome
- extends javax.ejb.EJBLocalHome
-{
- public static final String JNDI_NAME="OrderLocal";
-
- public org.jboss.test.cmp2.jbas1665.OrderLocal create(Integer id , String name)
- throws javax.ejb.CreateException;
-
- public org.jboss.test.cmp2.jbas1665.OrderLocal findByPrimaryKey(Integer pk)
- throws javax.ejb.FinderException;
-
- public java.util.Collection findAll()
- throws javax.ejb.FinderException;
-}
Copied: branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/cmp2/jbas1665/OrderLocalHome.java (from rev 57252, branches/JBoss_4_0_3_SP1_JBAS-2945/testsuite/src/main/org/jboss/test/cmp2/jbas1665/OrderLocalHome.java)
Copied: branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/cmp2/jbas1665 (from rev 57252, branches/JBoss_4_0_3_SP1_JBAS-2945/testsuite/src/resources/cmp2/jbas1665)
Copied: branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/cmp2/jbas1665/META-INF (from rev 57252, branches/JBoss_4_0_3_SP1_JBAS-2945/testsuite/src/resources/cmp2/jbas1665/META-INF)
Deleted: branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/cmp2/jbas1665/META-INF/ejb-jar.xml
===================================================================
--- branches/JBoss_4_0_3_SP1_JBAS-2945/testsuite/src/resources/cmp2/jbas1665/META-INF/ejb-jar.xml 2006-09-28 02:26:09 UTC (rev 57252)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/cmp2/jbas1665/META-INF/ejb-jar.xml 2006-09-28 03:08:01 UTC (rev 57253)
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE ejb-jar PUBLIC
- "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
- "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
-
-<ejb-jar>
- <enterprise-beans>
- <session>
- <description>JUnit Session Bean Test Runner</description>
- <ejb-name>EJBTestRunnerEJB</ejb-name>
- <home>org.jboss.test.util.ejb.EJBTestRunnerHome</home>
- <remote>org.jboss.test.util.ejb.EJBTestRunner</remote>
- <ejb-class>org.jboss.test.util.ejb.EJBTestRunnerBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Bean</transaction-type>
- </session>
- <entity>
- <description>Order</description>
- <ejb-name>OrderEJB</ejb-name>
- <local-home>org.jboss.test.cmp2.jbas1665.OrderLocalHome</local-home>
- <local>org.jboss.test.cmp2.jbas1665.OrderLocal</local>
- <ejb-class>org.jboss.test.cmp2.jbas1665.OrderBean</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>java.lang.Integer</prim-key-class>
- <reentrant>False</reentrant>
- <cmp-version>2.x</cmp-version>
- <abstract-schema-name>Order</abstract-schema-name>
- <cmp-field><field-name>id</field-name></cmp-field>
- <cmp-field><field-name>name</field-name></cmp-field>
- <primkey-field>id</primkey-field>
- <query>
- <query-method>
- <method-name>findAll</method-name>
- <method-params/>
- </query-method>
- <ejb-ql>SELECT OBJECT(o) FROM Order o</ejb-ql>
- </query>
- </entity>
- </enterprise-beans>
-</ejb-jar>
Copied: branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/cmp2/jbas1665/META-INF/ejb-jar.xml (from rev 57252, branches/JBoss_4_0_3_SP1_JBAS-2945/testsuite/src/resources/cmp2/jbas1665/META-INF/ejb-jar.xml)
Deleted: branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/cmp2/jbas1665/META-INF/jboss.xml
===================================================================
--- branches/JBoss_4_0_3_SP1_JBAS-2945/testsuite/src/resources/cmp2/jbas1665/META-INF/jboss.xml 2006-09-28 02:26:09 UTC (rev 57252)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/cmp2/jbas1665/META-INF/jboss.xml 2006-09-28 03:08:01 UTC (rev 57253)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<jboss>
- <enterprise-beans>
- <entity>
- <ejb-name>OrderEJB</ejb-name>
- <local-jndi-name>OrderLocal</local-jndi-name>
- </entity>
- <session>
- <ejb-name>EJBTestRunnerEJB</ejb-name>
- <jndi-name>ejb/EJBTestRunner</jndi-name>
- </session>
- </enterprise-beans>
-</jboss>
Copied: branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/cmp2/jbas1665/META-INF/jboss.xml (from rev 57252, branches/JBoss_4_0_3_SP1_JBAS-2945/testsuite/src/resources/cmp2/jbas1665/META-INF/jboss.xml)
Deleted: branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/cmp2/jbas1665/META-INF/jbosscmp-jdbc.xml
===================================================================
--- branches/JBoss_4_0_3_SP1_JBAS-2945/testsuite/src/resources/cmp2/jbas1665/META-INF/jbosscmp-jdbc.xml 2006-09-28 02:26:09 UTC (rev 57252)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/cmp2/jbas1665/META-INF/jbosscmp-jdbc.xml 2006-09-28 03:08:01 UTC (rev 57253)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jbosscmp-jdbc PUBLIC
- "-//JBoss//DTD JBOSSCMP-JDBC 3.2//EN"
- "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_3_2.dtd">
-<jbosscmp-jdbc>
- <defaults>
- <remove-table>true</remove-table>
- </defaults>
- <enterprise-beans>
- <entity>
- <ejb-name>OrderEJB</ejb-name>
- <table-name>ORDER_DATA</table-name>
- </entity>
- </enterprise-beans>
-</jbosscmp-jdbc>
Copied: branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/cmp2/jbas1665/META-INF/jbosscmp-jdbc.xml (from rev 57252, branches/JBoss_4_0_3_SP1_JBAS-2945/testsuite/src/resources/cmp2/jbas1665/META-INF/jbosscmp-jdbc.xml)
More information about the jboss-cvs-commits
mailing list