Skip to content
Snippets Groups Projects
Commit 66bb9368 authored by david_williams's avatar david_williams
Browse files

small improvement

parent f963cb96
No related branches found
No related tags found
No related merge requests found
Manifest-Version: 1.0
Class-Path:
<?xml version="1.0" encoding="UTF-8"?>
<web-app
id="WebApp_ID"
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">
<display-name>org.eclipse.jst.webupdatesite</display-name>
<welcome-file-list>
<welcome-file>index.html</welcome-file>
<welcome-file>default.htm</welcome-file>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.htm</welcome-file>
<welcome-file>default.html</welcome-file>
<welcome-file>default.jsp</welcome-file>
</welcome-file-list>
</web-app>
......@@ -22,11 +22,9 @@ if [ "${1}" == "-clean" ] ; then
rm -fr ${updateSite}/*
echo " Updating index and web site files, but not site xml files (yet)"
cp ${HOME}/${updateToolsDir}/WebContent/index.html ${updateSite}
cp ${HOME}/${updateToolsDir}/WebContent/indexEuropa.html ${updateSite}/index.html
cp ${HOME}/${updateToolsDir}/WebContent/*.jpg ${updateSite} > /dev/null
cp ${HOME}/${updateToolsDir}/WebContent/*.gif ${updateSite} > /dev/null
cp -r ${HOME}/${updateToolsDir}/WebContent/web ${updateSite} > /dev/null
fi
......
......@@ -2,18 +2,16 @@
# script to update site xml files, by merging new features from "mirror" command, with old "authored" content.
main_name=$1
updateSite=$2
main_name=${1}
updateSite=${2}
updateToolsDir=org.eclipse.wtp.releng.webupdatesite
in_authored=$HOME/$updateToolsDir/WebContent/$main_name
in_authored=${HOME}/${updateToolsDir}/WebContent/${main_name}
# remember, this 'site.xml' is just the output of mirror command, when ran in context
in_newFeatures=$updateSite/.site.xml
in_newFeatures=${updateSite}/.site.xml
# merges newFeautes in to authored, back in original locaion
java -jar siteFileUpdater.jar $in_authored $in_newFeatures
java -jar siteFileUpdater.jar ${in_authored} ${in_newFeatures}
#copy to discovery site
cp $in_authored $updateSite/$main_name
cp ${in_authored} ${updateSite}/site.xml
#set variables
updateToolsDir=$HOME/org.eclipse.wtp.releng.webupdatesite
updateSiteFile=$1
updateSite=$2
updateToolsDir=${HOME}/org.eclipse.wtp.releng.webupdatesite
updateSiteFile=${1}
updateSite=${2}
# save away a clean version of this site file, produced during mirroring commands,
# with all the latest version numbers
mv $updateSite/site.xml $updateSite/.site.xml
mv ${updateSite}/site.xml ${updateSite}/.site.xml
# merge authored site.xml with the autogenerated one
$updateToolsDir/build-home/runUpdateSiteXmlFile.sh $updateSiteFile $updateSite
${updateToolsDir}/build-home/runUpdateSiteXmlFile.sh ${updateSiteFile} ${updateSite}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment