Migrate vaadin-server build to maven

Change-Id: I5c740f4e9cb28103bab199f9a552153d82277e7e

.classpath

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="server/tests/src"/>
+	<classpathentry kind="src" path="server/src/test/java"/>
 	<classpathentry kind="src" path="client/tests/src"/>
 	<classpathentry kind="src" path="shared/src/test/java"/>
 	<classpathentry kind="src" path="client/src"/>
-	<classpathentry kind="src" path="server/src"/>
+	<classpathentry kind="src" path="server/src/main/java"/>
 	<classpathentry kind="src" path="client-compiler/src"/>
 	<classpathentry kind="src" path="client-compiler/tests/src"/>
 	<classpathentry kind="src" path="uitest/src"/>

.gitignore

@@ -86,6 +86,7 @@ scripts/*.pyc
 result
 push/target/
 shared/target/
+server/target/
 
 .sass-cache
 phantomjsdriver.log

client-compiled/ivy.xml

@@ -22,7 +22,7 @@
     </publications>
     <dependencies>
         <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" conf="compile-module-> build" />
+            rev="${vaadin.version}" conf="compile-module-> default" />
         <dependency org="com.vaadin" name="vaadin-client"
             rev="${vaadin.version}" conf="compile-module-> build" />
         <dependency org="com.vaadin" name="vaadin-client-compiler"

client-compiler/ivy.xml

@@ -23,7 +23,7 @@
         <dependency org="com.vaadin" name="vaadin-shared"
             rev="${vaadin.version}" conf="build -> default" />
         <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" conf="build" />
+            rev="${vaadin.version}" conf="build -> default" />
         <dependency org="com.vaadin" name="vaadin-client"
             rev="${vaadin.version}" conf="build,test" />
         <dependency org="com.vaadin" name="vaadin-sass-compiler"

client/ivy.xml

@@ -29,7 +29,7 @@
             <exclude type="pom" conf="test" />
         </dependency>
         <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" conf="build,test->build">
+            rev="${vaadin.version}" conf="build,test->default">
             <exclude type="pom" conf="test" />
         </dependency>
 

ivysettings.xml

@@ -40,7 +40,7 @@
         <module organisation="com.vaadin" name="vaadin-shared"
             resolver="local-maven" />
         <module organisation="com.vaadin" name="vaadin-server"
-            resolver="build-temp" />
+            resolver="local-maven" />
         <module organisation="com.vaadin" name="vaadin-client"
             resolver="build-temp" />
         <module organisation="com.vaadin" name="vaadin-client-compiler"

liferay/ivy.xml

@@ -24,7 +24,7 @@
         <dependency org="com.vaadin" name="vaadin-push"
             rev="${vaadin.version}" conf="deps -> default" transitive="false" />
         <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" conf="deps -> build" transitive="false" />
+            rev="${vaadin.version}" conf="deps -> default" transitive="false" />
     </dependencies>
 
 </ivy-module>

server/ivy.xml

@@ -8,87 +8,68 @@
         revision="${vaadin.version}" />
 
     <configurations>
-        <conf name="build" />
-        <conf name="build-provided" />
         <conf name="ide" visibility="private" />
-        <conf name="test" visibility="private" />
     </configurations>
-    <publications>
-        <artifact type="jar" ext="jar" />
-        <artifact type="source" ext="jar" m:classifier="sources" />
-        <artifact type="javadoc" ext="jar" m:classifier="javadoc" />
-        <artifact type="pom" ext="pom" />
-    </publications>
+
     <dependencies>
         <!-- API DEPENDENCIES -->
 
         <!-- Liferay Portal Service -->
         <dependency org="com.liferay.portal" name="portal-service"
-            rev="6.0.2" conf="build-provided,ide -> default" />
+            rev="6.0.2" conf="ide -> default" />
 
         <!--Servlet API version 3.0 -->
         <dependency org="javax.servlet" name="javax.servlet-api"
-            rev="3.0.1" conf="build-provided,ide,test -> default" />
+            rev="3.0.1" conf="ide -> default" />
 
         <!--Portlet API version 2.0 (JSR-286) -->
         <dependency org="javax.portlet" name="portlet-api"
-            rev="2.0" conf="build-provided,ide,test -> default" />
+            rev="2.0" conf="ide -> default" />
 
         <!-- Google App Engine -->
         <dependency org="com.google.appengine" name="appengine-api-1.0-sdk"
-            rev="1.7.7" conf="build-provided,ide,test -> default" />
+            rev="1.7.7" conf="ide -> default" />
 
         <!-- Bean Validation API -->
         <dependency org="javax.validation" name="validation-api"
-            rev="1.0.0.GA" conf="build-provided,ide,test -> default" />
+            rev="1.0.0.GA" conf="ide -> default" />
 
         <!-- Sass compiler -->
         <dependency org="com.vaadin" name="vaadin-sass-compiler"
-                    rev="${vaadin.sass.version}" conf="build,ide,test->default">
-            <exclude type="pom" conf="test" />
-        </dependency>
-
-        <!-- LIBRARY DEPENDENCIES (compile time) -->
-        <!-- Project modules -->
-        <dependency org="com.vaadin" name="vaadin-shared"
-            rev="${vaadin.version}" conf="build,test->default">
-            <exclude type="pom" conf="test" />
-        </dependency>
-        <dependency org="com.vaadin" name="vaadin-push" rev="${vaadin.version}"
-            conf="build-provided,test->compile">
-            <exclude type="pom" conf="test" />
+                    rev="${vaadin.sass.version}" conf="ide ->default">
+            <exclude type="pom" conf="ide" />
         </dependency>
 
         <!-- Jsoup for BootstrapHandler -->
         <dependency org="org.jsoup" name="jsoup" rev="1.8.3"
-            conf="build,ide,test -> default" />
+            conf="ide -> default" />
 
         <!-- TESTING DEPENDENCIES -->
 
         <!-- Test frameworks & related -->
         <dependency org="junit" name="junit" rev="4.11"
-            conf="test,ide -> default" />
+            conf="ide -> default" />
         <dependency org="org.mockito" name="mockito-all" rev="1.9.5"
-            conf="test,ide->default" />
+            conf="ide ->default" />
         <dependency org="org.hamcrest" name="hamcrest-all" rev="1.3"
-                    conf="test,ide->default" />
+                    conf="ide ->default" />
         <dependency org="org.easymock" name="easymock" rev="3.0"
-            conf="test,ide-> default" transitive="true" />
+            conf="ide -> default" transitive="true" />
         <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6"
-            conf="test,ide -> default" />
+            conf="ide -> default" />
         <dependency org="commons-io" name="commons-io" rev="${commons-io.version}"
-            conf="test->default" />
+            conf="ide->default" />
         <dependency org="commons-lang" name="commons-lang"
-            rev="2.6" conf="test,ide->default" />
+            rev="2.6" conf="ide ->default" />
         <!-- Bean Validation implementation -->
         <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1"
-            conf="test -> default" />
+            conf="ide -> default" />
         <dependency org="org.hibernate" name="hibernate-validator"
-            rev="4.2.0.Final" conf="test -> default" />
+            rev="4.2.0.Final" conf="ide -> default" />
 
         <!-- For manual testing with PostgreSQL (see SQLTestConstants) -->
         <!-- <dependency org="postgresql" name="postgresql" rev="9.1-901.jdbc3" 
-            conf="test,ide->default" /> -->
+            conf="ide" /> -->
 
         <!-- remove cssparser override once sass-compiler is updated -->
         <override org="net.sourceforge.cssparser" module="cssparser"