[jboss-svn-commits] JBL Code SVN: r27058 - in labs/jbossesb/workspace/dbevenius/jbossas5/product: install and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Jun 20 12:44:05 EDT 2009
Author: beve
Date: 2009-06-20 12:44:05 -0400 (Sat, 20 Jun 2009)
New Revision: 27058
Modified:
labs/jbossesb/workspace/dbevenius/jbossas5/product/build-distr.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/build.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/esb-config.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/install/build.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/tools/console/management-web/web.xml
Log:
Modified the build. Now using the properties files instead of setting an env variable on the command line.
Also added a delay after stopping the server. This is because there is a delay upon shutdown of JBM with AS5.
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/build-distr.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/build-distr.xml 2009-06-19 22:06:27 UTC (rev 27057)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/build-distr.xml 2009-06-20 16:44:05 UTC (rev 27058)
@@ -7,57 +7,48 @@
<!-- Load Build Properties File -->
<property file="${org.jboss.esb.properties}"/>
- <property name="build.dir" value="${basedir}/build"/>
- <property name="lib.dir" value="${basedir}/build/lib"/>
- <property name="aoplib.dir" value="${basedir}/build/aoplib"/>
- <property name="lib.ext.dir" value="${basedir}/lib/ext"/>
- <property name="services.dir" value="${basedir}/services"/>
+ <property name="build.dir" value="build"/>
+ <property name="lib.dir" value="build/lib"/>
+ <property name="aoplib.dir" value="build/aoplib"/>
+ <property name="lib.ext.dir" value="lib/ext"/>
+ <property name="services.dir" value="services"/>
<property name="build.lib.dir" value="${build.dir}/jbossesb/lib"/>
<property name="version" value="4.2.MR1"/>
- <property name="installation.files.dir" value="${basedir}/install"/>
+ <property name="esbserver.dist.dir" value="${build.dir}/jbossesb-server-${version}"/>
+ <property name="installation.files.dir" value="install"/>
- <condition property="skip.unzip" value="true">
- <available file="${esb.server.home}"/>
+ <condition property="skip.server.unzip" value="true">
+ <available file="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deployers"/>
</condition>
-
- <condition property="skip.server.esb" value="true">
- <equals arg1="${skip.unzip}" arg2="true"/>
- </condition>
- <echo message="skip.server.esb ${skip.server.esb}"/>
- <condition property="esbserver.dist.dir" value="${esb.server.home}" else="${build.dir}/jbossesb-server-${version}">
- <available file="${esb.server.home}"/>
- </condition>
-
-
<target name="dist" depends="server.dist, copy.esbserver.files" />
- <target name="copy.esbserver.files">
- <copy todir="${esbserver.dist.dir}/docs" failonerror="false">
+ <target name="copy.esbserver.files" unless="skip.server.esb">
+ <copy todir="${org.jboss.esb.server.home}/docs" failonerror="false">
<fileset dir="${build.dir}/jbossesb/docs">
<include name="**/*"/>
</fileset>
</copy>
- <copy todir="${esbserver.dist.dir}" failonerror="false">
+ <copy todir="${org.jboss.esb.server.home}" failonerror="false">
<fileset dir="${build.dir}/jbossesb">
<include name="javadocs/**/*"/>
</fileset>
</copy>
- <copy todir="${esbserver.dist.dir}" failonerror="false">
+ <copy todir="${org.jboss.esb.server.home}" failonerror="false">
<fileset dir="${build.dir}/jbossesb">
<include name="samples/**/*"/>
</fileset>
</copy>
- <copy todir="${esbserver.dist.dir}" failonerror="false">
+ <copy todir="${org.jboss.esb.server.home}" failonerror="false">
<fileset dir="${build.dir}/jbossesb">
<include name="tools/**/*"/>
</fileset>
</copy>
- <copy todir="${esbserver.dist.dir}/docs/schema">
+ <copy todir="${org.jboss.esb.server.home}/docs/schema">
<fileset dir="${build.dir}/jbossesb/xml/"
- includes="jbossesb-1.0.1.xsd jbossesb-1.1.0.xsd"/>
+ includes="jbossesb-1.0.1.xsd jbossesb-1.1.0.xsd jbossesb-1.2.0.xsd"/>
</copy>
- <copy todir="${esbserver.dist.dir}">
+ <copy todir="${org.jboss.esb.server.home}">
<fileset dir="${build.dir}/jbossesb">
<include name="*.txt"/>
</fileset>
@@ -68,15 +59,16 @@
<ant antfile="build.xml" dir="ftp"/>
</target>
- <target name="server.dist" depends="build.sar, unpack.server.zip, ftp-server">
+ <target name="server.dist" depends="build.sar, unpack.server.zip, ftp-server" unless="skip.server.esb">
<ant antfile="build.xml" dir="${esb.install.location}" target="deploy"
inheritall="false">
- <property name="org.jboss.esb.server.home" value="${esbserver.dist.dir}"/>
+ <!--property name="org.jboss.esb.server.home" value="${esbserver.dist.dir}"/-->
+ <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
<property name="org.jboss.esb.server.config" value="default"/>
</ant>
</target>
- <target name="unpack.server.zip" unless="skip.server.esb">
+ <target name="unpack.server.zip" unless="skip.server.unzip">
<delete dir="${esbserver.dist.dir}"/>
<unzip src="${installation.files.dir}/standalone/jbossesb-server-base.zip" dest="${build.dir}"/>
<chmod dir="${build.dir}/jbossesb-server/bin" perm="ugo+rx" includes="*.sh"/>
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/build.xml 2009-06-19 22:06:27 UTC (rev 27057)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/build.xml 2009-06-20 16:44:05 UTC (rev 27058)
@@ -33,43 +33,13 @@
<property name="org.jboss.esb.product.properties" value="jbossesb-properties.xml"/>
<!-- Some default build locations -->
- <property name="org.jboss.esb.internal.dest" location="${basedir}/build"/>
- <property name="org.jboss.esb.internal.jar.dest" location="${basedir}/build/jbossesb/lib"/>
+ <property name="org.jboss.esb.internal.dest" location="build"/>
+ <property name="org.jboss.esb.internal.jar.dest" location="build/jbossesb/lib"/>
- <!--
- If esb.server.home has been set an external as server is to be used
- and thus we should skip the unzip step of the standalone server.
- -->
- <condition property="skip.unzip" value="true">
- <available file="${esb.server.home}"/>
- </condition>
-
- <condition property="org.jboss.esb.server.home" value="${esb.server.home}">
- <available file="${esb.server.home}"/>
- </condition>
-
- <!--
- We need to check skip.unzip because this build.xml calls it self using
- the runant macro. We pass along the skip.unzip property but we also
- need to check that it is true and does not contain the string "{skip.unzip}"
- which inidcates that it was not set.
- -->
- <condition property="skip.unzip" value="true">
- <or>
- <isset property="${esb.server.home}"/>
- <equals arg1="${skip.unzip}" arg2="true"/>
- </or>
- </condition>
-
- <echo message="skip.unzip : ${skip.unzip}"/>
- <echo message="esb.server.home : ${esb.server.home}"/>
-
<!-- JBoss ESB version -->
<property name="version" value="4.5.GA"/>
<property name="esb.server.name" value="jbossesb-server-${version}"/>
- <condition property="esb.server.home" value="${esb.server.home}" else="${org.jboss.esb.internal.dest}/${esb.server.name}">
- <isset property="esb.server.home"/>
- </condition>
+ <property name="esbserver.dist.dir" value="${org.jboss.esb.internal.dest}/${esb.server.name}"/>
<!-- Set internal property defaults -->
<property name="org.jboss.esb.installationdirectory" location="build/jbossesb"/>
@@ -129,9 +99,7 @@
resultproperty="@{resultproperty}">
<sysproperty key="ant.home" value="${ant.home}"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
- <sysproperty key="org.jboss.esb.properties" value="${org.jboss.esb.properties}"/>
- <sysproperty key="esb.server.home" value="${esb.server.home}"/>
- <sysproperty key="skip.unzip" value="${skip.unzip}"/>
+ <sysproperty key="org.jboss.esb.properties" value="${org.jboss.esb.properties}"/>
<arg value="-cp"/>
<arg value="${junit.jar}"/>
<arg value="-f"/>
@@ -179,7 +147,7 @@
<ant dir="rosetta"/>
</target>
- <target name="dependencies.get" unless="skip.resolve">
+ <target name="dependencies.get">
<ant antfile="ivy-build.xml" />
</target>
@@ -559,21 +527,21 @@
</target>
<target name="start-server" depends="esb.setup-server">
- <start-server serverHome="${esb.server.home}"
+ <start-server serverHome="${org.jboss.esb.server.home}"
serverConfig="${org.jboss.esb.test.server.config}"/>
<wait-on-server/>
</target>
<target name="stop-server" depends="esb.init">
- <stop-server serverHome="${esb.server.home}"/>
+ <stop-server serverHome="${org.jboss.esb.server.home}"/>
<condition property="shutDownString" value="Server exit called, exiting the JVM now!" else="[org.jboss.system.server.Server] Shutdown complete">
- <available file="${esb.server.home}/server/${org.jboss.esb.test.server.config}/deployers"/>
+ <available file="${org.jboss.esb.server.home}/server/${org.jboss.esb.test.server.config}/deployers"/>
</condition>
- <wait-on-shutdown serverHome="${esb.server.home}"
- serverConfig="${org.jboss.esb.test.server.config}"
- shutDownString="${shutDownString}"
- />
+ <wait-on-shutdown serverHome="${org.jboss.esb.server.home}"
+ serverConfig="${org.jboss.esb.test.server.config}"
+ shutDownString="${shutDownString}"
+ />
</target>
<target name="instr-report">
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/esb-config.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/esb-config.xml 2009-06-19 22:06:27 UTC (rev 27057)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/esb-config.xml 2009-06-20 16:44:05 UTC (rev 27058)
@@ -9,7 +9,7 @@
<property name="esb.ftp.server.location" location="${esb.ftp.location}/build"/>
<property name="esb.ftp.server.name" value="ftp-server.sar"/>
- <property name="agent.jvmarg" value="-Xms128m -Xmx512m -XX:PermSize=200m -XX:MaxPermSize=500m"/>
+ <property name="agent.jvmarg" value="-Xms128m -Xmx512m -XX:PermSize=200m -XX:MaxPermSize=500m"/>
<property name="org.jboss.esb.server.config" value="default"/>
<condition property="esb.ftp.config.all">
@@ -47,7 +47,7 @@
<element name="serverElements" implicit="yes" optional="true"/>
<sequential>
<echo message="Starting local ESB server: @{serverHome}/server/@{serverConfig}"/>
- <echo message="java.endorsed.dirs : ${server.endorsed}"/>
+ <echo message="java.endorsed.dirs : ${server.endorsed}"/>
<java classname="org.jboss.Main" fork="true" spawn="true"
dir="@{serverHome}/bin">
<classpath refid="server.classpath"/>
@@ -62,24 +62,24 @@
</macrodef>
<macrodef name="stop-server">
- <attribute name="serverHome"/>
- <sequential>
- <echo message="Stopping local ESB server"/>
- <java classname="org.jboss.Shutdown" fork="true"
- dir="@{serverHome}/bin">
- <classpath>
- <pathelement location="@{serverHome}/bin/shutdown.jar"/>
- <pathelement location="@{serverHome}/client/jbossall-client.jar"/>
- </classpath>
- <arg value="--server"/>
- <arg value="jnp://localhost:1099"/>
- <arg value="--shutdown"/>
- </java>
- </sequential>
- </macrodef>
+ <attribute name="serverHome"/>
+ <sequential>
+ <echo message="Stopping local ESB server"/>
+ <java classname="org.jboss.Shutdown" fork="true"
+ dir="@{serverHome}/bin">
+ <classpath>
+ <pathelement location="@{serverHome}/bin/shutdown.jar"/>
+ <pathelement location="@{serverHome}/client/jbossall-client.jar"/>
+ </classpath>
+ <arg value="--server"/>
+ <arg value="jnp://localhost:1099"/>
+ <arg value="--shutdown"/>
+ </java>
+ </sequential>
+ </macrodef>
<macrodef name="wait-on-server">
- <attribute name="seconds" default="180"/>
+ <attribute name="seconds" default="120"/>
<sequential>
<echo message="Waiting for ESB server to start..."/>
<waitfor maxwait="@{seconds}" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout">
@@ -90,8 +90,8 @@
</macrodef>
<macrodef name="wait-on-shutdown">
- <attribute name="serverHome"/>
- <attribute name="serverConfig"/>
+ <attribute name="serverHome"/>
+ <attribute name="serverConfig"/>
<attribute name="seconds" default="120"/>
<attribute name="shutDownString" default="[org.jboss.system.server.Server] Shutdown complete"/>
<sequential>
@@ -100,16 +100,25 @@
</tstamp>
<echo message="${shutdown.time}: waiting for ESB server to stop, checking file @{serverHome}/server/@{serverConfig}/log/server.log ..."/>
<waitfor maxwait="@{seconds}" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="shutdown.timeout">
- <isfileselected file="@{serverHome}/server/@{serverConfig}/log/server.log">
+ <isfileselected file="@{serverHome}/server/@{serverConfig}/log/server.log">
<contains text="@{shutDownString}"/>
- </isfileselected>
- </waitfor>
- <fail message="Timeout waiting for ESB server to shutdown." if="shutdown.timeout"/>
- </sequential>
- </macrodef>
+ </isfileselected>
+ </waitfor>
+ <fail message="Timeout waiting for ESB server to shutdown." if="shutdown.timeout"/>
+ <echo message="extra wait for messaging"/>
+ <!-- When AS5 is the appserver JBM can block on a receive which will timeout but this will also delay the shutdown of the server
+ which is the reason for this additional delay
+ -->
+ <waitfor maxwait="15" maxwaitunit="second">
+ <available file="bogusfile.bogus"/>
+ </waitfor>
+ </sequential>
+ </macrodef>
<!-- Configuring an app server installation -->
<target name="esb.init-app-server" if="org.jboss.esb.server.home">
+ <echo message="Using set org.jboss.esb.server.home : ${org.jboss.esb.server.home}"/>
+ <echo message="Using set org.jboss.esb.server.config : ${org.jboss.esb.server.config}"/>
<property name="org.jboss.esb.test.server.config" value="test-esb"/>
<condition property="esb.server.config.nameclash">
<and>
@@ -132,7 +141,6 @@
<condition property="org.jboss.soa.esb.qa.jmsprovider" value="jbm">
<available file="${esb.server.deploy.dir}/jboss-messaging.sar"/>
</condition>
- <echo message="${esb.server.deploy.dir}"/>
<condition property="org.jboss.soa.esb.qa.jmsprovider" value="jbm">
<available file="${esb.server.deploy.dir}/messaging"/>
</condition>
@@ -208,19 +216,7 @@
<pathelement location="${org.jboss.esb.server.home}/bin/run.jar"/>
</path>
<property name="server.endorsed" location="${org.jboss.esb.server.home}/lib/endorsed"/>
- <antcall target="copy-ws-libs-to-endorsed"/>
</target>
-
- <target name="copy-ws-libs-to-endorsed" if="jbossas5">
- <copy todir="${server.endorsed}">
- <fileset dir="${org.jboss.esb.server.home}/common/lib">
- <include name="jbossws-native-jaxws.jar"/>
- <include name="jbossws-native-jaxws-ext.jar"/>
- <include name="jbossws-native-jaxrpc.jar"/>
- <include name="jbossws-native-saaj.jar"/>
- </fileset>
- </copy>
- </target>
<target name="esb.configure" depends="esb.init, esb.configure-app-server, esb.configure-esb-server, esb.configure-ftp-server"/>
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/install/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/install/build.xml 2009-06-19 22:06:27 UTC (rev 27057)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/install/build.xml 2009-06-20 16:44:05 UTC (rev 27058)
@@ -7,8 +7,6 @@
<!-- Load Build Properties File -->
<property file="${org.jboss.esb.deployment.properties}"/>
-
-
<property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
<property name="client.dir" value="${org.jboss.esb.server.home}/client"/>
<property name="conf.dir" value="${server.dir}/conf"/>
@@ -38,14 +36,12 @@
<condition property="jbossas5">
<available file="${server.dir}/deployers"/>
</condition>
-
- <!-- Check for JBossAS4.x -->
+ <!-- Check for JBossAS4.x -->
<condition property="jbossas4">
<not>
<available file="${server.dir}/deployers"/>
</not>
</condition>
-
<fail unless="hierarchy.recognised" message="Cannot determine build hierarchy"/>
@@ -75,13 +71,15 @@
<target name="tomcat" depends="check.tomcat.props, dependencies, tomcat.compile, tomcat.war.all.deploy" description="Wrapper for tomcat.war.all.deploy"/>
<target name="jms.config.check">
+ <echo message="deploy.dir : ${deploy.dir}"/>
<available property="jbm.present"
file="${deploy.dir}/jboss-messaging"/>
<available property="jbm.present"
file="${deploy.dir}/jboss-messaging.sar"/>
- <available property="jbmq.present"
+ <available property="jbm.present"
+ file="${deploy.dir}/messaging"/>
+ <available property="jbm.present"
file="${deploy.dir}/jms/jbossmq-service.xml"/>
- <available property="jbm.present" file="${deploy.dir}/messaging"/>
<available property="jbmq.present"
file="${hadeploy.dir}/jms/jbossmq-service.xml"/>
<fail message="Could not determine JMS provider">
@@ -117,248 +115,245 @@
<fail unless="esb.server.configured" message="Cannot determine target deployment, please check deployment.properties"/>
</target>
- <target name="internal.deploy" if="jbossas4" depends="check.deploy.props, dependencies, jms.config" description="Deploys Internal Services to the server">
-
- <!-- jbossesb.sar -->
- <copy todir="${deploy.dir}/jbossesb.sar">
- <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.sar"/>
- </copy>
+ <target name="internal.deploy" if="jbossas4" depends="check.deploy.props, dependencies, jms.config" description="Deploys Internal Services to the server">
+
+ <!-- jbossesb.sar -->
+ <copy todir="${deploy.dir}/jbossesb.sar">
+ <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.sar"/>
+ </copy>
- <!-- jbossesb.esb -->
- <copy todir="${deploy.dir}/jbossesb.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.esb" excludes="${messaging.excludes}"/>
- </copy>
+ <!-- jbossesb.esb -->
+ <copy todir="${deploy.dir}/jbossesb.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.esb" excludes="${messaging.excludes}"/>
+ </copy>
- <!-- jbpm.esb -->
- <copy todir="${deploy.dir}/jbpm.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/jbpm.esb" excludes="${messaging.excludes}"/>
- </copy>
+ <!-- jbpm.esb -->
+ <copy todir="${deploy.dir}/jbpm.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/jbpm.esb" excludes="${messaging.excludes}"/>
+ </copy>
- <!-- jbrules.esb -->
- <copy todir="${deploy.dir}/jbrules.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/jbrules.esb" excludes="${messaging.excludes}"/>
- </copy>
+ <!-- jbrules.esb -->
+ <copy todir="${deploy.dir}/jbrules.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/jbrules.esb" excludes="${messaging.excludes}"/>
+ </copy>
- <!-- smooks.esb -->
- <copy todir="${deploy.dir}/smooks.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/smooks.esb" excludes="${messaging.excludes}"/>
- </copy>
+ <!-- smooks.esb -->
+ <copy todir="${deploy.dir}/smooks.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/smooks.esb" excludes="${messaging.excludes}"/>
+ </copy>
- <!-- spring.esb -->
- <copy todir="${deploy.dir}/spring.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/spring.esb" excludes="${messaging.excludes}"/>
- </copy>
+ <!-- spring.esb -->
+ <copy todir="${deploy.dir}/spring.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/spring.esb" excludes="${messaging.excludes}"/>
+ </copy>
- <!-- soap.esb -->
- <copy todir="${deploy.dir}/soap.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/soap.esb" excludes="${messaging.excludes}, META-INF/jboss-structure.xml"/>
- <fileset dir="${client.dir}" includes="jboss-jaxws.jar jaxb-api.jar jaxb-impl.jar"/>
- </copy>
-
- <!-- slsb.esb -->
- <copy todir="${deploy.dir}/slsb.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/slsb.esb" excludes="${messaging.excludes}"/>
- </copy>
+ <!-- soap.esb -->
+ <copy todir="${deploy.dir}/soap.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/soap.esb" excludes="${messaging.excludes}, META-INF/jboss-structure.xml"/>
+ <fileset dir="${client.dir}" includes="jboss-jaxws.jar jaxb-api.jar jaxb-impl.jar"/>
+ </copy>
+
+ <!-- slsb.esb -->
+ <copy todir="${deploy.dir}/slsb.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/slsb.esb" excludes="${messaging.excludes}"/>
+ </copy>
- <!-- soapui-client.sar -->
- <copy todir="${deploy.dir}/soapui-client.sar">
- <fileset dir="${org.jboss.esb.dist.lib}/soapui-client.sar" excludes="${messaging.excludes}, META-INF/jboss-service-as5.xml"/>
- </copy>
+ <!-- soapui-client.sar -->
+ <copy todir="${deploy.dir}/soapui-client.sar">
+ <fileset dir="${org.jboss.esb.dist.lib}/soapui-client.sar" excludes="${messaging.excludes}, META-INF/jboss-service-as5.xml"/>
+ </copy>
- <!-- contracts app -->
- <copy file="${org.jboss.esb.dist}/tools/console/console/jboss-esb-console.ear/contract.war" todir="${deploy.dir}" />
+ <!-- contracts app -->
+ <copy file="${org.jboss.esb.dist}/tools/console/console/jboss-esb-console.ear/contract.war" todir="${deploy.dir}" />
- <!-- install h2 jar -->
- <copy file="${org.jboss.esb.dist.lib}/h2-1.0.68.jar" todir="${server.lib.dir}"/>
+ <!-- install h2 jar -->
+ <copy file="${org.jboss.esb.dist.lib}/h2-1.0.68.jar" todir="${server.lib.dir}"/>
- <!-- 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>
+ <!-- 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>
+ <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>
<target name="internal.deploy.jbossas5" if="jbossas5" depends="check.deploy.props, dependencies, jms.config" description="Deploys Internal Services to the JBossAS5">
- <echo message="Deploy to JBossAS5"/>
-
- <!-- jbossesb deployer -->
- <property name="deployers.dir" value="${server.dir}/deployers"/>
- <mkdir dir="${deployers.dir}/esb.deployer"/>
-
- <copy todir="${deployers.dir}/esb.deployer/lib" overwrite="true">
- <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.sar/lib">
- <include name="jbossesb-rosetta.jar"/>
- <include name="jbossesb-config-model-1.0.1.jar"/>
- <include name="jbossesb-config-model-1.1.0.jar"/>
- <include name="commons-lang-2.1.jar"/>
- <include name="commons-net-2.0.0-652071.jar"/>
- <include name="commons-ssl-0.3.4.jar"/>
- <include name="commons-io-1.3.jar"/>
- <include name="groovy-all-1.5.0.jar"/>
- <include name="jbossts-common.jar"/>
- <include name="jsch-0.1.38.jar"/>
- <include name="juddi-2.0rc5.aop.jar"/>
- <include name="juddi-client-2.0rc5.jar"/>
- <include name="mina-core-1.1.7.jar"/>
- <include name="mina-filter-ssl-1.1.7.jar"/>
- <include name="mvel-1.3.3-java1.5.jar"/>
- <include name="scout-1.0rc2.aop.jar"/>
- <include name="slf4j-api-1.4.3.jar"/>
- <include name="slf4j-log4j12-1.4.3.jar"/>
- <include name="stax-api-1.0.1.jar"/>
- <include name="wstx-asl-3.2.0.jar"/>
- <include name="xbean-2.2.0.jar"/>
- <include name="xstream-1.2.2.jar"/>
- <include name="xmlunit-1.2.jar"/>
- </fileset>
- <fileset dir="${org.jboss.esb.dist.lib}">
- <include name="commons-codec-1.3.jar"/>
- </fileset>
- </copy>
-
- <copy todir="${deployers.dir}/esb.deployer/META-INF" overwrite="true">
- <fileset dir="${basedir}">
- <include name="esb-deployers-jboss-beans.xml"/>
- <include name="jboss-structure.xml"/>
- </fileset>
- </copy>
-
- <copy todir="${deployers.dir}/esb.deployer" overwrite="true">
- <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.sar">
- <include name="actionArtifactMap.properties"/>
- <include name="esb.juddi.xml"/>
- <include name="jbossesb-properties.xml"/>
- <include name="privateKeyStore"/>
- <include name="publicKeyStore"/>
- </fileset>
- </copy>
-
- <!-- jbossesb.sar -->
- <copy todir="${deploy.dir}/jbossesb.sar" includeemptydirs="false" overwrite="true">
- <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.sar">
- <exclude name="lib/jbossesb-rosetta.jar"/>
- <exclude name="lib/jbossesb-config-model-1.0.1.jar"/>
- <exclude name="lib/jbossesb-config-model-1.1.0.jar"/>
- <exclude name="lib/commons-lang-2.1.jar"/>
- <exclude name="lib/commons-net-2.0.0-652071.jar"/>
- <exclude name="lib/commons-ssl-0.3.4.jar"/>
- <exclude name="lib/commons-io-1.3.jar"/>
- <exclude name="lib/groovy-all-1.5.0.jar"/>
- <exclude name="lib/jbossts-common.jar"/>
- <exclude name="lib/jsch-0.1.38.jar"/>
- <exclude name="lib/juddi-2.0rc5.aop.jar"/>
- <exclude name="lib/juddi-client-2.0rc5.jar"/>
- <exclude name="lib/mina-core-1.1.7.jar"/>
- <exclude name="lib/mina-filter-ssl-1.1.7.jar"/>
- <exclude name="lib/mvel-1.3.3-java1.5.jar"/>
- <exclude name="lib/scout-1.0rc2.aop.jar"/>
- <exclude name="lib/slf4j-api-1.4.3.jar"/>
- <exclude name="lib/slf4j-log4j12-1.4.3.jar"/>
- <exclude name="lib/stax-api-1.0.1.jar"/>
- <exclude name="lib/wstx-asl-3.2.0.jar"/>
- <exclude name="lib/xbean-2.2.0.jar"/>
- <exclude name="lib/xstream-1.2.2.jar"/>
- <exclude name="META-INF/jboss-service.xml"/>
- <exclude name="actionArtifactMap.properties"/>
- <exclude name="esb.juddi.xml"/>
- <exclude name="jbossesb-properties.xml"/>
- <exclude name="privateKeyStore"/>
- <exclude name="publicKeyStore"/>
- </fileset>
- </copy>
- <copy tofile="${deploy.dir}/jbossesb.sar/META-INF/jboss-service.xml" file="${basedir}/jboss-service-jbossas5.xml" overwrite="true"/>
+ <echo message="Deploy to JBossAS5"/>
+
+ <!-- jbossesb deployer -->
+ <property name="deployers.dir" value="${server.dir}/deployers"/>
+ <mkdir dir="${deployers.dir}/esb.deployer"/>
+
+ <copy todir="${deployers.dir}/esb.deployer/lib" overwrite="true">
+ <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.sar/lib">
+ <include name="jbossesb-rosetta.jar"/>
+ <include name="jbossesb-config-model-1.0.1.jar"/>
+ <include name="jbossesb-config-model-1.1.0.jar"/>
+ <include name="commons-lang-2.1.jar"/>
+ <include name="commons-net-2.0.0-652071.jar"/>
+ <include name="commons-ssl-0.3.4.jar"/>
+ <include name="commons-io-1.3.jar"/>
+ <include name="groovy-all-1.5.0.jar"/>
+ <include name="jbossts-common.jar"/>
+ <include name="jsch-0.1.38.jar"/>
+ <include name="juddi-2.0rc5.aop.jar"/>
+ <include name="juddi-client-2.0rc5.jar"/>
+ <include name="mina-core-1.1.7.jar"/>
+ <include name="mina-filter-ssl-1.1.7.jar"/>
+ <include name="mvel-1.3.3-java1.5.jar"/>
+ <include name="scout-1.0rc2.aop.jar"/>
+ <include name="slf4j-api-1.4.3.jar"/>
+ <include name="slf4j-log4j12-1.4.3.jar"/>
+ <include name="stax-api-1.0.1.jar"/>
+ <include name="wstx-asl-3.2.0.jar"/>
+ <include name="xbean-2.2.0.jar"/>
+ <include name="xstream-1.2.2.jar"/>
+ <include name="xmlunit-1.2.jar"/>
+ </fileset>
+ <fileset dir="${org.jboss.esb.dist.lib}">
+ <include name="commons-codec-1.3.jar"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${deployers.dir}/esb.deployer/META-INF" overwrite="true">
+ <fileset dir="${basedir}">
+ <include name="esb-deployers-jboss-beans.xml"/>
+ <include name="jboss-structure.xml"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${deployers.dir}/esb.deployer" overwrite="true">
+ <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.sar">
+ <include name="actionArtifactMap.properties"/>
+ <include name="esb.juddi.xml"/>
+ <include name="jbossesb-properties.xml"/>
+ <include name="privateKeyStore"/>
+ <include name="publicKeyStore"/>
+ </fileset>
+ </copy>
+
+ <!-- jbossesb.sar -->
+ <copy todir="${deploy.dir}/jbossesb.sar" includeemptydirs="false" overwrite="true">
+ <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.sar">
+ <exclude name="lib/jbossesb-rosetta.jar"/>
+ <exclude name="lib/jbossesb-config-model-1.0.1.jar"/>
+ <exclude name="lib/jbossesb-config-model-1.1.0.jar"/>
+ <exclude name="lib/commons-lang-2.1.jar"/>
+ <exclude name="lib/commons-net-2.0.0-652071.jar"/>
+ <exclude name="lib/commons-ssl-0.3.4.jar"/>
+ <exclude name="lib/commons-io-1.3.jar"/>
+ <exclude name="lib/groovy-all-1.5.0.jar"/>
+ <exclude name="lib/jbossts-common.jar"/>
+ <exclude name="lib/jsch-0.1.38.jar"/>
+ <exclude name="lib/juddi-2.0rc5.aop.jar"/>
+ <exclude name="lib/juddi-client-2.0rc5.jar"/>
+ <exclude name="lib/mina-core-1.1.7.jar"/>
+ <exclude name="lib/mina-filter-ssl-1.1.7.jar"/>
+ <exclude name="lib/mvel-1.3.3-java1.5.jar"/>
+ <exclude name="lib/scout-1.0rc2.aop.jar"/>
+ <exclude name="lib/slf4j-api-1.4.3.jar"/>
+ <exclude name="lib/slf4j-log4j12-1.4.3.jar"/>
+ <exclude name="lib/stax-api-1.0.1.jar"/>
+ <exclude name="lib/wstx-asl-3.2.0.jar"/>
+ <exclude name="lib/xbean-2.2.0.jar"/>
+ <exclude name="lib/xstream-1.2.2.jar"/>
+ <exclude name="META-INF/jboss-service.xml"/>
+ <exclude name="actionArtifactMap.properties"/>
+ <exclude name="esb.juddi.xml"/>
+ <exclude name="jbossesb-properties.xml"/>
+ <exclude name="privateKeyStore"/>
+ <exclude name="publicKeyStore"/>
+ </fileset>
+ </copy>
+ <copy tofile="${deploy.dir}/jbossesb.sar/META-INF/jboss-service.xml" file="${basedir}/jboss-service-jbossas5.xml" overwrite="true"/>
- <!-- jbossesb.esb -->
- <copy todir="${deploy.dir}/jbossesb.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.esb" excludes="${messaging.excludes}"/>
- </copy>
+ <!-- jbossesb.esb -->
+ <copy todir="${deploy.dir}/jbossesb.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.esb" excludes="${messaging.excludes}"/>
+ </copy>
- <!-- jbpm.esb -->
- <copy todir="${deploy.dir}/jbpm.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/jbpm.esb" excludes="${messaging.excludes}"/>
- </copy>
-
- <!-- jbrules.esb -->
- <copy todir="${deploy.dir}/jbrules.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/jbrules.esb" excludes="${messaging.excludes}"/>
- </copy>
+ <!-- jbpm.esb -->
+ <copy todir="${deploy.dir}/jbpm.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/jbpm.esb" excludes="${messaging.excludes}"/>
+ </copy>
+
+ <!-- jbrules.esb -->
+ <copy todir="${deploy.dir}/jbrules.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/jbrules.esb" excludes="${messaging.excludes}"/>
+ </copy>
- <!-- smooks.esb -->
- <copy todir="${deploy.dir}/smooks.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/smooks.esb" excludes="${messaging.excludes}"/>
- </copy>
-
- <!-- spring.esb -->
- <copy todir="${deploy.dir}/spring.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/spring.esb" excludes="${messaging.excludes}"/>
- </copy>
+ <!-- smooks.esb -->
+ <copy todir="${deploy.dir}/smooks.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/smooks.esb" excludes="${messaging.excludes}"/>
+ </copy>
+
+ <!-- spring.esb -->
+ <copy todir="${deploy.dir}/spring.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/spring.esb" excludes="${messaging.excludes}"/>
+ </copy>
- <!-- soap.esb -->
- <copy todir="${deploy.dir}/soap.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/soap.esb" excludes="${messaging.excludes}"/>
- <fileset dir="${client.dir}" includes="jboss-jaxws.jar jaxb-api.jar jaxb-impl.jar"/>
- </copy>
-
- <!-- slsb.esb -->
- <copy todir="${deploy.dir}/slsb.esb">
- <fileset dir="${org.jboss.esb.dist.lib}/slsb.esb" excludes="${messaging.excludes}"/>
- </copy>
-
- <!-- soapui-client.sar -->
- <copy todir="${deploy.dir}/soapui-client.sar">
- <fileset dir="${org.jboss.esb.dist.lib}/soapui-client.sar" excludes="${messaging.excludes} META-INF/jboss-service-as5.xml"/>
- </copy>
- <copy tofile="${deploy.dir}/soapui-client.sar/META-INF/jboss-service.xml" file="${org.jboss.esb.dist.lib}/soapui-client.sar/META-INF/jboss-service-as5.xml" overwrite="true"/>
+ <!-- soap.esb -->
+ <copy todir="${deploy.dir}/soap.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/soap.esb" excludes="${messaging.excludes}"/>
+ <fileset dir="${client.dir}" includes="jboss-jaxws.jar jaxb-api.jar jaxb-impl.jar"/>
+ </copy>
+
+ <!-- slsb.esb -->
+ <copy todir="${deploy.dir}/slsb.esb">
+ <fileset dir="${org.jboss.esb.dist.lib}/slsb.esb" excludes="${messaging.excludes}"/>
+ </copy>
+
+ <!-- soapui-client.sar -->
+ <copy todir="${deploy.dir}/soapui-client.sar">
+ <fileset dir="${org.jboss.esb.dist.lib}/soapui-client.sar" excludes="${messaging.excludes} META-INF/jboss-service-as5.xml"/>
+ </copy>
+ <copy tofile="${deploy.dir}/soapui-client.sar/META-INF/jboss-service.xml" file="${org.jboss.esb.dist.lib}/soapui-client.sar/META-INF/jboss-service-as5.xml" overwrite="true"/>
- <!-- contracts app -->
- <copy file="${org.jboss.esb.dist}/tools/console/console/jboss-esb-console.ear/contract.war" todir="${deploy.dir}" />
+ <!-- contracts app -->
+ <copy file="${org.jboss.esb.dist}/tools/console/console/jboss-esb-console.ear/contract.war" todir="${deploy.dir}" />
- <!-- install h2 jar -->
- <copy file="${org.jboss.esb.dist.lib}/h2-1.0.68.jar" todir="${server.lib.dir}"/>
+ <!-- install h2 jar -->
+ <copy file="${org.jboss.esb.dist.lib}/h2-1.0.68.jar" todir="${server.lib.dir}"/>
- <!-- 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>
+ <!-- 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>
-
- </target>
+ <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>
+
+ </target>
<target name="undeploy" depends="check.deploy.props, undeploy.bindings" description="Undeploy ESB components.">
- <delete dir="${deploy.dir}/jbossesb.sar" quiet="true"/>
- <delete dir="${deploy.dir}/jbossesb.esb" quiet="true"/>
- <delete dir="${deploy.dir}/jbpm.esb" quiet="true"/>
- <delete dir="${deploy.dir}/jbrules.esb" quiet="true"/>
- <delete dir="${deploy.dir}/smooks.esb" quiet="true"/>
- <delete dir="${deploy.dir}/spring.esb" quiet="true"/>
- <delete dir="${deploy.dir}/soap.esb" quiet="true"/>
- <delete dir="${deploy.dir}/soapui-client.sar" quiet="true"/>
- <delete file="${deploy.dir}/contract.war" quiet="true"/>
- <delete file="${deploy.dir}/esb-console.war"/>
- <delete file="${deploy.dir}/management.esb" quiet="true"/>
- <delete file="${conf.dir}/action-templates.xml" quiet="true"/>
- <antcall target="undeploy.jbossas5"/>
+ <delete dir="${deploy.dir}/jbossesb.sar" />
+ <delete dir="${deploy.dir}/jbossesb.esb" />
+ <delete dir="${deploy.dir}/jbpm.esb" />
+ <delete dir="${deploy.dir}/jbrules.esb" />
+ <delete dir="${deploy.dir}/smooks.esb" />
+ <delete dir="${deploy.dir}/spring.esb" />
+ <delete dir="${deploy.dir}/soap.esb" />
+ <delete dir="${deploy.dir}/soapui-client.sar" />
+ <delete dir="${deploy.dir}/contract.war" />
+ <delete dir="${conf.dir}/action-templates.xml" />
</target>
<target name="undeploy.jbossas5" if="jbossas5" >
- <delete dir="${server.dir}/deployers/esb.deployer"/>
- </target>
+ <delete dir="${server.dir}/deployers/esb.deployer"/>
+ </target>
<property name="org.jboss.esb.tomcat.55lib"
location="${org.jboss.esb.tomcat.home}/common/lib"/>
@@ -453,18 +448,18 @@
</target>
<target name="init.bindings.props" depends="check.deploy.props, dependencies">
- <condition property="bindings.dir" value="${org.jboss.esb.server.home}/docs/examples/binding-manager" else="${conf.dir}/bindingservice.beans/META-INF">
- <available file="${org.jboss.esb.server.home}/docs/examples/binding-manager"/>
- </condition>
-
- <condition property="bindings.location" value="${bindings.dir}/sample-bindings.xml" else="${bindings.dir}/bindings-jboss-beans.xml">
- <available file="${org.jboss.esb.server.home}/docs/examples/binding-manager"/>
- </condition>
+ <condition property="bindings.dir" value="${org.jboss.esb.server.home}/docs/examples/binding-manager" else="${conf.dir}/bindingservice.beans/META-INF">
+ <available file="${org.jboss.esb.server.home}/docs/examples/binding-manager"/>
+ </condition>
+
+ <condition property="bindings.location" value="${bindings.dir}/sample-bindings.xml" else="${bindings.dir}/bindings-jboss-beans.xml">
+ <available file="${org.jboss.esb.server.home}/docs/examples/binding-manager"/>
+ </condition>
- <property name="bindings.tmp.location" location="${bindings.location}.tmp"/>
- <property name="bindings.backup.location" location="${bindings.location}.bak"/>
- <available property="bindings.exist" file="${bindings.backup.location}" type="file"/>
- </target>
+ <property name="bindings.tmp.location" location="${bindings.location}.tmp"/>
+ <property name="bindings.backup.location" location="${bindings.location}.bak"/>
+ <available property="bindings.exist" file="${bindings.backup.location}" type="file"/>
+ </target>
<target name="deploy.bindings" depends="init.bindings.props" unless="bindings.exist" description="Deploys ESB Bindings into the application server">
<xslt style="bindings.xslt" in="${bindings.location}" out="${bindings.tmp.location}"/>
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/tools/console/management-web/web.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/tools/console/management-web/web.xml 2009-06-19 22:06:27 UTC (rev 27057)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/tools/console/management-web/web.xml 2009-06-20 16:44:05 UTC (rev 27058)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
+<web-app version="2.3" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
<display-name>Archetype Created Web Application</display-name>
</web-app>
More information about the jboss-svn-commits
mailing list