Merge "Issue #2142 fix radar server logging" into development
Former-commit-id:5f12c25177[formerly90b000482e[formerly f9822d956e4d2bd473f0954560499837949b6f8e]] Former-commit-id:90b000482eFormer-commit-id:e9684f0add
This commit is contained in:
Nate Jensen
Gerrit Code Review
commit
f28b440fa8
2 changed files with 156 additions and 151 deletions
|
|
@ -22,171 +22,176 @@
|
|||
<!ENTITY substitute-targets SYSTEM "substitute.xml">
|
||||
]>
|
||||
<project name="RCMPackageBuilder" default="deploy" basedir=".">
|
||||
<!--
|
||||
This build script expects the following projects to exist at the same
|
||||
level as this project's folder. com.raytheon.rcm.lib
|
||||
com.raytheon.rcm.server com.raytheon.rcm.server.mq
|
||||
com.raytheon.rcm.tools org.itadaki.bzip2 The projects must be
|
||||
built before running this script.
|
||||
-->
|
||||
&substitute-targets;
|
||||
<!--
|
||||
This build script expects the following projects to exist at the same
|
||||
level as this project's folder. com.raytheon.rcm.lib
|
||||
com.raytheon.rcm.server com.raytheon.rcm.server.mq
|
||||
com.raytheon.rcm.tools org.itadaki.bzip2 The projects must be
|
||||
built before running this script.
|
||||
-->
|
||||
&substitute-targets;
|
||||
|
||||
<description>
|
||||
Builds a deployment of the RCM for packaging
|
||||
</description>
|
||||
<description>
|
||||
Builds a deployment of the RCM for packaging
|
||||
</description>
|
||||
|
||||
<!-- set global properties for this build -->
|
||||
<property environment="user" />
|
||||
<!-- set global properties for this build -->
|
||||
<property environment="user" />
|
||||
|
||||
<property name="src" location="src" />
|
||||
<property name="build" location="build" />
|
||||
<property name="deploy.dir" location="Deploy" />
|
||||
<property name="src" location="src" />
|
||||
<property name="build" location="build" />
|
||||
<property name="deploy.dir" location="Deploy" />
|
||||
|
||||
<property name="props.dir" location="${basedir}/properties" />
|
||||
<property file="${props.dir}/build-local.properties" />
|
||||
<property name="props.dir" location="${basedir}/properties" />
|
||||
<property file="${props.dir}/build-local.properties" />
|
||||
|
||||
<available file="${basedir}/tmp" property="tmp.ready" />
|
||||
<available file="${basedir}/tmp" property="tmp.ready" />
|
||||
|
||||
<condition property="pde.not.ready">
|
||||
<and>
|
||||
<isset property="pde.build" />
|
||||
<not>
|
||||
<isset property="tmp.ready" />
|
||||
</not>
|
||||
</and>
|
||||
</condition>
|
||||
|
||||
<!-- Set default EDEX install location for copy filter -->
|
||||
<property name="def.edex.install.dir" value="/awips" />
|
||||
<condition property="edex.home" value="$EdexBaseDir" else="${def.edex.install.dir}">
|
||||
<isset property="installer"/>
|
||||
</condition>
|
||||
|
||||
<!-- Create clean deployment -->
|
||||
<target name="deploy">
|
||||
<echo message="----------------------------------------------------------------"/>
|
||||
<echo message=" deploying RCM to ${deploy.dir}"/>
|
||||
<echo message=" PDE Build = ${pde.build}"/>
|
||||
<echo message="----------------------------------------------------------------"/>
|
||||
<antcall target="un.deploy" />
|
||||
<antcall target="re.deploy" />
|
||||
<antcall target="config.deploy" />
|
||||
</target>
|
||||
<condition property="pde.not.ready">
|
||||
<and>
|
||||
<isset property="pde.build" />
|
||||
<not>
|
||||
<isset property="tmp.ready" />
|
||||
</not>
|
||||
</and>
|
||||
</condition>
|
||||
|
||||
<!-- Set default EDEX install location for copy filter -->
|
||||
<property name="def.edex.install.dir" value="/awips" />
|
||||
<condition property="edex.home" value="$EdexBaseDir" else="${def.edex.install.dir}">
|
||||
<isset property="installer"/>
|
||||
</condition>
|
||||
|
||||
<!-- Create clean deployment -->
|
||||
<target name="deploy">
|
||||
<echo message="----------------------------------------------------------------"/>
|
||||
<echo message=" deploying RCM to ${deploy.dir}"/>
|
||||
<echo message=" PDE Build = ${pde.build}"/>
|
||||
<echo message="----------------------------------------------------------------"/>
|
||||
<antcall target="un.deploy" />
|
||||
<antcall target="re.deploy" />
|
||||
<antcall target="config.deploy" />
|
||||
</target>
|
||||
|
||||
<!--
|
||||
Deploy on top of existing deployment. Old files not removed nor is the
|
||||
configuration file changed.
|
||||
-->
|
||||
<target name="re.deploy">
|
||||
<mkdir dir="${deploy.dir}" />
|
||||
<mkdir dir="${deploy.dir}/bin" />
|
||||
<mkdir dir="${deploy.dir}/lib" />
|
||||
<mkdir dir="${deploy.dir}/data" />
|
||||
<!-- copy with filter -->
|
||||
<copy todir="${deploy.dir}" verbose="false">
|
||||
<filterset refid="installer.filter.set" />
|
||||
<fileset dir="bits">
|
||||
<include name="bin/*" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<chmod perm="a-w,a+x">
|
||||
<fileset dir="${deploy.dir}/bin">
|
||||
<include name="*" />
|
||||
</fileset>
|
||||
</chmod>
|
||||
<!--
|
||||
Deploy on top of existing deployment. Old files not removed nor is the
|
||||
configuration file changed.
|
||||
-->
|
||||
<target name="re.deploy">
|
||||
<mkdir dir="${deploy.dir}" />
|
||||
<mkdir dir="${deploy.dir}/bin" />
|
||||
<mkdir dir="${deploy.dir}/lib" />
|
||||
<mkdir dir="${deploy.dir}/data" />
|
||||
<!-- copy with filter -->
|
||||
<copy todir="${deploy.dir}" verbose="false">
|
||||
<filterset refid="installer.filter.set" />
|
||||
<fileset dir="bits">
|
||||
<include name="bin/*" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<chmod perm="a-w,a+x">
|
||||
<fileset dir="${deploy.dir}/bin">
|
||||
<include name="*" />
|
||||
</fileset>
|
||||
</chmod>
|
||||
|
||||
<!--
|
||||
Not all of these files should be made executable. Need to know all
|
||||
executable names... or all non-executables...
|
||||
-->
|
||||
<copy todir="${deploy.dir}/bin" verbose="false">
|
||||
<fileset dir="../com.raytheon.rcm.tools/src">
|
||||
<include name="*.py" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<chmod perm="a+x">
|
||||
<fileset dir="${deploy.dir}/bin">
|
||||
<include name="*.py" />
|
||||
<exclude name="stomp.py" />
|
||||
</fileset>
|
||||
</chmod>
|
||||
<chmod perm="a-w">
|
||||
<fileset dir="${deploy.dir}/bin">
|
||||
<include name="*.py" />
|
||||
</fileset>
|
||||
</chmod>
|
||||
<!--
|
||||
Not all of these files should be made executable. Need to know all
|
||||
executable names... or all non-executables...
|
||||
-->
|
||||
<copy todir="${deploy.dir}/bin" verbose="false">
|
||||
<fileset dir="../com.raytheon.rcm.tools/src">
|
||||
<include name="*.py" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<chmod perm="a+x">
|
||||
<fileset dir="${deploy.dir}/bin">
|
||||
<include name="*.py" />
|
||||
<exclude name="stomp.py" />
|
||||
</fileset>
|
||||
</chmod>
|
||||
<chmod perm="a-w">
|
||||
<fileset dir="${deploy.dir}/bin">
|
||||
<include name="*.py" />
|
||||
</fileset>
|
||||
</chmod>
|
||||
|
||||
<copy todir="${deploy.dir}/lib" flatten="true">
|
||||
<fileset dir="../org.apache.activemq" includes="**/*.jar" />
|
||||
<fileset dir="../org.apache.qpid" includes="**/*.jar" />
|
||||
<fileset dir="../org.slf4j" includes="**/*.jar" />
|
||||
<fileset dir="../org.apache.commons.beanutils" includes="**/*.jar" />
|
||||
<fileset dir="../org.apache.commons.codec" includes="**/*.jar" />
|
||||
<fileset dir="../org.apache.commons.collections" includes="**/*.jar" />
|
||||
<fileset dir="../org.apache.commons.lang" includes="**/*.jar" />
|
||||
<fileset dir="../org.apache.commons.logging" includes="**/*.jar" />
|
||||
<fileset dir="../org.apache.mina" includes="**/*.jar" />
|
||||
<fileset dir="../org.apache.log4j" includes="**/*.jar" />
|
||||
<fileset dir="../javax.jms" includes="**/*.jar" />
|
||||
<fileset dir="../org.springframework">
|
||||
<include name="**/spring-beans*.jar" />
|
||||
<include name="**/spring-context*.jar" />
|
||||
<include name="**/quartz-all*.jar" />
|
||||
</fileset>
|
||||
<fileset dir="../org.itadaki.bzip2" includes="**/*.jar" />
|
||||
</copy>
|
||||
<copy todir="${deploy.dir}/lib" flatten="true">
|
||||
<fileset dir="../../cots/org.apache.activemq" includes="**/*.jar" />
|
||||
<fileset dir="../../cots/org.apache.qpid" includes="**/*.jar" />
|
||||
<fileset dir="../../cots/org.slf4j">
|
||||
<include name="**/jcl-over-slf4j*.jar" />
|
||||
<include name="**/jul-to-slf4j*.jar" />
|
||||
<include name="**/slf4j-api*.jar" />
|
||||
</fileset>
|
||||
<fileset dir="../../cots/org.apache.commons.beanutils" includes="**/*.jar" />
|
||||
<fileset dir="../../cots/org.apache.commons.codec" includes="**/*.jar" />
|
||||
<fileset dir="../../cots/org.apache.commons.collections" includes="**/*.jar" />
|
||||
<fileset dir="../../cots/org.apache.commons.lang" includes="**/*.jar" />
|
||||
<fileset dir="../../cots/org.apache.commons.logging" includes="**/*.jar" />
|
||||
<fileset dir="../../cots/org.apache.mina" includes="**/*.jar" />
|
||||
<fileset dir="../../cots/org.apache.log4j" includes="**/*.jar" />
|
||||
<fileset dir="../../cots/javax.jms" includes="**/*.jar" />
|
||||
<fileset dir="../../cots/org.springframework">
|
||||
<include name="**/*spring*beans*.jar" />
|
||||
<include name="**/*spring*context*.jar" />
|
||||
</fileset>
|
||||
<fileset dir="../../cots/org.itadaki.bzip2" includes="**/*.jar" />
|
||||
<fileset dir="../../cots/org.quartz" includes="**/*.jar" />
|
||||
<fileset dir="lib" includes="**/*.jar" />
|
||||
</copy>
|
||||
|
||||
<delete dir="bin" />
|
||||
<mkdir dir="bin" />
|
||||
<antcall target="local.jar" />
|
||||
<antcall target="pde.jar" />
|
||||
<jar destfile="${deploy.dir}/lib/radarserver-mq.jar" basedir="bin" />
|
||||
<delete dir="bin" />
|
||||
</target>
|
||||
<delete dir="bin" />
|
||||
<mkdir dir="bin" />
|
||||
<antcall target="local.jar" />
|
||||
<antcall target="pde.jar" />
|
||||
<jar destfile="${deploy.dir}/lib/radarserver-mq.jar" basedir="bin" />
|
||||
<delete dir="bin" />
|
||||
</target>
|
||||
|
||||
<target name="local.jar" if="pde.build">
|
||||
<copy toDir="bin">
|
||||
<fileset dir="tmp/plugins/com.raytheon.rcm.lib/@dot"
|
||||
includes="**/*.class" />
|
||||
<fileset dir="tmp/plugins/com.raytheon.rcm.lib/@dot"
|
||||
includes="**/*.txt" />
|
||||
<fileset dir="tmp/plugins/com.raytheon.rcm.server/@dot"
|
||||
includes="**/*.class" />
|
||||
<fileset dir="tmp/plugins/com.raytheon.rcm.server.mq/@dot"
|
||||
includes="**/*.class" />
|
||||
<target name="local.jar" if="pde.build">
|
||||
<copy toDir="bin">
|
||||
<fileset dir="tmp/plugins/com.raytheon.rcm.lib/@dot"
|
||||
includes="**/*.class" />
|
||||
<fileset dir="tmp/plugins/com.raytheon.rcm.lib/@dot"
|
||||
includes="**/*.txt" />
|
||||
<fileset dir="tmp/plugins/com.raytheon.rcm.server/@dot"
|
||||
includes="**/*.class" />
|
||||
<fileset dir="tmp/plugins/com.raytheon.rcm.server.mq/@dot"
|
||||
includes="**/*.class" />
|
||||
<fileset dir="tmp/plugins/com.raytheon.rcm.server.mq/@dot"
|
||||
includes="**/*.txt" />
|
||||
</copy>
|
||||
</target>
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="pde.jar" unless="pde.build">
|
||||
<copy todir="bin">
|
||||
<fileset dir="../com.raytheon.rcm.lib/bin" includes="**/*.class" />
|
||||
<fileset dir="../com.raytheon.rcm.lib/bin" includes="**/*.txt" />
|
||||
<fileset dir="../com.raytheon.rcm.server/bin" includes="**/*.class" />
|
||||
<fileset dir="../com.raytheon.rcm.server.mq/bin" includes="**/*.class" />
|
||||
<target name="pde.jar" unless="pde.build">
|
||||
<copy todir="bin">
|
||||
<fileset dir="../com.raytheon.rcm.lib/bin" includes="**/*.class" />
|
||||
<fileset dir="../com.raytheon.rcm.lib/bin" includes="**/*.txt" />
|
||||
<fileset dir="../com.raytheon.rcm.server/bin" includes="**/*.class" />
|
||||
<fileset dir="../com.raytheon.rcm.server.mq/bin" includes="**/*.class" />
|
||||
<fileset dir="../com.raytheon.rcm.server.mq/bin" includes="**/*.txt" />
|
||||
</copy>
|
||||
</target>
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="config.deploy">
|
||||
<copy todir="${deploy.dir}" verbose="false">
|
||||
<filterset refid="installer.filter.set" />
|
||||
<fileset dir="cfgbits">
|
||||
<include name="**/*" />
|
||||
<exclude name="**/config.xml"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
<!-- this is required because config.xml contains an '@' in a url -->
|
||||
<copy todir="${deploy.dir}" verbose="false">
|
||||
<filterset refid="config.xml.filter.set"/>
|
||||
<fileset dir="cfgbits">
|
||||
<include name="**/config.xml"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
</target>
|
||||
<target name="config.deploy">
|
||||
<copy todir="${deploy.dir}" verbose="false">
|
||||
<filterset refid="installer.filter.set" />
|
||||
<fileset dir="cfgbits">
|
||||
<include name="**/*" />
|
||||
<exclude name="**/config.xml"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
<!-- this is required because config.xml contains an '@' in a url -->
|
||||
<copy todir="${deploy.dir}" verbose="false">
|
||||
<filterset refid="config.xml.filter.set"/>
|
||||
<fileset dir="cfgbits">
|
||||
<include name="**/config.xml"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="un.deploy">
|
||||
<delete dir="${deploy.dir}"></delete>
|
||||
</target>
|
||||
</project>
|
||||
<target name="un.deploy">
|
||||
<delete dir="${deploy.dir}"></delete>
|
||||
</target>
|
||||
</project>
|
||||
|
|
|
|||
BIN
RadarServer/build.rcm/lib/slf4j-log4j12-1.7.5.jar
Normal file
BIN
RadarServer/build.rcm/lib/slf4j-log4j12-1.7.5.jar
Normal file
Binary file not shown.
Loading…
Add table
Reference in a new issue