[jboss-cvs] JBossAS SVN: r82543 - in projects/ejb3/trunk/docs/tutorial/consumer: META-INF and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Dec 24 06:52:24 EST 2008
Author: jaikiran
Date: 2008-12-24 06:52:24 -0500 (Wed, 24 Dec 2008)
New Revision: 82543
Added:
projects/ejb3/trunk/docs/tutorial/consumer/META-INF/
projects/ejb3/trunk/docs/tutorial/consumer/META-INF/queue-example-service.xml
Removed:
projects/ejb3/trunk/docs/tutorial/consumer/queue-example-service.xml
Modified:
projects/ejb3/trunk/docs/tutorial/consumer/build.xml
projects/ejb3/trunk/docs/tutorial/consumer/pom.xml
projects/ejb3/trunk/docs/tutorial/consumer/src/org/jboss/tutorial/consumer/client/Client.java
Log:
Move the queue-example-service to the META-INF folder and correspondingly update the build and pom files
Added: projects/ejb3/trunk/docs/tutorial/consumer/META-INF/queue-example-service.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/consumer/META-INF/queue-example-service.xml (rev 0)
+++ projects/ejb3/trunk/docs/tutorial/consumer/META-INF/queue-example-service.xml 2008-12-24 11:52:24 UTC (rev 82543)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=tutorial"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <attribute name="JNDIName">queue/tutorial/example</attribute>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+
+</server>
\ No newline at end of file
Property changes on: projects/ejb3/trunk/docs/tutorial/consumer/META-INF/queue-example-service.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: projects/ejb3/trunk/docs/tutorial/consumer/build.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/consumer/build.xml 2008-12-24 11:49:44 UTC (rev 82542)
+++ projects/ejb3/trunk/docs/tutorial/consumer/build.xml 2008-12-24 11:52:24 UTC (rev 82543)
@@ -6,79 +6,76 @@
<project name="JBoss" default="ejbjar" basedir=".">
- <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-consumer.jar"/>
+ <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-consumer.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 -->
- <fileset dir="${jboss.home}/client">
- <include name="**/jbossall-client.jar"/>
- </fileset>
- <pathelement location="${build.classes.dir}"/>
- </path>
+ <!-- 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 -->
+ <fileset dir="${jboss.home}/client">
+ <include name="**/jbossall-client.jar" />
+ </fileset>
+ <pathelement location="${build.classes.dir}" />
+ </path>
- <property name="build.classpath" refid="classpath"/>
+ <property name="build.classpath" refid="classpath" />
- <!-- =================================================================== -->
- <!-- Prepares the build directory -->
- <!-- =================================================================== -->
- <target name="prepare">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.classes.dir}"/>
- </target>
+ <!-- =================================================================== -->
+ <!-- Prepares the build directory -->
+ <!-- =================================================================== -->
+ <target name="prepare">
+ <mkdir dir="${build.dir}" />
+ <mkdir dir="${build.classes.dir}" />
+ </target>
- <!-- =================================================================== -->
- <!-- Compiles the source code -->
- <!-- =================================================================== -->
- <target name="compile" depends="prepare">
- <javac srcdir="${src.dir}"
- destdir="${build.classes.dir}"
- debug="on"
- deprecation="on"
- optimize="off"
- includes="**">
- <classpath refid="classpath"/>
- </javac>
- </target>
+ <!-- =================================================================== -->
+ <!-- Compiles the source code -->
+ <!-- =================================================================== -->
+ <target name="compile" depends="prepare">
+ <javac srcdir="${src.dir}" destdir="${build.classes.dir}" debug="on" deprecation="on" optimize="off" includes="**">
+ <classpath refid="classpath" />
+ </javac>
+ </target>
- <target name="ejbjar" depends="compile">
- <jar jarfile="build/${build.artifact}">
- <fileset dir="${build.classes.dir}">
- <include name="**/*.class"/>
- </fileset>
- <!-- Include the queue-example-service.xml in the META-INF of the jar -->
- <metainf includesfile="queue-example-service.xml"/>
- </jar>
-
- <copy file="build/${build.artifact}" todir="${jboss.home}/server/${jboss.server.config}/deploy"/>
- </target>
+ <target name="ejbjar" depends="compile">
+ <jar jarfile="build/${build.artifact}">
+ <fileset dir="${build.classes.dir}">
+ <include name="**/*.class" />
+ </fileset>
+ <!-- Include the queue-example-service.xml in the META-INF of the jar -->
+ <fileset dir="${basedir}">
+ <include name="META-INF/*.xml"/>
+ </fileset>
+ </jar>
- <target name="run" depends="ejbjar">
- <java classname="org.jboss.tutorial.consumer.client.Client" fork="yes" dir=".">
- <classpath refid="classpath"/>
- </java>
- </target>
+ <copy file="build/${build.artifact}" todir="${jboss.home}/server/${jboss.server.config}/deploy" />
+ </target>
- <!-- =================================================================== -->
- <!-- Cleans up generated stuff -->
- <!-- =================================================================== -->
- <target name="clean.db">
- <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic"/>
- </target>
+ <target name="run" depends="ejbjar">
+ <java classname="org.jboss.tutorial.consumer.client.Client" fork="yes" dir=".">
+ <classpath refid="classpath" />
+ </java>
+ </target>
- <target name="clean">
- <delete dir="${build.dir}"/>
- <delete file="${jboss.home}/server/${jboss.server.config}/deploy/${build.artifact}"/>
- </target>
+ <!-- =================================================================== -->
+ <!-- Cleans up generated stuff -->
+ <!-- =================================================================== -->
+ <target name="clean.db">
+ <delete dir="${jboss.home}/server/${jboss.server.config}/data/hypersonic" />
+ </target>
+ <target name="clean">
+ <delete dir="${build.dir}" />
+ <delete file="${jboss.home}/server/${jboss.server.config}/deploy/${build.artifact}" />
+ </target>
+
</project>
Modified: projects/ejb3/trunk/docs/tutorial/consumer/pom.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/consumer/pom.xml 2008-12-24 11:49:44 UTC (rev 82542)
+++ projects/ejb3/trunk/docs/tutorial/consumer/pom.xml 2008-12-24 11:52:24 UTC (rev 82543)
@@ -31,55 +31,6 @@
Tutorial about JBoss specific JMS Consumers and Producers
</description>
- <build>
- <!--
- If child pom has a resources section then the resource section from
- the parent is NOT inherited. So repeat the resources section from the
- parent pom here. Additionally, add the queue-example-service.xml
- (used to deploy the queue) into the META-INF folder of the output
- artifact
- -->
- <!-- Include the jndi.properties and the log4j.xml in the classpath -->
- <resources>
- <!--
- Include files from the root of the tutorial into the root of output
- artifact jar
- -->
- <resource>
- <directory>./</directory>
- <includes>
- <include>*.properties</include>
- <include>log4j.xml</include>
- </includes>
- </resource>
- <!--
- Include xml files from the META-INF of the tutorial into the
- META-INF folder of output artifact jar
- -->
- <resource>
-
- <directory>./META-INF</directory>
- <includes>
- <include>*.xml</include>
- </includes>
- <targetPath>META-INF</targetPath>
- </resource>
-
- <!--
- Include the queue-example-service.xml into the META-INF of the
- packaged jar
- -->
- <resource>
- <directory>./</directory>
- <includes>
- <include>queue-example-service.xml</include>
- </includes>
- <targetPath>META-INF</targetPath>
- </resource>
-
- </resources>
- </build>
-
</project>
Deleted: projects/ejb3/trunk/docs/tutorial/consumer/queue-example-service.xml
===================================================================
--- projects/ejb3/trunk/docs/tutorial/consumer/queue-example-service.xml 2008-12-24 11:49:44 UTC (rev 82542)
+++ projects/ejb3/trunk/docs/tutorial/consumer/queue-example-service.xml 2008-12-24 11:52:24 UTC (rev 82543)
@@ -1,13 +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=tutorial"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <attribute name="JNDIName">queue/tutorial/example</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
-
-</server>
\ No newline at end of file
Modified: projects/ejb3/trunk/docs/tutorial/consumer/src/org/jboss/tutorial/consumer/client/Client.java
===================================================================
--- projects/ejb3/trunk/docs/tutorial/consumer/src/org/jboss/tutorial/consumer/client/Client.java 2008-12-24 11:49:44 UTC (rev 82542)
+++ projects/ejb3/trunk/docs/tutorial/consumer/src/org/jboss/tutorial/consumer/client/Client.java 2008-12-24 11:52:24 UTC (rev 82543)
@@ -49,13 +49,15 @@
{
// Call method1
remote.method1("Remote method1 called", 1);
-
+ System.out.println("Remote method1 called");
+
// Call method2
Map<String, String> map = new HashMap<String, String>();
map.put("hello", "world");
map.put("great", "ejb3");
remote.method2("Remote method2 called", map);
+ System.out.println("Remote method2 called");
}
finally
{
More information about the jboss-cvs-commits
mailing list