[jboss-cvs] JBoss Messaging SVN: r6283 - in trunk/examples/jms: common/src/org/jboss/jms/example and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 3 04:14:46 EDT 2009
Author: ataylor
Date: 2009-04-03 04:14:46 -0400 (Fri, 03 Apr 2009)
New Revision: 6283
Added:
trunk/examples/jms/dead-letter/config/jbm-security.xml
Removed:
trunk/examples/jms/common/config/jbm-jms.xml
trunk/examples/jms/common/config/jbm-security.xml
Modified:
trunk/examples/jms/common/src/org/jboss/jms/example/JMSExample.java
trunk/examples/jms/dead-letter/config/jbm-jms.xml
trunk/examples/jms/dead-letter/config/jbm-queues.xml
trunk/examples/jms/dead-letter/src/org/jboss/jms/example/DeadLetterExample.java
Log:
removed management stuff from eamples and removed common-config
Deleted: trunk/examples/jms/common/config/jbm-jms.xml
===================================================================
--- trunk/examples/jms/common/config/jbm-jms.xml 2009-04-03 08:03:26 UTC (rev 6282)
+++ trunk/examples/jms/common/config/jbm-jms.xml 2009-04-03 08:14:46 UTC (rev 6283)
@@ -1,21 +0,0 @@
-<deployment xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
-
- <connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
- </connection-factory>
-
- <queue name="queue">
- <entry name="/queue/exampleQueue"/>
- </queue>
-
- <topic name="topic">
- <entry name="/topic/exampleTopic"/>
- </topic>
-
-</deployment>
\ No newline at end of file
Deleted: trunk/examples/jms/common/config/jbm-security.xml
===================================================================
--- trunk/examples/jms/common/config/jbm-security.xml 2009-04-03 08:03:26 UTC (rev 6282)
+++ trunk/examples/jms/common/config/jbm-security.xml 2009-04-03 08:14:46 UTC (rev 6283)
@@ -1,11 +0,0 @@
-<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-security.xsd ">
- <!-- the default user. this is used where username is null-->
- <defaultuser name="guest" password="guest">
- <role name="guest"/>
- </defaultuser>
- <user name="admin" password="admin">
- <role name="admin"/>
- <role name="guest"/>
- </user>
-</deployment>
\ No newline at end of file
Modified: trunk/examples/jms/common/src/org/jboss/jms/example/JMSExample.java
===================================================================
--- trunk/examples/jms/common/src/org/jboss/jms/example/JMSExample.java 2009-04-03 08:03:26 UTC (rev 6282)
+++ trunk/examples/jms/common/src/org/jboss/jms/example/JMSExample.java 2009-04-03 08:14:46 UTC (rev 6283)
@@ -21,24 +21,11 @@
*/
package org.jboss.jms.example;
-import static org.jboss.messaging.core.config.impl.ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS;
-import org.jboss.messaging.core.management.ObjectNames;
-import org.jboss.messaging.jms.JBossQueue;
-import org.jboss.messaging.jms.server.management.impl.JMSManagementHelper;
-
import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.ObjectMessage;
-import javax.jms.QueueRequestor;
-import javax.jms.QueueSession;
-import javax.jms.Session;
import javax.naming.InitialContext;
import java.net.URL;
-import java.util.HashSet;
import java.util.Properties;
-import java.util.Set;
import java.util.logging.Logger;
/**
@@ -71,16 +58,6 @@
{
startServer(getServerNames(args), logServerOutput);
}
- InitialContext ic = getContext();
- ConnectionFactory cf = (ConnectionFactory) ic.lookup("/ConnectionFactory");
- conn = cf.createConnection("admin", "admin");
- Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- conn.start();
- JBossQueue managementQueue = new JBossQueue(DEFAULT_MANAGEMENT_ADDRESS.toString(),
- DEFAULT_MANAGEMENT_ADDRESS.toString());
- QueueRequestor requestor = new QueueRequestor((QueueSession) session, managementQueue);
- deployQueues(session, requestor);
- deployTopics(session, requestor);
runExample();
}
catch (Throwable e)
@@ -116,21 +93,6 @@
reportResultAndExit();
}
-
- public Set<String> getQueues()
- {
- Set<String> queues = new HashSet<String>();
- queues.add("exampleQueue");
- return queues;
- }
-
- public Set<String> getTopics()
- {
- Set<String> topics = new HashSet<String>();
- topics.add("exampleTopic");
- return topics;
- }
-
protected InitialContext getContext() throws Exception
{
URL url = Thread.currentThread().getContextClassLoader().getResource("client-jndi.properties");
@@ -161,60 +123,6 @@
}
}
- private void deployQueues(Session session, QueueRequestor requestor) throws Exception
- {
- Set<String> queues = getQueues();
- for (String queue : queues)
- {
- Message m = session.createMessage();
- JMSManagementHelper.putOperationInvocation(m, ObjectNames.getJMSServerObjectName(), "createQueue", queue, "/queue/" + queue);
- ObjectMessage reply = (ObjectMessage) requestor.request(m);
- if (JMSManagementHelper.hasOperationSucceeded(reply))
- {
- Boolean created = (Boolean) reply.getObject();
- if (created)
- {
- log.info("created queue " + queue);
- }
- else
- {
- log.info("queue " + queue + " already exists not creating");
- }
- }
- else
- {
- throw new Exception(JMSManagementHelper.getOperationExceptionMessage(reply));
- }
- }
- }
-
- private void deployTopics(Session session, QueueRequestor requestor) throws Exception
- {
- Set<String> topics = getTopics();
- for (String topic : topics)
- {
- Message m = session.createMessage();
- JMSManagementHelper.putOperationInvocation(m, ObjectNames.getJMSServerObjectName(), "createTopic", topic, "/topic/" + topic);
- ObjectMessage reply = (ObjectMessage) requestor.request(m);
- if (JMSManagementHelper.hasOperationSucceeded(reply))
- {
- Boolean created = (Boolean) reply.getObject();
- if (created)
- {
- log.info("created topic " + topic);
- }
- else
- {
- log.info("topic " + topic + " already exists not creating");
- }
- }
- else
- {
- throw new Exception(JMSManagementHelper.getOperationExceptionMessage(reply));
- }
- }
- }
-
private String[][] getServerNames(String[] args)
{
String[][] actArgs = new String[args.length][1];
Modified: trunk/examples/jms/dead-letter/config/jbm-jms.xml
===================================================================
--- trunk/examples/jms/dead-letter/config/jbm-jms.xml 2009-04-03 08:03:26 UTC (rev 6282)
+++ trunk/examples/jms/dead-letter/config/jbm-jms.xml 2009-04-03 08:14:46 UTC (rev 6283)
@@ -2,6 +2,18 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+ <connection-factory name="ConnectionFactory">
+ <connector-ref connector-name="netty"/>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </connection-factory>
+
+ <queue name="queue">
+ <entry name="/queue/exampleQueue"/>
+ </queue>
+
<queue name="deadLetterQueue">
<entry name="/queue/deadLetterQueue"/>
</queue>
Modified: trunk/examples/jms/dead-letter/config/jbm-queues.xml
===================================================================
--- trunk/examples/jms/dead-letter/config/jbm-queues.xml 2009-04-03 08:03:26 UTC (rev 6282)
+++ trunk/examples/jms/dead-letter/config/jbm-queues.xml 2009-04-03 08:14:46 UTC (rev 6283)
@@ -2,6 +2,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+ <!--default security to catch all-->
+ <security match="#">
+ <permission type="createDurableQueue" roles="guest,def"/>
+ <permission type="deleteDurableQueue" roles="guest,def"/>
+ <permission type="createTempQueue" roles="guest,def"/>
+ <permission type="deleteTempQueue" roles="guest,def"/>
+ <permission type="consume" roles="guest,def"/>
+ <permission type="send" roles="guest,def"/>
+ </security>
+
<!--default for catch all-->
<address-settings match="queuejms.queue">
<clustered>false</clustered>
Copied: trunk/examples/jms/dead-letter/config/jbm-security.xml (from rev 6281, trunk/examples/jms/common/config/jbm-security.xml)
===================================================================
--- trunk/examples/jms/dead-letter/config/jbm-security.xml (rev 0)
+++ trunk/examples/jms/dead-letter/config/jbm-security.xml 2009-04-03 08:14:46 UTC (rev 6283)
@@ -0,0 +1,7 @@
+<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-security.xsd ">
+ <!-- the default user. this is used where username is null-->
+ <defaultuser name="guest" password="guest">
+ <role name="guest"/>
+ </defaultuser>
+</deployment>
\ No newline at end of file
Property changes on: trunk/examples/jms/dead-letter/config/jbm-security.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/examples/jms/dead-letter/src/org/jboss/jms/example/DeadLetterExample.java
===================================================================
--- trunk/examples/jms/dead-letter/src/org/jboss/jms/example/DeadLetterExample.java 2009-04-03 08:03:26 UTC (rev 6282)
+++ trunk/examples/jms/dead-letter/src/org/jboss/jms/example/DeadLetterExample.java 2009-04-03 08:14:46 UTC (rev 6283)
@@ -21,9 +21,6 @@
*/
package org.jboss.jms.example;
-import java.util.HashSet;
-import java.util.Set;
-
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.MessageConsumer;
@@ -148,13 +145,4 @@
}
}
- @Override
- public Set<String> getQueues()
- {
- HashSet<String> queues = new HashSet<String>();
- queues.add("exampleQueue");
- queues.add("deadLetterQueue");
- return queues;
- }
-
}
More information about the jboss-cvs-commits
mailing list