From: Marc Englund <marc.englund@itmill.com>
Date: Wed, 30 Apr 2008 08:05:49 +0000 (+0000)
Subject: Updated to support portlet integration.
X-Git-Tag: 6.7.0.beta1~4846
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=33e76f08f4ec289b56722de1457b39a152c4cf7e;p=vaadin-framework.git

Updated to support portlet integration.
Now also works on windows.

svn changeset:4295/svn branch:trunk
---

diff --git a/build/build.xml b/build/build.xml
index 4efe82a337..db8eecb7c3 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -91,10 +91,9 @@
 
 		<!-- Create result dir unless already exists -->
 		<mkdir dir="${result-path}" />
-
 		<!-- Find out which platform we are in -->
 		<if>
-			<equals arg1="${os.name}" arg2="Windows 2000, Windows XP" />
+			<contains arg1="${os.name}" arg2="Windows" />
 			<then>
 				<property name="platform" value="windows" />
 			</then>
@@ -145,6 +144,9 @@
 			<pathelement path="lib/jetty/jetty-6.1.7.jar" />
 			<pathelement path="lib/jetty/jetty-util-6.1.7.jar" />
 			<pathelement path="lib/jetty/servlet-api-2.5-6.1.7.jar" />
+			<pathelement path="lib/portlet/portal-kernel.jar" />
+			<pathelement path="lib/portlet/portal-service.jar" />
+			<pathelement path="lib/portlet/portlet.jar" />
 		</path>
 
 	</target>