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

Merge "Issue #1134 - edex will now use the same jep library that CAVE does" into development

Browse source 
Former-commit-id: 60b21393fc [formerly 701960a246 [formerly 978e35357ee01c8b5d7fc4f4ced8ba82a3ddd0b6]]
Former-commit-id: 701960a246
Former-commit-id: c8443cf85c
This commit is contained in:
Richard Peter 2012-09-12 08:27:11 -05:00 • committed by Gerrit Code Review
commit 5baaa6593f
14 changed files with 205 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cots/com.opensymphony.ognl/build.properties
View file

@ -1,5 +1,2 @@
source.. = .
output.. = .
bin.includes = META-INF/,\
ognl/,\
ognl-2.7.3.jar

1
cots/org.jep.linux32/build.properties
View file

@ -1,4 +1,3 @@
bin.includes = META-INF/,\
.,\
libjep.so
src.includes = libjep.so

1
cots/org.jep.linux64/build.properties
View file

@ -1,4 +1,3 @@
bin.includes = META-INF/,\
.,\
libjep.so
src.includes = libjep.so

1
cots/org.jep.win32/build.properties
View file

@ -1,3 +1,2 @@
bin.includes = META-INF/,\
.,\
jep.dll

12
edexOsgi/build.edex/deploy-common/deploy-esb.xml
View file

@ -98,17 +98,7 @@
<fileset dir="${esb.directory}">
<include name="**/bin/linux-x86-64/**" />
</fileset>
</copy>
<if>
<available file="${edex.root.directory}/lib/native/linux32/libjep.so"
type="file" />
<then>
<delete>
<fileset file="${edex.root.directory}/lib/native/linux32/libjep.so" />
</delete>
</then>
</if>
</copy>
<!-- update permissions on the wrapper. -->
<chmod file="${edex.root.directory}/bin/linux-x86-64/wrapper"

9
edexOsgi/build.edex/deploy-common/deploy-web.xml
View file

@ -30,7 +30,14 @@
</if>
</sequential>
</for>
<if>
<equals arg1="${project.dir}" arg2="" />
<then>
<fail message="Failed to find web project: @{web.project.dir}" />
</then>
</if>
<var name="war.file" value="@{war.name}.war" />
<!-- delete old war file -->

99
edexOsgi/build.edex/deploy-common/plugin-methods.xml
View file

@ -81,6 +81,13 @@
</if>
</sequential>
</for>
<if>
<equals arg1="${plugin.path}" arg2="" />
<then>
<fail message="Failed to find plugin: @{plugin.name}" />
</then>
</if>
<var name="plugin.base" value="${plugin.path}/@{plugin.name}" />
<var name="plugin.bin" value="${plugin.base}/bin" />
@ -91,12 +98,11 @@
<if>
<equals arg1="@{plugin.type}" arg2="cots" />
<then>
<!-- copy the cots jars to the destination -->
<copy todir="${destination.directory}"
overwrite="true" verbose="true">
<fileset dir="${plugin.path}"
includes="@{original.pattern}" />
</copy>
<!-- copy the cots jars to the destination -->
<copyFOSS
plugin.directory323="${plugin.base}"
jar.file323="${jar.destfile}"
destination.directory323="${destination.directory}/@{plugin.name}" />
<!-- jar any compiled cots source -->
<if>
@ -140,7 +146,7 @@
maintain uniqueness of variable names
-->
<attribute name="plugin.directory323" />
<attribute name="jar.file323" />
<attribute name="jar.file323" />
<sequential>
<!--
@ -209,4 +215,83 @@
</for>
</sequential>
</macrodef>
<macrodef name="copyFOSS">
<!--
random character suffixes added to
maintain uniqueness of variable names
-->
<attribute name="plugin.directory323" />
<attribute name="jar.file323" />
<attribute name="destination.directory323" />
<sequential>
<mkdir dir="@{destination.directory323}" />
<!-- scan build.properties -->
<var file="@{plugin.directory323}/build.properties" />
<!--
* iterate through bin.includes
* '.' is seen as the ${output..} directory, itself
* artifacts are only deployed if they are present
-->
<for list="${bin.includes}" param="include"
delimiter="," trim="true">
<sequential>
<if>
<available file="@{plugin.directory323}/@{include}"
type="dir" />
<then>
<!-- deploy a directory -->
<!-- is this the output directory? -->
<if>
<equals arg1="@{include}" arg2="." />
<then>
<if>
<available file="@{plugin.directory323}/${output..}"
type="dir" />
<then>
<jar destfile="@{jar.file323}" update="true">
<fileset
dir="@{plugin.directory323}/${output..}"
includes="**" />
</jar>
</then>
</if>
</then>
<else>
<copy todir="@{destination.directory323}"
overwrite="true" verbose="true">
<fileset dir="@{plugin.directory323}"
includes="@{include}/**" />
</copy>
</else>
</if>
</then>
<else>
<!-- are we deploying a file? -->
<if>
<available file="@{plugin.directory323}/@{include}"
type="file" />
<then>
<copy todir="@{destination.directory323}"
overwrite="true" verbose="true">
<fileset dir="@{plugin.directory323}"
includes="@{include}" />
</copy>
</then>
<else>
<!-- fail: unknown deployment artifact -->
<fail
message="Unable to deploy '@{include}' specified in @{plugin.directory323}/build.properties; unable to find the file / directory." />
</else>
</if>
</else>
</if>
</sequential>
</for>
</sequential>
</macrodef>
</project>

6
edexOsgi/build.edex/deploy-install.xml
View file

@ -76,6 +76,12 @@
</for>
<!-- run includegen -->
<echo message="Generating deployment list for feature: ${edex.feature}" />
<!--
TODO: need to update the includegen ant task to recognize
plugin architecture restrictions. Plugins that should only
be deployed for a 64-bit system should not be deployed for
a 32-bit system, etc.
-->
<includegen providerfilter="${includegen.filter}"
basedirectories="${basedirectories}"
featurefile="${feature}"

83
edexOsgi/build.edex/edex/allElements.xml
View file

@ -1,4 +1,4 @@
<project name="allElements Delegator">
<project name="allElements Delegator">
<property name="defaultAssemblyEnabled" value="true" />
<!-- ===================================================================== -->
@ -67,6 +67,13 @@
</sequential>
</for>
<if>
<equals arg1="${feature.path}" arg2="" />
<then>
<fail message="Failed to find feature: ${topLevelElementId}" />
</then>
</if>
<mkdir dir="${builder}/tmp/features" />
<!-- copy the feature -->
<copy todir="${builder}/tmp/features">
@ -205,15 +212,81 @@
<if>
<equals arg1="@{plugin.type}" arg2="cots" />
<then>
<copy todir="${builder}/dependencies-stash">
<fileset dir="${plugin.directory}"
includes="@{plugin.pattern}" />
</copy>
<copyFOSS
plugin.directory323="${plugin.directory}/${plugin.name}"
destination.directory323="${builder}/dependencies-stash/@{plugin.name}" />
</then>
</if>
</sequential>
</macrodef>
<macrodef name="copyFOSS">
<!--
random character suffixes added to
maintain uniqueness of variable names
-->
<attribute name="plugin.directory323" />
<attribute name="destination.directory323" />
<sequential>
<mkdir dir="@{destination.directory323}" />
<!-- scan build.properties -->
<var file="@{plugin.directory323}/build.properties" />
<!--
* iterate through bin.includes
* '.' is seen as the ${output..} directory, itself
* artifacts are only deployed if they are present
-->
<for list="${bin.includes}" param="include"
delimiter="," trim="true">
<sequential>
<if>
<available file="@{plugin.directory323}/@{include}"
type="dir" />
<then>
<!-- deploy a directory -->
<!-- is this the output directory? -->
<if>
<not>
<equals arg1="@{include}" arg2="." />
</not>
<then>
<copy todir="@{destination.directory323}"
overwrite="true" verbose="true">
<fileset dir="@{plugin.directory323}"
includes="@{include}/**" />
</copy>
</then>
</if>
</then>
<else>
<!-- are we deploying a file? -->
<if>
<available file="@{plugin.directory323}/@{include}"
type="file" />
<then>
<copy todir="@{destination.directory323}"
overwrite="true" verbose="true">
<fileset dir="@{plugin.directory323}"
includes="@{include}" />
</copy>
</then>
<else>
<!-- fail: unknown deployment artifact -->
<fail
message="Unable to deploy '@{include}' specified in @{plugin.directory323}/build.properties; unable to find the file / directory." />
</else>
</if>
</else>
</if>
</sequential>
</for>
</sequential>
</macrodef>
<!-- ====================================================================== -->
<!-- The default assemble target, this will be called to assemble each -->

1
edexOsgi/build.edex/esb/bin/linux-x86-32/wrapper.conf
View file

@ -23,4 +23,5 @@
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=%EDEX_HOME%/bin/linux-x86-32/
wrapper.java.library.path.4=%EDEX_HOME%/lib/dependencies/org.jep.linux32/

1
edexOsgi/build.edex/esb/bin/linux-x86-64/wrapper.conf
View file

@ -24,3 +24,4 @@
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=%EDEX_HOME%/bin/linux-x86-64/
wrapper.java.library.path.4=%EDEX_HOME%/lib/native/linux64/
wrapper.java.library.path.5=%EDEX_HOME%/lib/dependencies/org.jep.linux64/

BIN
edexOsgi/build.edex/esb/lib/native/linux32/libjep.so
View file

Binary file not shown.

BIN
edexOsgi/build.edex/esb/lib/native/linux64/libjep.so
View file

Binary file not shown.

18
edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml
View file

@ -172,6 +172,24 @@
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.jep.linux32"
os="linux"
arch="x86"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"/>
<plugin
id="org.jep.linux64"
os="linux"
arch="x86_64"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"/>
<plugin
id="ucar.nc2"