[jboss-cvs] jboss-seam/bootstrap/deploy/messaging ...

[Ales Justin]

  User: alesj   
  Date: 07/11/12 16:06:10

  Modified:    bootstrap/deploy/messaging    hsqldb-persistence-service.xml
                        messaging-service.xml jms-ds.xml
  Log:
  Fixing mbean xmls.
  
  Revision  Changes    Path
  1.2       +46 -46    jboss-seam/bootstrap/deploy/messaging/hsqldb-persistence-service.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: hsqldb-persistence-service.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/bootstrap/deploy/messaging/hsqldb-persistence-service.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- hsqldb-persistence-service.xml	15 Jun 2007 05:20:58 -0000	1.1
  +++ hsqldb-persistence-service.xml	12 Nov 2007 21:06:10 -0000	1.2
  @@ -3,12 +3,12 @@
   <!--
        Hypersonic persistence deployment descriptor.
   
  -     $Id: hsqldb-persistence-service.xml,v 1.1 2007/06/15 05:20:58 gavin Exp $
  +     $Id: hsqldb-persistence-service.xml,v 1.2 2007/11/12 21:06:10 alesj Exp $
    -->
   
   <server>
   
  -   <mbean code="org.jboss.messaging.core.plugin.JDBCPersistenceManagerService"
  +   <mbean code="org.jboss.messaging.core.jmx.JDBCPersistenceManagerService"
         name="jboss.messaging:service=PersistenceManager"
         xmbean-dd="xmdesc/JDBCPersistenceManager-xmbean.xml">
         <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
  @@ -21,9 +21,9 @@
   
      <!-- Note that Hypersonic CANNOT be used for clustered post offices -->
   
  -   <mbean code="org.jboss.messaging.core.plugin.DefaultPostOfficeService"
  +   <mbean code="org.jboss.messaging.core.jmx.MessagingPostOfficeService"
         name="jboss.messaging:service=PostOffice"
  -      xmbean-dd="xmdesc/DefaultPostOffice-xmbean.xml">
  +      xmbean-dd="xmdesc/MessagingPostOffice-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
         <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
  
  
  
  1.2       +39 -45    jboss-seam/bootstrap/deploy/messaging/messaging-service.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: messaging-service.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/bootstrap/deploy/messaging/messaging-service.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- messaging-service.xml	15 Jun 2007 05:20:58 -0000	1.1
  +++ messaging-service.xml	12 Nov 2007 21:06:10 -0000	1.2
  @@ -3,7 +3,7 @@
   <!--
        The JBoss Messaging service deployment descriptor.
   
  -     $Id: messaging-service.xml,v 1.1 2007/06/15 05:20:58 gavin Exp $
  +     $Id: messaging-service.xml,v 1.2 2007/11/12 21:06:10 alesj Exp $
    -->
   
   <server>
  @@ -12,15 +12,6 @@
         name="jboss.messaging:service=ServerPeer"
         xmbean-dd="xmdesc/ServerPeer-xmbean.xml">
   
  -      <constructor>
  -         <!-- ServerPeerID -->
  -         <arg type="int" value="0"/>
  -         <!-- DefaultQueueJNDIContext -->
  -         <arg type="java.lang.String" value="/queue"/>
  -         <!-- DefaultTopicJNDIContext -->
  -         <arg type="java.lang.String" value="/topic"/>
  -      </constructor>
  -
   	   <attribute name="PostOffice">jboss.messaging:service=PostOffice</attribute>
         <attribute name="SecurityDomain">java:/jaas/messaging</attribute>
         <attribute name="DefaultSecurityConfig">
  @@ -28,11 +19,14 @@
               <role name="guest" read="true" write="true" create="true"/>
           </security>
         </attribute>
  +      <attribute name="ServerPeerID">0</attribute>
  +      <attribute name="DefaultQueueJNDIContext">/queue</attribute>
  +      <attribute name="DefaultTopicJNDIContext">/topic</attribute>
         <attribute name="DefaultDLQ">jboss.messaging.destination:service=Queue,name=DLQ</attribute>
         <attribute name="DefaultMaxDeliveryAttempts">10</attribute>
         <attribute name="DefaultExpiryQueue">jboss.messaging.destination:service=Queue,name=ExpiryQueue</attribute>
         <attribute name="DefaultRedeliveryDelay">0</attribute>
  -      <attribute name="QueueStatsSamplePeriod">5000</attribute>
  +      <!--<attribute name="QueueStatsSamplePeriod">5000</attribute>-->
         <attribute name="FailoverStartTimeout">3000</attribute>
         <attribute name="FailoverCompleteTimeout">12000</attribute>
         <attribute name="DefaultMessageCounterHistoryDayLimit">-1</attribute>
  
  
  
  1.2       +45 -43    jboss-seam/bootstrap/deploy/messaging/jms-ds.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: jms-ds.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/bootstrap/deploy/messaging/jms-ds.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- jms-ds.xml	15 Jun 2007 05:20:58 -0000	1.1
  +++ jms-ds.xml	12 Nov 2007 21:06:10 -0000	1.2
  @@ -20,12 +20,14 @@
         <attribute name="TopicFactoryRef">java:/XAConnectionFactory</attribute>
      </mbean>
   
  +<!--
      <mbean code="org.jboss.jms.asf.ServerSessionPoolLoader"
             name="jboss.messaging:service=ServerSessionPoolMBean,name=StdJMSPool">
         <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
         <attribute name="PoolName">StdJMSPool</attribute>
         <attribute name="PoolFactoryClass">org.jboss.jms.asf.StdServerSessionPoolFactory</attribute>
      </mbean>
  +-->
   
      <!-- JMS XA Resource adapter, use this to get transacted JMS in beans -->
      <tx-connection-factory>