xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #2142 fix radar server logging" into development

Browse source 
Former-commit-id: f28b440fa8 [formerly e9684f0add] [formerly 90b000482e] [formerly f28b440fa8 [formerly e9684f0add] [formerly 90b000482e] [formerly 5f12c25177 [formerly 90b000482e [formerly f9822d956e4d2bd473f0954560499837949b6f8e]]]]
Former-commit-id: 5f12c25177
Former-commit-id: 4e52491e63 [formerly af75ff0ffb] [formerly 4c84ae155cc7d80b9af9489a4b726757d8fac8a3 [formerly 0948cc8925]]
Former-commit-id: 8ab0111a7983662937080358e1030f49fa88407d [formerly 1303acb408]
Former-commit-id: 133c793f60
This commit is contained in:
Nate Jensen 2013-07-11 16:06:49 -05:00 • committed by Gerrit Code Review
commit c67cf9e81d
2 changed files with 156 additions and 151 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

307
RadarServer/build.rcm/build.xml
View file

@ -22,171 +22,176 @@
<!ENTITY substitute-targets SYSTEM "substitute.xml"> <!ENTITY substitute-targets SYSTEM "substitute.xml">
]> ]>
<project name="RCMPackageBuilder" default="deploy" basedir="."> <project name="RCMPackageBuilder" default="deploy" basedir=".">
<!-- <!--
This build script expects the following projects to exist at the same This build script expects the following projects to exist at the same
level as this project's folder. com.raytheon.rcm.lib level as this project's folder. com.raytheon.rcm.lib
com.raytheon.rcm.server com.raytheon.rcm.server.mq com.raytheon.rcm.server com.raytheon.rcm.server.mq
com.raytheon.rcm.tools org.itadaki.bzip2 The projects must be com.raytheon.rcm.tools org.itadaki.bzip2 The projects must be
built before running this script. built before running this script.
--> -->
&substitute-targets; &substitute-targets;
<description> <description>
Builds a deployment of the RCM for packaging Builds a deployment of the RCM for packaging
</description> </description>
<!-- set global properties for this build --> <!-- set global properties for this build -->
<property environment="user" /> <property environment="user" />
<property name="src" location="src" /> <property name="src" location="src" />
<property name="build" location="build" /> <property name="build" location="build" />
<property name="deploy.dir" location="Deploy" /> <property name="deploy.dir" location="Deploy" />
<property name="props.dir" location="${basedir}/properties" /> <property name="props.dir" location="${basedir}/properties" />
<property file="${props.dir}/build-local.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"> <condition property="pde.not.ready">
<and> <and>
<isset property="pde.build" /> <isset property="pde.build" />
<not> <not>
<isset property="tmp.ready" /> <isset property="tmp.ready" />
</not> </not>
</and> </and>
</condition> </condition>
<!-- Set default EDEX install location for copy filter --> <!-- Set default EDEX install location for copy filter -->
<property name="def.edex.install.dir" value="/awips" /> <property name="def.edex.install.dir" value="/awips" />
<condition property="edex.home" value="$EdexBaseDir" else="${def.edex.install.dir}"> <condition property="edex.home" value="$EdexBaseDir" else="${def.edex.install.dir}">
<isset property="installer"/> <isset property="installer"/>
</condition> </condition>
<!-- Create clean deployment --> <!-- Create clean deployment -->
<target name="deploy"> <target name="deploy">
<echo message="----------------------------------------------------------------"/> <echo message="----------------------------------------------------------------"/>
<echo message=" deploying RCM to ${deploy.dir}"/> <echo message=" deploying RCM to ${deploy.dir}"/>
<echo message=" PDE Build = ${pde.build}"/> <echo message=" PDE Build = ${pde.build}"/>
<echo message="----------------------------------------------------------------"/> <echo message="----------------------------------------------------------------"/>
<antcall target="un.deploy" /> <antcall target="un.deploy" />
<antcall target="re.deploy" /> <antcall target="re.deploy" />
<antcall target="config.deploy" /> <antcall target="config.deploy" />
</target> </target>
<!-- <!--
Deploy on top of existing deployment. Old files not removed nor is the Deploy on top of existing deployment. Old files not removed nor is the
configuration file changed. configuration file changed.
--> -->
<target name="re.deploy"> <target name="re.deploy">
<mkdir dir="${deploy.dir}" /> <mkdir dir="${deploy.dir}" />
<mkdir dir="${deploy.dir}/bin" /> <mkdir dir="${deploy.dir}/bin" />
<mkdir dir="${deploy.dir}/lib" /> <mkdir dir="${deploy.dir}/lib" />
<mkdir dir="${deploy.dir}/data" /> <mkdir dir="${deploy.dir}/data" />
<!-- copy with filter --> <!-- copy with filter -->
<copy todir="${deploy.dir}" verbose="false"> <copy todir="${deploy.dir}" verbose="false">
<filterset refid="installer.filter.set" /> <filterset refid="installer.filter.set" />
<fileset dir="bits"> <fileset dir="bits">
<include name="bin/*" /> <include name="bin/*" />
</fileset> </fileset>
</copy> </copy>
<chmod perm="a-w,a+x"> <chmod perm="a-w,a+x">
<fileset dir="${deploy.dir}/bin"> <fileset dir="${deploy.dir}/bin">
<include name="*" /> <include name="*" />
</fileset> </fileset>
</chmod> </chmod>
<!-- <!--
Not all of these files should be made executable. Need to know all Not all of these files should be made executable. Need to know all
executable names... or all non-executables... executable names... or all non-executables...
--> -->
<copy todir="${deploy.dir}/bin" verbose="false"> <copy todir="${deploy.dir}/bin" verbose="false">
<fileset dir="../com.raytheon.rcm.tools/src"> <fileset dir="../com.raytheon.rcm.tools/src">
<include name="*.py" /> <include name="*.py" />
</fileset> </fileset>
</copy> </copy>
<chmod perm="a+x"> <chmod perm="a+x">
<fileset dir="${deploy.dir}/bin"> <fileset dir="${deploy.dir}/bin">
<include name="*.py" /> <include name="*.py" />
<exclude name="stomp.py" /> <exclude name="stomp.py" />
</fileset> </fileset>
</chmod> </chmod>
<chmod perm="a-w"> <chmod perm="a-w">
<fileset dir="${deploy.dir}/bin"> <fileset dir="${deploy.dir}/bin">
<include name="*.py" /> <include name="*.py" />
</fileset> </fileset>
</chmod> </chmod>
<copy todir="${deploy.dir}/lib" flatten="true"> <copy todir="${deploy.dir}/lib" flatten="true">
<fileset dir="../org.apache.activemq" includes="**/*.jar" /> <fileset dir="../../cots/org.apache.activemq" includes="**/*.jar" />
<fileset dir="../org.apache.qpid" includes="**/*.jar" /> <fileset dir="../../cots/org.apache.qpid" includes="**/*.jar" />
<fileset dir="../org.slf4j" includes="**/*.jar" /> <fileset dir="../../cots/org.slf4j">
<fileset dir="../org.apache.commons.beanutils" includes="**/*.jar" /> <include name="**/jcl-over-slf4j*.jar" />
<fileset dir="../org.apache.commons.codec" includes="**/*.jar" /> <include name="**/jul-to-slf4j*.jar" />
<fileset dir="../org.apache.commons.collections" includes="**/*.jar" /> <include name="**/slf4j-api*.jar" />
<fileset dir="../org.apache.commons.lang" includes="**/*.jar" /> </fileset>
<fileset dir="../org.apache.commons.logging" includes="**/*.jar" /> <fileset dir="../../cots/org.apache.commons.beanutils" includes="**/*.jar" />
<fileset dir="../org.apache.mina" includes="**/*.jar" /> <fileset dir="../../cots/org.apache.commons.codec" includes="**/*.jar" />
<fileset dir="../org.apache.log4j" includes="**/*.jar" /> <fileset dir="../../cots/org.apache.commons.collections" includes="**/*.jar" />
<fileset dir="../javax.jms" includes="**/*.jar" /> <fileset dir="../../cots/org.apache.commons.lang" includes="**/*.jar" />
<fileset dir="../org.springframework"> <fileset dir="../../cots/org.apache.commons.logging" includes="**/*.jar" />
<include name="**/spring-beans*.jar" /> <fileset dir="../../cots/org.apache.mina" includes="**/*.jar" />
<include name="**/spring-context*.jar" /> <fileset dir="../../cots/org.apache.log4j" includes="**/*.jar" />
<include name="**/quartz-all*.jar" /> <fileset dir="../../cots/javax.jms" includes="**/*.jar" />
</fileset> <fileset dir="../../cots/org.springframework">
<fileset dir="../org.itadaki.bzip2" includes="**/*.jar" /> <include name="**/*spring*beans*.jar" />
</copy> <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" /> <delete dir="bin" />
<mkdir dir="bin" /> <mkdir dir="bin" />
<antcall target="local.jar" /> <antcall target="local.jar" />
<antcall target="pde.jar" /> <antcall target="pde.jar" />
<jar destfile="${deploy.dir}/lib/radarserver-mq.jar" basedir="bin" /> <jar destfile="${deploy.dir}/lib/radarserver-mq.jar" basedir="bin" />
<delete dir="bin" /> <delete dir="bin" />
</target> </target>
<target name="local.jar" if="pde.build"> <target name="local.jar" if="pde.build">
<copy toDir="bin"> <copy toDir="bin">
<fileset dir="tmp/plugins/com.raytheon.rcm.lib/@dot" <fileset dir="tmp/plugins/com.raytheon.rcm.lib/@dot"
includes="**/*.class" /> includes="**/*.class" />
<fileset dir="tmp/plugins/com.raytheon.rcm.lib/@dot" <fileset dir="tmp/plugins/com.raytheon.rcm.lib/@dot"
includes="**/*.txt" /> includes="**/*.txt" />
<fileset dir="tmp/plugins/com.raytheon.rcm.server/@dot" <fileset dir="tmp/plugins/com.raytheon.rcm.server/@dot"
includes="**/*.class" /> includes="**/*.class" />
<fileset dir="tmp/plugins/com.raytheon.rcm.server.mq/@dot" <fileset dir="tmp/plugins/com.raytheon.rcm.server.mq/@dot"
includes="**/*.class" /> includes="**/*.class" />
<fileset dir="tmp/plugins/com.raytheon.rcm.server.mq/@dot" <fileset dir="tmp/plugins/com.raytheon.rcm.server.mq/@dot"
includes="**/*.txt" /> includes="**/*.txt" />
</copy> </copy>
</target> </target>
<target name="pde.jar" unless="pde.build"> <target name="pde.jar" unless="pde.build">
<copy todir="bin"> <copy todir="bin">
<fileset dir="../com.raytheon.rcm.lib/bin" includes="**/*.class" /> <fileset dir="../com.raytheon.rcm.lib/bin" includes="**/*.class" />
<fileset dir="../com.raytheon.rcm.lib/bin" includes="**/*.txt" /> <fileset dir="../com.raytheon.rcm.lib/bin" includes="**/*.txt" />
<fileset dir="../com.raytheon.rcm.server/bin" includes="**/*.class" /> <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="**/*.class" />
<fileset dir="../com.raytheon.rcm.server.mq/bin" includes="**/*.txt" /> <fileset dir="../com.raytheon.rcm.server.mq/bin" includes="**/*.txt" />
</copy> </copy>
</target> </target>
<target name="config.deploy"> <target name="config.deploy">
<copy todir="${deploy.dir}" verbose="false"> <copy todir="${deploy.dir}" verbose="false">
<filterset refid="installer.filter.set" /> <filterset refid="installer.filter.set" />
<fileset dir="cfgbits"> <fileset dir="cfgbits">
<include name="**/*" /> <include name="**/*" />
<exclude name="**/config.xml"/> <exclude name="**/config.xml"/>
</fileset> </fileset>
</copy> </copy>
<!-- this is required because config.xml contains an '@' in a url --> <!-- this is required because config.xml contains an '@' in a url -->
<copy todir="${deploy.dir}" verbose="false"> <copy todir="${deploy.dir}" verbose="false">
<filterset refid="config.xml.filter.set"/> <filterset refid="config.xml.filter.set"/>
<fileset dir="cfgbits"> <fileset dir="cfgbits">
<include name="**/config.xml"/> <include name="**/config.xml"/>
</fileset> </fileset>
</copy> </copy>
</target> </target>
<target name="un.deploy"> <target name="un.deploy">
<delete dir="${deploy.dir}"></delete> <delete dir="${deploy.dir}"></delete>
</target> </target>
</project> </project>

BIN
RadarServer/build.rcm/lib/slf4j-log4j12-1.7.5.jar Normal file
View file

Binary file not shown.