diff --git a/org.eclipse.wtp.releng.webupdatesite/WebContent/META-INF/MANIFEST.MF b/org.eclipse.wtp.releng.webupdatesite/WebContent/META-INF/MANIFEST.MF deleted file mode 100644 index 254272e1c0740423e25eb40be9a98ce1556474b1..0000000000000000000000000000000000000000 --- a/org.eclipse.wtp.releng.webupdatesite/WebContent/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - diff --git a/org.eclipse.wtp.releng.webupdatesite/WebContent/WEB-INF/web.xml b/org.eclipse.wtp.releng.webupdatesite/WebContent/WEB-INF/web.xml deleted file mode 100644 index e06bde91adc892ad6f835ed53abd10ced84fe7ed..0000000000000000000000000000000000000000 --- a/org.eclipse.wtp.releng.webupdatesite/WebContent/WEB-INF/web.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?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> diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh index 0f0eac92480bb68a26e6b0af62c61d5860f8a16b..98ec8c9ccd0865c6501c499aadb5a3e1113474ee 100644 --- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh +++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh @@ -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 diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFile.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFile.sh index cc785d933fd127d2985484d210e2fe482901daa3..24893e68db5f908143455156c4ce2ef02afca65e 100644 --- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFile.sh +++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFile.sh @@ -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 diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh index 1056a9f715a5c5ca85310807a045516a5142eb2f..02e3e987826a4a952e9a924996c8a1a7830a6484 100644 --- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh +++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh @@ -1,15 +1,15 @@ #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}