[jboss-cvs] JBossAS SVN: r66585 - in branches/Branch_4_2/ejb3: src/test/org/jboss/ejb3/test and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 30 18:43:22 EDT 2007
Author: ALRubinger
Date: 2007-10-30 18:43:22 -0400 (Tue, 30 Oct 2007)
New Revision: 66585
Added:
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/Calculator.java
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CalculatorBean.java
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CommonBase.java
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CommonInterface.java
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/MyStatelessBean.java
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/MyStatelessLocal.java
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/SuperBean.java
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/SuperInterface.java
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/Tester.java
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/TesterBean.java
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/unit/
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/unit/DefaultLocalBusinessUnitTestCase.java
Removed:
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CommonBase.java
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CommonInterface.java
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/MyStatelessBean.java
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/MyStatelessLocal.java
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/Tester.java
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/TesterBean.java
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/unit/
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/unit/DefaultLocalBusinessUnitTestCase.java
Modified:
branches/Branch_4_2/ejb3/build-test.xml
Log:
[EJBTHREE-1062] Merged Unit Tests w/ Branch_4_2
Modified: branches/Branch_4_2/ejb3/build-test.xml
===================================================================
--- branches/Branch_4_2/ejb3/build-test.xml 2007-10-30 22:22:57 UTC (rev 66584)
+++ branches/Branch_4_2/ejb3/build-test.xml 2007-10-30 22:43:22 UTC (rev 66585)
@@ -1905,6 +1905,10 @@
<build-simple-jar name="ejbthree1057"/>
</target>
+ <target name="ejbthree1062" depends="compile-classes">
+ <build-simple-jar name="ejbthree1062"/>
+ </target>
+
<target name="jbas4489"
description="Builds a simple jar files."
depends="compile-classes">
@@ -3381,7 +3385,7 @@
<target name="jars" depends="removedislocal, statelesscreation, defaultremotebindings, localfromremote, clusteredjms, entityoptimisticlocking, concurrentnaming, propertyreplacement, persistenceunits, invalidtxmdb, descriptortypo, libdeployment, homeinterface, timestampentity, servicexmbean, arjuna, mdbtransactions, unauthenticatedprincipal, clusteredservice, invoker, classloader,
circulardependency, jsp, timerdependency, servicedependency, servlet, stateless14, webservices, ear, ejbthree440,
ejbthree454, ejbthree653, ejbthree670, ejbthree712, ejbthree724, ejbthree751, ejbthree785, ejbthree786, ejbthree832, ejbthree921,
- ejbthree959, ejbthree963, ejbthree986, ejbthree994, ejbthree1023, ejbthree1025, ejbthree1057,
+ ejbthree959, ejbthree963, ejbthree986, ejbthree994, ejbthree1023, ejbthree1025, ejbthree1057, ejbthree1062,
jbas4489,
aspectdomain, ejbcontext, schema, mail, scopedclassloader, dependency, jaxws,
pkg, securitydomain, enventry,
@@ -3970,6 +3974,18 @@
<param name="test" value="ejbthree1057"/>
</antcall>
<antcall target="test" inheritRefs="true">
+ <param name="test" value="ejbthree1058"/>
+ </antcall>
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="ejbthree1060"/>
+ </antcall>
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="ejbthree1062"/>
+ </antcall>
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="statelesscreation"/>
+ </antcall>
+ <antcall target="test" inheritRefs="true">
<param name="test" value="jbas4489"/>
</antcall>
</target>
Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062 (from rev 66002, trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062)
Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/Calculator.java (from rev 66021, trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/Calculator.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/Calculator.java (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/Calculator.java 2007-10-30 22:43:22 UTC (rev 66585)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, 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.ejb3.test.ejbthree1062;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public interface Calculator extends SuperInterface
+{
+
+}
Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CalculatorBean.java (from rev 66021, trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CalculatorBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CalculatorBean.java (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CalculatorBean.java 2007-10-30 22:43:22 UTC (rev 66585)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, 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.ejb3.test.ejbthree1062;
+
+import javax.ejb.Local;
+import javax.ejb.Stateless;
+
+/**
+ * The calculator bean extends one interface and a superclass.
+ * The calculator interface extends the super interface implemented by the superclass, so
+ * in effect the calculator bean only implements the calculator interface.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at Stateless
+ at Local
+public class CalculatorBean extends SuperBean implements Calculator
+{
+ public int add(int a, int b)
+ {
+ return a + b;
+ }
+}
Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CommonBase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CommonBase.java 2007-10-10 08:37:20 UTC (rev 66002)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CommonBase.java 2007-10-30 22:43:22 UTC (rev 66585)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, 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.ejb3.test.ejbthree1062;
-
-/**
- * A common base for beans that implements an interface.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public abstract class CommonBase implements CommonInterface
-{
-
-}
Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CommonBase.java (from rev 66002, trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CommonBase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CommonBase.java (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CommonBase.java 2007-10-30 22:43:22 UTC (rev 66585)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, 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.ejb3.test.ejbthree1062;
+
+/**
+ * A common base for beans that implements an interface.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public abstract class CommonBase implements CommonInterface
+{
+
+}
Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CommonInterface.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CommonInterface.java 2007-10-10 08:37:20 UTC (rev 66002)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CommonInterface.java 2007-10-30 22:43:22 UTC (rev 66585)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, 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.ejb3.test.ejbthree1062;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public interface CommonInterface
-{
- String sayHiTo(String name);
-}
Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CommonInterface.java (from rev 66002, trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CommonInterface.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CommonInterface.java (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/CommonInterface.java 2007-10-30 22:43:22 UTC (rev 66585)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, 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.ejb3.test.ejbthree1062;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public interface CommonInterface
+{
+ String sayHiTo(String name);
+}
Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/MyStatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/MyStatelessBean.java 2007-10-10 08:37:20 UTC (rev 66002)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/MyStatelessBean.java 2007-10-30 22:43:22 UTC (rev 66585)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, 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.ejb3.test.ejbthree1062;
-
-import javax.ejb.Stateless;
-
-/**
- * This bean only implements one interface, so that interface
- * should become the local business interface (4.6.6)
- *
- * But it extends a common base which also implements an interface.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
- at Stateless
-public class MyStatelessBean extends CommonBase implements MyStatelessLocal
-{
- public String sayHiTo(String name)
- {
- return "Hi " + name;
- }
-}
Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/MyStatelessBean.java (from rev 66002, trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/MyStatelessBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/MyStatelessBean.java (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/MyStatelessBean.java 2007-10-30 22:43:22 UTC (rev 66585)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, 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.ejb3.test.ejbthree1062;
+
+import javax.ejb.Stateless;
+
+/**
+ * This bean only implements one interface, so that interface
+ * should become the local business interface (4.6.6)
+ *
+ * But it extends a common base which also implements an interface.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at Stateless
+public class MyStatelessBean extends CommonBase implements MyStatelessLocal
+{
+ public String sayHiTo(String name)
+ {
+ return "Hi " + name;
+ }
+}
Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/MyStatelessLocal.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/MyStatelessLocal.java 2007-10-10 08:37:20 UTC (rev 66002)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/MyStatelessLocal.java 2007-10-30 22:43:22 UTC (rev 66585)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, 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.ejb3.test.ejbthree1062;
-
-/**
- * This business interface should not be annotated.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public interface MyStatelessLocal
-{
- String sayHiTo(String name);
-}
Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/MyStatelessLocal.java (from rev 66002, trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/MyStatelessLocal.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/MyStatelessLocal.java (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/MyStatelessLocal.java 2007-10-30 22:43:22 UTC (rev 66585)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, 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.ejb3.test.ejbthree1062;
+
+/**
+ * This business interface should not be annotated.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public interface MyStatelessLocal
+{
+ String sayHiTo(String name);
+}
Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/SuperBean.java (from rev 66021, trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/SuperBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/SuperBean.java (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/SuperBean.java 2007-10-30 22:43:22 UTC (rev 66585)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, 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.ejb3.test.ejbthree1062;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public abstract class SuperBean implements SuperInterface
+{
+
+}
Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/SuperInterface.java (from rev 66021, trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/SuperInterface.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/SuperInterface.java (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/SuperInterface.java 2007-10-30 22:43:22 UTC (rev 66585)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, 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.ejb3.test.ejbthree1062;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public interface SuperInterface
+{
+ int add(int a, int b);
+}
Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/Tester.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/Tester.java 2007-10-10 08:37:20 UTC (rev 66002)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/Tester.java 2007-10-30 22:43:22 UTC (rev 66585)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, 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.ejb3.test.ejbthree1062;
-
-import javax.ejb.Remote;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
- at Remote
-public interface Tester extends CommonInterface
-{
-
-}
Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/Tester.java (from rev 66002, trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/Tester.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/Tester.java (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/Tester.java 2007-10-30 22:43:22 UTC (rev 66585)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, 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.ejb3.test.ejbthree1062;
+
+import javax.ejb.Remote;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+ at Remote
+public interface Tester extends CommonInterface, SuperInterface
+{
+
+}
Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/TesterBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/TesterBean.java 2007-10-10 08:37:20 UTC (rev 66002)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/TesterBean.java 2007-10-30 22:43:22 UTC (rev 66585)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, 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.ejb3.test.ejbthree1062;
-
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-
-/**
- * Comment
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
- at Stateless
-public class TesterBean implements Tester
-{
- @EJB
- private MyStatelessLocal bean;
-
- public String sayHiTo(String name)
- {
- return bean.sayHiTo(name);
- }
-}
Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/TesterBean.java (from rev 66002, trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/TesterBean.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/TesterBean.java (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/TesterBean.java 2007-10-30 22:43:22 UTC (rev 66585)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, 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.ejb3.test.ejbthree1062;
+
+import javax.ejb.EJB;
+import javax.ejb.Stateless;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+ at Stateless
+public class TesterBean implements Tester
+{
+ @EJB
+ private Calculator calculator;
+
+ @EJB
+ private MyStatelessLocal bean;
+
+ public int add(int a, int b)
+ {
+ return calculator.add(a, b);
+ }
+
+ public String sayHiTo(String name)
+ {
+ return bean.sayHiTo(name);
+ }
+
+}
Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/unit (from rev 66002, trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/unit)
Deleted: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/unit/DefaultLocalBusinessUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/unit/DefaultLocalBusinessUnitTestCase.java 2007-10-10 08:37:20 UTC (rev 66002)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/unit/DefaultLocalBusinessUnitTestCase.java 2007-10-30 22:43:22 UTC (rev 66585)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, 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.ejb3.test.ejbthree1062.unit;
-
-import java.util.Date;
-
-import javax.naming.NameNotFoundException;
-
-import junit.framework.Test;
-
-import org.jboss.ejb3.test.ejbthree1062.Tester;
-import org.jboss.test.JBossTestCase;
-
-/**
- * If bean class implements a single interface, that interface is assumed to be the busi-
- * ness interface of the bean. This business interface will be a local interface unless the
- * interface is designated as a remote business interface by use of the Remote annota-
- * tion on the bean class or interface or by means of the deployment descriptor.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class DefaultLocalBusinessUnitTestCase extends JBossTestCase
-{
- public DefaultLocalBusinessUnitTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite() throws Exception
- {
- return getDeploySetup(DefaultLocalBusinessUnitTestCase.class, "ejbthree1062.jar");
- }
-
- public void testSayHiTo() throws Exception
- {
- // Guard for errors
- try
- {
- getInitialContext().lookup("MyStatelessBean/local");
- }
- catch(NameNotFoundException e)
- {
- fail("MyStatelessBean was not deployed properly");
- }
- Tester tester = (Tester) getInitialContext().lookup("TesterBean/remote");
- Date date = new Date();
- String expected = "Hi " + date;
- String actual = tester.sayHiTo(date.toString());
- assertEquals(expected, actual);
- }
-}
Copied: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/unit/DefaultLocalBusinessUnitTestCase.java (from rev 66002, trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/unit/DefaultLocalBusinessUnitTestCase.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/unit/DefaultLocalBusinessUnitTestCase.java (rev 0)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1062/unit/DefaultLocalBusinessUnitTestCase.java 2007-10-30 22:43:22 UTC (rev 66585)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, 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.ejb3.test.ejbthree1062.unit;
+
+import java.util.Date;
+
+import javax.naming.NameNotFoundException;
+
+import junit.framework.Test;
+
+import org.jboss.ejb3.test.ejbthree1062.Tester;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * If bean class implements a single interface, that interface is assumed to be the busi-
+ * ness interface of the bean. This business interface will be a local interface unless the
+ * interface is designated as a remote business interface by use of the Remote annota-
+ * tion on the bean class or interface or by means of the deployment descriptor.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision$
+ */
+public class DefaultLocalBusinessUnitTestCase extends JBossTestCase
+{
+ public DefaultLocalBusinessUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(DefaultLocalBusinessUnitTestCase.class, "ejbthree1062.jar");
+ }
+
+ public void testCalculator() throws Exception
+ {
+ // Guard for errors
+ try
+ {
+ getInitialContext().lookup("CalculatorBean/local");
+ }
+ catch(NameNotFoundException e)
+ {
+ fail("CalculatorBean was not deployed properly");
+ }
+ Tester tester = (Tester) getInitialContext().lookup("TesterBean/remote");
+ int actual = tester.add(1, 2);
+ assertEquals(3, actual);
+ }
+
+ public void testSayHiTo() throws Exception
+ {
+ // Guard for errors
+ try
+ {
+ getInitialContext().lookup("MyStatelessBean/local");
+ }
+ catch(NameNotFoundException e)
+ {
+ fail("MyStatelessBean was not deployed properly");
+ }
+ Tester tester = (Tester) getInitialContext().lookup("TesterBean/remote");
+ Date date = new Date();
+ String expected = "Hi " + date;
+ String actual = tester.sayHiTo(date.toString());
+ assertEquals(expected, actual);
+ }
+}
More information about the jboss-cvs-commits
mailing list