[jboss-cvs] JBossAS SVN: r79053 - in trunk/testsuite: imports and 23 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 3 02:46:23 EDT 2008
Author: istudens at redhat.com
Date: 2008-10-03 02:46:23 -0400 (Fri, 03 Oct 2008)
New Revision: 79053
Added:
trunk/testsuite/imports/config/tests-bootstrap-dependencies.xml
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyMessageBean.java
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStateful.java
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStatefulBean.java
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStatefulHome.java
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStateless.java
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStatelessBean.java
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStatelessHome.java
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/SimpleEntity.java
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/SimpleEntityBean.java
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/SimpleEntityHome.java
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/DummyMessageBean.java
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/DummyStateful.java
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/DummyStatefulLocal.java
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/DummyStateless.java
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/DummyStatelessLocal.java
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/SimpleEntity.java
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/sar/
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/sar/BootstrapDependenciesTest.java
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/sar/BootstrapDependenciesTestMBean.java
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/servlet/
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/servlet/DummyServlet.java
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/test/
trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/test/BootstrapDependenciesTestCase.java
trunk/testsuite/src/resources/deployers/jbas5349/
trunk/testsuite/src/resources/deployers/jbas5349/bootstrapdependencies-hsqldb-ds.xml
trunk/testsuite/src/resources/deployers/jbas5349/dummywar/
trunk/testsuite/src/resources/deployers/jbas5349/dummywar/WEB-INF/
trunk/testsuite/src/resources/deployers/jbas5349/dummywar/WEB-INF/jboss-web.xml
trunk/testsuite/src/resources/deployers/jbas5349/dummywar/WEB-INF/web.xml
trunk/testsuite/src/resources/deployers/jbas5349/ejb2/
trunk/testsuite/src/resources/deployers/jbas5349/ejb2/cmp/
trunk/testsuite/src/resources/deployers/jbas5349/ejb2/mdb/
trunk/testsuite/src/resources/deployers/jbas5349/ejb2/mdb/META-INF/
trunk/testsuite/src/resources/deployers/jbas5349/ejb2/mdb/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/deployers/jbas5349/ejb2/mdb/META-INF/jboss.xml
trunk/testsuite/src/resources/deployers/jbas5349/ejb2/session/
trunk/testsuite/src/resources/deployers/jbas5349/ejb3/
trunk/testsuite/src/resources/deployers/jbas5349/ejb3/entity/
trunk/testsuite/src/resources/deployers/jbas5349/ejb3/entity/META-INF/
trunk/testsuite/src/resources/deployers/jbas5349/ejb3/entity/META-INF/persistence.xml
trunk/testsuite/src/resources/deployers/jbas5349/sar/
trunk/testsuite/src/resources/deployers/jbas5349/sar/META-INF/
trunk/testsuite/src/resources/deployers/jbas5349/sar/META-INF/jboss-service.xml
Removed:
trunk/testsuite/src/resources/cmp2/jbas979/META-INF/jbosscmp-jdbc.xml
Modified:
trunk/testsuite/build.xml
trunk/testsuite/imports/config/configs.xml
trunk/testsuite/imports/sections/deployers.xml
trunk/testsuite/imports/server-config.xml
trunk/testsuite/src/resources/cmp2/jbas979/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cmp2/jbas979/META-INF/jboss.xml
trunk/testsuite/src/resources/cmp2/simple/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cmp2/simple/META-INF/jboss.xml
trunk/testsuite/src/resources/cmp2/simple/META-INF/jbosscmp-jdbc.xml
Log:
first commit of bootstrap dependencies tests; includes:
- EJB3 Session Bean, Entity Bean, MDB
- EJB2 Session Bean, CMP Entity, MDB
- WAR
- datasource
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2008-10-03 04:08:44 UTC (rev 79052)
+++ trunk/testsuite/build.xml 2008-10-03 06:46:23 UTC (rev 79053)
@@ -936,6 +936,7 @@
<antcall target="jboss-minimal-tests" />
<antcall target="jboss-all-config-tests"/>
<antcall target="tests-profileservice"/>
+ <antcall target="tests-bootstrap-dependencies"/>
<antcall target="tests-springdeployer"/>
<antcall target="tests-security-manager"/>
<antcall target="tests-clustering-all-stacks"/>
Modified: trunk/testsuite/imports/config/configs.xml
===================================================================
--- trunk/testsuite/imports/config/configs.xml 2008-10-03 04:08:44 UTC (rev 79052)
+++ trunk/testsuite/imports/config/configs.xml 2008-10-03 06:46:23 UTC (rev 79053)
@@ -10,5 +10,6 @@
<!-- Import all the xml files that define targets that require a separate
JBoss Server Configuration -->
<import file="tests-clustering.xml"/>
+<import file="tests-bootstrap-dependencies.xml"/>
</project>
Added: trunk/testsuite/imports/config/tests-bootstrap-dependencies.xml
===================================================================
--- trunk/testsuite/imports/config/tests-bootstrap-dependencies.xml (rev 0)
+++ trunk/testsuite/imports/config/tests-bootstrap-dependencies.xml 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+
+<!--
+ | Targets that run the bootstrap dependencies tests
+-->
+
+<!-- $Id: tests-clustering.xml 75738 2008-07-13 13:33:32Z bstansberry at jboss.com $ -->
+<project name="main.server.config.bootstrapdependencies" xmlns:server="http://jboss.org/ns/test/ant/server">
+
+ <!--
+ | Define the Pattern Sets Here
+ -->
+ <patternset id="bootstrap-dependencies.includes">
+ <include name="org/jboss/test/deployers/jbas5349/test/BootstrapDependenciesTestCase.class"/>
+ </patternset>
+ <patternset id="bootstrap-dependencies.excludes">
+ <exclude name="org/jboss/test/deployers/jbas5349/**/*TestCase.class"/>
+ </patternset>
+
+ <!--
+ | Targets
+ -->
+
+ <!-- JBAS-5349 -->
+ <target name="tests-bootstrap-dependencies"
+ description="Tests bootstrap dependencies of the JBossMC.">
+ <!-- EJB3 Session -->
+ <antcall target="generalmodule-bootstrap-dependencies-tests">
+ <param name="jboss-junit-configuration" value="EJB3Session"/>
+ <param name="bootstrap.testmodule.name" value="bootstrapdependencies-ejb3-sessionbean.jar"/>
+ </antcall>
+ <!-- EJB3 Entity -->
+ <antcall target="generalmodule-bootstrap-dependencies-tests">
+ <param name="jboss-junit-configuration" value="EJB3Entity"/>
+ <param name="bootstrap.testmodule.name" value="bootstrapdependencies-ejb3-entitybean.jar"/>
+ </antcall>
+ <!-- EJB3 Message -->
+ <antcall target="generalmodule-bootstrap-dependencies-tests">
+ <param name="jboss-junit-configuration" value="EJB3Message"/>
+ <param name="bootstrap.testmodule.name" value="bootstrapdependencies-ejb3-messagebean.jar"/>
+ </antcall>
+ <!-- EJB2 Session -->
+ <antcall target="generalmodule-bootstrap-dependencies-tests">
+ <param name="jboss-junit-configuration" value="EJB2Session"/>
+ <param name="bootstrap.testmodule.name" value="bootstrapdependencies-ejb2-sessionbean.jar"/>
+ </antcall>
+ <!-- EJB2 CMP Entity -->
+ <antcall target="generalmodule-bootstrap-dependencies-tests">
+ <param name="jboss-junit-configuration" value="EJB2EntityCMP"/>
+ <param name="bootstrap.testmodule.name" value="bootstrapdependencies-ejb2-entitycmpbean.jar"/>
+ </antcall>
+ <!-- EJB2 Message -->
+ <antcall target="generalmodule-bootstrap-dependencies-tests">
+ <param name="jboss-junit-configuration" value="EJB2Message"/>
+ <param name="bootstrap.testmodule.name" value="bootstrapdependencies-ejb2-messagebean.jar"/>
+ </antcall>
+ <!-- Web WAR -->
+ <antcall target="generalmodule-bootstrap-dependencies-tests">
+ <param name="jboss-junit-configuration" value="WAR"/>
+ <param name="bootstrap.testmodule.name" value="bootstrapdependencies-web.war"/>
+ </antcall>
+ <!-- datasource -->
+ <antcall target="generalmodule-bootstrap-dependencies-tests">
+ <param name="jboss-junit-configuration" value="datasource"/>
+ <param name="bootstrap.testmodule.name" value="bootstrapdependencies-hsqldb-ds.xml"/>
+ </antcall>
+ </target>
+
+ <!-- General module's test -->
+ <target name="generalmodule-bootstrap-dependencies-tests">
+ <create-bootstrapdependencies-config baseconf="all" conf="bootstrapdependenciesJBAS5349-${jboss-junit-configuration}">
+ <module-patternset>
+ <include name="${bootstrap.testmodule.name}"/>
+ </module-patternset>
+ </create-bootstrapdependencies-config>
+ <server:start name="bootstrapdependenciesJBAS5349-${jboss-junit-configuration}"/>
+ <run-junit junit.patternset="bootstrap-dependencies.includes"
+ junit.configuration="${jboss-junit-configuration}" />
+ <server:stop name="bootstrapdependenciesJBAS5349-${jboss-junit-configuration}"/>
+ </target>
+
+</project>
\ No newline at end of file
Modified: trunk/testsuite/imports/sections/deployers.xml
===================================================================
--- trunk/testsuite/imports/sections/deployers.xml 2008-10-03 04:08:44 UTC (rev 79052)
+++ trunk/testsuite/imports/sections/deployers.xml 2008-10-03 06:46:23 UTC (rev 79053)
@@ -133,6 +133,66 @@
</fileset>
</jar>
+ <!-- JBAS-5349 -->
+ <delete dir="${build.resources}/test-configs/bootstrap-dependencies/deploy/Aaabootstrapdependencies-jbas5349.sar"/>
+ <mkdir dir="${build.resources}/test-configs/bootstrap-dependencies/deploy/Aaabootstrapdependencies-jbas5349.sar"/>
+ <copy todir="${build.resources}/test-configs/bootstrap-dependencies/deploy/Aaabootstrapdependencies-jbas5349.sar/">
+ <fileset dir="${build.resources}/deployers/jbas5349/sar/"/>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/deployers/jbas5349/sar/BootstrapDependenciesTest*.class"/>
+ </fileset>
+ </copy>
+ <copy file="${build.resources}/deployers/jbas5349/bootstrapdependencies-hsqldb-ds.xml" todir="${build.lib}"/>
+ <jar destfile="${build.lib}/bootstrapdependencies-ejb3-sessionbean.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/deployers/jbas5349/ejb3/DummyStateless*.class"/>
+ <include name="org/jboss/test/deployers/jbas5349/ejb3/DummyStateful*.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${build.lib}/bootstrapdependencies-ejb3-entitybean.jar">
+ <fileset dir="${build.resources}/deployers/jbas5349/ejb3/entity">
+ <include name="**/*"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/deployers/jbas5349/ejb3/SimpleEntity.java"/>
+ </fileset>
+ </jar>
+ <jar destfile="${build.lib}/bootstrapdependencies-ejb3-messagebean.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/deployers/jbas5349/ejb3/DummyMessageBean.java"/>
+ </fileset>
+ </jar>
+ <jar destfile="${build.lib}/bootstrapdependencies-ejb2-sessionbean.jar">
+ <fileset dir="${build.resources}/deployers/jbas5349/ejb2/session">
+ <include name="META-INF/*"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/deployers/jbas5349/ejb2/DummyStateless*.class"/>
+ <include name="org/jboss/test/deployers/jbas5349/ejb2/DummyStateful*.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${build.lib}/bootstrapdependencies-ejb2-entitycmpbean.jar">
+ <fileset dir="${build.resources}/deployers/jbas5349/ejb2/cmp">
+ <include name="META-INF/*"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/deployers/jbas5349/ejb2/SimpleEntity*.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${build.lib}/bootstrapdependencies-ejb2-messagebean.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/deployers/jbas5349/ejb2/DummyMessageBean.java"/>
+ </fileset>
+ </jar>
+ <jar destfile="${build.lib}/bootstrapdependencies-web.war">
+ <fileset dir="${build.resources}/deployers/jbas5349/dummywar">
+ <include name="**/*"/>
+ </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/deployers/jbas5349/servlet/DummyServlet.java"/>
+ </fileset>
+ </jar>
+
<!-- JBAS-2904 SAR -->
<jar destfile="${build.lib}/Atestdeployerorder-jbas2904.sar">
<fileset dir="${build.resources}/deployers/jbas2904/mbean1">
Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml 2008-10-03 04:08:44 UTC (rev 79052)
+++ trunk/testsuite/imports/server-config.xml 2008-10-03 06:46:23 UTC (rev 79053)
@@ -837,6 +837,45 @@
</copy>
</sequential>
</macrodef>
+
+ <macrodef name="create-bootstrapdependencies-config"
+ description="Create a configuration based on the 'all' profile with bootstrap dependencies test's SAR">
+ <attribute name="conf" />
+ <attribute name="baseconf" />
+ <element name="module-patternset" />
+ <sequential>
+ <server:config>
+ <server name="@{conf}" host="${node0}">
+ <jvmarg value="-Xms128m" />
+ <jvmarg value="-Xmx512m" />
+ <jvmarg value="-XX:MaxPermSize=512m" />
+ <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
+ <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+ </server>
+ </server:config>
+ <delete dir="${jboss.dist}/server/@{conf}" />
+ <create-config baseconf="@{baseconf}" newconf="@{conf}"
+ newconf-src="bootstrap-dependencies">
+ <patternset>
+ <include name="conf/**" />
+ <include name="deployers/**" />
+ <include name="deploy/**" />
+ <include name="lib/**" />
+ </patternset>
+ </create-config>
+ <copy
+ todir="${jboss.dist}/server/@{conf}/deploy/Aaabootstrapdependencies-jbas5349.sar"
+ filtering="false">
+ <fileset dir="${build.lib}">
+ <patternset>
+ <module-patternset />
+ </patternset>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
<macrodef name="create-profileservice-config"
description="Create a configuration with the full features profile service">
Added: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyMessageBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyMessageBean.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyMessageBean.java 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,64 @@
+/*
+ * 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.deployers.jbas5349.ejb2;
+
+import javax.ejb.EJBException;
+import javax.ejb.MessageDrivenBean;
+import javax.ejb.MessageDrivenContext;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+
+/**
+ * A dummy (empty) EJB2 message bean.
+ *
+ * @author <a href="istudens at redhat.com">Ivo Studensky</a>
+ * @version $Revision: 1.1 $
+ */
+public class DummyMessageBean implements MessageDrivenBean, MessageListener
+{
+ private static final long serialVersionUID = 1L;
+
+ protected transient MessageDrivenContext mdc = null;
+
+
+ public void onMessage(Message message)
+ {
+ // nothing to do now
+ }
+
+
+ public void ejbCreate() {}
+
+ public void ejbRemove() throws EJBException
+ {
+ mdc = null;
+ }
+
+ public void setMessageDrivenContext(MessageDrivenContext mdc) throws EJBException
+ {
+ this.mdc = mdc;
+ }
+
+}
+
Added: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStateful.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStateful.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStateful.java 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,38 @@
+/*
+ * 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.deployers.jbas5349.ejb2;
+
+import javax.ejb.EJBObject;
+
+/**
+ * Remote interface of a dummy (empty) EJB2 stateless bean.
+ *
+ * @author <a href="istudens at redhat.com">Ivo Studensky</a>
+ * @version $Revision: 1.1 $
+ */
+public interface DummyStateful
+ extends EJBObject
+{
+
+}
+
Added: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStatefulBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStatefulBean.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStatefulBean.java 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,60 @@
+/*
+ * 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.deployers.jbas5349.ejb2;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.EJBException;
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+
+/**
+ * A dummy (empty) EJB2 stateless bean.
+ *
+ * @author <a href="istudens at redhat.com">Ivo Studensky</a>
+ * @version $Revision: 1.1 $
+ */
+public class DummyStatefulBean
+ implements SessionBean
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+ public void ejbActivate() throws EJBException, RemoteException
+ {
+ }
+
+ public void ejbPassivate() throws EJBException, RemoteException
+ {
+ }
+
+ public void ejbRemove() throws EJBException, RemoteException
+ {
+ }
+
+ public void setSessionContext(SessionContext ctx) throws EJBException, RemoteException
+ {
+ }
+
+}
+
Added: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStatefulHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStatefulHome.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStatefulHome.java 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,43 @@
+/*
+ * 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.deployers.jbas5349.ejb2;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBHome;
+
+
+/**
+ * Home interface of a dummy (empty) EJB2 stateful bean.
+ *
+ * @author <a href="istudens at redhat.com">Ivo Studensky</a>
+ * @version $Revision: 1.1 $
+ */
+public interface DummyStatefulHome
+ extends EJBHome
+{
+ public DummyStateful create()
+ throws CreateException, RemoteException;
+}
+
Added: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStateless.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStateless.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStateless.java 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,38 @@
+/*
+ * 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.deployers.jbas5349.ejb2;
+
+import javax.ejb.EJBObject;
+
+/**
+ * Remote interface of a dummy (empty) EJB2 stateless bean.
+ *
+ * @author <a href="istudens at redhat.com">Ivo Studensky</a>
+ * @version $Revision: 1.1 $
+ */
+public interface DummyStateless
+ extends EJBObject
+{
+
+}
+
Added: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStatelessBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStatelessBean.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStatelessBean.java 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,60 @@
+/*
+ * 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.deployers.jbas5349.ejb2;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.EJBException;
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+
+/**
+ * A dummy (empty) EJB2 stateless bean.
+ *
+ * @author <a href="istudens at redhat.com">Ivo Studensky</a>
+ * @version $Revision: 1.1 $
+ */
+public class DummyStatelessBean
+ implements SessionBean
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+ public void ejbActivate() throws EJBException, RemoteException
+ {
+ }
+
+ public void ejbPassivate() throws EJBException, RemoteException
+ {
+ }
+
+ public void ejbRemove() throws EJBException, RemoteException
+ {
+ }
+
+ public void setSessionContext(SessionContext ctx) throws EJBException, RemoteException
+ {
+ }
+
+}
+
Added: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStatelessHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStatelessHome.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/DummyStatelessHome.java 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,43 @@
+/*
+ * 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.deployers.jbas5349.ejb2;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBHome;
+
+
+/**
+ * Home interface of a dummy (empty) EJB2 stateless bean.
+ *
+ * @author <a href="istudens at redhat.com">Ivo Studensky</a>
+ * @version $Revision: 1.1 $
+ */
+public interface DummyStatelessHome
+ extends EJBHome
+{
+ public DummyStateful create()
+ throws CreateException, RemoteException;
+}
+
Added: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/SimpleEntity.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/SimpleEntity.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/SimpleEntity.java 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,29 @@
+/*
+ * 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.deployers.jbas5349.ejb2;
+
+import javax.ejb.EJBObject;
+
+public interface SimpleEntity extends EJBObject
+{
+ public Long getId();
+}
Property changes on: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/SimpleEntity.java
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/SimpleEntityBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/SimpleEntityBean.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/SimpleEntityBean.java 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,72 @@
+/*
+ * 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.deployers.jbas5349.ejb2;
+
+
+import javax.ejb.EntityBean;
+import javax.ejb.CreateException;
+import javax.ejb.EntityContext;
+
+/**
+ * A simple EJB2 CMP entity.
+ *
+ * @author <a href="istudens at redhat.com">Ivo Studensky</a>
+ * @version $Revision: 1.1 $
+ */
+public abstract class SimpleEntityBean implements EntityBean
+{
+ private static final long serialVersionUID = 1L;
+
+ private transient EntityContext ctx;
+
+ public abstract Long getId();
+ public abstract void setId(Long id);
+
+ public Long ejbCreate(Long id) throws CreateException
+ {
+ setId(id);
+ return null;
+ }
+
+ public void ejbPostCreate(Long id) throws CreateException {}
+
+ public void ejbActivate() {}
+
+ public void ejbPassivate() {}
+
+ public void ejbLoad() {}
+
+ public void ejbStore() {}
+
+ public void ejbRemove() {}
+
+ public void setEntityContext(EntityContext context)
+ {
+ this.ctx = context;
+ }
+
+ public void unsetEntityContext()
+ {
+ this.ctx = null;
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/SimpleEntityBean.java
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/SimpleEntityHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/SimpleEntityHome.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/SimpleEntityHome.java 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,32 @@
+/*
+ * 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.deployers.jbas5349.ejb2;
+
+import javax.ejb.EJBHome;
+import javax.ejb.FinderException;
+import javax.ejb.CreateException;
+
+public interface SimpleEntityHome extends EJBHome
+{
+ public SimpleEntity create(Long id) throws CreateException;
+ public SimpleEntity findByPrimaryKey(Long id) throws FinderException;
+}
Property changes on: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb2/SimpleEntityHome.java
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/DummyMessageBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/DummyMessageBean.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/DummyMessageBean.java 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,56 @@
+/*
+ * 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.deployers.jbas5349.ejb3;
+
+import javax.annotation.Resource;
+import javax.ejb.MessageDriven;
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDrivenContext;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+/**
+ * A dummy (empty) EJB3 message bean.
+ *
+ * @author <a href="istudens at redhat.com">Ivo Studensky</a>
+ * @version $Revision: 1.1 $
+ */
+ at MessageDriven(activationConfig =
+{
+ @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+ @ActivationConfigProperty(propertyName="destination", propertyValue="queue/testingqueue")
+})
+public class DummyMessageBean implements MessageListener
+{
+
+ @Resource
+ private MessageDrivenContext mdc;
+
+ public DummyMessageBean() {}
+
+ public void onMessage(Message message)
+ {
+ }
+
+}
+
Added: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/DummyStateful.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/DummyStateful.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/DummyStateful.java 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,40 @@
+/*
+ * 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.deployers.jbas5349.ejb3;
+
+import javax.ejb.Stateful;
+
+/**
+ * A dummy (empty) EJB3 stateful bean.
+ *
+ * @author <a href="istudens at redhat.com">Ivo Studensky</a>
+ * @version $Revision: 1.1 $
+ */
+ at Stateful
+public class DummyStateful implements DummyStatefulLocal
+{
+ public void testEmpty()
+ {
+ }
+}
+
Added: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/DummyStatefulLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/DummyStatefulLocal.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/DummyStatefulLocal.java 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,38 @@
+/*
+ * 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.deployers.jbas5349.ejb3;
+
+import javax.ejb.Local;
+
+/**
+ * Local interface of a dummy (empty) EJB3 stateful bean.
+ *
+ * @author <a href="istudens at redhat.com">Ivo Studensky</a>
+ * @version $Revision: 1.1 $
+ */
+ at Local
+public interface DummyStatefulLocal
+{
+ public void testEmpty();
+}
+
Added: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/DummyStateless.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/DummyStateless.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/DummyStateless.java 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,40 @@
+/*
+ * 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.deployers.jbas5349.ejb3;
+
+import javax.ejb.Stateless;
+
+/**
+ * A dummy (empty) EJB3 stateless bean.
+ *
+ * @author <a href="istudens at redhat.com">Ivo Studensky</a>
+ * @version $Revision: 1.1 $
+ */
+ at Stateless
+public class DummyStateless implements DummyStatelessLocal
+{
+ public void testEmpty()
+ {
+ }
+}
+
Added: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/DummyStatelessLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/DummyStatelessLocal.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/DummyStatelessLocal.java 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,38 @@
+/*
+ * 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.deployers.jbas5349.ejb3;
+
+import javax.ejb.Local;
+
+/**
+ * Local interface of a dummy (empty) EJB3 stateless bean.
+ *
+ * @author <a href="istudens at redhat.com">Ivo Studensky</a>
+ * @version $Revision: 1.1 $
+ */
+ at Local
+public interface DummyStatelessLocal
+{
+ public void testEmpty();
+}
+
Added: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/SimpleEntity.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/SimpleEntity.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/ejb3/SimpleEntity.java 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,80 @@
+/*
+ * 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.deployers.jbas5349.ejb3;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+/**
+ * A simple EJB3 entity.
+ *
+ * @author <a href="istudens at redhat.com">Ivo Studensky</a>
+ * @version $Revision: 1.1 $
+ */
+ at Entity
+public class SimpleEntity implements java.io.Serializable
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+ private int pk;
+
+ /** empty constructor */
+ public SimpleEntity() {}
+
+ @Id
+ public int getPk()
+ {
+ return pk;
+ }
+ public void setPk(int pk)
+ {
+ this.pk = pk;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + pk;
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ SimpleEntity other = (SimpleEntity) obj;
+ if (pk != other.pk)
+ return false;
+ return true;
+ }
+
+}
+
Added: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/sar/BootstrapDependenciesTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/sar/BootstrapDependenciesTest.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/sar/BootstrapDependenciesTest.java 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,62 @@
+/*
+ * 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.deployers.jbas5349.sar;
+
+import org.jboss.system.ServiceMBeanSupport;
+
+
+/**
+ * Bootstrap Dependency Test's MBean.
+ *
+ * @author <a href="istudens at redhat.com">Ivo Studensky</a>
+ * @version $$Revision: 1.1 $$
+ */
+public class BootstrapDependenciesTest
+ extends ServiceMBeanSupport
+ implements BootstrapDependenciesTestMBean
+{
+
+ public BootstrapDependenciesTest()
+ {
+ // nothing to do now
+ }
+
+ @Override
+ public String getName()
+ {
+ return "Bootstrap Dependencies Test MBean";
+ }
+
+ @Override
+ protected void startService() throws Exception
+ {
+ log.debug("BootstrapDependenciesTest's MBean is started");
+ }
+
+ @Override
+ protected void stopService() throws Exception
+ {
+ // nothing to do now
+ }
+
+}
Added: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/sar/BootstrapDependenciesTestMBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/sar/BootstrapDependenciesTestMBean.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/sar/BootstrapDependenciesTestMBean.java 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,30 @@
+/*
+ * 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.deployers.jbas5349.sar;
+
+import org.jboss.system.ServiceMBean;
+
+public interface BootstrapDependenciesTestMBean
+ extends ServiceMBean
+{
+}
Added: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/servlet/DummyServlet.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/servlet/DummyServlet.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/servlet/DummyServlet.java 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,51 @@
+/*
+ * 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.deployers.jbas5349.servlet;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ *
+ *
+ * @author <a href="istudens at redhat.com">Ivo Studensky</a>
+ * @version $Revision: 1.1 $
+ */
+public class DummyServlet extends HttpServlet
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException
+ {
+
+ }
+
+}
+
Added: trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/test/BootstrapDependenciesTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/test/BootstrapDependenciesTestCase.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas5349/test/BootstrapDependenciesTestCase.java 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,81 @@
+/*
+ * 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.deployers.jbas5349.test;
+
+import javax.management.ObjectName;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+
+
+/**
+ * Tests bootstrap dependencies.
+ *
+ * @author <a href="istudens at redhat.com">Ivo Studensky</a>
+ * @version $Revision: 1.1 $
+ */
+public class BootstrapDependenciesTestCase
+ extends JBossTestCase
+{
+ protected static Logger staticLog = Logger.getLogger(BootstrapDependenciesTestCase.class);
+
+ // Constants -----------------------------------------------------
+ public final static String bootstrapDependenciesTestMBeanName =
+ "org.jboss.test.deployers.jbas5349.sar.bootstrap.dependencies.test:service=BootstrapDependenciesTest";
+ public final static int expectedMBeanState = 3;
+
+
+ public BootstrapDependenciesTestCase(String name)
+ {
+ super(name);
+ }
+
+
+ /**
+ * Tests the status of deployment of testing SAR.
+ * If it fails, probably the deployment of a tested module included in the SAR fails.
+ * See details in server's log.
+ *
+ * @throws Exception Description of Exception
+ */
+ public void testDeploymentStatus() throws Exception
+ {
+ assertEquals(expectedMBeanState, checkMBeanState());
+ }
+
+
+ /**
+ * Checks the state of testing MBean.
+ *
+ * @exception Exception Description of Exception
+ */
+ protected int checkMBeanState() throws Exception
+ {
+ Object state = invoke(new ObjectName(bootstrapDependenciesTestMBeanName), "getState", null, null);
+ staticLog.debug("state=" + state);
+
+ return ((Integer) state).intValue();
+ }
+
+}
+
Modified: trunk/testsuite/src/resources/cmp2/jbas979/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/jbas979/META-INF/ejb-jar.xml 2008-10-03 04:08:44 UTC (rev 79052)
+++ trunk/testsuite/src/resources/cmp2/jbas979/META-INF/ejb-jar.xml 2008-10-03 06:46:23 UTC (rev 79053)
@@ -6,73 +6,37 @@
<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>
+ <ejb-name>DummyStatelessEJB</ejb-name>
+ <home>org.jboss.test.deployers.jbas5349.ejb2.DummyStatelessHome</home>
+ <remote>org.jboss.test.deployers.jbas5349.ejb2.DummyStateless</remote>
+ <ejb-class>org.jboss.test.deployers.jbas5349.ejb2.DummyStatelessBean</ejb-class>
<session-type>Stateless</session-type>
- <transaction-type>Bean</transaction-type>
+ <transaction-type>Container</transaction-type>
</session>
<session>
- <ejb-name>FacadeEJB</ejb-name>
- <home>org.jboss.test.cmp2.jbas979.FacadeHome</home>
- <remote>org.jboss.test.cmp2.jbas979.Facade</remote>
- <ejb-class>org.jboss.test.cmp2.jbas979.FacadeSessionBean</ejb-class>
- <session-type>Stateless</session-type>
+ <ejb-name>DummyStatefulEJB</ejb-name>
+ <home>org.jboss.test.deployers.jbas5349.ejb2.DummyStatefulHome</home>
+ <remote>org.jboss.test.deployers.jbas5349.ejb2.DummyStateful</remote>
+ <ejb-class>org.jboss.test.deployers.jbas5349.ejb2.DummyStatefulBean</ejb-class>
+ <session-type>Stateful</session-type>
<transaction-type>Container</transaction-type>
</session>
- <entity>
- <ejb-name>AStoreNotFlushedTrueEJB</ejb-name>
- <local-home>org.jboss.test.cmp2.jbas979.ALocalHome</local-home>
- <local>org.jboss.test.cmp2.jbas979.ALocal</local>
- <ejb-class>org.jboss.test.cmp2.jbas979.ABean</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>AStoreNotFlushedTrue</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 AStoreNotFlushedTrue o</ejb-ql>
- </query>
- </entity>
- <entity>
- <ejb-name>AStoreNotFlushedFalseEJB</ejb-name>
- <local-home>org.jboss.test.cmp2.jbas979.ALocalHome</local-home>
- <local>org.jboss.test.cmp2.jbas979.ALocal</local>
- <ejb-class>org.jboss.test.cmp2.jbas979.ABean</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>AStoreNotFlushedFalse</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 AStoreNotFlushedFalse o</ejb-ql>
- </query>
- </entity>
</enterprise-beans>
- <assembly-descriptor >
- <container-transaction >
- <method >
- <ejb-name>FacadeEJB</ejb-name>
+ <assembly-descriptor>
+ <container-transaction>
+ <method>
+ <ejb-name>DummyStatelessEJB</ejb-name>
<method-name>*</method-name>
</method>
- <trans-attribute>RequiresNew</trans-attribute>
+ <trans-attribute>Supports</trans-attribute>
</container-transaction>
+ <container-transaction>
+ <method>
+ <ejb-name>DummyStatefulEJB</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>Supports</trans-attribute>
+ </container-transaction>
</assembly-descriptor>
</ejb-jar>
Modified: trunk/testsuite/src/resources/cmp2/jbas979/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/jbas979/META-INF/jboss.xml 2008-10-03 04:08:44 UTC (rev 79052)
+++ trunk/testsuite/src/resources/cmp2/jbas979/META-INF/jboss.xml 2008-10-03 06:46:23 UTC (rev 79053)
@@ -4,63 +4,13 @@
<jboss>
<enterprise-beans>
- <entity>
- <ejb-name>AStoreNotFlushedTrueEJB</ejb-name>
- <local-jndi-name>AStoreNotFlushedTrue</local-jndi-name>
- <configuration-name>store-not-flushed=true</configuration-name>
- </entity>
- <entity>
- <ejb-name>AStoreNotFlushedFalseEJB</ejb-name>
- <local-jndi-name>AStoreNotFlushedFalse</local-jndi-name>
- <configuration-name>store-not-flushed=false</configuration-name>
- </entity>
<session>
- <ejb-name>EJBTestRunnerEJB</ejb-name>
- <jndi-name>ejb/EJBTestRunner</jndi-name>
+ <ejb-name>DummyStatelessEJB</ejb-name>
+ <jndi-name>ejb/DummyStateless</jndi-name>
</session>
<session>
- <ejb-name>FacadeEJB</ejb-name>
- <jndi-name>Facade</jndi-name>
+ <ejb-name>DummyStatefulEJB</ejb-name>
+ <jndi-name>ejb/DummyStateful</jndi-name>
</session>
</enterprise-beans>
-
- <container-configurations>
- <container-configuration extends="Standard Pessimistic CMP 2.x EntityBean">
- <container-name>store-not-flushed=true</container-name>
- <store-not-flushed>true</store-not-flushed>
- <container-cache-conf>
- <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
- <cache-policy-conf>
- <min-capacity>50</min-capacity>
- <max-capacity>1000000</max-capacity>
- <overager-period>1</overager-period>
- <max-bean-age>3</max-bean-age>
- <resizer-period>400</resizer-period>
- <max-cache-miss-period>60</max-cache-miss-period>
- <min-cache-miss-period>1</min-cache-miss-period>
- <cache-load-factor>0.75</cache-load-factor>
- </cache-policy-conf>
- </container-cache-conf>
- <commit-option>A</commit-option>
- </container-configuration>
-
- <container-configuration extends="Standard Pessimistic CMP 2.x EntityBean">
- <container-name>store-not-flushed=false</container-name>
- <store-not-flushed>false</store-not-flushed>
- <container-cache-conf>
- <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
- <cache-policy-conf>
- <min-capacity>50</min-capacity>
- <max-capacity>1000000</max-capacity>
- <overager-period>1</overager-period>
- <max-bean-age>3</max-bean-age>
- <resizer-period>400</resizer-period>
- <max-cache-miss-period>60</max-cache-miss-period>
- <min-cache-miss-period>1</min-cache-miss-period>
- <cache-load-factor>0.75</cache-load-factor>
- </cache-policy-conf>
- </container-cache-conf>
- <commit-option>A</commit-option>
- </container-configuration>
- </container-configurations>
</jboss>
Deleted: trunk/testsuite/src/resources/cmp2/jbas979/META-INF/jbosscmp-jdbc.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/jbas979/META-INF/jbosscmp-jdbc.xml 2008-10-03 04:08:44 UTC (rev 79052)
+++ trunk/testsuite/src/resources/cmp2/jbas979/META-INF/jbosscmp-jdbc.xml 2008-10-03 06:46:23 UTC (rev 79053)
@@ -1,20 +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>AStoreNotFlushedTrueEJB</ejb-name>
- <table-name>AStoreNotFlushedTrue</table-name>
- </entity>
- <entity>
- <ejb-name>AStoreNotFlushedFalseEJB</ejb-name>
- <table-name>AStoreNotFlushedFalse</table-name>
- </entity>
- </enterprise-beans>
-</jbosscmp-jdbc>
Modified: trunk/testsuite/src/resources/cmp2/simple/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/simple/META-INF/ejb-jar.xml 2008-10-03 04:08:44 UTC (rev 79052)
+++ trunk/testsuite/src/resources/cmp2/simple/META-INF/ejb-jar.xml 2008-10-03 06:46:23 UTC (rev 79053)
@@ -6,161 +6,27 @@
<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>SimpleEJB</ejb-name>
- <local-home>org.jboss.test.cmp2.simple.SimpleHome</local-home>
- <local>org.jboss.test.cmp2.simple.Simple</local>
- <ejb-class>org.jboss.test.cmp2.simple.SimpleBean</ejb-class>
+ <ejb-name>SimpleEntityEJB</ejb-name>
+ <home>org.jboss.test.deployers.jbas5349.ejb2.SimpleEntityHome</home>
+ <remote>org.jboss.test.deployers.jbas5349.ejb2.SimpleEntity</remote>
+ <ejb-class>org.jboss.test.deployers.jbas5349.ejb2.SimpleEntityBean</ejb-class>
<persistence-type>Container</persistence-type>
<prim-key-class>java.lang.String</prim-key-class>
<reentrant>False</reentrant>
<cmp-version>2.x</cmp-version>
<abstract-schema-name>simple</abstract-schema-name>
<cmp-field><field-name>id</field-name></cmp-field>
- <cmp-field><field-name>booleanPrimitive</field-name></cmp-field>
- <cmp-field><field-name>booleanObject</field-name></cmp-field>
- <cmp-field><field-name>bytePrimitive</field-name></cmp-field>
- <cmp-field><field-name>byteObject</field-name></cmp-field>
- <cmp-field><field-name>shortPrimitive</field-name></cmp-field>
- <cmp-field><field-name>shortObject</field-name></cmp-field>
- <cmp-field><field-name>integerPrimitive</field-name></cmp-field>
- <cmp-field><field-name>integerObject</field-name></cmp-field>
- <cmp-field><field-name>longPrimitive</field-name></cmp-field>
- <cmp-field><field-name>longObject</field-name></cmp-field>
- <cmp-field><field-name>floatPrimitive</field-name></cmp-field>
- <cmp-field><field-name>floatObject</field-name></cmp-field>
- <cmp-field><field-name>doublePrimitive</field-name></cmp-field>
- <cmp-field><field-name>doubleObject</field-name></cmp-field>
- <cmp-field><field-name>stringValue</field-name></cmp-field>
- <cmp-field><field-name>utilDateValue</field-name></cmp-field>
- <cmp-field><field-name>sqlDateValue</field-name></cmp-field>
- <cmp-field><field-name>timeValue</field-name></cmp-field>
- <cmp-field><field-name>timestampValue</field-name></cmp-field>
- <cmp-field><field-name>bigDecimalValue</field-name></cmp-field>
- <cmp-field><field-name>byteArrayValue</field-name></cmp-field>
- <cmp-field><field-name>objectValue</field-name></cmp-field>
- <cmp-field><field-name>valueClass</field-name></cmp-field>
- <cmp-field><field-name>hashtable</field-name></cmp-field>
<primkey-field>id</primkey-field>
- <query>
- <query-method>
- <method-name>findWithByteArray</method-name>
- <method-params>
- <method-param>byte[]</method-param>
- </method-params>
- </query-method>
- <ejb-ql/>
- </query>
- <query>
- <query-method>
- <method-name>ejbSelectDynamic</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- <method-param>java.lang.Object[]</method-param>
- </method-params>
- </query-method>
- <ejb-ql/>
- </query>
- <query>
- <query-method>
- <method-name>ejbSelectValueClass</method-name>
- <method-params/>
- </query-method>
- <ejb-ql>
- SELECT s.valueClass
- FROM simple s
- </ejb-ql>
- </query>
</entity>
-
- <entity>
- <ejb-name>SimpleEJBWithOptionA</ejb-name>
- <local-home>org.jboss.test.cmp2.simple.SimpleHome</local-home>
- <local>org.jboss.test.cmp2.simple.Simple</local>
- <ejb-class>org.jboss.test.cmp2.simple.SimpleBean</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>java.lang.String</prim-key-class>
- <reentrant>False</reentrant>
- <cmp-version>2.x</cmp-version>
- <abstract-schema-name>simpleA</abstract-schema-name>
- <cmp-field><field-name>id</field-name></cmp-field>
- <cmp-field><field-name>booleanPrimitive</field-name></cmp-field>
- <cmp-field><field-name>booleanObject</field-name></cmp-field>
- <cmp-field><field-name>bytePrimitive</field-name></cmp-field>
- <cmp-field><field-name>byteObject</field-name></cmp-field>
- <cmp-field><field-name>shortPrimitive</field-name></cmp-field>
- <cmp-field><field-name>shortObject</field-name></cmp-field>
- <cmp-field><field-name>integerPrimitive</field-name></cmp-field>
- <cmp-field><field-name>integerObject</field-name></cmp-field>
- <cmp-field><field-name>longPrimitive</field-name></cmp-field>
- <cmp-field><field-name>longObject</field-name></cmp-field>
- <cmp-field><field-name>floatPrimitive</field-name></cmp-field>
- <cmp-field><field-name>floatObject</field-name></cmp-field>
- <cmp-field><field-name>doublePrimitive</field-name></cmp-field>
- <cmp-field><field-name>doubleObject</field-name></cmp-field>
- <cmp-field><field-name>stringValue</field-name></cmp-field>
- <cmp-field><field-name>utilDateValue</field-name></cmp-field>
- <cmp-field><field-name>sqlDateValue</field-name></cmp-field>
- <cmp-field><field-name>timeValue</field-name></cmp-field>
- <cmp-field><field-name>timestampValue</field-name></cmp-field>
- <cmp-field><field-name>bigDecimalValue</field-name></cmp-field>
- <cmp-field><field-name>byteArrayValue</field-name></cmp-field>
- <cmp-field><field-name>objectValue</field-name></cmp-field>
- <cmp-field><field-name>valueClass</field-name></cmp-field>
- <cmp-field><field-name>hashtable</field-name></cmp-field>
- <primkey-field>id</primkey-field>
- <query>
- <query-method>
- <method-name>findWithByteArray</method-name>
- <method-params>
- <method-param>byte[]</method-param>
- </method-params>
- </query-method>
- <ejb-ql/>
- </query>
- <query>
- <query-method>
- <method-name>ejbSelectDynamic</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- <method-param>java.lang.Object[]</method-param>
- </method-params>
- </query-method>
- <ejb-ql/>
- </query>
- <query>
- <query-method>
- <method-name>ejbSelectValueClass</method-name>
- <method-params/>
- </query-method>
- <ejb-ql>
- SELECT s.valueClass
- FROM simple s
- </ejb-ql>
- </query>
- </entity>
</enterprise-beans>
<assembly-descriptor>
<container-transaction>
<method>
- <ejb-name>SimpleEJB</ejb-name>
+ <ejb-name>SimpleEntityEJB</ejb-name>
<method-name>*</method-name>
</method>
- <method>
- <ejb-name>SimpleEJBWithOptionA</ejb-name>
- <method-name>*</method-name>
- </method>
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
Modified: trunk/testsuite/src/resources/cmp2/simple/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/simple/META-INF/jboss.xml 2008-10-03 04:08:44 UTC (rev 79052)
+++ trunk/testsuite/src/resources/cmp2/simple/META-INF/jboss.xml 2008-10-03 06:46:23 UTC (rev 79053)
@@ -5,22 +5,10 @@
<jboss>
<enterprise-beans>
- <session>
- <ejb-name>EJBTestRunnerEJB</ejb-name>
- <jndi-name>ejb/EJBTestRunner</jndi-name>
- </session>
-
<entity>
- <ejb-name>SimpleEJB</ejb-name>
- <local-jndi-name>cmp2/simple/Simple</local-jndi-name>
+ <ejb-name>SimpleEntityEJB</ejb-name>
+ <local-jndi-name>ejb/SimpleEntity</local-jndi-name>
</entity>
-
- <entity>
- <ejb-name>SimpleEJBWithOptionA</ejb-name>
- <local-jndi-name>cmp2/simple/SimpleA</local-jndi-name>
- <read-only>false</read-only>
- <configuration-name>CMP 2.x and Cache</configuration-name>
- </entity>
</enterprise-beans>
<container-configurations>
Modified: trunk/testsuite/src/resources/cmp2/simple/META-INF/jbosscmp-jdbc.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/simple/META-INF/jbosscmp-jdbc.xml 2008-10-03 04:08:44 UTC (rev 79052)
+++ trunk/testsuite/src/resources/cmp2/simple/META-INF/jbosscmp-jdbc.xml 2008-10-03 06:46:23 UTC (rev 79053)
@@ -28,60 +28,8 @@
<enterprise-beans>
<entity>
- <ejb-name>SimpleEJB</ejb-name>
- <table-name>Simple</table-name>
- <query>
- <query-method>
- <method-name>ejbSelectDynamic</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- <method-param>java.lang.Object[]</method-param>
- </method-params>
- </query-method>
- <dynamic-ql/>
- </query>
- <query>
- <query-method>
- <method-name>findWithByteArray</method-name>
- <method-params>
- <method-param>byte[]</method-param>
- </method-params>
- </query-method>
- <jboss-ql>
- SELECT OBJECT(s)
- FROM simple AS s
- WHERE s.byteArrayValue = ?1
- </jboss-ql>
- </query>
+ <ejb-name>SimpleEntityEJB</ejb-name>
+ <table-name>SimpleEntity</table-name>
</entity>
-
- <entity>
- <ejb-name>SimpleEJBWithOptionA</ejb-name>
- <read-only>false</read-only>
- <table-name>SimpleA</table-name>
- <query>
- <query-method>
- <method-name>ejbSelectDynamic</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- <method-param>java.lang.Object[]</method-param>
- </method-params>
- </query-method>
- <dynamic-ql/>
- </query>
- <query>
- <query-method>
- <method-name>findWithByteArray</method-name>
- <method-params>
- <method-param>byte[]</method-param>
- </method-params>
- </query-method>
- <jboss-ql>
- SELECT OBJECT(s)
- FROM simpleA AS s
- WHERE s.byteArrayValue = ?1
- </jboss-ql>
- </query>
- </entity>
</enterprise-beans>
</jbosscmp-jdbc>
Added: trunk/testsuite/src/resources/deployers/jbas5349/bootstrapdependencies-hsqldb-ds.xml
===================================================================
--- trunk/testsuite/src/resources/deployers/jbas5349/bootstrapdependencies-hsqldb-ds.xml (rev 0)
+++ trunk/testsuite/src/resources/deployers/jbas5349/bootstrapdependencies-hsqldb-ds.xml 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- The Hypersonic embedded database JCA connection factory config -->
+
+<!-- $Id: hsqldb-ds.xml 76997 2008-08-12 22:29:19Z bstansberry at jboss.com $ -->
+
+<datasources>
+ <local-tx-datasource>
+
+ <jndi-name>BootstrapDependenciesDS</jndi-name>
+
+ <!-- For server mode db, allowing other processes to use hsqldb over tcp.
+ This requires the org.jboss.jdbc.HypersonicDatabase mbean.
+ <connection-url>jdbc:hsqldb:hsql://${jboss.bind.address}:1701</connection-url>
+ -->
+ <!-- For totally in-memory db, not saved when jboss stops.
+ The org.jboss.jdbc.HypersonicDatabase mbean is required for proper db shutdown
+ <connection-url>jdbc:hsqldb:.</connection-url>
+ -->
+ <!-- For in-process persistent db, saved when jboss stops.
+ The org.jboss.jdbc.HypersonicDatabase mbean is required for proper db shutdown
+ -->
+ <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB</connection-url>
+
+ <!-- The driver class -->
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+
+ <!-- The login and password -->
+ <user-name>sa</user-name>
+ <password></password>
+
+ <!--example of how to specify class that determines if exception means connection should be destroyed-->
+ <!--exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyExceptionSorter</exception-sorter-class-name-->
+
+ <!-- this will be run before a managed connection is removed from the pool for use by a client-->
+ <!--<check-valid-connection-sql>select * from something</check-valid-connection-sql> -->
+
+ <!-- The minimum connections in a pool/sub-pool. Pools are lazily constructed on first use -->
+ <min-pool-size>5</min-pool-size>
+
+ <!-- The maximum connections in a pool/sub-pool -->
+ <max-pool-size>20</max-pool-size>
+
+ <!-- The time before an unused connection is destroyed -->
+ <!-- NOTE: This is the check period. It will be destroyed somewhere between 1x and 2x this timeout after last use -->
+ <!-- TEMPORARY FIX! - Disable idle connection removal, HSQLDB has a problem with not reaping threads on closed connections -->
+ <idle-timeout-minutes>0</idle-timeout-minutes>
+
+ <!-- sql to call when connection is created
+ <new-connection-sql>some arbitrary sql</new-connection-sql>
+ -->
+
+ <!-- sql to call on an existing pooled connection when it is obtained from pool
+ <check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
+ -->
+
+ <!-- example of how to specify a class that determines a connection is valid before it is handed out from the pool
+ <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyValidConnectionChecker</valid-connection-checker-class-name>
+ -->
+
+ <!-- Whether to check all statements are closed when the connection is returned to the pool,
+ this is a debugging feature that should be turned off in production -->
+ <track-statements/>
+
+ <!-- Use the getConnection(user, pw) for logins
+ <application-managed-security/>
+ -->
+
+ <!-- Use the security domain defined in conf/login-config.xml -->
+ <security-domain>HsqlDbRealm</security-domain>
+
+ <!-- Use the security domain defined in conf/login-config.xml or the
+ getConnection(user, pw) for logins. The security domain takes precedence.
+ <security-domain-and-application>HsqlDbRealm</security-domain-and-application>
+ -->
+
+ <!-- HSQL DB benefits from prepared statement caching -->
+ <prepared-statement-cache-size>32</prepared-statement-cache-size>
+
+ <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+ <metadata>
+ <type-mapping>Hypersonic SQL</type-mapping>
+ </metadata>
+
+ <!-- When using in-process (standalone) mode -->
+ <depends>jboss:service=Hypersonic,database=localDB</depends>
+ <!-- Uncomment when using hsqldb in server mode
+ <depends>jboss:service=Hypersonic</depends>
+ -->
+ </local-tx-datasource>
+
+</datasources>
Added: trunk/testsuite/src/resources/deployers/jbas5349/dummywar/WEB-INF/jboss-web.xml
===================================================================
--- trunk/testsuite/src/resources/deployers/jbas5349/dummywar/WEB-INF/jboss-web.xml (rev 0)
+++ trunk/testsuite/src/resources/deployers/jbas5349/dummywar/WEB-INF/jboss-web.xml 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-web
+ PUBLIC "-//JBoss//DTD Web Application 2.4//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+ <context-root>/dummywar</context-root>
+</jboss-web>
Added: trunk/testsuite/src/resources/deployers/jbas5349/dummywar/WEB-INF/web.xml
===================================================================
--- trunk/testsuite/src/resources/deployers/jbas5349/dummywar/WEB-INF/web.xml (rev 0)
+++ trunk/testsuite/src/resources/deployers/jbas5349/dummywar/WEB-INF/web.xml 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+>
+ <display-name>dummyweb</display-name>
+
+ <servlet>
+ <servlet-name>DummyServlet</servlet-name>
+ <servlet-class>org.jboss.test.deployers.jbas5349.servlet.DummyServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>DummyServlet</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Added: trunk/testsuite/src/resources/deployers/jbas5349/ejb2/mdb/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/deployers/jbas5349/ejb2/mdb/META-INF/ejb-jar.xml (rev 0)
+++ trunk/testsuite/src/resources/deployers/jbas5349/ejb2/mdb/META-INF/ejb-jar.xml 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar version="2.1"
+ xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
+
+ <enterprise-beans>
+ <message-driven >
+ <ejb-name>DummyMessageBean</ejb-name>
+ <ejb-class>iorg.jboss.test.deployers.jbas5349.ejb2.DummyMessageBean</ejb-class>
+ <messaging-type>javax.jms.MessageListener</messaging-type>
+ <transaction-type>Container</transaction-type>
+ <message-destination-type>javax.jms.Queue</message-destination-type>
+ <activation-config>
+ <activation-config-property>
+ <activation-config-property-name>destinationType</activation-config-property-name>
+ <activation-config-property-value>javax.jms.Queue</activation-config-property-value>
+ </activation-config-property>
+ </activation-config>
+ </message-driven>
+ </enterprise-beans>
+</ejb-jar>
Added: trunk/testsuite/src/resources/deployers/jbas5349/ejb2/mdb/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/deployers/jbas5349/ejb2/mdb/META-INF/jboss.xml (rev 0)
+++ trunk/testsuite/src/resources/deployers/jbas5349/ejb2/mdb/META-INF/jboss.xml 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_0.dtd">
+
+<jboss>
+ <enterprise-beans>
+ <message-driven>
+ <ejb-name>DummyMessageBean</ejb-name>
+ <destination-jndi-name>queue/testingqueue</destination-jndi-name>
+ </message-driven>
+ </enterprise-beans>
+</jboss>
Added: trunk/testsuite/src/resources/deployers/jbas5349/ejb3/entity/META-INF/persistence.xml
===================================================================
--- trunk/testsuite/src/resources/deployers/jbas5349/ejb3/entity/META-INF/persistence.xml (rev 0)
+++ trunk/testsuite/src/resources/deployers/jbas5349/ejb3/entity/META-INF/persistence.xml 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,14 @@
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+ version="1.0">
+
+ <persistence-unit name="test">
+ <jta-data-source>java:/DefaultDS</jta-data-source>
+ <properties>
+ <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
+ <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+ </properties>
+ </persistence-unit>
+
+</persistence>
Added: trunk/testsuite/src/resources/deployers/jbas5349/sar/META-INF/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/deployers/jbas5349/sar/META-INF/jboss-service.xml (rev 0)
+++ trunk/testsuite/src/resources/deployers/jbas5349/sar/META-INF/jboss-service.xml 2008-10-03 06:46:23 UTC (rev 79053)
@@ -0,0 +1,3 @@
+<mbean code="org.jboss.test.deployers.jbas5349.sar.BootstrapDependenciesTest"
+ name="org.jboss.test.deployers.jbas5349.sar.bootstrap.dependencies.test:service=BootstrapDependenciesTest">
+</mbean>
More information about the jboss-cvs-commits
mailing list