[jboss-cvs] JBossAS SVN: r57292 - in branches/Branch_3_2/testsuite: imports/sections src/main/org/jboss/test/cmp2 src/main/org/jboss/test/cmp2/jbas3717 src/resources/cmp2 src/resources/cmp2/jbas3717 src/resources/cmp2/jbas3717/ear src/resources/cmp2/jbas3717/ear/META-INF src/resources/cmp2/jbas3717/ejb src/resources/cmp2/jbas3717/ejb/META-INF
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 29 11:54:29 EDT 2006
Author: alex.loubyansky at jboss.com
Date: 2006-09-29 11:54:24 -0400 (Fri, 29 Sep 2006)
New Revision: 57292
Added:
branches/Branch_3_2/testsuite/src/main/org/jboss/test/cmp2/jbas3717/
branches/Branch_3_2/testsuite/src/main/org/jboss/test/cmp2/jbas3717/ABean.java
branches/Branch_3_2/testsuite/src/main/org/jboss/test/cmp2/jbas3717/ALocal.java
branches/Branch_3_2/testsuite/src/main/org/jboss/test/cmp2/jbas3717/ALocalHome.java
branches/Branch_3_2/testsuite/src/main/org/jboss/test/cmp2/jbas3717/JBAS3717UnitTestCase.java
branches/Branch_3_2/testsuite/src/main/org/jboss/test/cmp2/jbas3717/MyEntityCommand.java
branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/
branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ear/
branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ear/META-INF/
branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ear/META-INF/application.xml
branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ear/META-INF/jboss-app.xml
branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ejb/
branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ejb/META-INF/
branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ejb/META-INF/ejb-jar.xml
branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ejb/META-INF/jboss.xml
branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ejb/META-INF/jbosscmp-jdbc.xml
Modified:
branches/Branch_3_2/testsuite/imports/sections/cmp.xml
Log:
testcase for JBAS-3717
Modified: branches/Branch_3_2/testsuite/imports/sections/cmp.xml
===================================================================
--- branches/Branch_3_2/testsuite/imports/sections/cmp.xml 2006-09-29 15:29:39 UTC (rev 57291)
+++ branches/Branch_3_2/testsuite/imports/sections/cmp.xml 2006-09-29 15:54:24 UTC (rev 57292)
@@ -407,5 +407,25 @@
<zipfileset src="${junit.junit.lib}/junit.jar"
includes="junit/**/*.*"/>
</jar>
+
+ <!-- build cmp2-jbas3717.jar -->
+ <jar destfile="${build.lib}/cmp2-jbas3717.jar">
+ <fileset dir="${build.classes}">
+ <patternset refid="jboss.test.util.ejb.set"/>
+ <include name="org/jboss/test/cmp2/jbas3717/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/cmp2/jbas3717/ejb">
+ <include name="**/*.*"/>
+ </fileset>
+ <zipfileset src="${junit.junit.lib}/junit.jar" includes="junit/**/*.*"/>
+ </jar>
+ <jar destfile="${build.lib}/cmp2-jbas3717.ear">
+ <fileset dir="${build.lib}">
+ <include name="cmp2-jbas3717.jar"/>
+ </fileset>
+ <fileset dir="${build.resources}/cmp2/jbas3717/ear">
+ <include name="**/*.*"/>
+ </fileset>
+ </jar>
</target>
</project>
Added: branches/Branch_3_2/testsuite/src/main/org/jboss/test/cmp2/jbas3717/ABean.java
===================================================================
--- branches/Branch_3_2/testsuite/src/main/org/jboss/test/cmp2/jbas3717/ABean.java 2006-09-29 15:29:39 UTC (rev 57291)
+++ branches/Branch_3_2/testsuite/src/main/org/jboss/test/cmp2/jbas3717/ABean.java 2006-09-29 15:54:24 UTC (rev 57292)
@@ -0,0 +1,89 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbas3717;
+
+
+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 ABean implements EntityBean
+{
+ // CMP accessors --------------------------------------------
+ /**
+ * @ejb.pk-field
+ * @ejb.persistent-field
+ * @ejb.interface-method
+ */
+ public abstract Long getId();
+
+ public abstract void setId(Long id);
+
+ /**
+ * @throws javax.ejb.CreateException
+ * @ejb.create-method
+ */
+ public Long ejbCreate(Long id)
+ throws CreateException
+ {
+ setId(id);
+ return null;
+ }
+
+ public void ejbPostCreate(Long id)
+ {
+ }
+
+ public void setEntityContext(EntityContext ctx)
+ {
+ }
+
+ public void unsetEntityContext()
+ {
+ }
+
+ public void ejbActivate()
+ {
+ }
+
+ public void ejbLoad()
+ {
+ }
+
+ public void ejbPassivate()
+ {
+ }
+
+ public void ejbRemove() throws RemoveException
+ {
+ }
+
+ public void ejbStore()
+ {
+ }
+}
Added: branches/Branch_3_2/testsuite/src/main/org/jboss/test/cmp2/jbas3717/ALocal.java
===================================================================
--- branches/Branch_3_2/testsuite/src/main/org/jboss/test/cmp2/jbas3717/ALocal.java 2006-09-29 15:29:39 UTC (rev 57291)
+++ branches/Branch_3_2/testsuite/src/main/org/jboss/test/cmp2/jbas3717/ALocal.java 2006-09-29 15:54:24 UTC (rev 57292)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbas3717;
+
+/**
+ * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
+ * @version <tt>$Revision: $</tt>
+ */
+public interface ALocal
+ extends javax.ejb.EJBLocalObject
+{
+ public Long getId( ) ;
+}
Added: branches/Branch_3_2/testsuite/src/main/org/jboss/test/cmp2/jbas3717/ALocalHome.java
===================================================================
--- branches/Branch_3_2/testsuite/src/main/org/jboss/test/cmp2/jbas3717/ALocalHome.java 2006-09-29 15:29:39 UTC (rev 57291)
+++ branches/Branch_3_2/testsuite/src/main/org/jboss/test/cmp2/jbas3717/ALocalHome.java 2006-09-29 15:54:24 UTC (rev 57292)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbas3717;
+
+import java.util.Collection;
+
+/**
+ * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
+ * @version <tt>$Revision: $</tt>
+ */
+public interface ALocalHome
+ extends javax.ejb.EJBLocalHome
+{
+ public ALocal create(Long id)
+ throws javax.ejb.CreateException;
+
+ public ALocal findByPrimaryKey(Long pk)
+ throws javax.ejb.FinderException;
+}
Added: branches/Branch_3_2/testsuite/src/main/org/jboss/test/cmp2/jbas3717/JBAS3717UnitTestCase.java
===================================================================
--- branches/Branch_3_2/testsuite/src/main/org/jboss/test/cmp2/jbas3717/JBAS3717UnitTestCase.java 2006-09-29 15:29:39 UTC (rev 57291)
+++ branches/Branch_3_2/testsuite/src/main/org/jboss/test/cmp2/jbas3717/JBAS3717UnitTestCase.java 2006-09-29 15:54:24 UTC (rev 57292)
@@ -0,0 +1,77 @@
+/*
+ * 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.jbas3717;
+
+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: 44174 $</tt>
+ */
+public class JBAS3717UnitTestCase
+ extends EJBTestCase
+{
+ public static Test suite() throws Exception
+ {
+ return JBossTestCase.getDeploySetup(JBAS3717UnitTestCase.class, "cmp2-jbas3717.ear");
+ }
+
+ public JBAS3717UnitTestCase(String methodName)
+ {
+ super(methodName);
+ }
+
+ protected void setUp() throws Exception
+ {
+ getALocalHome().create(new Long(1));
+ }
+
+ protected void tearDown() throws Exception
+ {
+ getALocalHome().remove(new Long(1));
+ }
+
+ // Tests
+
+ public void testJBAS3541() throws Throwable
+ {
+ getALocalHome().findByPrimaryKey(new Long(1));
+ }
+
+ // Private
+
+ private ALocalHome getALocalHome()
+ throws NamingException
+ {
+ return (ALocalHome)lookup("ALocal");
+ }
+
+ private Object lookup(String name) throws NamingException
+ {
+ InitialContext ic = new InitialContext();
+ return ic.lookup(name);
+ }
+}
Added: branches/Branch_3_2/testsuite/src/main/org/jboss/test/cmp2/jbas3717/MyEntityCommand.java
===================================================================
--- branches/Branch_3_2/testsuite/src/main/org/jboss/test/cmp2/jbas3717/MyEntityCommand.java 2006-09-29 15:29:39 UTC (rev 57291)
+++ branches/Branch_3_2/testsuite/src/main/org/jboss/test/cmp2/jbas3717/MyEntityCommand.java 2006-09-29 15:54:24 UTC (rev 57292)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbas3717;
+
+/**
+ * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
+ * @version <tt>$Revision: $</tt>
+ */
+public class MyEntityCommand
+ extends org.jboss.ejb.plugins.cmp.jdbc.JDBCInsertPKCreateCommand
+{
+}
Added: branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ear/META-INF/application.xml
===================================================================
--- branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ear/META-INF/application.xml 2006-09-29 15:29:39 UTC (rev 57291)
+++ branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ear/META-INF/application.xml 2006-09-29 15:54:24 UTC (rev 57292)
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE application PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application 1.2//EN'
+ 'http://java.sun.com/j2ee/dtds/application_1_2.dtd'>
+
+<application>
+ <display-name>dummy</display-name>
+ <module>
+ <ejb>cmp2-jbas3717.jar</ejb>
+ </module>
+</application>
Added: branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ear/META-INF/jboss-app.xml
===================================================================
--- branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ear/META-INF/jboss-app.xml 2006-09-29 15:29:39 UTC (rev 57291)
+++ branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ear/META-INF/jboss-app.xml 2006-09-29 15:54:24 UTC (rev 57292)
@@ -0,0 +1,3 @@
+<jboss-app>
+ <loader-repository>jboss.test:loader=jbas3717</loader-repository>
+</jboss-app>
Added: branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ejb/META-INF/ejb-jar.xml
===================================================================
--- branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ejb/META-INF/ejb-jar.xml 2006-09-29 15:29:39 UTC (rev 57291)
+++ branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ejb/META-INF/ejb-jar.xml 2006-09-29 15:54:24 UTC (rev 57292)
@@ -0,0 +1,36 @@
+<?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 >
+ <ejb-name>A</ejb-name>
+
+ <local-home>org.jboss.test.cmp2.jbas3717.ALocalHome</local-home>
+ <local>org.jboss.test.cmp2.jbas3717.ALocal</local>
+
+ <ejb-class>org.jboss.test.cmp2.jbas3717.ABean</ejb-class>
+ <persistence-type>Container</persistence-type>
+ <prim-key-class>java.lang.Long</prim-key-class>
+ <reentrant>false</reentrant>
+ <cmp-version>2.x</cmp-version>
+ <abstract-schema-name>A</abstract-schema-name>
+ <cmp-field >
+ <description><![CDATA[]]></description>
+ <field-name>id</field-name>
+ </cmp-field>
+ <primkey-field>id</primkey-field>
+ </entity>
+ </enterprise-beans>
+</ejb-jar>
Added: branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ejb/META-INF/jboss.xml
===================================================================
--- branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ejb/META-INF/jboss.xml 2006-09-29 15:29:39 UTC (rev 57291)
+++ branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ejb/META-INF/jboss.xml 2006-09-29 15:54:24 UTC (rev 57292)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<jboss>
+ <enterprise-beans>
+ <entity>
+ <ejb-name>A</ejb-name>
+ <local-jndi-name>ALocal</local-jndi-name>
+ </entity>
+ <session>
+ <ejb-name>EJBTestRunnerEJB</ejb-name>
+ <jndi-name>ejb/EJBTestRunner</jndi-name>
+ </session>
+ </enterprise-beans>
+</jboss>
Added: branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ejb/META-INF/jbosscmp-jdbc.xml
===================================================================
--- branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ejb/META-INF/jbosscmp-jdbc.xml 2006-09-29 15:29:39 UTC (rev 57291)
+++ branches/Branch_3_2/testsuite/src/resources/cmp2/jbas3717/ejb/META-INF/jbosscmp-jdbc.xml 2006-09-29 15:54:24 UTC (rev 57292)
@@ -0,0 +1,15 @@
+<?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>A</ejb-name>
+ <entity-command name="mycmd" class="org.jboss.test.cmp2.jbas3717.MyEntityCommand"/>
+ </entity>
+ </enterprise-beans>
+</jbosscmp-jdbc>
More information about the jboss-cvs-commits
mailing list