Update Ivy configuration and build script for integrated GWT.

For ease of development, GWT "trunk" and "tools" are assumed to be
checked out in a directory parallel to the project directory. Otherwise,
the variable gwt.root can be used to give the location of trunk.

Add Ivy dependencies for servlet API and libraries needed to compile
tests (Jetty, Apache Commons) - these were previously used from GWT
JARs.

diff --git a/build/build.xml b/build/build.xml
index 6b3a04661691ce9793b1e0f2d96aba06458880ab..85bee09a52fc9d4e78b84b0390b8e7590a2769d6 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -35,6 +35,9 @@
             <fileset dir="build" includes="lib/**/*.jar" ></fileset>
         </path>
 
+       <!-- Default location for GWT check-out: trunk and tools in a directory next to Vaadin project -->
+       <property name="gwt.root" value="${basedir}/../trunk"/>
+
        <property name="gwt.build.dir" value="${gwt.root}/build"/>
        <property name="gwt.tools" value="${gwt.root}/../tools"/>
        <property name="gwt.tools.lib" value="${gwt.tools}/lib"/>

diff --git a/build/ivy/ivy.xml b/build/ivy/ivy.xml
index 6b569d124860a48b17ef5a047910d8b2b21ae297..fb94277434c255f99634726ac400711e113b9ab3 100644 (file)
--- a/build/ivy/ivy.xml
+++ b/build/ivy/ivy.xml
@@ -12,6 +12,9 @@
     <publications />        
        <dependencies defaultconf="ss.compile" defaultconfmapping="ss.compile->master">
 
+               <!--Servlet API version 2.5 -->
+               <dependency org="javax.servlet" name="servlet-api" rev="2.5" />                 
+
                <!-- Liferay Portal Service -->
                <dependency org="com.liferay.portal" name="portal-service" rev="6.0.2" />
                <!--Portlet API version 2.0 (JSR-286) -->
@@ -26,7 +29,14 @@
                <dependency org="junit" name="junit" rev="4.5" conf="ss.test.compile -> master"/>
                <dependency org="org.easymock" name="easymock" rev="3.0" conf="ss.test.compile -> master, runtime(*)"/>  
                <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6" conf="ss.test.compile -> master, runtime(*)"/>  
-                               
+
+               <!-- Additional libraries used by tests - also included from GWT -->
+               <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.26" conf="ss.test.compile -> master"/>
+               <dependency org="org.mortbay.jetty" name="jetty-util" rev="6.1.26" conf="ss.test.compile -> master"/>
+               <dependency org="commons-lang" name="commons-lang" rev="2.6" conf="ss.test.compile -> master"/>
+               <dependency org="commons-io" name="commons-io" rev="2.3" conf="ss.test.compile -> master"/>
+               <dependency org="commons-codec" name="commons-codec" rev="1.6" conf="ss.test.compile -> master"/>
+
                <!-- Ant tasks -->      
                <dependency org="ant-contrib" name="ant-contrib" rev="1.0b3" conf="taskdefs ->master"/>
                <dependency org="org.apache.maven" name="maven-ant-tasks" rev="2.0.10" conf="taskdefs ->master"/>