[jboss-cvs] JBoss Messaging SVN: r1448 - in branches/Branch_1_0: docs/examples/ejb3mdb docs/examples/ejb3mdb/src/org/jboss/example/jms/ejb3mdb tests/smoke util
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 6 07:09:56 EDT 2006
Author: ovidiu.feodorov at jboss.com
Date: 2006-10-06 07:09:52 -0400 (Fri, 06 Oct 2006)
New Revision: 1448
Modified:
branches/Branch_1_0/docs/examples/ejb3mdb/README.html
branches/Branch_1_0/docs/examples/ejb3mdb/build.xml
branches/Branch_1_0/docs/examples/ejb3mdb/do-not-distribute.properties
branches/Branch_1_0/docs/examples/ejb3mdb/src/org/jboss/example/jms/ejb3mdb/EJB3MDBExample.java
branches/Branch_1_0/tests/smoke/build.xml
branches/Branch_1_0/util/do-not-distribute.properties
Log:
EJB3 example
http://jira.jboss.org/jira/browse/JBMESSAGING-351
http://jira.jboss.org/jira/browse/JBMESSAGING-559
Modified: branches/Branch_1_0/docs/examples/ejb3mdb/README.html
===================================================================
--- branches/Branch_1_0/docs/examples/ejb3mdb/README.html 2006-10-06 05:37:45 UTC (rev 1447)
+++ branches/Branch_1_0/docs/examples/ejb3mdb/README.html 2006-10-06 11:09:52 UTC (rev 1448)
@@ -87,8 +87,9 @@
use the JBoss Installer.<br>
<br>
<span style="font-weight: bold;">Note</span>: The current example was
-tested with <span class="tdwn">JBoss EJB 3.0 RC5 - PFD</span> but more
-recent EJB3 versions are liable to introduce API changes that may break
+tested with <span class="tdwn">the EJB3 release bundled with JBoss
+4.0.5. Earlier </span>EJB3 versions may use slightly different APIs
+that may break
the example. If this is the case, please modify the example
accordingly. Most likely, you will only need to modify the import fully
qualified class names.<br>
Modified: branches/Branch_1_0/docs/examples/ejb3mdb/build.xml
===================================================================
--- branches/Branch_1_0/docs/examples/ejb3mdb/build.xml 2006-10-06 05:37:45 UTC (rev 1447)
+++ branches/Branch_1_0/docs/examples/ejb3mdb/build.xml 2006-10-06 11:09:52 UTC (rev 1448)
@@ -79,15 +79,12 @@
</target>
<target name="jar" depends="compile">
- <!-- TODO: uncomment this when http://jira.jboss.org/jira/browse/JBMESSAGING-351 is done -->
- <!--
<copy todir="./output/classes/META-INF" filtering="true">
<fileset dir="./etc/META-INF" includes="*"/>
<filterset>
<filter token="QUEUE_NAME" value="${example.queue.name}"/>
</filterset>
</copy>
- -->
<jar destfile="./output/lib/mdb-example.ejb3"
basedir="./output/classes"
includes="META-INF/**,org/jboss/example/**/EJB3MDBExample.class"/>
Modified: branches/Branch_1_0/docs/examples/ejb3mdb/do-not-distribute.properties
===================================================================
--- branches/Branch_1_0/docs/examples/ejb3mdb/do-not-distribute.properties 2006-10-06 05:37:45 UTC (rev 1447)
+++ branches/Branch_1_0/docs/examples/ejb3mdb/do-not-distribute.properties 2006-10-06 11:09:52 UTC (rev 1448)
@@ -4,4 +4,5 @@
#
messaging.client.jar.path=../../../output/lib
messaging.client.jar.name=jboss-messaging-client.jar
-jboss.configuration=messaging
+jboss.configuration=messaging-smoke-test
+jboss.home=C:\\work\\src\\jboss-4.0.5.CR1-src\\build\\output\\jboss-4.0.5.CR1-ejb3
Modified: branches/Branch_1_0/docs/examples/ejb3mdb/src/org/jboss/example/jms/ejb3mdb/EJB3MDBExample.java
===================================================================
--- branches/Branch_1_0/docs/examples/ejb3mdb/src/org/jboss/example/jms/ejb3mdb/EJB3MDBExample.java 2006-10-06 05:37:45 UTC (rev 1447)
+++ branches/Branch_1_0/docs/examples/ejb3mdb/src/org/jboss/example/jms/ejb3mdb/EJB3MDBExample.java 2006-10-06 11:09:52 UTC (rev 1448)
@@ -8,7 +8,6 @@
import javax.ejb.ActivationConfigProperty;
import javax.ejb.MessageDriven;
-import javax.ejb.MessageDrivenContext;
import javax.naming.InitialContext;
import javax.jms.TextMessage;
Modified: branches/Branch_1_0/tests/smoke/build.xml
===================================================================
--- branches/Branch_1_0/tests/smoke/build.xml 2006-10-06 05:37:45 UTC (rev 1447)
+++ branches/Branch_1_0/tests/smoke/build.xml 2006-10-06 11:09:52 UTC (rev 1448)
@@ -137,6 +137,12 @@
<param name="run.secure-socket.example" value="false"/>
</antcall>
+ <antcall target="installation-test">
+ <param name="jboss.home" value="${jboss405CR1ejb3.home}"/>
+ <param name="no.java4" value="true"/>
+ <param name="run.ejb3mdb.example" value="true"/>
+ </antcall>
+
<!--
Stateless Session Bean installation test will fail on this because the client talks to
Messaging's remoting and to Unified Invoker's remoting and runs into compatibility
@@ -352,7 +358,7 @@
<!-- Internal Targets -->
<!-- ======================================================================== -->
- <target name="installation-test" depends="check-jboss-availability">
+ <target name="installation-test" depends="check-java-version, check-jboss-availability" unless="skip.current.java">
<echo message="Testing installation on ${jboss.home}"/>
<antcall target="create-messaging-config"/>
@@ -361,6 +367,21 @@
</target>
+ <target name="check-java-version">
+ <condition property="skip.current.java" value="true">
+ <or>
+ <and>
+ <istrue value="${no.java4}"/>
+ <equals arg1="1.4" arg2="${ant.java.version}"/>
+ </and>
+ <and>
+ <istrue value="${no.java5}"/>
+ <equals arg1="1.5" arg2="${ant.java.version}"/>
+ </and>
+ </or>
+ </condition>
+ </target>
+
<target name="old-server-compatibility-test" depends="check-jboss-availability">
<echo message="Checking current client's compatibility with a ${jboss.messaging.version} server"/>
Modified: branches/Branch_1_0/util/do-not-distribute.properties
===================================================================
--- branches/Branch_1_0/util/do-not-distribute.properties 2006-10-06 05:37:45 UTC (rev 1447)
+++ branches/Branch_1_0/util/do-not-distribute.properties 2006-10-06 11:09:52 UTC (rev 1448)
@@ -6,6 +6,7 @@
#jboss.home=C:\\work/src/cvs/jboss-head/build/output/jboss-5.0.0.Alpha
#jboss.home=C:\\work\\src\\jboss-4.0.3SP1-src\\build\\output\\jboss-4.0.3SP1
jboss.home=C:\\work\\src\\jboss-4.0.4.GA-src\\build\\output\\jboss-4.0.4.GA
+#jboss.home=C:\\work\\src\\jboss-4.0.5.CR1-src\\build\\output\\jboss-4.0.5.CR1-ejb3
messaging.config.name=messaging
relative.artifact.location=../output/lib
messaging.artifact.name=jboss-messaging-scoped.sar
More information about the jboss-cvs-commits
mailing list