From ebcfc775d204c896f7729c6981d48f81e168e830 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Thu, 17 Jan 2013 13:40:16 +0000
Subject: [PATCH] Make build scripts use jetty 8.1.8 rather than jetty 7.5.4
 (test).

SVN: 28126
---
 datastore_server/build/build.xml | 2 +-
 openbis/build/build.xml          | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/datastore_server/build/build.xml b/datastore_server/build/build.xml
index 60f1b84a4cc..db21646ccb0 100644
--- a/datastore_server/build/build.xml
+++ b/datastore_server/build/build.xml
@@ -220,7 +220,7 @@
 	<!-- Add libraries to DSS distribution. -->
 	<target name="add-dss-dist-libs">
   	<copy todir="${dist.datastore_server.lib}" flatten="true">
-  		<fileset dir="${lib}/jetty7/lib">
+  		<fileset dir="${lib}/jetty8/lib">
   		  <include name="common/*.jar" />
   		  <include name="server/*.jar" />
   		</fileset>
diff --git a/openbis/build/build.xml b/openbis/build/build.xml
index 71b0f6c22cb..7276bee14fb 100644
--- a/openbis/build/build.xml
+++ b/openbis/build/build.xml
@@ -272,8 +272,9 @@
 
   <target name="make-dist" description="Makes a distribution file." 
   		depends="check-dictionary-syntax, clean, war, admin-console-dist, core-plugins-dist, compute-checksum">
-    <copy file="${lib}/jetty7/jetty.zip" todir="${server.dist}" />
-    <loadfile property="jetty.version" srcFile="${lib}/jetty7/version.txt">
+    <property name="jetty.path" value="${lib}/jetty8" />
+    <copy file="${jetty.path}/jetty.zip" todir="${server.dist}" />
+    <loadfile property="jetty.version" srcFile="${jetty.path}/version.txt">
       <filterchain>
         <striplinebreaks />
       </filterchain>
-- 
GitLab