[jboss-cvs] JBossAS SVN: r83938 - in projects/ejb3/trunk/docs/tutorial: interceptor/META-INF and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 6 05:06:15 EST 2009
Author: jaikiran
Date: 2009-02-06 05:06:14 -0500 (Fri, 06 Feb 2009)
New Revision: 83938
Added:
projects/ejb3/trunk/docs/tutorial/interceptor/META-INF/queue-example-service.xml
projects/ejb3/trunk/docs/tutorial/mdb/META-INF/
projects/ejb3/trunk/docs/tutorial/mdb/META-INF/custom-ejb3-interceptors-aop.xml
projects/ejb3/trunk/docs/tutorial/mdb/META-INF/queue-example-service.xml
projects/ejb3/trunk/docs/tutorial/resource_ref/META-INF/queue-example-service.xml
Removed:
projects/ejb3/trunk/docs/tutorial/interceptor/queue-example-service.xml
projects/ejb3/trunk/docs/tutorial/mdb/custom-ejb3-interceptors-aop.xml
projects/ejb3/trunk/docs/tutorial/mdb/queue-example-service.xml
projects/ejb3/trunk/docs/tutorial/resource_ref/tutorial-jbossmq-destinations-service.xml
Modified:
projects/ejb3/trunk/docs/tutorial/interceptor/build.xml
projects/ejb3/trunk/docs/tutorial/interceptor/pom.xml
projects/ejb3/trunk/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsMDB.java
projects/ejb3/trunk/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/EmailMDB.java
projects/ejb3/trunk/docs/tutorial/mdb/build.xml
projects/ejb3/trunk/docs/tutorial/mdb/pom.xml
projects/ejb3/trunk/docs/tutorial/mdb/src/org/jboss/tutorial/mdb/bean/ExampleMDB.java
projects/ejb3/trunk/docs/tutorial/resource_ref/build.xml
projects/ejb3/trunk/docs/tutorial/resource_ref/pom.xml
Log:
EJBTHREE-1720 Moved the configuration files for defining resources (like queues)to META-INF of the tutorials to ensure that they get packaged in the final artifact(jar), effectively making the tutorial self-contained
Copied: projects/ejb3/trunk/docs/tutorial/interceptor/META-INF/queue-example-service.xml (from rev 83889, projects/ejb3/trunk/docs/tutorial/interceptor/queue-example-service.xml)
===================================================================
--- projects/ejb3/trunk/docs/tutorial/interceptor/META-INF/queue-example-service.xml (rev 0)
+++ projects/ejb3/trunk/docs/tutorial/interceptor/META-INF/queue-example-service.xml 2009-02-06 10:06:14 UTC (rev 83938)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=email"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <attribute name="JNDIName">queue/tutorial/email</attribute>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=trace"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <attribute name="JNDIName">queue/tutorial/accounts</attribute>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+</server>
Modified: projects/ejb3/trunk/docs/tutorial/interceptor/build.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/interceptor/build.xml 2009-02-06 09:55:59 UTC (rev 83937)
+++ projects/ejb3/trunk/docs/tutorial/interceptor/build.xml 2009-02-06 10:06:14 UTC (rev 83938)
@@ -63,8 +63,6 @@
<include name="META-INF/*.xml"/>
</fileset>
</jar>
- <copy file="${basedir}/queue-example-service.xml" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
- <sleep seconds="8"/>
<copy file="build/${build.artifact}" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
</target>
@@ -84,7 +82,7 @@
<target name="clean">
<delete dir="${build.dir}"/>
<delete file="${jboss.home}/server/${jboss.server.config}/deploy/${build.artifact}"/>
- <delete file="${jboss.home}/server/${jboss.server.config}/deploy/queue-example-service.xml"/>
+
</target>
Modified: projects/ejb3/trunk/docs/tutorial/interceptor/pom.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/interceptor/pom.xml 2009-02-06 09:55:59 UTC (rev 83937)
+++ projects/ejb3/trunk/docs/tutorial/interceptor/pom.xml 2009-02-06 10:06:14 UTC (rev 83938)
@@ -18,7 +18,7 @@
</parent>
<properties>
- <jboss.ejb3.tutorial.deployables>${basedir}/queue-example-service.xml,${pom.build.directory}/${pom.artifactId}.${pom.packaging}</jboss.ejb3.tutorial.deployables>
+
<ejb3.tutorial.client>org.jboss.tutorial.interceptor.client.Client</ejb3.tutorial.client>
</properties>
Deleted: projects/ejb3/trunk/docs/tutorial/interceptor/queue-example-service.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/interceptor/queue-example-service.xml 2009-02-06 09:55:59 UTC (rev 83937)
+++ projects/ejb3/trunk/docs/tutorial/interceptor/queue-example-service.xml 2009-02-06 10:06:14 UTC (rev 83938)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=email"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <attribute name="JNDIName">queue/tutorial/email</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=trace"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <attribute name="JNDIName">queue/tutorial/accounts</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
-</server>
Modified: projects/ejb3/trunk/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsMDB.java
===================================================================
--- projects/ejb3/trunk/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsMDB.java 2009-02-06 09:55:59 UTC (rev 83937)
+++ projects/ejb3/trunk/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/AccountsMDB.java 2009-02-06 10:06:14 UTC (rev 83938)
@@ -18,7 +18,7 @@
* 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.tutorial.interceptor.bean;
import javax.ejb.ActivationConfigProperty;
@@ -27,28 +27,26 @@
import javax.jms.Message;
import javax.jms.MessageListener;
import javax.jms.TextMessage;
+
import org.jboss.ejb3.annotation.Depends;
/**
- *
+ *
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision$
*/
@MessageDriven(activationConfig =
-{
- at ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
- at ActivationConfigProperty(propertyName="destination", propertyValue="queue/tutorial/accounts")
-})
+{@ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
+ @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/tutorial/accounts")})
+ at Depends("jboss.messaging.destination:service=Queue,name=trace")
public class AccountsMDB implements MessageListener
{
public void onMessage(Message recvMsg)
{
try
{
- System.out.println(
- "\n----------------\n" +
- "AccountsMDB - Got message " + ((TextMessage)recvMsg).getText() + "\n" +
- "----------------");
+ System.out.println("\n----------------\n" + "AccountsMDB - Got message " + ((TextMessage) recvMsg).getText()
+ + "\n" + "----------------");
//Do necessary bookkeeping
}
catch (JMSException e)
Modified: projects/ejb3/trunk/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/EmailMDB.java
===================================================================
--- projects/ejb3/trunk/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/EmailMDB.java 2009-02-06 09:55:59 UTC (rev 83937)
+++ projects/ejb3/trunk/docs/tutorial/interceptor/src/org/jboss/tutorial/interceptor/bean/EmailMDB.java 2009-02-06 10:06:14 UTC (rev 83938)
@@ -21,29 +21,26 @@
*/
package org.jboss.tutorial.interceptor.bean;
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.interceptor.InvocationContext;
+import javax.ejb.ActivationConfigProperty;
import javax.ejb.MessageDriven;
import javax.interceptor.AroundInvoke;
-import javax.ejb.ActivationConfigProperty;
+import javax.interceptor.ExcludeDefaultInterceptors;
+import javax.interceptor.InvocationContext;
import javax.jms.Message;
import javax.jms.MessageListener;
+
import org.jboss.ejb3.annotation.Depends;
@MessageDriven(activationConfig =
- {
- @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
- @ActivationConfigProperty(propertyName="destination", propertyValue="queue/tutorial/email")
- })
+{@ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
+ @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/tutorial/email")})
@ExcludeDefaultInterceptors
+ at Depends("jboss.messaging.destination:service=Queue,name=email")
public class EmailMDB implements MessageListener
{
public void onMessage(Message recvMsg)
{
- System.out.println(
- "\n----------------\n" +
- "EMailMDB - Got message, sending email\n" +
- "----------------");
+ System.out.println("\n----------------\n" + "EMailMDB - Got message, sending email\n" + "----------------");
//Generate and save email
}
Copied: projects/ejb3/trunk/docs/tutorial/mdb/META-INF/custom-ejb3-interceptors-aop.xml (from rev 83889, projects/ejb3/trunk/docs/tutorial/mdb/custom-ejb3-interceptors-aop.xml)
===================================================================
--- projects/ejb3/trunk/docs/tutorial/mdb/META-INF/custom-ejb3-interceptors-aop.xml (rev 0)
+++ projects/ejb3/trunk/docs/tutorial/mdb/META-INF/custom-ejb3-interceptors-aop.xml 2009-02-06 10:06:14 UTC (rev 83938)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aop xmlns="urn:jboss:aop-beans:1.0">
+ <!-- TODO: Jaikiran - These interceptor declarations need not be here since they
+ are already declared through the ejb3-interceptors-aop.xml. Duplicating them leads to
+ deployment errors. However, if this custom-ejb3-interceptors-aop.xml needs to be
+ independent, then we must find a better way of declaring these. Right now, commenting these
+ out, can be looked at later. -->
+ <!--
+ <interceptor class="org.jboss.ejb3.AllowedOperationsInterceptor" scope="PER_VM"/>
+ <interceptor class="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor" scope="PER_VM"/>
+ <interceptor factory="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory" scope="PER_CLASS"/>
+ <interceptor class="org.jboss.ejb3.stateless.StatelessInstanceInterceptor" scope="PER_VM"/>
+
+ <interceptor factory="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory" scope="PER_CLASS_JOINPOINT"/>
+ <interceptor factory="org.jboss.aspects.tx.TxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/>
+ -->
+ <domain name="Custom Message Driven Bean" extends="Message Driven Bean" inheritBindings="true">
+
+ <annotation expr="!class(@org.jboss.ejb3.annotation.DefaultActivationSpecs)">
+ @org.jboss.ejb3.annotation.DefaultActivationSpecs (value={@javax.ejb.ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"), @javax.ejb.ActivationConfigProperty(propertyName="destination", propertyValue="queue/tutorial/defaultedexample")})
+ </annotation>
+ </domain>
+</aop>
Copied: projects/ejb3/trunk/docs/tutorial/mdb/META-INF/queue-example-service.xml (from rev 83889, projects/ejb3/trunk/docs/tutorial/mdb/queue-example-service.xml)
===================================================================
--- projects/ejb3/trunk/docs/tutorial/mdb/META-INF/queue-example-service.xml (rev 0)
+++ projects/ejb3/trunk/docs/tutorial/mdb/META-INF/queue-example-service.xml 2009-02-06 10:06:14 UTC (rev 83938)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.mq.destination:service=Queue,name=tutorial">
+ <attribute name="JNDIName">queue/tutorial/example</attribute>
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.mq.destination:service=Queue,name=defaultedtutorial">
+ <attribute name="JNDIName">queue/tutorial/defaultedexample</attribute>
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+</server>
Modified: projects/ejb3/trunk/docs/tutorial/mdb/build.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/mdb/build.xml 2009-02-06 09:55:59 UTC (rev 83937)
+++ projects/ejb3/trunk/docs/tutorial/mdb/build.xml 2009-02-06 10:06:14 UTC (rev 83938)
@@ -8,17 +8,17 @@
<property environment="env"/>
<property name="src.dir" value="${basedir}/src"/>
- <property name="jboss.home" value="${env.JBOSS_HOME}"/>
- <property name="jboss.server.config" value="default"/>
- <property name="build.dir" value="${basedir}/build"/>
- <property name="build.classes.dir" value="${build.dir}/classes"/>
- <property name="build.artifact" value="jboss-ejb3-tutorial-mdb.jar"/>
+ <property name="jboss.home" value="${env.JBOSS_HOME}"/>
+ <property name="jboss.server.config" value="default"/>
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="build.classes.dir" value="${build.dir}/classes"/>
+ <property name="build.artifact" value="jboss-ejb3-tutorial-mdb.jar"/>
<!-- Build classpath -->
<path id="classpath">
<!-- So that we can get jndi.properties for InitialContext -->
<pathelement location="${basedir}"/>
- <!-- Only the jbossall-client.jar should ideally be sufficient -->
+ <!-- Only the jbossall-client.jar should ideally be sufficient -->
<fileset dir="${jboss.home}/client">
<include name="**/jbossall-client.jar"/>
</fileset>
@@ -54,14 +54,15 @@
<fileset dir="${build.classes.dir}">
<include name="**/*.class"/>
</fileset>
+ <!-- Include the queue-example-service.xml and the custom-ejb3-interceptor-aop.xml in the META-INF of the jar -->
+ <fileset dir="${basedir}">
+ <include name="META-INF/*.xml"/>
+ </fileset>
+
</jar>
- <copy file="${basedir}/custom-ejb3-interceptors-aop.xml" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
- <sleep seconds="8"/>
- <copy file="${basedir}/queue-example-service.xml" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
- <sleep seconds="8"/>
-
+
<copy file="build/${build.artifact}" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
-
+
</target>
<target name="run" depends="ejbjar">
@@ -79,11 +80,8 @@
<target name="clean">
<delete dir="${build.dir}"/>
- <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial.jar"/>
<delete file="${jboss.home}/server/${jboss.server.config}/deploy/${build.artifact}"/>
- <delete file="${jboss.home}/server/${jboss.server.config}/deploy/queue-example-service.xml"/>
- <delete file="${jboss.home}/server/${jboss.server.config}/deploy/custom-ejb3-interceptors-aop.xml"/>
-
+
</target>
Deleted: projects/ejb3/trunk/docs/tutorial/mdb/custom-ejb3-interceptors-aop.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/mdb/custom-ejb3-interceptors-aop.xml 2009-02-06 09:55:59 UTC (rev 83937)
+++ projects/ejb3/trunk/docs/tutorial/mdb/custom-ejb3-interceptors-aop.xml 2009-02-06 10:06:14 UTC (rev 83938)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<aop xmlns="urn:jboss:aop-beans:1.0">
- <!-- TODO: Jaikiran - These interceptor declarations need not be here since they
- are already declared through the ejb3-interceptors-aop.xml. Duplicating them leads to
- deployment errors. However, if this custom-ejb3-interceptors-aop.xml needs to be
- independent, then we must find a better way of declaring these. Right now, commenting these
- out, can be looked at later. -->
- <!--
- <interceptor class="org.jboss.ejb3.AllowedOperationsInterceptor" scope="PER_VM"/>
- <interceptor class="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor" scope="PER_VM"/>
- <interceptor factory="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory" scope="PER_CLASS"/>
- <interceptor class="org.jboss.ejb3.stateless.StatelessInstanceInterceptor" scope="PER_VM"/>
-
- <interceptor factory="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory" scope="PER_CLASS_JOINPOINT"/>
- <interceptor factory="org.jboss.aspects.tx.TxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/>
- -->
- <domain name="Custom Message Driven Bean" extends="Message Driven Bean" inheritBindings="true">
-
- <annotation expr="!class(@org.jboss.ejb3.annotation.DefaultActivationSpecs)">
- @org.jboss.ejb3.annotation.DefaultActivationSpecs (value={@javax.ejb.ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"), @javax.ejb.ActivationConfigProperty(propertyName="destination", propertyValue="queue/tutorial/defaultedexample")})
- </annotation>
- </domain>
-</aop>
Modified: projects/ejb3/trunk/docs/tutorial/mdb/pom.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/mdb/pom.xml 2009-02-06 09:55:59 UTC (rev 83937)
+++ projects/ejb3/trunk/docs/tutorial/mdb/pom.xml 2009-02-06 10:06:14 UTC (rev 83938)
@@ -9,7 +9,7 @@
<!-- Model Version -->
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-tutorial-common</artifactId>
@@ -18,12 +18,12 @@
</parent>
<properties>
- <jboss.ejb3.tutorial.deployables>${basedir}/queue-example-service.xml,${basedir}/custom-ejb3-interceptors-aop.xml,${pom.build.directory}/${pom.artifactId}.${pom.packaging}</jboss.ejb3.tutorial.deployables>
+
<ejb3.tutorial.client>org.jboss.tutorial.mdb.client.Client</ejb3.tutorial.client>
</properties>
-
+
<artifactId>jboss-ejb3-tutorial-mdb</artifactId>
<version>0.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
Deleted: projects/ejb3/trunk/docs/tutorial/mdb/queue-example-service.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/mdb/queue-example-service.xml 2009-02-06 09:55:59 UTC (rev 83937)
+++ projects/ejb3/trunk/docs/tutorial/mdb/queue-example-service.xml 2009-02-06 10:06:14 UTC (rev 83938)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=tutorial">
- <attribute name="JNDIName">queue/tutorial/example</attribute>
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
-
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=defaultedtutorial">
- <attribute name="JNDIName">queue/tutorial/defaultedexample</attribute>
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
-</server>
Modified: projects/ejb3/trunk/docs/tutorial/mdb/src/org/jboss/tutorial/mdb/bean/ExampleMDB.java
===================================================================
--- projects/ejb3/trunk/docs/tutorial/mdb/src/org/jboss/tutorial/mdb/bean/ExampleMDB.java 2009-02-06 09:55:59 UTC (rev 83937)
+++ projects/ejb3/trunk/docs/tutorial/mdb/src/org/jboss/tutorial/mdb/bean/ExampleMDB.java 2009-02-06 10:06:14 UTC (rev 83938)
@@ -21,16 +21,19 @@
*/
package org.jboss.tutorial.mdb.bean;
+import javax.ejb.ActivationConfigProperty;
import javax.ejb.MessageDriven;
-import javax.ejb.ActivationConfigProperty;
import javax.jms.Message;
import javax.jms.MessageListener;
+import org.jboss.ejb3.annotation.Depends;
+
@MessageDriven(activationConfig =
{
@ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
@ActivationConfigProperty(propertyName="destination", propertyValue="queue/tutorial/example")
})
+ at Depends ("jboss.mq.destination:service=Queue,name=tutorial")
public class ExampleMDB implements MessageListener
{
public void onMessage(Message recvMsg)
Copied: projects/ejb3/trunk/docs/tutorial/resource_ref/META-INF/queue-example-service.xml (from rev 83889, projects/ejb3/trunk/docs/tutorial/resource_ref/tutorial-jbossmq-destinations-service.xml)
===================================================================
--- projects/ejb3/trunk/docs/tutorial/resource_ref/META-INF/queue-example-service.xml (rev 0)
+++ projects/ejb3/trunk/docs/tutorial/resource_ref/META-INF/queue-example-service.xml 2009-02-06 10:06:14 UTC (rev 83938)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=testQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <attribute name="JNDIName">queue/testQueue</attribute>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=A"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <attribute name="JNDIName">queue/A</attribute>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=A"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <attribute name="JNDIName">topic/testTopic</attribute>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+</server>
Modified: projects/ejb3/trunk/docs/tutorial/resource_ref/build.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/resource_ref/build.xml 2009-02-06 09:55:59 UTC (rev 83937)
+++ projects/ejb3/trunk/docs/tutorial/resource_ref/build.xml 2009-02-06 10:06:14 UTC (rev 83938)
@@ -56,12 +56,10 @@
<include name="**/*.class"/>
</fileset>
<fileset dir=".">
- <include name="META-INF/ejb-jar.xml"/>
- <include name="META-INF/jboss.xml"/>
+ <include name="META-INF/*.xml"/>
+
</fileset>
</jar>
- <copy file="tutorial-jbossmq-destinations-service.xml" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
- <sleep seconds="5"/>
<copy file="build/${build.artifact}" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
</target>
@@ -81,7 +79,7 @@
<target name="clean">
<delete dir="${build.dir}"/>
<delete file="${jboss.home}/server/${jboss.server.config}/deploy/${build.artifact}"/>
- <delete file="${jboss.home}/server/${jboss.server.config}/deploy/tutorial-jbossmq-destinations-service.xml"/>
+
</target>
Modified: projects/ejb3/trunk/docs/tutorial/resource_ref/pom.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/resource_ref/pom.xml 2009-02-06 09:55:59 UTC (rev 83937)
+++ projects/ejb3/trunk/docs/tutorial/resource_ref/pom.xml 2009-02-06 10:06:14 UTC (rev 83938)
@@ -9,7 +9,7 @@
<!-- Model Version -->
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-tutorial-common</artifactId>
@@ -18,12 +18,12 @@
</parent>
<properties>
- <jboss.ejb3.tutorial.deployables>${basedir}/tutorial-jbossmq-destinations-service.xml,${pom.build.directory}/${pom.artifactId}.${pom.packaging}</jboss.ejb3.tutorial.deployables>
+
<ejb3.tutorial.client>org.jboss.tutorial.resource_ref.client.Client</ejb3.tutorial.client>
</properties>
-
+
<artifactId>jboss-ejb3-tutorial-resource_ref</artifactId>
<version>0.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
Deleted: projects/ejb3/trunk/docs/tutorial/resource_ref/tutorial-jbossmq-destinations-service.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/resource_ref/tutorial-jbossmq-destinations-service.xml 2009-02-06 09:55:59 UTC (rev 83937)
+++ projects/ejb3/trunk/docs/tutorial/resource_ref/tutorial-jbossmq-destinations-service.xml 2009-02-06 10:06:14 UTC (rev 83938)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=testQueue"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <attribute name="JNDIName">queue/testQueue</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=A"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <attribute name="JNDIName">queue/A</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.TopicService"
- name="jboss.messaging.destination:service=Topic,name=A"
- xmbean-dd="xmdesc/Topic-xmbean.xml">
- <attribute name="JNDIName">topic/testTopic</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
-</server>
More information about the jboss-cvs-commits
mailing list