You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/06/12 02:06:51 UTC
svn commit: r666926 - in /geronimo/samples/trunk/samples/jms-mdb-sample:
jms-mdb-sample-ear/src/main/resources/
jms-mdb-sample-ejb/src/main/java/org/apache/geronimo/samples/order/
jms-mdb-sample-ejb/src/main/resources/META-INF/ jms-mdb-sample-jetty/src...
Author: djencks
Date: Wed Jun 11 17:06:51 2008
New Revision: 666926
URL: http://svn.apache.org/viewvc?rev=666926&view=rev
Log:
minor cleanups
Removed:
geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/jms-resources.xml
geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ejb/src/main/resources/META-INF/openejb-jar.xml
Modified:
geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ejb/src/main/java/org/apache/geronimo/samples/order/OrderRecvMDB.java
geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/java/org/apache/geronimo/samples/order/OrderSenderServlet.java
Modified: geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ejb/src/main/java/org/apache/geronimo/samples/order/OrderRecvMDB.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ejb/src/main/java/org/apache/geronimo/samples/order/OrderRecvMDB.java?rev=666926&r1=666925&r2=666926&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ejb/src/main/java/org/apache/geronimo/samples/order/OrderRecvMDB.java (original)
+++ geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-ejb/src/main/java/org/apache/geronimo/samples/order/OrderRecvMDB.java Wed Jun 11 17:06:51 2008
@@ -42,7 +42,7 @@
public void onMessage(Message message) {
TextMessage textMessage = (TextMessage) message;
try {
- System.out.println("Order Received \n" + textMessage.getText());
+ System.out.println("(mdb) Order Received \n" + textMessage.getText());
} catch (JMSException e) {
e.printStackTrace();
}
Modified: geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/plan.xml?rev=666926&r1=666925&r2=666926&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/plan.xml Wed Jun 11 17:06:51 2008
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,8 +22,57 @@
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
<module>
+ <ejb>jms-mdb-sample-ejb-${pom.version}.jar</ejb>
+ <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
+ <enterprise-beans>
+ <message-driven>
+ <ejb-name>OrderRecvMDB</ejb-name>
+ <resource-adapter>
+ <resource-link>jms-resources</resource-link>
+ </resource-adapter>
+ </message-driven>
+ </enterprise-beans>
+ </openejb-jar>
+
+ </module>
+ <module>
<connector>geronimo-activemq-ra-${geronimoVersion}.rar</connector>
- <alt-dd>jms-resources.xml</alt-dd>
+ <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+ <resourceadapter>
+ <resourceadapter-instance>
+ <resourceadapter-name>jms-resources</resourceadapter-name>
+ <nam:workmanager xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2">
+ <nam:gbean-link>DefaultWorkManager</nam:gbean-link>
+ </nam:workmanager>
+ </resourceadapter-instance>
+ <outbound-resourceadapter>
+ <connection-definition>
+ <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
+ <connectiondefinition-instance>
+ <name>OrderConnectionFactory</name>
+ <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
+ <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
+ <connectionmanager>
+ <xa-transaction>
+ <transaction-caching/>
+ </xa-transaction>
+ <single-pool>
+ <match-one/>
+ </single-pool>
+ </connectionmanager>
+ </connectiondefinition-instance>
+ </connection-definition>
+ </outbound-resourceadapter>
+ </resourceadapter>
+ <adminobject>
+ <adminobject-interface>javax.jms.Queue</adminobject-interface>
+ <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
+ <adminobject-instance>
+ <message-destination-name>OrderQueue</message-destination-name>
+ <config-property-setting name="PhysicalName">OrderQueue</config-property-setting>
+ </adminobject-instance>
+ </adminobject>
+ </connector>
</module>
</application>
Modified: geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/plan/plan.xml?rev=666926&r1=666925&r2=666926&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/plan/plan.xml Wed Jun 11 17:06:51 2008
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,8 +22,57 @@
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
<module>
+ <ejb>jms-mdb-sample-ejb-${pom.version}.jar</ejb>
+ <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
+ <enterprise-beans>
+ <message-driven>
+ <ejb-name>OrderRecvMDB</ejb-name>
+ <resource-adapter>
+ <resource-link>jms-resources</resource-link>
+ </resource-adapter>
+ </message-driven>
+ </enterprise-beans>
+ </openejb-jar>
+
+ </module>
+ <module>
<connector>geronimo-activemq-ra-${geronimoVersion}.rar</connector>
- <alt-dd>jms-resources.xml</alt-dd>
+ <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+ <resourceadapter>
+ <resourceadapter-instance>
+ <resourceadapter-name>jms-resources</resourceadapter-name>
+ <nam:workmanager xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2">
+ <nam:gbean-link>DefaultWorkManager</nam:gbean-link>
+ </nam:workmanager>
+ </resourceadapter-instance>
+ <outbound-resourceadapter>
+ <connection-definition>
+ <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
+ <connectiondefinition-instance>
+ <name>OrderConnectionFactory</name>
+ <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
+ <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
+ <connectionmanager>
+ <xa-transaction>
+ <transaction-caching/>
+ </xa-transaction>
+ <single-pool>
+ <match-one/>
+ </single-pool>
+ </connectionmanager>
+ </connectiondefinition-instance>
+ </connection-definition>
+ </outbound-resourceadapter>
+ </resourceadapter>
+ <adminobject>
+ <adminobject-interface>javax.jms.Queue</adminobject-interface>
+ <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
+ <adminobject-instance>
+ <message-destination-name>OrderQueue</message-destination-name>
+ <config-property-setting name="PhysicalName">OrderQueue</config-property-setting>
+ </adminobject-instance>
+ </adminobject>
+ </connector>
</module>
</application>
Modified: geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/java/org/apache/geronimo/samples/order/OrderSenderServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/java/org/apache/geronimo/samples/order/OrderSenderServlet.java?rev=666926&r1=666925&r2=666926&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/java/org/apache/geronimo/samples/order/OrderSenderServlet.java (original)
+++ geronimo/samples/trunk/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/java/org/apache/geronimo/samples/order/OrderSenderServlet.java Wed Jun 11 17:06:51 2008
@@ -69,7 +69,7 @@
String model = req.getParameter("model");
if (!customerId.equals("") && !orderId.equals("") && !qty.equals("")) {
- System.out.println("Start Sending Order Request");
+ System.out.println("(client) Start Sending Order Request");
path = "/order.jsp";
connection = factory.createConnection();
@@ -78,7 +78,7 @@
+ " Quantity=" + qty + " Model=" + model + ">");
messageProducer = sess.createProducer(receivingQueue);
messageProducer.send(msg);
- System.out.println("Order Request Send");
+ System.out.println("(client) Order Request Sent");
} else {
String error = "";