[jboss-cvs] JBoss Messaging SVN: r2332 - trunk/util.

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

Author: ovidiu.feodorov at jboss.com
Date: 2007-02-16 00:20:45 -0500 (Fri, 16 Feb 2007)
New Revision: 2332

Modified:
   trunk/util/release-admin.xml
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-847

Modified: trunk/util/release-admin.xml
===================================================================
--- trunk/util/release-admin.xml	2007-02-16 00:19:18 UTC (rev 2331)
+++ trunk/util/release-admin.xml	2007-02-16 05:20:45 UTC (rev 2332)
@@ -496,6 +496,19 @@
       </replaceregexp>
 
       <!--
+          Some installer-generated installations (JBoss 4.0.3, JBoss 4.0.3.SP1) do not contain
+          a BindingManager declaration at all, so we need to insert it by ourselves.
+      -->
+      <loadfile property="jboss-service.xml-content"
+                srcFile="${jboss.home}/server/${config.name}/conf/jboss-service.xml"/>
+
+      <condition property="binding.manager.declared">
+         <contains string="${jboss-service.xml-content}" substring="org.jboss.services.binding.ServiceBindingManager"/>
+      </condition>
+
+      <antcall target="insert-service-binding-manager-configuration"/>
+
+      <!--
           Actually copy the file
       -->
       <copy file="${jboss.home}/docs/examples/binding-manager/sample-bindings.xml"
@@ -551,6 +564,24 @@
 
    </target>
 
+   <target name="insert-service-binding-manager-configuration" unless="binding.manager.declared">
+
+      <replaceregexp file="${jboss.home}/server/${config.name}/conf/jboss-service.xml" flags="s">
+         <regexp pattern="(\x3cmbean[ \t]*code=\x22org.jboss.logging.Log4jService\x22.*?\x3c/mbean\x3e)"/>
+         <substitution expression="\1
+&#013;&#010;&#013;&#010;
+  &lt;mbean code=&quot;org.jboss.services.binding.ServiceBindingManager&quot;&#013;&#010;
+         name=&quot;jboss.system:service=ServiceBindingManager&quot;&gt;&#013;&#010;
+     &lt;attribute name=&quot;ServerName&quot;&gt;${ports}&lt;/attribute&gt;&#013;&#010;
+     &lt;attribute name=&quot;StoreURL&quot;&gt;${jboss.server.config.url}/binding-manager.xml&lt;/attribute&gt;&#013;&#010;
+     &lt;attribute name=&quot;StoreFactoryClassName&quot;&gt;&#013;&#010;
+        org.jboss.services.binding.XMLServicesStoreFactory&#013;&#010;
+     &lt;/attribute&gt;&#013;&#010;
+  &lt;/mbean&gt;"/>
+      </replaceregexp>
+
+   </target>
+
    <macrodef name="set-config-name">
       <attribute name="base"/>
       <attribute name="suffix"/>