[jboss-svn-commits] JBL Code SVN: r25768 - in labs/jbossesb/workspace/dbevenius/jbossas5/product: tools/console/management-esb and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Mar 20 11:50:23 EDT 2009
Author: beve
Date: 2009-03-20 11:50:23 -0400 (Fri, 20 Mar 2009)
New Revision: 25768
Added:
labs/jbossesb/workspace/dbevenius/jbossas5/product/tools/console/management-esb/src/main/resources/jbossesbmanagement-service-as5.xml
Modified:
labs/jbossesb/workspace/dbevenius/jbossas5/product/install/build.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/tools/console/management-esb/build.xml
Log:
Removed consoles they don't deploy(I'm sure I had this working).
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/install/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/install/build.xml 2009-03-20 15:27:09 UTC (rev 25767)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/install/build.xml 2009-03-20 15:50:23 UTC (rev 25768)
@@ -181,6 +181,7 @@
<property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
<property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
</ant>
+
<ant dir="${product.dir}/tools/console/management-esb" target="deploy">
<property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
<property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
@@ -304,22 +305,24 @@
<!-- install h2 jar -->
<copy file="${org.jboss.esb.dist.lib}/h2-1.0.68.jar" todir="${server.lib.dir}"/>
- <!-- embedded jopr console -->
+ <!-- embedded jopr console
<ant dir="embedded-console" target="replace">
<property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
<property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
</ant>
+ -->
<ant dir="jbpm-patch" target="replace">
<property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
<property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
</ant>
- <!-- -->
+ <!--
<ant dir="${product.dir}/tools/console/management-esb" target="deploy">
<property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
<property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
</ant>
+ -->
</target>
<target name="undeploy" depends="check.deploy.props, undeploy.bindings" description="Undeploy ESB components.">
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/tools/console/management-esb/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/tools/console/management-esb/build.xml 2009-03-20 15:27:09 UTC (rev 25767)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/tools/console/management-esb/build.xml 2009-03-20 15:50:23 UTC (rev 25768)
@@ -95,11 +95,27 @@
</copy>
</target>
+ <!-- Check for JBossAS5 -->
+ <condition property="jbossas5">
+ <available file="${server.dir}/deployers"/>
+ </condition>
+
+ <!-- Check for JBossAS4.x -->
+ <condition property="jbossas4">
+ <not>
+ <available file="${server.dir}/deployers"/>
+ </not>
+ </condition>
+
<target name="esb" depends="initialise-messaging,messaging-dependencies,jbossmq-dependencies,build-war,copy-metainf"
description="Build the management ESB">
<mkdir dir="${mgmt.esb.dir}/build"/>
<mkdir dir="${mgmt.esb.dir}/build/META-INF"/>
+ <ant target="copy-management-servicexml-as4"/>
+ <ant target="copy-management-servicexml-as5"/>
+
+ <!--
<copy file="${mgmt.esb.dir}/src/main/resources/jbossesbmanagement-service.xml"
todir="${mgmt.esb.dir}/build"
overwrite="true">
@@ -110,6 +126,7 @@
<filter token="pollMinuteFrequency" value="${pollMinuteFrequency}"/>
</filterset>
</copy>
+ -->
<jar destfile="${mgmt.esb.dir}/build/management.esb">
<fileset dir="${mgmt.esb.dir}">
@@ -133,6 +150,32 @@
</jar>
</target>
+ <target name="copy-management-servicexml-as4" if="jbossas4">
+ <copy file="${mgmt.esb.dir}/src/main/resources/jbossesbmanagement-service.xml"
+ todir="${mgmt.esb.dir}/build"
+ overwrite="true">
+ <filterset>
+ <filter token="database.depends" value="${database.depends}"/>
+ <filter token="db.datasource" value="${db.datasource}"/>
+ <filter token="connection.datasource" value="${connection.datasource}"/>
+ <filter token="pollMinuteFrequency" value="${pollMinuteFrequency}"/>
+ </filterset>
+ </copy>
+ </target>
+
+ <target name="copy-management-servicexml-as5" if="jbossas5">
+ <copy file="${mgmt.esb.dir}/src/main/resources/jbossesbmanagement-service-as5.xml"
+ todir="${mgmt.esb.dir}/build"
+ overwrite="true">
+ <filterset>
+ <filter token="database.depends" value="${database.depends}"/>
+ <filter token="db.datasource" value="${db.datasource}"/>
+ <filter token="connection.datasource" value="${connection.datasource}"/>
+ <filter token="pollMinuteFrequency" value="${pollMinuteFrequency}"/>
+ </filterset>
+ </copy>
+ </target>
+
<target name="copy-datasource" if="management.ds.available" depends="initialise-config">
<filter token="db.username" value="${db.username}"/>
<filter token="db.password" value="${db.password}"/>
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/tools/console/management-esb/src/main/resources/jbossesbmanagement-service-as5.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/tools/console/management-esb/src/main/resources/jbossesbmanagement-service-as5.xml (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/tools/console/management-esb/src/main/resources/jbossesbmanagement-service-as5.xml 2009-03-20 15:50:23 UTC (rev 25768)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+ <classpath codebase="deploy" archives="management.esb"/>
+
+ <mbean code="org.jboss.soa.esb.monitoring.server.DataFilerScheduler"
+ name="jboss.esb:service=DataFilerScheduler">
+ <attribute name="PollMinuteFrequency">@pollMinuteFrequency@</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
+ name="jboss.esb:service=ManagementDatabaseInitializer">
+ <attribute name="Datasource">@connection.datasource@</attribute>
+ <attribute name="ExistsSql">select * from JMXDATA</attribute>
+ <attribute name="SqlFiles">
+ create_database.sql,
+ insert_rows.sql
+ </attribute>
+ <depends>jboss.jca:service=DataSourceBinding,name=ManagementDS</depends>
+ @database.depends@
+ </mbean>
+</server>
More information about the jboss-svn-commits
mailing list