From 557acfb6c4212ad1ddd5270fc7e25f1fc3d63762 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 31 Aug 2012 16:13:18 +0300
Subject: Module for compiled client side (#9299)

---
 client-compiled/ivy.xml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 client-compiled/ivy.xml

(limited to 'client-compiled/ivy.xml')

diff --git a/client-compiled/ivy.xml b/client-compiled/ivy.xml
new file mode 100644
index 0000000000..5e739a0d0d
--- /dev/null
+++ b/client-compiled/ivy.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="2.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+
+    <info organisation="com.vaadin" module="vaadin-client-compiled"
+        revision="${vaadin.version}" />
+
+    <configurations>
+        <conf name="build" />
+    </configurations>
+    <publications>
+        <artifact type="jar"></artifact>
+    </publications>
+    <dependencies defaultconfmapping="*->build">
+        <dependency org="com.vaadin" name="vaadin-server"
+            rev="${vaadin.version}" />
+        <dependency org="com.vaadin" name="vaadin-client"
+            rev="${vaadin.version}" />
+        <dependency org="com.vaadin" name="vaadin-client-compiler"
+            rev="${vaadin.version}" />
+        <dependency org="javax.validation" name="validation-api"
+            rev="1.0.0.GA" conf="build-> default,sources" />
+    </dependencies>
+
+</ivy-module>
-- 
cgit v1.2.3


From 1d6f0611a8dc7478caf2126ccd191d4284259cba Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 3 Sep 2012 15:36:28 +0300
Subject: Added themes-compiled module (#9299)

---
 build.xml                                          |   5 +-
 buildhelpers/ivy.xml                               |   2 +-
 client-compiled/build.xml                          |  33 +++---
 client-compiled/ivy.xml                            |  11 +-
 client-compiler/ivy.xml                            |   2 +-
 client/ivy.xml                                     |   2 +-
 common.xml                                         |   7 +-
 ivysettings.xml                                    |   4 +
 server/build.xml                                   |   7 +-
 server/ivy.xml                                     |   6 +-
 shared/ivy.xml                                     |   5 +-
 theme-compiler/build.xml                           |   2 +-
 theme-compiler/ivy.xml                             |  10 +-
 .../vaadin/buildhelpers/CompileDefaultTheme.java   | 121 ---------------------
 .../src/com/vaadin/buildhelpers/CompileTheme.java  | 114 +++++++++++++++++++
 themes-compiled/build.xml                          | 103 ++++++++++++++++++
 themes-compiled/ivy.xml                            |  21 ++++
 uitest/build.xml                                   |  10 +-
 uitest/ivy.xml                                     |  19 ++--
 19 files changed, 311 insertions(+), 173 deletions(-)
 delete mode 100755 theme-compiler/src/com/vaadin/buildhelpers/CompileDefaultTheme.java
 create mode 100644 theme-compiler/src/com/vaadin/buildhelpers/CompileTheme.java
 create mode 100644 themes-compiled/build.xml
 create mode 100644 themes-compiled/ivy.xml

(limited to 'client-compiled/ivy.xml')

diff --git a/build.xml b/build.xml
index fc7007f47c..44965003c0 100644
--- a/build.xml
+++ b/build.xml
@@ -27,8 +27,9 @@
 		<subant buildpathref="build-path" target="clean">
 		</subant>
 		<delete dir="result" />
-		<!-- Clean IVY cache (~/.ivy2) so no old artifacts are fetched from there -->
-		<ivy:cleancache />
+		<!-- Clean IVY cache (~/.ivy2) so no old artifacts are fetched from there (leave everything but Vaadin artifacts) -->
+		<delete dir="${ivy.cache.dir}/com.vaadin">
+		</delete>
 
 	</target>
 
diff --git a/buildhelpers/ivy.xml b/buildhelpers/ivy.xml
index 9d8055bb3f..a2a6ea35ae 100644
--- a/buildhelpers/ivy.xml
+++ b/buildhelpers/ivy.xml
@@ -17,7 +17,7 @@
     <configurations>
         <conf name="build" />
         <conf name="build-provided" />
-        <conf name="ide" />
+        <conf name="ide" visibility="private"/>
         <conf name="tests" />
     </configurations>
     <publications>
diff --git a/client-compiled/build.xml b/client-compiled/build.xml
index 588d232ab2..8cead01a79 100644
--- a/client-compiled/build.xml
+++ b/client-compiled/build.xml
@@ -28,8 +28,8 @@
 		<property name="extraParams" value="" />
 		<property name="module.output.dir" location="${result.dir}/VAADIN/widgetsets" />
 
-		<ivy:resolve resolveid="common" conf="build" />
-		<ivy:cachepath pathid="classpath.compile.widgetset" conf="build" />
+		<ivy:resolve resolveid="common" conf="compile-module" />
+		<ivy:cachepath pathid="classpath.compile.widgetset" conf="compile-module" />
 
 		<echo>Compiling ${module} to ${module.output.dir}</echo>
 		<mkdir dir="${module.output.dir}" />
@@ -72,29 +72,36 @@
 		<echo>Compiled ${module}</echo>
 	</target>
 
-
 	<target name="jar" depends="default-widgetset">
+		<antcall target="common.pom.xml">
+		</antcall>
 		<property name="result.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
-		<property name="module.output.dir" location="${result.dir}/VAADIN/widgetsets" />
 
 		<jar file="${result.jar}" compress="true">
-			<fileset dir="${module.output.dir}">
+			<fileset dir="${result.dir}">
+				<include name="VAADIN/widgetsets/**" />
+				<include name="pom.xml" />
+				<exclude name="VAADIN/widgetsets/WEB-INF"/>
 			</fileset>
 			<fileset refid="common.files.for.all.jars" />
 		</jar>
 	</target>
 
 	<target name="publish-local" depends="jar">
-		<antcall target="common.publish-local" />
+		<antcall target="common.publish-local">
+			<param name="conf" value="build" />
+		</antcall>
+	</ivy:publish>
+-->
 	</target>
 
-	<target name="clean">
-		<antcall target="common.clean" />
-	</target>
+<target name="clean">
+	<antcall target="common.clean" />
+</target>
 
-	<target name="tests">
-		<!--<antcall target="common.tests.run" />-->
-		<echo>WHAT? No tests for ${module.name}!</echo>
-	</target>
+<target name="tests">
+	<!--<antcall target="common.tests.run" />-->
+	<echo>WHAT? No tests for ${module.name}!</echo>
+</target>
 
 </project>
\ No newline at end of file
diff --git a/client-compiled/ivy.xml b/client-compiled/ivy.xml
index 5e739a0d0d..7c0fcf0162 100644
--- a/client-compiled/ivy.xml
+++ b/client-compiled/ivy.xml
@@ -8,19 +8,20 @@
 
     <configurations>
         <conf name="build" />
+        <conf name="compile-module" visibility="private" />
     </configurations>
     <publications>
         <artifact type="jar"></artifact>
     </publications>
-    <dependencies defaultconfmapping="*->build">
+    <dependencies>
         <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" />
+            rev="${vaadin.version}" conf="compile-module-> build" />
         <dependency org="com.vaadin" name="vaadin-client"
-            rev="${vaadin.version}" />
+            rev="${vaadin.version}" conf="compile-module-> build" />
         <dependency org="com.vaadin" name="vaadin-client-compiler"
-            rev="${vaadin.version}" />
+            rev="${vaadin.version}" conf="compile-module-> build" />
         <dependency org="javax.validation" name="validation-api"
-            rev="1.0.0.GA" conf="build-> default,sources" />
+            rev="1.0.0.GA" conf="compile-module-> default,sources" />
     </dependencies>
 
 </ivy-module>
diff --git a/client-compiler/ivy.xml b/client-compiler/ivy.xml
index f0cabd85bb..4eafb3cbae 100644
--- a/client-compiler/ivy.xml
+++ b/client-compiler/ivy.xml
@@ -9,7 +9,7 @@
     <configurations>
         <conf name="build" />
         <conf name="build-provided" />
-        <conf name="ide" />
+        <conf name="ide" visibility="private"/>
     </configurations>
     <publications>
         <artifact></artifact>
diff --git a/client/ivy.xml b/client/ivy.xml
index 26c271fe22..e81984949f 100644
--- a/client/ivy.xml
+++ b/client/ivy.xml
@@ -9,7 +9,7 @@
     <configurations>
         <conf name="build" />
         <conf name="build-provided" />
-        <conf name="ide" />
+        <conf name="ide" visibility="private"/>
         <conf name="tests" />
     </configurations>
     <publications>
diff --git a/common.xml b/common.xml
index 5e1943aba2..91a907f003 100644
--- a/common.xml
+++ b/common.xml
@@ -21,7 +21,9 @@
 		<fail unless="result.dir" message="No result.dir parameter given" />
 		<property name="ivy.xml" location="${result.dir}/../ivy.xml" />
 		<property name="pom.xml" location="${result.dir}/pom.xml" />
-		<ivy:makepom templatefile="${vaadin.basedir}/pom-template.xml" ivyfile="${ivy.xml}" pomfile="${pom.xml}" conf="build, build-provided">
+		<property name="conf" value="build, build-provided" />
+		
+		<ivy:makepom templatefile="${vaadin.basedir}/pom-template.xml" ivyfile="${ivy.xml}" pomfile="${pom.xml}" conf="${conf}">
 			<mapping conf="build" scope="compile" />
 			<mapping conf="build-provided" scope="provided" />
 		</ivy:makepom>
@@ -201,9 +203,10 @@
 
 	<target name="publish-local" description="Publishes the given module to the local repository">
 		<fail unless="result.dir" message="No result.dir parameter given" />
+		<property name="conf" value="*(public)" />
 
 		<ivy:resolve />
-		<ivy:publish resolver="build-temp" overwrite="true" forcedeliver="true">
+		<ivy:publish conf="${conf}" resolver="build-temp" overwrite="true" forcedeliver="true">
 			<!--			<artifacts pattern="${result.dir}/[artifact]-[revision].[ext]" />-->
 			<artifacts pattern="${result.dir}/lib/[artifact]-[revision](-[classifier]).[ext]" />
 
diff --git a/ivysettings.xml b/ivysettings.xml
index 63d97b304c..f9b3450be3 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -41,8 +41,12 @@
             resolver="build-temp" />
         <module organisation="com.vaadin" name="vaadin-client-compiler"
             resolver="build-temp" />
+        <module organisation="com.vaadin" name="vaadin-client-compiled"
+            resolver="build-temp" />
         <module organisation="com.vaadin" name="vaadin-theme-compiler"
             resolver="build-temp" />
+        <module organisation="com.vaadin" name="vaadin-themes-compiled"
+            resolver="build-temp" />
     </modules>
 
 
diff --git a/server/build.xml b/server/build.xml
index 1d3f8a5938..2763d5ff10 100644
--- a/server/build.xml
+++ b/server/build.xml
@@ -16,13 +16,14 @@
 
 	<union id="jar.includes">
 		<union refid="server.gwt.includes" />
-		<fileset dir="${vaadin.basedir}">
-			<include name="WebContent/VAADIN/vaadinBootstrap.js" />
+		<fileset dir="${vaadin.basedir}/WebContent">
+			<include name="VAADIN/vaadinBootstrap.js" />
 		</fileset>
 	</union>
 
 	<target name="jar">
 		<antcall target="common.jar">
+			<param name="conf" value="build" />
 			<reference torefid="extra.jar.includes" refid="jar.includes" />
 		</antcall>
 	</target>
@@ -36,7 +37,7 @@
 	</target>
 
 	<target name="tests">
-		<antcall target="common.tests.run"/>
+		<antcall target="common.tests.run" />
 	</target>
 
 
diff --git a/server/ivy.xml b/server/ivy.xml
index 10f06700e5..e6f3d60de6 100644
--- a/server/ivy.xml
+++ b/server/ivy.xml
@@ -9,8 +9,8 @@
     <configurations>
         <conf name="build" />
         <conf name="build-provided" />
-        <conf name="ide" />
-        <conf name="tests" />
+        <conf name="ide" visibility="private"/>
+        <conf name="tests" visibility="private"/>
     </configurations>
     <publications>
         <artifact></artifact>
@@ -39,8 +39,6 @@
         <!-- Project modules -->
         <dependency org="com.vaadin" name="vaadin-shared"
             rev="${vaadin.version}" conf="build,tests" />
-        <dependency org="com.vaadin" name="vaadin-buildhelpers"
-            rev="${vaadin.version}" conf="build,tests" />
 
         <!-- Jsoup for BootstrapHandler -->
         <dependency org="org.jsoup" name="jsoup" rev="1.6.3"
diff --git a/shared/ivy.xml b/shared/ivy.xml
index a20956214b..f445514bcd 100644
--- a/shared/ivy.xml
+++ b/shared/ivy.xml
@@ -9,16 +9,13 @@
     <configurations>
         <conf name="build" />
         <conf name="build-provided" />
-        <conf name="ide" />
+        <conf name="ide" visibility="private"/>
         <conf name="tests" />
     </configurations>
     <publications>
         <artifact></artifact>
     </publications>
     <dependencies>
-        <dependency org="com.vaadin" name="vaadin-buildhelpers"
-            rev="${vaadin.version}" conf="build"></dependency>
-
     </dependencies>
 
 </ivy-module>
diff --git a/theme-compiler/build.xml b/theme-compiler/build.xml
index 71b1a6ae3e..aa378f7769 100644
--- a/theme-compiler/build.xml
+++ b/theme-compiler/build.xml
@@ -13,7 +13,7 @@
 	<path id="classpath.compile.custom" />
 	<path id="classpath.tests.custom" />
 
-	<property name="classes.exclude" value="com/vaadin/buildhelpers/**" />
+	<!--<property name="classes.exclude" value="com/vaadin/buildhelpers/**" />-->
 
 	<target name="jar">
 		<antcall target="common.jar">
diff --git a/theme-compiler/ivy.xml b/theme-compiler/ivy.xml
index 1876a0fed1..00da62582c 100644
--- a/theme-compiler/ivy.xml
+++ b/theme-compiler/ivy.xml
@@ -9,7 +9,7 @@
     <configurations>
         <conf name="build" />
         <conf name="build-provided" />
-        <conf name="ide" />
+        <conf name="ide" visibility="private"/>
         <conf name="tests" />
     </configurations>
     <publications>
@@ -18,6 +18,12 @@
         <artifact type="javadoc" ext="jar" />
     </publications>
     <dependencies defaultconf="*->default">
+        <!-- LIBRARY DEPENDENCIES (compile time) -->
+        <!-- Project modules -->
+        <dependency org="com.vaadin" name="vaadin-shared"
+            rev="${vaadin.version}" conf="build,tests" />
+
+
         <dependency org="org.w3c.css" name="sac" rev="1.3" />
         <dependency org="milyn" name="flute" rev="1.3" conf="*->default" />
         <dependency org="javax.servlet" name="servlet-api"
@@ -30,6 +36,8 @@
             conf="tests -> default" />
         <dependency org="net.sourceforge.cssparser" name="cssparser"
             rev="0.9.5" conf="tests,ide->default" />
+        <dependency org="commons-cli" name="commons-cli" rev="1.2"
+            conf="build,ide -> default" />
     </dependencies>
 
 </ivy-module>
diff --git a/theme-compiler/src/com/vaadin/buildhelpers/CompileDefaultTheme.java b/theme-compiler/src/com/vaadin/buildhelpers/CompileDefaultTheme.java
deleted file mode 100755
index 5b17ae4902..0000000000
--- a/theme-compiler/src/com/vaadin/buildhelpers/CompileDefaultTheme.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.vaadin.buildhelpers;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
-import java.io.IOException;
-
-import com.vaadin.sass.ScssStylesheet;
-
-/**
- * Helper to combine css divided into separate per component dirs into one to
- * optimize http requests.
- */
-public class CompileDefaultTheme {
-
-    private static final String ARG_VERSION = "-version";
-
-    private static final String THEME_DIR = "./WebContent/VAADIN/themes/";
-    private static final String BASE = "base";
-    private static final String RUNO = "runo";
-    private static final String REINDEER = "reindeer";
-    private static final String LIFERAY = "liferay";
-    private static final String CHAMELEON = "chameleon";
-
-    /**
-     * @param args
-     * @throws IOException
-     */
-    public static void main(String[] args) throws IOException {
-        String ver = null;
-        for (int i = 0; i < args.length; i++) {
-            if (ARG_VERSION.equals(args[i])) {
-                if (args.length >= i) {
-                    ver = args[i + 1];
-                }
-                break;
-            }
-        }
-
-        for (String themeName : new String[] { BASE, RUNO, LIFERAY, CHAMELEON }) {
-            try {
-                processSassTheme(themeName, false, ver);
-                System.out.println("Compiling theme " + themeName
-                        + " successful");
-            } catch (Exception e) {
-                System.err.println("Compiling theme " + themeName + " failed");
-                e.printStackTrace();
-            }
-        }
-
-        // Compile Reindeer last, since it requires the spriting operation
-        // (makes testing the other themes a bit faster, since you don't need to
-        // wait for the spriting operation to finish before the theme CSS is
-        // compiled)
-        for (String themeName : new String[] { REINDEER }) {
-            try {
-                processSassTheme(themeName, true, ver);
-                System.out.println("Compiling theme " + themeName
-                        + " successful");
-            } catch (Exception e) {
-                System.err.println("Compiling theme " + themeName + " failed");
-                e.printStackTrace();
-            }
-        }
-    }
-
-    private static void processSassTheme(String themeName,
-            boolean useSmartSprites, String version) throws Exception {
-
-        StringBuffer cssHeader = new StringBuffer();
-
-        // Theme version
-        if (version == null) {
-            version = "9.9.9.INTERNAL-DEBUG-BUILD";
-        }
-        version = version.replaceAll("\\.", "_");
-        cssHeader.append(".v-theme-version:after {content:\"" + version
-                + "\";}\n");
-        cssHeader.append(".v-theme-version-" + version + " {display: none;}\n");
-
-        String stylesCssDir = THEME_DIR + themeName + "/";
-        String stylesCssName = stylesCssDir + "styles.css";
-
-        // Process as SASS file
-        ScssStylesheet scss = ScssStylesheet.get(stylesCssDir + "styles.scss");
-        scss.compile();
-
-        BufferedWriter out = new BufferedWriter(new FileWriter(stylesCssName));
-        out.write(cssHeader.toString());
-        out.write(scss.toString());
-        out.close();
-
-        System.out.println("Compiled CSS to " + stylesCssName + " ("
-                + scss.toString().length() + " bytes)");
-
-        if (useSmartSprites) {
-            createSprites(themeName);
-            System.out.println("Used SmartSprites to create sprites");
-            File oldCss = new File(stylesCssName);
-            oldCss.delete();
-
-            File newCss = new File(stylesCssDir + "styles-sprite.css");
-            boolean ok = newCss.renameTo(oldCss);
-            if (!ok) {
-                System.out.println("Rename " + newCss + " -> " + oldCss
-                        + " failed");
-            }
-        }
-    }
-
-    private static void createSprites(String themeName)
-            throws FileNotFoundException, IOException {
-        String[] parameters = new String[] { "--sprite-png-depth", "AUTO",
-                "--css-file-suffix", "-sprite", "--css-file-encoding", "UTF-8",
-                "--root-dir-path", THEME_DIR + themeName, "--log-level", "WARN" };
-
-        org.carrot2.labs.smartsprites.SmartSprites.main(parameters);
-
-    }
-}
diff --git a/theme-compiler/src/com/vaadin/buildhelpers/CompileTheme.java b/theme-compiler/src/com/vaadin/buildhelpers/CompileTheme.java
new file mode 100644
index 0000000000..c0bfb9aa7f
--- /dev/null
+++ b/theme-compiler/src/com/vaadin/buildhelpers/CompileTheme.java
@@ -0,0 +1,114 @@
+package com.vaadin.buildhelpers;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileWriter;
+import java.io.IOException;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.PosixParser;
+
+import com.vaadin.sass.ScssStylesheet;
+import com.vaadin.shared.Version;
+
+/**
+ * Helper to combine css divided into separate per component dirs into one to
+ * optimize http requests.
+ */
+public class CompileTheme {
+
+    /**
+     * @param args
+     * @throws IOException
+     * @throws ParseException
+     */
+    public static void main(String[] args) throws IOException, ParseException {
+        Options options = new Options();
+        options.addOption("t", "theme", true, "the theme to compile");
+        options.addOption("f", "theme-folder", true,
+                "the folder containing the theme");
+        options.addOption("s", "sprites", true, "use smartsprites");
+        CommandLineParser parser = new PosixParser();
+        CommandLine params = parser.parse(options, args);
+        if (!params.hasOption("theme") || !params.hasOption("theme-folder")) {
+            // automatically generate the help statement
+            HelpFormatter formatter = new HelpFormatter();
+            formatter.printHelp(CompileTheme.class.getName(), options);
+            return;
+        }
+        String themeName = params.getOptionValue("theme");
+        String themeFolder = params.getOptionValue("theme-folder");
+        boolean useSprites = params.hasOption("sprites");
+
+        String version = Version.getFullVersion();
+        try {
+            processSassTheme(themeFolder, themeName, useSprites, version);
+            System.out.println("Compiling theme " + themeName + " successful");
+        } catch (Exception e) {
+            System.err.println("Compiling theme " + themeName + " failed");
+            e.printStackTrace();
+        }
+    }
+
+    private static void processSassTheme(String themeFolder, String themeName,
+            boolean useSmartSprites, String version) throws Exception {
+
+        StringBuffer cssHeader = new StringBuffer();
+
+        version = version.replaceAll("\\.", "_");
+        cssHeader.append(".v-theme-version:after {content:\"" + version
+                + "\";}\n");
+        cssHeader.append(".v-theme-version-" + version + " {display: none;}\n");
+
+        String stylesCssDir = themeFolder + File.separator + themeName
+                + File.separator;
+        String stylesCssName = stylesCssDir + "styles.css";
+
+        // Process as SASS file
+        String sassFile = stylesCssDir + "styles.scss";
+        ScssStylesheet scss = ScssStylesheet.get(sassFile);
+        if (scss == null) {
+            throw new IllegalArgumentException("SASS file: " + sassFile
+                    + " not found");
+        }
+        scss.compile();
+
+        BufferedWriter out = new BufferedWriter(new FileWriter(stylesCssName));
+        out.write(cssHeader.toString());
+        out.write(scss.toString());
+        out.close();
+
+        System.out.println("Compiled CSS to " + stylesCssName + " ("
+                + scss.toString().length() + " bytes)");
+
+        if (useSmartSprites) {
+            createSprites(themeFolder, themeName);
+            System.out.println("Used SmartSprites to create sprites");
+            File oldCss = new File(stylesCssName);
+            oldCss.delete();
+
+            File newCss = new File(stylesCssDir + "styles-sprite.css");
+            boolean ok = newCss.renameTo(oldCss);
+            if (!ok) {
+                System.out.println("Rename " + newCss + " -> " + oldCss
+                        + " failed");
+            }
+        }
+    }
+
+    private static void createSprites(String themeFolder, String themeName)
+            throws FileNotFoundException, IOException {
+        String[] parameters = new String[] { "--sprite-png-depth", "AUTO",
+                "--css-file-suffix", "-sprite", "--css-file-encoding", "UTF-8",
+                "--root-dir-path", themeFolder + File.separator + themeName,
+                "--log-level", "WARN" };
+
+        org.carrot2.labs.smartsprites.SmartSprites.main(parameters);
+
+    }
+}
diff --git a/themes-compiled/build.xml b/themes-compiled/build.xml
new file mode 100644
index 0000000000..c295c570cd
--- /dev/null
+++ b/themes-compiled/build.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+
+<project name="vaadin-client-compiler" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant">
+	<description>
+		Themes compiled to CSS 
+	</description>
+
+	<include file="../common.xml" as="common" />
+	<include file="../build.xml" as="vaadin" />
+	<include file="../gwt-files.xml" as="gwtfiles" />
+
+	<!-- global properties -->
+	<property name="module.name" value="vaadin-themes-compiled" />
+	<property name="result.dir" value="result" />
+	<property name="theme.result.dir" value="${result.dir}/VAADIN/themes" />
+
+	<target name="compile-themes">
+		<ivy:resolve resolveid="common" conf="build" />
+		<ivy:cachepath pathid="classpath.compile.theme" conf="build" />
+
+		<antcall target="compile-theme">
+			<param name="theme" value="base" />
+		</antcall>
+		<antcall target="compile-theme">
+			<param name="theme" value="runo" />
+		</antcall>
+		<antcall target="compile-theme">
+			<param name="theme" value="reindeer" />
+		</antcall>
+		<antcall target="compile-theme">
+			<param name="theme" value="chameleon" />
+		</antcall>
+		<antcall target="compile-theme">
+			<param name="theme" value="liferay" />
+		</antcall>
+	</target>
+
+	<target name="jar" depends="compile-themes">
+		<fail unless="module.name" message="No module.name parameter given" />
+
+		<property name="result.dir" location="result" />
+		<property name="result.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
+		<property name="classes" location="{$result.dir}/classes" />
+
+		<jar jarfile="${result.jar}">
+			<fileset dir="${result.dir}">
+				<include name="VAADIN/themes/**" />
+			</fileset>
+			<fileset refid="common.files.for.all.jars" />
+		</jar>
+
+	</target>
+	<target name="copy-theme">
+		<fail unless="theme" message="You must give the theme name to copy n the 'theme' parameter" />
+		<property name="theme.source.dir" location="../WebContent/VAADIN/themes" />
+
+		<copy todir="${theme.result.dir}">
+			<fileset dir="${theme.source.dir}">
+				<include name="${theme}/**" />
+			</fileset>
+		</copy>
+	</target>
+
+	<target name="compile-theme" depends="copy-theme">
+		<fail unless="theme" message="You must give the theme name to compile in the 'theme' parameter" />
+
+		<ivy:resolve resolveid="common" conf="compile-theme" />
+		<ivy:cachepath pathid="classpath.compile.theme" conf="compile-theme" />
+		<ivy:cachepath pathid="classpath.runtime.theme" conf="build" />
+
+		<echo>Compiling ${theme}</echo>
+		<mkdir dir="${theme.result.dir}" />
+
+		<!-- compile the theme -->
+		<java classname="com.vaadin.buildhelpers.CompileTheme" classpathref="classpath.compile.theme" failonerror="yes" fork="yes" maxmemory="512m">
+			<arg value="--theme" />
+			<arg value="${theme}" />
+			<arg value="--theme-folder" />
+			<arg value="${theme.result.dir}" />
+			<jvmarg value="-Xss8M" />
+			<jvmarg value="-XX:MaxPermSize=256M" />
+			<jvmarg value="-Djava.awt.headless=true" />
+		</java>
+
+	</target>
+
+
+	<target name="publish-local" depends="jar">
+		<antcall target="common.publish-local">
+
+		</antcall>
+	</target>
+
+	<target name="clean">
+		<antcall target="common.clean" />
+	</target>
+
+	<target name="tests">
+		<!--<antcall target="common.tests.run" />-->
+		<echo>WHAT? No tests for ${module.name}!</echo>
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/themes-compiled/ivy.xml b/themes-compiled/ivy.xml
new file mode 100644
index 0000000000..746acf38c1
--- /dev/null
+++ b/themes-compiled/ivy.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="2.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+
+    <info organisation="com.vaadin" module="vaadin-themes-compiled"
+        revision="${vaadin.version}" />
+
+    <configurations>
+        <conf name="build" />
+        <conf name="compile-theme" visibility="private" />
+    </configurations>
+    <publications>
+        <artifact type="jar"></artifact>
+    </publications>
+    <dependencies>
+        <dependency org="com.vaadin" name="vaadin-theme-compiler"
+            rev="${vaadin.version}" conf="compile-theme->build" />
+    </dependencies>
+
+</ivy-module>
diff --git a/uitest/build.xml b/uitest/build.xml
index 6b8a6934c3..8a5fe71b35 100644
--- a/uitest/build.xml
+++ b/uitest/build.xml
@@ -17,8 +17,8 @@
 	<target name="dependencies">
 		<!-- This is copied from common.xml to be able to add server.tests.source to the source path -->
 
-		<ivy:resolve resolveid="common" conf="build, build-provided" />
-		<ivy:cachepath pathid="classpath.compile.dependencies" conf="build, build-provided" />
+		<ivy:resolve resolveid="common" conf="build" />
+		<ivy:cachepath pathid="classpath.compile.dependencies" conf="build" />
 	</target>
 
 	<target name="compile" description="Compiles the module" depends="dependencies">
@@ -55,10 +55,14 @@
 		<property name="WebContent.dir" location="${vaadin.basedir}/WebContent" />
 		<property name="deps.dir" location="${result.dir}/deps" />
 
+		<ivy:resolve resolveid="common" conf="build" />
+		<ivy:cachepath pathid="classpath.runtime.dependencies" conf="build" />
 
+		<delete dir="${deps.dir}" />
 		<mkdir dir="${deps.dir}" />
+
 		<copy todir="${deps.dir}" flatten="true">
-			<path refid="classpath.compile.dependencies" />
+			<path refid="classpath.runtime.dependencies" />
 		</copy>
 
 		<war destfile="${result.war}" duplicate="fail" index="true">
diff --git a/uitest/ivy.xml b/uitest/ivy.xml
index 2e4829b721..583e09c76b 100644
--- a/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@ -8,8 +8,7 @@
 
     <configurations>
         <conf name="build" />
-        <conf name="build-provided" />
-        <conf name="ide" />
+        <conf name="ide" visibility="private" />
     </configurations>
     <publications>
         <artifact type="war" />
@@ -17,28 +16,26 @@
     <dependencies defaultconf="build" defaultconfmapping="build,ide->default">
         <!-- API DEPENDENCIES -->
         <dependency org="javax.portlet" name="portlet-api"
-            rev="2.0" conf="build-provided,ide -> default" />
+            rev="2.0" conf="ide -> default" />
 
         <dependency org="javax.validation" name="validation-api"
-            rev="1.0.0.GA" conf="build-provided,ide -> default" />
+            rev="1.0.0.GA" conf="ide -> default" />
         <!--Servlet API version 2.5 -->
         <dependency org="javax.servlet" name="servlet-api"
-            rev="2.5" conf="build-provided,ide -> default" />
+            rev="2.5" conf="ide -> default" />
         <!-- Google App Engine -->
         <dependency org="com.google.appengine" name="appengine-api-1.0-sdk"
-            rev="1.2.1" conf="build-provided,ide -> default" />
+            rev="1.2.1" conf="ide -> default" />
 
         <!-- LIBRARY DEPENDENCIES (compile time) -->
         <!-- Project modules -->
         <dependency org="com.vaadin" name="vaadin-server"
             rev="${vaadin.version}" conf="build->build"></dependency>
-        <dependency org="com.vaadin" name="vaadin-client"
+        <dependency org="com.vaadin" name="vaadin-client-compiled"
             rev="${vaadin.version}" conf="build->build"></dependency>
-<!--          <dependency org="com.vaadin" name="vaadin-client-compiled"
+        <dependency org="com.vaadin" name="vaadin-themes-compiled"
             rev="${vaadin.version}" conf="build->build"></dependency>
-        <dependency org="com.vaadin" name="vaadin-theme-compiled"
-            rev="${vaadin.version}" conf="build->build"></dependency>
--->
+
         <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.11"
             conf="build,ide->default" />
         <dependency org="org.mortbay.jetty" name="jetty-util"
-- 
cgit v1.2.3


From e722b038d48f19201637267fbc58e0471405ec83 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Tue, 4 Sep 2012 00:33:58 +0300
Subject: Client-compiled-cache artifact (#9299)

---
 client-compiled/build.xml | 99 ++++++++++++++++++++++++++++++-----------------
 client-compiled/ivy.xml   |  3 +-
 gwt-files.xml             |  2 +-
 uitest/build.xml          |  1 +
 uitest/ivy.xml            | 10 +++--
 5 files changed, 73 insertions(+), 42 deletions(-)

(limited to 'client-compiled/ivy.xml')

diff --git a/client-compiled/build.xml b/client-compiled/build.xml
index 8cead01a79..6533ce2744 100644
--- a/client-compiled/build.xml
+++ b/client-compiled/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<project name="vaadin-client-compiler" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="vaadin-client-compiled" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant">
 	<description>
 		Compiled (JS+HTML) version of client side 
 	</description>
@@ -12,6 +12,17 @@
 	<!-- global properties -->
 	<property name="module.name" value="vaadin-client-compiled" />
 	<property name="result.dir" value="result" />
+	<property name="gwtar.dir" location="${result.dir}/gwtar" />
+	<property name="work.dir" location="${result.dir}/work" />
+	<property name="module.output.dir" location="${result.dir}/VAADIN/widgetsets" />
+	<property name="compiled.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
+	<property name="compiled-cache.jar" location="${result.dir}/lib/${module.name}-cache-${vaadin.version}.jar" />
+
+	<target name="default-widgetset-cache">
+		<antcall target="compile-module-cache">
+			<param name="module" value="com.vaadin.DefaultWidgetSet" />
+		</antcall>
+	</target>
 
 	<target name="default-widgetset">
 		<antcall target="compile-module">
@@ -20,40 +31,50 @@
 	</target>
 
 
+	<target name="compile-module-cache">
+		<fail unless="module" message="You must give the module to compile in the 'module' parameter" />
+		<ivy:resolve resolveid="common" conf="compile-module" />
+		<ivy:cachepath pathid="classpath.compile.widgetset" conf="compile-module" />
+		<echo>Creating gwtar files for ${module} in ${gwtar.dir}</echo>
+
+		<!-- Produce gwtar files for the separate JAR -->
+		<java classname="com.google.gwt.dev.CompileModule" classpathref="classpath.compile.widgetset" failonerror="yes" fork="yes" maxmemory="512m">
+			<arg value="-out" />
+			<arg value="${gwtar.dir}" />
+			<arg value="-strict" />
+			<arg value="${module}" />
+
+			<jvmarg value="-Xss8M" />
+			<jvmarg value="-XX:MaxPermSize=256M" />
+			<jvmarg value="-Djava.awt.headless=true" />
+		</java>
+	</target>
+
 	<target name="compile-module">
 		<fail unless="module" message="You must give the module to compile in the 'module' parameter" />
-		<property name="result.dir" location="result" />
 		<property name="style" value="OBF" />
 		<property name="localWorkers" value="2" />
 		<property name="extraParams" value="" />
-		<property name="module.output.dir" location="${result.dir}/VAADIN/widgetsets" />
 
 		<ivy:resolve resolveid="common" conf="compile-module" />
 		<ivy:cachepath pathid="classpath.compile.widgetset" conf="compile-module" />
 
-		<echo>Compiling ${module} to ${module.output.dir}</echo>
 		<mkdir dir="${module.output.dir}" />
 
-		<!-- Disabled to reduce JAR size: precompile the widgetset to a .gwtar file -->
-		<!--
-	        <java classname="com.google.gwt.dev.CompileModule" classpathref="compile.classpath.widgetset" failonerror="yes" fork="yes" maxmemory="512m">
-	            <arg value="-out" />
-	            <arg value="${result-precompiled-widgetsets}" />
-	            <arg value="-strict" />
-	            <arg value="${widgetset}" />
-
-	            <jvmarg value="-Xss8M"/>
-	            <jvmarg value="-XX:MaxPermSize=256M"/>  
-	            <jvmarg value="-Djava.awt.headless=true"/>
-	        </java>
-	        -->
-
-		<!-- compile the widgetset -->
+		<echo>Compiling ${module} to ${module.output.dir}</echo>
+
+		<!-- compile the module -->
 		<java classname="com.google.gwt.dev.Compiler" classpathref="classpath.compile.widgetset" failonerror="yes" fork="yes" maxmemory="512m">
+			<classpath location="${compiled-cache.jar}" />
+			<arg value="-workDir" />
+			<arg value="${work.dir}" />
+			<arg value="-logLevel" />
+			<arg value="TRACE" />
 			<arg value="-war" />
 			<arg value="${module.output.dir}" />
 			<arg value="-style" />
 			<arg value="${style}" />
+
 			<arg value="-localWorkers" />
 			<arg value="${localWorkers}" />
 			<arg value="-strict" />
@@ -67,41 +88,47 @@
 			<jvmarg value="-Djava.awt.headless=true" />
 		</java>
 
-		<!--<antcall target="remove-gwt-tmp" />-->
+	</target>
 
-		<echo>Compiled ${module}</echo>
+	<target name="client-compiled-cache.jar" depends="default-widgetset-cache">
+		<jar file="${compiled-cache.jar}" compress="true">
+			<fileset dir="${gwtar.dir}">
+				<include name="**/*.gwtar" />
+				<include name="pom.xml" />
+			</fileset>
+			<union refid="client-compiled-cache.gwt.includes" />
+			<fileset refid="common.files.for.all.jars" />
+		</jar>
 	</target>
 
-	<target name="jar" depends="default-widgetset">
+	<target name="client-compiled.jar" depends="default-widgetset">
 		<antcall target="common.pom.xml">
 		</antcall>
-		<property name="result.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
 
-		<jar file="${result.jar}" compress="true">
+		<jar file="${compiled.jar}" compress="true">
 			<fileset dir="${result.dir}">
-				<include name="VAADIN/widgetsets/**" />
+				<include name="VAADIN/widgetsets/com.vaadin*/**" />
 				<include name="pom.xml" />
-				<exclude name="VAADIN/widgetsets/WEB-INF"/>
 			</fileset>
 			<fileset refid="common.files.for.all.jars" />
 		</jar>
+
+
 	</target>
 
-	<target name="publish-local" depends="jar">
+	<target name="publish-local" depends="client-compiled.jar, client-compiled-cache.jar">
 		<antcall target="common.publish-local">
 			<param name="conf" value="build" />
 		</antcall>
-	</ivy:publish>
--->
 	</target>
 
-<target name="clean">
-	<antcall target="common.clean" />
-</target>
+	<target name="clean">
+		<antcall target="common.clean" />
+	</target>
 
-<target name="tests">
-	<!--<antcall target="common.tests.run" />-->
-	<echo>WHAT? No tests for ${module.name}!</echo>
-</target>
+	<target name="tests">
+		<!--<antcall target="common.tests.run" />-->
+		<echo>WHAT? No tests for ${module.name}!</echo>
+	</target>
 
 </project>
\ No newline at end of file
diff --git a/client-compiled/ivy.xml b/client-compiled/ivy.xml
index 7c0fcf0162..496177682a 100644
--- a/client-compiled/ivy.xml
+++ b/client-compiled/ivy.xml
@@ -11,7 +11,8 @@
         <conf name="compile-module" visibility="private" />
     </configurations>
     <publications>
-        <artifact type="jar"></artifact>
+        <artifact type="jar" name="vaadin-client-compiled"/>
+        <artifact type="jar" name="vaadin-client-compiled-cache"/>
     </publications>
     <dependencies>
         <dependency org="com.vaadin" name="vaadin-server"
diff --git a/gwt-files.xml b/gwt-files.xml
index dff4c1baf9..7ec493bff2 100755
--- a/gwt-files.xml
+++ b/gwt-files.xml
@@ -68,7 +68,7 @@
 		</fileset>
 	</union>
 
-	<union id="client-compiled.gwt.includes">
+	<union id="client-compiled-cache.gwt.includes">
 		<!-- Precompiled GWT modules (.gwtar file) -->
 		<fileset dir="${gwt.user.jar.files}">
 			<exclude name="META-INF/**" />
diff --git a/uitest/build.xml b/uitest/build.xml
index 8a5fe71b35..9090df7dcc 100644
--- a/uitest/build.xml
+++ b/uitest/build.xml
@@ -66,6 +66,7 @@
 		</copy>
 
 		<war destfile="${result.war}" duplicate="fail" index="true">
+			<manifest><attribute name="Class-Path" value="WEB-INF/classes"/></manifest>
 			<fileset refid="common.files.for.all.jars" />
 			<fileset dir="${WebContent.dir}">
 				<include name="statictestfiles/**" />
diff --git a/uitest/ivy.xml b/uitest/ivy.xml
index 583e09c76b..b243dfd8ec 100644
--- a/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@ -16,21 +16,23 @@
     <dependencies defaultconf="build" defaultconfmapping="build,ide->default">
         <!-- API DEPENDENCIES -->
         <dependency org="javax.portlet" name="portlet-api"
-            rev="2.0" conf="ide -> default" />
+            rev="2.0" conf="build,ide -> default" />
 
         <dependency org="javax.validation" name="validation-api"
-            rev="1.0.0.GA" conf="ide -> default" />
+            rev="1.0.0.GA" conf="build,ide -> default" />
         <!--Servlet API version 2.5 -->
         <dependency org="javax.servlet" name="servlet-api"
-            rev="2.5" conf="ide -> default" />
+            rev="2.5" conf="build,ide -> default" />
         <!-- Google App Engine -->
         <dependency org="com.google.appengine" name="appengine-api-1.0-sdk"
-            rev="1.2.1" conf="ide -> default" />
+            rev="1.2.1" conf="build,ide -> default" />
 
         <!-- LIBRARY DEPENDENCIES (compile time) -->
         <!-- Project modules -->
         <dependency org="com.vaadin" name="vaadin-server"
             rev="${vaadin.version}" conf="build->build"></dependency>
+        <dependency org="com.vaadin" name="vaadin-client"
+            rev="${vaadin.version}" conf="build->build"></dependency>
         <dependency org="com.vaadin" name="vaadin-client-compiled"
             rev="${vaadin.version}" conf="build->build"></dependency>
         <dependency org="com.vaadin" name="vaadin-themes-compiled"
-- 
cgit v1.2.3


From 1cbf26ffc5f228d7000cac88d5d699a90988aaf9 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Tue, 4 Sep 2012 16:22:57 +0300
Subject: Do not build client-compiled-cache for now, it should be a separate
 module (#9299)

---
 client-compiled/ivy.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'client-compiled/ivy.xml')

diff --git a/client-compiled/ivy.xml b/client-compiled/ivy.xml
index 496177682a..eb5513171e 100644
--- a/client-compiled/ivy.xml
+++ b/client-compiled/ivy.xml
@@ -11,8 +11,9 @@
         <conf name="compile-module" visibility="private" />
     </configurations>
     <publications>
-        <artifact type="jar" name="vaadin-client-compiled"/>
-        <artifact type="jar" name="vaadin-client-compiled-cache"/>
+        <artifact type="jar" name="vaadin-client-compiled" />
+        <!-- cache must be a separate artifact, not within vaadin-client-compiled -->
+        <!-- <artifact type="jar" name="vaadin-client-compiled-cache"/> -->
     </publications>
     <dependencies>
         <dependency org="com.vaadin" name="vaadin-server"
-- 
cgit v1.2.3


From 93ed08119c3fb45a750998f05ba4f67643787295 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Tue, 4 Sep 2012 22:56:14 +0300
Subject: Generate pom artifacts and automatically publish to local Maven
 (#9299)

---
 buildhelpers/ivy.xml      |  8 +++++---
 client-compiled/build.xml |  4 +---
 client-compiled/ivy.xml   |  5 +++--
 client-compiler/ivy.xml   |  5 +++--
 client/ivy.xml            |  3 ++-
 common.xml                | 14 ++++++++++++--
 ivysettings.xml           |  4 ++++
 server/ivy.xml            |  5 +++--
 shared/ivy.xml            |  5 +++--
 theme-compiler/ivy.xml    |  5 +++--
 themes-compiled/build.xml |  3 ++-
 themes-compiled/ivy.xml   |  5 +++--
 uitest/build.xml          |  2 +-
 uitest/ivy.xml            |  4 ++--
 14 files changed, 47 insertions(+), 25 deletions(-)

(limited to 'client-compiled/ivy.xml')

diff --git a/buildhelpers/ivy.xml b/buildhelpers/ivy.xml
index a2a6ea35ae..9d74b56f59 100644
--- a/buildhelpers/ivy.xml
+++ b/buildhelpers/ivy.xml
@@ -17,13 +17,15 @@
     <configurations>
         <conf name="build" />
         <conf name="build-provided" />
-        <conf name="ide" visibility="private"/>
+        <conf name="ide" visibility="private" />
         <conf name="tests" />
     </configurations>
     <publications>
         <artifact type="jar" />
-<!--         <artifact type="source" ext="jar" m:classifier="sources" /> -->
-<!--         <artifact type="javadoc" ext="jar" m:classifier="javadoc" /> -->
+        <!-- <artifact type="source" ext="jar" m:classifier="sources" /> -->
+        <!-- <artifact type="javadoc" ext="jar" m:classifier="javadoc" /> -->
+        <artifact type="pom" ext="pom" />
+
     </publications>
     <dependencies />
 
diff --git a/client-compiled/build.xml b/client-compiled/build.xml
index 2f0c2f6e9c..9327e6da5f 100644
--- a/client-compiled/build.xml
+++ b/client-compiled/build.xml
@@ -94,7 +94,6 @@
 		<jar file="${compiled-cache.jar}" compress="true">
 			<fileset dir="${gwtar.dir}">
 				<include name="**/*.gwtar" />
-				<include name="pom.xml" />
 			</fileset>
 			<union refid="client-compiled-cache.gwt.includes" />
 			<fileset refid="common.files.for.all.jars" />
@@ -115,7 +114,6 @@
 			</manifest>
 			<fileset dir="${result.dir}">
 				<include name="VAADIN/widgetsets/com.vaadin*/**" />
-				<include name="pom.xml" />
 			</fileset>
 			<fileset refid="common.files.for.all.jars" />
 		</jar>
@@ -123,7 +121,7 @@
 
 	</target>
 
-	<target name="publish-local" depends="client-compiled.jar, client-compiled-cache.jar">
+	<target name="publish-local" depends="client-compiled.jar">
 		<antcall target="common.publish-local">
 			<param name="conf" value="build" />
 		</antcall>
diff --git a/client-compiled/ivy.xml b/client-compiled/ivy.xml
index eb5513171e..bddabc8bb8 100644
--- a/client-compiled/ivy.xml
+++ b/client-compiled/ivy.xml
@@ -11,8 +11,9 @@
         <conf name="compile-module" visibility="private" />
     </configurations>
     <publications>
-        <artifact type="jar" name="vaadin-client-compiled" />
-        <!-- cache must be a separate artifact, not within vaadin-client-compiled -->
+        <artifact type="jar" ext="jar"/>
+        <artifact type="pom" ext="pom"/>
+                <!-- cache must be a separate artifact, not within vaadin-client-compiled -->
         <!-- <artifact type="jar" name="vaadin-client-compiled-cache"/> -->
     </publications>
     <dependencies>
diff --git a/client-compiler/ivy.xml b/client-compiler/ivy.xml
index 4eafb3cbae..8c991b2223 100644
--- a/client-compiler/ivy.xml
+++ b/client-compiler/ivy.xml
@@ -12,8 +12,9 @@
         <conf name="ide" visibility="private"/>
     </configurations>
     <publications>
-        <artifact></artifact>
-    </publications>
+        <artifact type="jar" ext="jar"/>
+                <artifact type="pom" ext="pom"/>
+                    </publications>
     <dependencies>
         <dependency org="com.vaadin" name="vaadin-shared"
             rev="${vaadin.version}"></dependency>
diff --git a/client/ivy.xml b/client/ivy.xml
index e81984949f..52706b4ed9 100644
--- a/client/ivy.xml
+++ b/client/ivy.xml
@@ -13,7 +13,8 @@
         <conf name="tests" />
     </configurations>
     <publications>
-        <artifact></artifact>
+        <artifact type="jar" ext="jar"/>
+        <artifact type="pom" ext="pom"/>
     </publications>
     <dependencies defaultconf="build" defaultconfmapping="build,ide->default">
         <!-- API DEPENDENCIES -->
diff --git a/common.xml b/common.xml
index 191b522bc4..c457d827a9 100644
--- a/common.xml
+++ b/common.xml
@@ -20,7 +20,7 @@
 	<target name="pom.xml" description="Generates a pom.xml based on the Ivy configuration">
 		<fail unless="result.dir" message="No result.dir parameter given" />
 		<property name="ivy.xml" location="${result.dir}/../ivy.xml" />
-		<property name="pom.xml" location="${result.dir}/pom.xml" />
+		<property name="pom.xml" location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" />
 		<property name="conf" value="build, build-provided" />
 
 		<ivy:makepom templatefile="${vaadin.basedir}/pom-template.xml" ivyfile="${ivy.xml}" pomfile="${pom.xml}" conf="${conf}">
@@ -86,7 +86,6 @@
 			<fileset dir="${classes}" excludes="${classes.exclude}" />
 			<fileset dir="${src}" excludes="${jar.exclude}" />
 			<fileset refid="common.files.for.all.jars" />
-			<fileset file="${pom.xml}" />
 			<union refid="extra.jar.includes" />
 		</union>
 		<jar destfile="${result.jar}" duplicate="fail" index="true">
@@ -211,5 +210,16 @@
 			<artifacts pattern="${result.dir}/lib/[artifact]-[revision](-[classifier]).[ext]" />
 
 		</ivy:publish>
+		<ivy:publish conf="${conf}" resolver="local-maven" overwrite="true">
+			<artifacts pattern="${result.dir}/lib/[artifact]-[revision](-[classifier]).[ext]" />
+		</ivy:publish>
+	</target>
+
+	<target name="publish.to.local.maven">
+		<property name="conf" value="*(public)" />
+
+		<ivy:resolve conf="${conf}" />
+		<ivy:publish conf="${conf}" resolver="local-maven" overwrite="true">
+		</ivy:publish>
 	</target>
 </project>
\ No newline at end of file
diff --git a/ivysettings.xml b/ivysettings.xml
index f9b3450be3..5940218108 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -11,6 +11,10 @@
     <settings defaultResolver="public" />
     <resolvers>
         <ibiblio name="public" m2compatible="true" />
+        <filesystem name="local-maven" m2compatible="true">
+            <artifact
+                pattern="${user.home}/.m2/repository/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]" />
+        </filesystem>
         <dual name="custom-smartsprites">
             <filesystem name="smartsprites-ivy">
                 <ivy pattern="${basedir}/ivymodule/[module]-ivy-[revision].xml" />
diff --git a/server/ivy.xml b/server/ivy.xml
index c0951e90a3..1e1b4460d7 100644
--- a/server/ivy.xml
+++ b/server/ivy.xml
@@ -13,8 +13,9 @@
         <conf name="tests" visibility="private" />
     </configurations>
     <publications>
-        <artifact></artifact>
-    </publications>
+        <artifact type="jar" ext="jar"/>
+                <artifact type="pom" ext="pom"/>
+                    </publications>
     <dependencies>
         <!-- API DEPENDENCIES -->
 
diff --git a/shared/ivy.xml b/shared/ivy.xml
index f445514bcd..8c344a92e9 100644
--- a/shared/ivy.xml
+++ b/shared/ivy.xml
@@ -13,8 +13,9 @@
         <conf name="tests" />
     </configurations>
     <publications>
-        <artifact></artifact>
-    </publications>
+        <artifact type="jar" ext="jar"/>
+                <artifact type="pom" ext="pom"/>
+                    </publications>
     <dependencies>
     </dependencies>
 
diff --git a/theme-compiler/ivy.xml b/theme-compiler/ivy.xml
index 00da62582c..06285afaf1 100644
--- a/theme-compiler/ivy.xml
+++ b/theme-compiler/ivy.xml
@@ -13,8 +13,9 @@
         <conf name="tests" />
     </configurations>
     <publications>
-        <artifact type="jar" />
-        <artifact type="sources" ext="jar" />
+        <artifact type="jar" ext="jar"/>
+                <artifact type="pom" ext="pom"/>
+                        <artifact type="sources" ext="jar" />
         <artifact type="javadoc" ext="jar" />
     </publications>
     <dependencies defaultconf="*->default">
diff --git a/themes-compiled/build.xml b/themes-compiled/build.xml
index c295c570cd..a3adbd654f 100644
--- a/themes-compiled/build.xml
+++ b/themes-compiled/build.xml
@@ -41,7 +41,8 @@
 		<property name="result.dir" location="result" />
 		<property name="result.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
 		<property name="classes" location="{$result.dir}/classes" />
-
+		<antcall target="common.pom.xml" />
+		
 		<jar jarfile="${result.jar}">
 			<fileset dir="${result.dir}">
 				<include name="VAADIN/themes/**" />
diff --git a/themes-compiled/ivy.xml b/themes-compiled/ivy.xml
index 746acf38c1..6bf7d0d813 100644
--- a/themes-compiled/ivy.xml
+++ b/themes-compiled/ivy.xml
@@ -11,8 +11,9 @@
         <conf name="compile-theme" visibility="private" />
     </configurations>
     <publications>
-        <artifact type="jar"></artifact>
-    </publications>
+        <artifact type="jar" ext="jar"/>
+                <artifact type="pom" ext="pom"/>
+                    </publications>
     <dependencies>
         <dependency org="com.vaadin" name="vaadin-theme-compiler"
             rev="${vaadin.version}" conf="compile-theme->build" />
diff --git a/uitest/build.xml b/uitest/build.xml
index a97886dc8b..29f1540321 100644
--- a/uitest/build.xml
+++ b/uitest/build.xml
@@ -50,7 +50,7 @@
 	</target>
 
 	<target name="testing-widgetset" depends="dependencies,compile">
-		<property name="module" value="com.vaadin.tests.widgetset.TestingWidgetSet"/>
+		<property name="module" value="com.vaadin.tests.widgetset.TestingWidgetSet" />
 		<property name="style" value="OBF" />
 		<property name="localWorkers" value="2" />
 		<property name="extraParams" value="" />
diff --git a/uitest/ivy.xml b/uitest/ivy.xml
index 6cb7fc9050..563be59b0b 100644
--- a/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@ -13,8 +13,8 @@
         <conf name="jetty-run" extends="build" visibility="private" />
     </configurations>
     <publications>
-        <artifact type="war" />
-    </publications>
+        <artifact type="war" ext="war"/>
+                   </publications>
     <dependencies defaultconf="build" defaultconfmapping="build,ide->default">
         <!-- API DEPENDENCIES -->
         <dependency org="javax.portlet" name="portlet-api"
-- 
cgit v1.2.3


From 6da3cd640d404965405d24dd515db90e57c8ad76 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 5 Sep 2012 10:29:34 +0300
Subject: Build javadoc and sources jars (#9299)

---
 build.properties          |  2 --
 buildhelpers/ivy.xml      |  4 ++--
 client-compiled/ivy.xml   | 12 ++++++++----
 client-compiler/build.xml | 15 +++++++++------
 client-compiler/ivy.xml   | 13 ++++++++-----
 client/build.xml          |  3 +++
 client/ivy.xml            |  5 ++++-
 common.xml                | 22 ++++++++++++++++++----
 ivysettings.xml           |  2 +-
 pom-template.xml          |  2 +-
 server/build.xml          |  3 +++
 server/ivy.xml            |  5 ++++-
 shared/build.xml          |  3 +++
 shared/ivy.xml            |  5 ++++-
 theme-compiler/build.xml  |  3 +++
 theme-compiler/ivy.xml    |  7 ++++---
 themes-compiled/ivy.xml   | 11 +++++++----
 uitest/ivy.xml            |  3 ++-
 18 files changed, 84 insertions(+), 36 deletions(-)

(limited to 'client-compiled/ivy.xml')

diff --git a/build.properties b/build.properties
index f5682be0a0..fb08ef6690 100644
--- a/build.properties
+++ b/build.properties
@@ -5,5 +5,3 @@ vaadin.vendor=Vaadin Ltd
 vaadin.java.version=1.6
 vaadin.version=0.0.0.unversioned-development-build
 
-# repository into which Maven snapshots should be published 
-snapshot.repository.url=http://oss.sonatype.org/content/repositories/vaadin-snapshots
diff --git a/buildhelpers/ivy.xml b/buildhelpers/ivy.xml
index 9d74b56f59..ba44ebfc3f 100644
--- a/buildhelpers/ivy.xml
+++ b/buildhelpers/ivy.xml
@@ -22,8 +22,8 @@
     </configurations>
     <publications>
         <artifact type="jar" />
-        <!-- <artifact type="source" ext="jar" m:classifier="sources" /> -->
-        <!-- <artifact type="javadoc" ext="jar" m:classifier="javadoc" /> -->
+        <artifact type="source" ext="jar" m:classifier="sources" />
+        <artifact type="javadoc" ext="jar" m:classifier="javadoc" />
         <artifact type="pom" ext="pom" />
 
     </publications>
diff --git a/client-compiled/ivy.xml b/client-compiled/ivy.xml
index bddabc8bb8..a136929929 100644
--- a/client-compiled/ivy.xml
+++ b/client-compiled/ivy.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivy-module version="2.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+    xmlns:m="http://ant.apache.org/ivy/maven">
 
     <info organisation="com.vaadin" module="vaadin-client-compiled"
         revision="${vaadin.version}" />
 
     <configurations>
         <conf name="build" />
+        <conf name="build-provided" />
         <conf name="compile-module" visibility="private" />
     </configurations>
     <publications>
-        <artifact type="jar" ext="jar"/>
-        <artifact type="pom" ext="pom"/>
-                <!-- cache must be a separate artifact, not within vaadin-client-compiled -->
+        <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" />
+        <!-- cache must be a separate artifact, not within vaadin-client-compiled -->
         <!-- <artifact type="jar" name="vaadin-client-compiled-cache"/> -->
     </publications>
     <dependencies>
diff --git a/client-compiler/build.xml b/client-compiler/build.xml
index fd29e8ed02..97645ea51c 100644
--- a/client-compiler/build.xml
+++ b/client-compiler/build.xml
@@ -25,12 +25,12 @@
 	<target name="jar">
 		<!-- Get Git revision -->
 		<exec executable="git" outputproperty="git.revision" failifexecutionfails="false" errorproperty="">
-			 <arg value="describe"/>
-			 <arg value="--tags"/>
-			 <arg value="--always"/>
-			 <arg value="HEAD"/>
-		</exec> 
-		 
+			<arg value="describe"/>
+			<arg value="--tags"/>
+			<arg value="--always"/>
+			<arg value="HEAD"/>
+		</exec>
+
 		<echo file="${result.dir}/com/google/gwt/dev/About.properties">gwt.version=${vaadin.version}
 gwt.svnrev=${git.revision}</echo>
 
@@ -40,6 +40,9 @@ gwt.svnrev=${git.revision}</echo>
 	</target>
 
 	<target name="publish-local" depends="jar">
+		<antcall target="common.sources.jar" />
+		<antcall target="common.javadoc.jar" />
+
 		<antcall target="common.publish-local" />
 	</target>
 
diff --git a/client-compiler/ivy.xml b/client-compiler/ivy.xml
index 8c991b2223..d824f503b2 100644
--- a/client-compiler/ivy.xml
+++ b/client-compiler/ivy.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivy-module version="2.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+    xmlns:m="http://ant.apache.org/ivy/maven">
 
     <info organisation="com.vaadin" module="vaadin-client-compiler"
         revision="${vaadin.version}" />
@@ -9,12 +10,14 @@
     <configurations>
         <conf name="build" />
         <conf name="build-provided" />
-        <conf name="ide" visibility="private"/>
+        <conf name="ide" visibility="private" />
     </configurations>
     <publications>
-        <artifact type="jar" ext="jar"/>
-                <artifact type="pom" ext="pom"/>
-                    </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>
         <dependency org="com.vaadin" name="vaadin-shared"
             rev="${vaadin.version}"></dependency>
diff --git a/client/build.xml b/client/build.xml
index de1b5444a8..f0ee0892f9 100644
--- a/client/build.xml
+++ b/client/build.xml
@@ -28,6 +28,9 @@
 	</target>
 
 	<target name="publish-local" depends="jar">
+		<antcall target="common.sources.jar" />
+		<antcall target="common.javadoc.jar" />
+
 		<antcall target="common.publish-local" />
 	</target>
 
diff --git a/client/ivy.xml b/client/ivy.xml
index 52706b4ed9..39ed494d86 100644
--- a/client/ivy.xml
+++ b/client/ivy.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivy-module version="2.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+    xmlns:m="http://ant.apache.org/ivy/maven">
 
     <info organisation="com.vaadin" module="vaadin-client"
         revision="${vaadin.version}" />
@@ -14,6 +15,8 @@
     </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 defaultconf="build" defaultconfmapping="build,ide->default">
diff --git a/common.xml b/common.xml
index c457d827a9..efaf47d30d 100644
--- a/common.xml
+++ b/common.xml
@@ -1,8 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="common" basedir="." default="" xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="common" basedir="." default="" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:antcontrib="antlib:net.sf.antcontrib">
+
 	<dirname property="vaadin.basedir" file="${ant.file.common}" />
 	<property file="${vaadin.basedir}/build.properties" />
-	<ivy:settings file="${vaadin.basedir}/ivysettings.xml" />
+
+	<ivy:resolve file="${vaadin.basedir}/build/ivy/ivy.xml" conf="taskdefs" />
+	<ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" />
+	<taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml" classpathref="taskdefs.classpath" />
+	<!-- ant contrib for Maven integration -->
+	<taskdef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" />
+
+	<!-- FIXME These are not available in other files -->
+	<antcontrib:propertyregex property="vaadin.version.major" input="${version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\1" />
+	<antcontrib:propertyregex property="vaadin.version.minor" input="${version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\2" />
+	<antcontrib:propertyregex property="vaadin.version.revision" input="${version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\3" />
+
+	<ivy:settings file="${vaadin.basedir}/ivysettings.xml" id="ivysettings" />
 
 	<union id="empty.reference" />
 
@@ -22,6 +35,7 @@
 		<property name="ivy.xml" location="${result.dir}/../ivy.xml" />
 		<property name="pom.xml" location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" />
 		<property name="conf" value="build, build-provided" />
+		<property name="vaadin.maven.version" value="${vaadin.version.major}.${vaadin.version.minor}-SNAPSHOT" />
 
 		<ivy:makepom templatefile="${vaadin.basedir}/pom-template.xml" ivyfile="${ivy.xml}" pomfile="${pom.xml}" conf="${conf}">
 			<mapping conf="build" scope="compile" />
@@ -205,12 +219,12 @@
 		<property name="conf" value="*(public)" />
 
 		<ivy:resolve conf="${conf}" />
-		<ivy:publish conf="${conf}" resolver="build-temp" overwrite="true" forcedeliver="true">
+		<ivy:publish settingsref="ivysettings" conf="${conf}" resolver="build-temp" overwrite="true" forcedeliver="true">
 			<!--			<artifacts pattern="${result.dir}/[artifact]-[revision].[ext]" />-->
 			<artifacts pattern="${result.dir}/lib/[artifact]-[revision](-[classifier]).[ext]" />
 
 		</ivy:publish>
-		<ivy:publish conf="${conf}" resolver="local-maven" overwrite="true">
+		<ivy:publish settingsref="ivysettings" conf="${conf}" resolver="local-maven" overwrite="true">
 			<artifacts pattern="${result.dir}/lib/[artifact]-[revision](-[classifier]).[ext]" />
 		</ivy:publish>
 	</target>
diff --git a/ivysettings.xml b/ivysettings.xml
index 5940218108..487fc921df 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -28,7 +28,7 @@
             <ivy
                 pattern="${ivy.settings.dir}/result/artifacts/[revision]/[module]/ivy-[revision].xml" />
             <artifact
-                pattern="${ivy.settings.dir}/result/artifacts/[revision]/[module]/[artifact]-[revision].[ext]" />
+                pattern="${ivy.settings.dir}/result/artifacts/[revision]/[module]/[artifact]-[revision](-[classifier]).[ext]" />
         </filesystem>
     </resolvers>
     <modules>
diff --git a/pom-template.xml b/pom-template.xml
index cec0ca6dc4..563a5a8e97 100644
--- a/pom-template.xml
+++ b/pom-template.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.vaadin</groupId>
   <artifactId>${module.name}</artifactId>
-  <version>${vaadin.version}</version>
+  <version>${vaadin.maven.version}</version>
   <name>Vaadin</name>
   <organization>
     <name>Vaadin Ltd</name>
diff --git a/server/build.xml b/server/build.xml
index 2763d5ff10..c08df072cd 100644
--- a/server/build.xml
+++ b/server/build.xml
@@ -29,6 +29,9 @@
 	</target>
 
 	<target name="publish-local" depends="jar">
+		<antcall target="common.sources.jar" />
+		<antcall target="common.javadoc.jar" />
+
 		<antcall target="common.publish-local" />
 	</target>
 
diff --git a/server/ivy.xml b/server/ivy.xml
index 1e1b4460d7..99e5ae7811 100644
--- a/server/ivy.xml
+++ b/server/ivy.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivy-module version="2.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+    xmlns:m="http://ant.apache.org/ivy/maven">
 
     <info organisation="com.vaadin" module="vaadin-server"
         revision="${vaadin.version}" />
@@ -14,6 +15,8 @@
     </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>
diff --git a/shared/build.xml b/shared/build.xml
index 29f68ef643..d458b57d71 100644
--- a/shared/build.xml
+++ b/shared/build.xml
@@ -22,6 +22,9 @@
 	</target>
 
 	<target name="publish-local" depends="jar">
+		<antcall target="common.sources.jar" />
+		<antcall target="common.javadoc.jar" />
+
 		<antcall target="common.publish-local" />
 	</target>
 		
diff --git a/shared/ivy.xml b/shared/ivy.xml
index 8c344a92e9..413231ab01 100644
--- a/shared/ivy.xml
+++ b/shared/ivy.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivy-module version="2.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+    xmlns:m="http://ant.apache.org/ivy/maven">
 
     <info organisation="com.vaadin" module="vaadin-shared"
         revision="${vaadin.version}" />
@@ -14,6 +15,8 @@
     </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>
diff --git a/theme-compiler/build.xml b/theme-compiler/build.xml
index aa378f7769..300f2718aa 100644
--- a/theme-compiler/build.xml
+++ b/theme-compiler/build.xml
@@ -21,6 +21,9 @@
 		</antcall>
 	</target>
 	<target name="publish-local" depends="jar">
+		<antcall target="common.sources.jar" />
+		<antcall target="common.javadoc.jar" />
+
 		<antcall target="common.publish-local" />
 	</target>
 
diff --git a/theme-compiler/ivy.xml b/theme-compiler/ivy.xml
index 06285afaf1..873faa7a84 100644
--- a/theme-compiler/ivy.xml
+++ b/theme-compiler/ivy.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivy-module version="2.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+    xmlns:m="http://ant.apache.org/ivy/maven">
 
     <info organisation="com.vaadin" module="vaadin-theme-compiler"
         revision="${vaadin.version}" />
@@ -15,8 +16,8 @@
     <publications>
         <artifact type="jar" ext="jar"/>
                 <artifact type="pom" ext="pom"/>
-                        <artifact type="sources" ext="jar" />
-        <artifact type="javadoc" ext="jar" />
+<artifact type="source" ext="jar" m:classifier="sources" />
+<artifact type="javadoc" ext="jar" m:classifier="javadoc" />
     </publications>
     <dependencies defaultconf="*->default">
         <!-- LIBRARY DEPENDENCIES (compile time) -->
diff --git a/themes-compiled/ivy.xml b/themes-compiled/ivy.xml
index 6bf7d0d813..ce5260c598 100644
--- a/themes-compiled/ivy.xml
+++ b/themes-compiled/ivy.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivy-module version="2.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+    xmlns:m="http://ant.apache.org/ivy/maven">
 
     <info organisation="com.vaadin" module="vaadin-themes-compiled"
         revision="${vaadin.version}" />
@@ -11,9 +12,11 @@
         <conf name="compile-theme" visibility="private" />
     </configurations>
     <publications>
-        <artifact type="jar" ext="jar"/>
-                <artifact type="pom" ext="pom"/>
-                    </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>
         <dependency org="com.vaadin" name="vaadin-theme-compiler"
             rev="${vaadin.version}" conf="compile-theme->build" />
diff --git a/uitest/ivy.xml b/uitest/ivy.xml
index 563be59b0b..2a9bc6b2ef 100644
--- a/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivy-module version="2.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+    xmlns:m="http://ant.apache.org/ivy/maven">
 
     <info organisation="com.vaadin" module="vaadin-uitest"
         revision="${vaadin.version}" />
-- 
cgit v1.2.3


From 94b1759e67c07fbca4c7371b374da97feb0fe7e7 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 6 Sep 2012 19:09:03 +0300
Subject: Moved validation dependency to compiler (#9299)

---
 client-compiled/ivy.xml | 2 --
 client-compiler/ivy.xml | 6 ++++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'client-compiled/ivy.xml')

diff --git a/client-compiled/ivy.xml b/client-compiled/ivy.xml
index a136929929..7802775f70 100644
--- a/client-compiled/ivy.xml
+++ b/client-compiled/ivy.xml
@@ -27,8 +27,6 @@
             rev="${vaadin.version}" conf="compile-module-> build" />
         <dependency org="com.vaadin" name="vaadin-client-compiler"
             rev="${vaadin.version}" conf="compile-module-> build" />
-        <dependency org="javax.validation" name="validation-api"
-            rev="1.0.0.GA" conf="compile-module-> default,sources" />
     </dependencies>
 
 </ivy-module>
diff --git a/client-compiler/ivy.xml b/client-compiler/ivy.xml
index 3e8b46d77b..d57c3f700c 100644
--- a/client-compiler/ivy.xml
+++ b/client-compiler/ivy.xml
@@ -27,8 +27,10 @@
             rev="${vaadin.version}" conf="build" />
         <dependency org="commons-collections" name="commons-collections"
             rev="3.1" conf="build,ide -> default" />
-        <dependency org="ant" name="ant"
-            rev="1.6.5" conf="build,ide -> default" />
+        <dependency org="ant" name="ant" rev="1.6.5"
+            conf="build,ide -> default" />
+        <dependency org="javax.validation" name="validation-api"
+            rev="1.0.0.GA" conf="build->default,sources" />
 
     </dependencies>
 
-- 
cgit v1.2.3