[Jboss-cvs] JBossAS SVN: r55993 - in trunk/varia/src/resources/services/deployment/templates: jms-queue/vm jms-topic/vm

[jboss-cvs-commits at lists.jboss.org]

Author: chilin
Date: 2006-08-16 12:16:59 -0400 (Wed, 16 Aug 2006)
New Revision: 55993

Modified:
   trunk/varia/src/resources/services/deployment/templates/jms-queue/vm/jms-queue.xml.vm
   trunk/varia/src/resources/services/deployment/templates/jms-topic/vm/jms-topic.xml.vm
Log:
Fix the vm template so a queue (or topic) can be created with the correct QueueName (or TopicName).

Modified: trunk/varia/src/resources/services/deployment/templates/jms-queue/vm/jms-queue.xml.vm
===================================================================
--- trunk/varia/src/resources/services/deployment/templates/jms-queue/vm/jms-queue.xml.vm	2006-08-16 16:04:56 UTC (rev 55992)
+++ trunk/varia/src/resources/services/deployment/templates/jms-queue/vm/jms-queue.xml.vm	2006-08-16 16:16:59 UTC (rev 55993)
@@ -10,16 +10,16 @@
 -->
 <server>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:name=$QueueName,service=Queue">
+	 name="jboss.mq.destination:name=${QueueName},service=Queue">
          
-    <depends optional-attribute-name="DestinationManager">$DestinationManager</depends>
-#if($SecurityManager)
-    <depends optional-attribute-name="SecurityManager">$SecurityManager</depends>
+    <depends optional-attribute-name="DestinationManager">${DestinationManager}</depends>
+#if(${SecurityManager})
+    <depends optional-attribute-name="SecurityManager">${SecurityManager}</depends>
 #end
-#if($SecurityRoles)
+#if(${SecurityRoles})
     <attribute name="SecurityConf">
       <security>
-#foreach($role in $SecurityRoles)      
+#foreach($role in ${SecurityRoles})      
         <role name="#firstToken($role ':')" #ifDefReplace($role "read" 'read="true"') #ifDefReplace($role "write" 'write="true"') #ifDefReplace($role "create" 'create="true"')/>
 #end        
       </security>

Modified: trunk/varia/src/resources/services/deployment/templates/jms-topic/vm/jms-topic.xml.vm
===================================================================
--- trunk/varia/src/resources/services/deployment/templates/jms-topic/vm/jms-topic.xml.vm	2006-08-16 16:04:56 UTC (rev 55992)
+++ trunk/varia/src/resources/services/deployment/templates/jms-topic/vm/jms-topic.xml.vm	2006-08-16 16:16:59 UTC (rev 55993)
@@ -10,16 +10,16 @@
 -->
 <server>
   <mbean code="org.jboss.mq.server.jmx.Topic"
-	 name="jboss.mq.destination:name=$TopicName,service=Topic">
+	 name="jboss.mq.destination:name=${TopicName},service=Topic">
          
-    <depends optional-attribute-name="DestinationManager">$DestinationManager</depends>
-#if($SecurityManager)
-    <depends optional-attribute-name="SecurityManager">$SecurityManager</depends>
+    <depends optional-attribute-name="DestinationManager">${DestinationManager}</depends>
+#if(${SecurityManager})
+    <depends optional-attribute-name="SecurityManager">${SecurityManager}</depends>
 #end
-#if($SecurityRoles)
+#if(${SecurityRoles})
     <attribute name="SecurityConf">
       <security>
-#foreach($role in $SecurityRoles)      
+#foreach($role in ${SecurityRoles})      
         <role name="#firstToken($role ':')" #ifDefReplace($role "read" 'read="true"') #ifDefReplace($role "write" 'write="true"') #ifDefReplace($role "create" 'create="true"')/>
 #end        
       </security>