Author: manaRH Date: 2008-08-27 16:28:45 -0400 (Wed, 27 Aug 2008) New Revision: 8831 Modified: branches/Seam_2_0_FP/examples/remoting/chatroom/resources/chatroom-service.xml branches/Seam_2_0_FP/src/main/org/jboss/seam/jms/QueueConnection.java branches/Seam_2_0_FP/src/main/org/jboss/seam/jms/TopicConnection.java branches/Seam_2_0_FP/src/remoting/org/jboss/seam/remoting/messaging/JBossConnectionProvider.java Log: JBPAPP-1113 Modified: branches/Seam_2_0_FP/examples/remoting/chatroom/resources/chatroom-service.xml =================================================================== --- branches/Seam_2_0_FP/examples/remoting/chatroom/resources/chatroom-service.xml 2008-08-27 15:27:14 UTC (rev 8830) +++ branches/Seam_2_0_FP/examples/remoting/chatroom/resources/chatroom-service.xml 2008-08-27 20:28:45 UTC (rev 8831) @@ -1,16 +1,19 @@ <server> - <mbean code="org.jboss.mq.server.jmx.Topic" - name="jboss.mq.destination:service=Topic,name=chatroomTopic"> - <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends> - <depends optional-attribute-name="SecurityManager">jboss.mq:service=SecurityManager</depends> - <attribute name="SecurityConf"> - <security> - <role name="guest" read="true" write="true"/> - <role name="publisher" read="true" write="true" create="false"/> - <role name="durpublisher" read="true" write="true" create="true"/> - </security> - </attribute> - </mbean> + <mbean code="org.jboss.jms.server.destination.TopicService" + name="jboss.messaging.destination:service=Topic,name=chatroomTopic" + xmbean-dd="xmdesc/Topic-xmbean.xml"> + <depends optional-attribute-name="ServerPeer"> + jboss.messaging:service=ServerPeer + </depends> + <depends>jboss.messaging:service=PostOffice</depends> + <attribute name="SecurityConfig"> + <security> + <role name="guest" read="true" write="true"/> + <role name="publisher" read="true" write="true" create="false"/> + <role name="durpublisher" read="true" write="true" create="true"/> + </security> + </attribute> + </mbean> </server> Modified: branches/Seam_2_0_FP/src/main/org/jboss/seam/jms/QueueConnection.java =================================================================== --- branches/Seam_2_0_FP/src/main/org/jboss/seam/jms/QueueConnection.java 2008-08-27 15:27:14 UTC (rev 8830) +++ branches/Seam_2_0_FP/src/main/org/jboss/seam/jms/QueueConnection.java 2008-08-27 20:28:45 UTC (rev 8831) @@ -18,7 +18,7 @@ import org.jboss.seam.util.Naming; /** - * Manager for a JMS QueueConnection. By default, the JBoss MQ UIL2. + * Manager for a JMS QueueConnection. By default, JBoss Messaging * * @author Gavin King * @@ -29,7 +29,7 @@ @Install(precedence=BUILT_IN, genericDependencies=ManagedQueueSender.class) public class QueueConnection { - private String queueConnectionFactoryJndiName = "UIL2ConnectionFactory"; + private String queueConnectionFactoryJndiName = "ConnectionFactory"; private javax.jms.QueueConnection queueConnection; /** Modified: branches/Seam_2_0_FP/src/main/org/jboss/seam/jms/TopicConnection.java =================================================================== --- branches/Seam_2_0_FP/src/main/org/jboss/seam/jms/TopicConnection.java 2008-08-27 15:27:14 UTC (rev 8830) +++ branches/Seam_2_0_FP/src/main/org/jboss/seam/jms/TopicConnection.java 2008-08-27 20:28:45 UTC (rev 8831) @@ -18,7 +18,7 @@ import org.jboss.seam.util.Naming; /** - * Manager for a JMS TopicConnection. By default, the JBoss MQ UIL2. + * Manager for a JMS TopicConnection. By default, JBoss Messaging * * @author Gavin King * @@ -29,7 +29,7 @@ @Install(precedence=BUILT_IN, genericDependencies=ManagedTopicPublisher.class) public class TopicConnection { - private String topicConnectionFactoryJndiName = "UIL2ConnectionFactory"; + private String topicConnectionFactoryJndiName = "ConnectionFactory"; private javax.jms.TopicConnection topicConnection; /** Modified: branches/Seam_2_0_FP/src/remoting/org/jboss/seam/remoting/messaging/JBossConnectionProvider.java =================================================================== --- branches/Seam_2_0_FP/src/remoting/org/jboss/seam/remoting/messaging/JBossConnectionProvider.java 2008-08-27 15:27:14 UTC (rev 8830) +++ branches/Seam_2_0_FP/src/remoting/org/jboss/seam/remoting/messaging/JBossConnectionProvider.java 2008-08-27 20:28:45 UTC (rev 8831) @@ -10,7 +10,7 @@ */ public class JBossConnectionProvider implements JMSConnectionProvider { - private static final String FACTORY_JNDI_NAME = "UIL2ConnectionFactory"; + private static final String FACTORY_JNDI_NAME = "ConnectionFactory"; public TopicConnection createConnection() throws Exception