[jboss-svn-commits] JBL Code SVN: r13566 - in labs/jbossesb/trunk/product: docs and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jul 17 06:27:52 EDT 2007
Author: kevin.conner at jboss.com
Date: 2007-07-17 06:27:52 -0400 (Tue, 17 Jul 2007)
New Revision: 13566
Added:
labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyControlAction.java
labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyDynamicRouterAction.java
Removed:
labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction.java
labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction2.java
Modified:
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/docs/GettingStarted.odt
labs/jbossesb/trunk/product/docs/ReleaseNotes.odt
labs/jbossesb/trunk/product/docs/TBGuide.odt
labs/jbossesb/trunk/product/docs/services/ContentBasedRouting.odt
labs/jbossesb/trunk/product/docs/services/MessageTransformation.odt
labs/jbossesb/trunk/product/docs/services/Registry.odt
labs/jbossesb/trunk/product/install/build.xml
labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
labs/jbossesb/trunk/product/samples/quickstarts/conf/quickstarts.properties-example
Log:
Fixed action class names: JBESB-706
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2007-07-17 04:09:17 UTC (rev 13565)
+++ labs/jbossesb/trunk/product/build.xml 2007-07-17 10:27:52 UTC (rev 13566)
@@ -31,7 +31,7 @@
<property name="org.jboss.esb.internal.jar.dest" location="build/jbossesb/lib"/>
<!-- JBoss ESB version -->
- <property name="version" value="4.2MR2"/>
+ <property name="version" value="4.2MR3"/>
<property name="esb.server.name" value="jbossesb-server-${version}"/>
<property name="esbserver.dist.dir" value="${org.jboss.esb.internal.dest}/${esb.server.name}"/>
Modified: labs/jbossesb/trunk/product/docs/GettingStarted.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/trunk/product/docs/ReleaseNotes.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/trunk/product/docs/TBGuide.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/trunk/product/docs/services/ContentBasedRouting.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/trunk/product/docs/services/MessageTransformation.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/trunk/product/docs/services/Registry.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml 2007-07-17 04:09:17 UTC (rev 13565)
+++ labs/jbossesb/trunk/product/install/build.xml 2007-07-17 10:27:52 UTC (rev 13566)
@@ -3,7 +3,7 @@
<!-- Set deployment properties filename -->
<property name="org.jboss.esb.deployment.properties" location="deployment.properties"/>
<property name="org.jboss.esb.deployment.deploy" location="deploy"/>
-
+
<!-- Load Build Properties File -->
<property file="${org.jboss.esb.deployment.properties}"/>
@@ -46,8 +46,12 @@
<target name="deploy" depends="internal.deploy" description="Wrapper for internal.deploy"/>
- <target name="tomcat" depends="tomcat.compile, tomcat.war.all.deploy" description="Wrapper for tomcat.war.all.deploy"/>
+ <target name="check.tomcat.props">
+ <fail unless="org.jboss.esb.tomcat.home" message="Cannot determine target deployment, please check deployment.properties"/>
+ </target>
+ <target name="tomcat" depends="check.tomcat.props, dependencies, tomcat.compile, tomcat.war.all.deploy" description="Wrapper for tomcat.war.all.deploy"/>
+
<target name="jms.config.check">
<available property="jbm.present"
file="${deploy.dir}/jboss-messaging"/>
@@ -77,7 +81,18 @@
<target name="jms.config" depends="jms.config.check, jbmq.config, jbm.config"/>
- <target name="internal.deploy" depends="dependencies, jms.config" description="Deploys Internal Services to the server">
+ <target name="check.deploy.props">
+ <condition property="esb.server.configured">
+ <and>
+ <isset property="org.jboss.esb.server.home"/>
+ <isset property="org.jboss.esb.server.config"/>
+ </and>
+ </condition>
+
+ <fail unless="esb.server.configured" message="Cannot determine target deployment, please check deployment.properties"/>
+ </target>
+
+ <target name="internal.deploy" depends="check.deploy.props, dependencies, jms.config" description="Deploys Internal Services to the server">
<!-- jbossesb.sar -->
<copy todir="${deploy.dir}/jbossesb.sar">
<fileset dir="${org.jboss.esb.dist.lib}/jbossesb.sar"/>
Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml 2007-07-17 04:09:17 UTC (rev 13565)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml 2007-07-17 10:27:52 UTC (rev 13566)
@@ -133,14 +133,28 @@
<isset property="quickstart.org.jboss.esb.server.config"/>
</condition>
+ <condition
+ property="org.jboss.esb.server.home"
+ value="${quickstart.org.jboss.esb.server.home}">
+ <isset property="quickstart.org.jboss.esb.server.home"/>
+ </condition>
+
+ <condition property="esb.server.configured">
+ <and>
+ <isset property="org.jboss.esb.server.home"/>
+ <isset property="org.jboss.esb.server.config"/>
+ </and>
+ </condition>
+
+ <fail unless="esb.server.configured" message="Cannot determine target deployment, please check quickstarts.properties or deployment.properties"/>
+
<!-- check for installation deployment.properties -->
<property name="install.dir" value="${product.dir}/install"/>
<property file="${install.dir}/deployment.properties" prefix="install" />
<condition
property="org.jboss.esb.server.home"
- value="${quickstart.org.jboss.esb.server.home}"
- else="${install.org.jboss.esb.server.home}">
- <isset property="quickstart.org.jboss.esb.server.home"/>
+ value="${install.org.jboss.esb.server.home}">
+ <isset property="install.org.jboss.esb.server.home"/>
</condition>
<condition
Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/quickstarts.properties-example
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/quickstarts.properties-example 2007-07-17 04:09:17 UTC (rev 13565)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/quickstarts.properties-example 2007-07-17 10:27:52 UTC (rev 13566)
@@ -5,7 +5,7 @@
##############################################################################################
# Location of your JBoss Application Server installation.
# Will override the same property name from install/deployment.properties
-#org.jboss.esb.server.home=${product.dir}/build/jbossesb-server-4.2MR2
+#org.jboss.esb.server.home=${product.dir}/build/jbossesb-server-4.2MR3
# JBossAS server name. If not set defaults to 'default'
# Will override the same property name from install/deployment.properties
Copied: labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyControlAction.java (from rev 13565, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction2.java)
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyControlAction.java (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyControlAction.java 2007-07-17 10:27:52 UTC (rev 13566)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package quickstart.dynamicRouter;
+
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+
+import quickstart.dynamicRouter.test.*;
+import java.util.Hashtable;
+
+import java.util.Enumeration;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.FileOutputStream;
+import java.io.FileInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectInputStream;
+
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueReceiver;
+import javax.jms.QueueSession;
+import javax.jms.ObjectMessage;
+import javax.jms.TextMessage;
+import javax.naming.InitialContext;
+import javax.jms.JMSException;
+import javax.jms.TextMessage;
+import javax.jms.QueueSender;
+import javax.naming.NamingException;
+
+public class MyControlAction extends AbstractActionLifecycle {
+ protected ConfigTree _config;
+
+ public MyControlAction(ConfigTree config) {
+ _config = config;
+ }
+
+ public Message processControlMessage(Message message) throws Exception {
+
+ Hashtable theHashtable = QsHashtable.readHash();
+ String tm = new String(message.getBody().getByteArray());
+
+ try {
+ // The message contains the queue name and status separated by ":"
+ // for example - queue/queueName:OK - any queue associated with
+ // a value of "OK" is added to the dynamic router data store
+ String[] theStrings = tm.split(":");
+
+ // Make the data store dynamic - to reflect changes in queue status
+ if (theHashtable.containsKey(theStrings[0])) {
+ theHashtable.remove(theStrings[0]);
+ }
+
+ theHashtable.put(theStrings[0], theStrings[1]);
+
+ } catch (Throwable t) {
+ t.printStackTrace();
+ }
+ QsHashtable.writeHash(theHashtable);
+ return message;
+
+ } /* method */
+
+} /* class */
Copied: labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyDynamicRouterAction.java (from rev 13565, labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction.java)
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyDynamicRouterAction.java (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyDynamicRouterAction.java 2007-07-17 10:27:52 UTC (rev 13566)
@@ -0,0 +1,101 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package quickstart.dynamicRouter;
+
+import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.message.Message;
+
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueReceiver;
+import javax.jms.QueueSession;
+import javax.jms.ObjectMessage;
+import javax.jms.TextMessage;
+import javax.naming.InitialContext;
+import javax.jms.JMSException;
+import javax.jms.TextMessage;
+import javax.jms.QueueSender;
+import javax.naming.NamingException;
+
+import java.util.Enumeration;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.FileOutputStream;
+import java.io.FileInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectInputStream;
+import quickstart.dynamicRouter.test.*;
+import java.util.Hashtable;
+
+public class MyDynamicRouterAction extends AbstractActionLifecycle
+{
+
+ protected ConfigTree _config;
+ public MyDynamicRouterAction(ConfigTree config) { _config = config; }
+ public Message processMessage(Message message) throws Exception{
+
+ Hashtable theHashtable = QsHashtable.readHash();
+ try {
+ TextMessage tm = null;
+
+ for (Enumeration e = theHashtable.keys(); e.hasMoreElements();) {
+ String theKey = (String) e.nextElement();
+ String theValue = (String) theHashtable.get(theKey);
+
+ // If the queue is "OK" - send the incoming message to that queue
+ if (theValue.equals("OK")) {
+
+ // Set up the connection
+ QueueConnection conn1 = null;
+ Queue que;
+ QueueSession session;
+ InitialContext iniCtx = new InitialContext();
+ Object tmp = iniCtx.lookup("ConnectionFactory");
+ QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
+ conn1 = qcf.createQueueConnection();
+ que = (Queue) iniCtx.lookup(theKey);
+ session = conn1.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+ conn1.start();
+
+ // Send the message
+ QueueSender send = session.createSender(que);
+ tm = session.createTextMessage(new String(message.getBody().getByteArray()));
+ send.send(tm);
+
+ // Close the connection
+ send.close();
+ conn1.stop();
+ session.close();
+ conn1.close();
+ }
+ }
+ }
+ catch (Throwable t) {
+ t.printStackTrace();
+ } /* try and catch */
+
+ return message;
+
+ } /* method */
+
+} /* class */
Deleted: labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction.java 2007-07-17 04:09:17 UTC (rev 13565)
+++ labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction.java 2007-07-17 10:27:52 UTC (rev 13566)
@@ -1,101 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * 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,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-package quickstart.dynamicRouter;
-
-import org.jboss.soa.esb.actions.AbstractActionLifecycle;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Message;
-
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueReceiver;
-import javax.jms.QueueSession;
-import javax.jms.ObjectMessage;
-import javax.jms.TextMessage;
-import javax.naming.InitialContext;
-import javax.jms.JMSException;
-import javax.jms.TextMessage;
-import javax.jms.QueueSender;
-import javax.naming.NamingException;
-
-import java.util.Enumeration;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.FileOutputStream;
-import java.io.FileInputStream;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
-import quickstart.dynamicRouter.test.*;
-import java.util.Hashtable;
-
-public class MyJMSListenerAction extends AbstractActionLifecycle
-{
-
- protected ConfigTree _config;
- public MyJMSListenerAction(ConfigTree config) { _config = config; }
- public Message processMessage(Message message) throws Exception{
-
- Hashtable theHashtable = QsHashtable.readHash();
- try {
- TextMessage tm = null;
-
- for (Enumeration e = theHashtable.keys(); e.hasMoreElements();) {
- String theKey = (String) e.nextElement();
- String theValue = (String) theHashtable.get(theKey);
-
- // If the queue is "OK" - send the incoming message to that queue
- if (theValue.equals("OK")) {
-
- // Set up the connection
- QueueConnection conn1 = null;
- Queue que;
- QueueSession session;
- InitialContext iniCtx = new InitialContext();
- Object tmp = iniCtx.lookup("ConnectionFactory");
- QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
- conn1 = qcf.createQueueConnection();
- que = (Queue) iniCtx.lookup(theKey);
- session = conn1.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
- conn1.start();
-
- // Send the message
- QueueSender send = session.createSender(que);
- tm = session.createTextMessage(new String(message.getBody().getByteArray()));
- send.send(tm);
-
- // Close the connection
- send.close();
- conn1.stop();
- session.close();
- conn1.close();
- }
- }
- }
- catch (Throwable t) {
- t.printStackTrace();
- } /* try and catch */
-
- return message;
-
- } /* method */
-
-} /* class */
\ No newline at end of file
Deleted: labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction2.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction2.java 2007-07-17 04:09:17 UTC (rev 13565)
+++ labs/jbossesb/trunk/product/samples/quickstarts/dynamic_router/src/quickstart/dynamicRouter/MyJMSListenerAction2.java 2007-07-17 10:27:52 UTC (rev 13566)
@@ -1,84 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * 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,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-package quickstart.dynamicRouter;
-
-import org.jboss.soa.esb.actions.AbstractActionLifecycle;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.message.Message;
-
-import quickstart.dynamicRouter.test.*;
-import java.util.Hashtable;
-
-import java.util.Enumeration;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.FileOutputStream;
-import java.io.FileInputStream;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
-
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueReceiver;
-import javax.jms.QueueSession;
-import javax.jms.ObjectMessage;
-import javax.jms.TextMessage;
-import javax.naming.InitialContext;
-import javax.jms.JMSException;
-import javax.jms.TextMessage;
-import javax.jms.QueueSender;
-import javax.naming.NamingException;
-
-public class MyJMSListenerAction2 extends AbstractActionLifecycle {
- protected ConfigTree _config;
-
- public MyJMSListenerAction2(ConfigTree config) {
- _config = config;
- }
-
- public Message processControlMessage(Message message) throws Exception {
-
- Hashtable theHashtable = QsHashtable.readHash();
- String tm = new String(message.getBody().getByteArray());
-
- try {
- // The message contains the queue name and status separated by ":"
- // for example - queue/queueName:OK - any queue associated with
- // a value of "OK" is added to the dynamic router data store
- String[] theStrings = tm.split(":");
-
- // Make the data store dynamic - to reflect changes in queue status
- if (theHashtable.containsKey(theStrings[0])) {
- theHashtable.remove(theStrings[0]);
- }
-
- theHashtable.put(theStrings[0], theStrings[1]);
-
- } catch (Throwable t) {
- t.printStackTrace();
- }
- QsHashtable.writeHash(theHashtable);
- return message;
-
- } /* method */
-
-} /* class */
More information about the jboss-svn-commits
mailing list