summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-09-12 09:48:46 (EDT)
committerStephan Born2013-09-12 09:48:46 (EDT)
commit0958e2510b6c94c2c6921dc76384f6959b0f1521 (patch)
tree43dfca09d5837ce3a7ec554f7e658b6c27beb55e
parentf07e47e2c3141b31c0650bafa1dac6e24f75bcea (diff)
downloadorg.eclipse.stardust.ui.web-0958e2510b6c94c2c6921dc76384f6959b0f1521.zip
org.eclipse.stardust.ui.web-0958e2510b6c94c2c6921dc76384f6959b0f1521.tar.gz
org.eclipse.stardust.ui.web-0958e2510b6c94c2c6921dc76384f6959b0f1521.tar.bz2
CRNT-30480
Build script changes to include common-menu-config-context.xml in ipp-views-common.jar git-svn-id: https://svn.csa.sungard.com/repos/ipp2/product/trunk/stardust/ui.web@67255 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b Signed-off-by: Sidharth Singh <sidharth.singh@sungard.com>
-rw-r--r--build.xml1
-rw-r--r--views-common/build.xml5
2 files changed, 5 insertions, 1 deletions
diff --git a/build.xml b/build.xml
index 8e6e735..a809157 100644
--- a/build.xml
+++ b/build.xml
@@ -22,6 +22,7 @@
<property name="nirvana.project.etc" location="${nirvana.project.dir}/etc" />
<property file="${nirvana.project.etc}/private.properties"/>
<property name="views-common-menu-context.xmlfile" location="${nirvana.project.dir}/views-common/src/main/resources/META-INF/spring/views-common-menu-context.xml" />
+ <property name="common-menu-config-context.xmlfile" value="${common-menu-config-context.xmlfile}" />
<import file="${nirvana.project.dir}/../../buildtools/ipp-build.xml" />
diff --git a/views-common/build.xml b/views-common/build.xml
index 6c814d1..d3d046c 100644
--- a/views-common/build.xml
+++ b/views-common/build.xml
@@ -25,6 +25,7 @@
<property file="${project.etc}/private.properties"/>
<property name="views-common-menu-context.xmlfile" value="${resources.src}/META-INF/spring/views-common-menu-context.xml" />
+ <property name="common-menu-config-context.xmlfile" value="${resources.src}/META-INF/spring/common-menu-config-context.xml" />
<property name="artifactId" value="ipp-views-common" />
@@ -133,10 +134,11 @@
</fileset>
<fileset dir="${resources.src}">
<include name="**/*.*" />
- <exclude name="META-INF/spring/views-common-menu-context.xml" />
+ <exclude name="META-INF/spring/views-common-menu-context.xml" />
</fileset>
</copy>
<copy file="${views-common-menu-context.xmlfile}" todir="${build.classes}/META-INF/spring" overwrite="true" />
+ <copy file="${common-menu-config-context.xmlfile}" todir="${build.classes}/META-INF/spring" overwrite="true" />
<copy todir="${build.src}">
<fileset dir="${project.src}">
@@ -148,6 +150,7 @@
</fileset>
</copy>
<copy file="${views-common-menu-context.xmlfile}" todir="${build.src}/META-INF/spring" overwrite="true" />
+ <copy file="${common-menu-config-context.xmlfile}" todir="${build.classes}/META-INF/spring" overwrite="true" />
<!-- Copy NL property file for locale "en" to NL property with no locale. -->
<copy todir="${build.classes}" overwrite="true">