From: Artur Signell <artur@vaadin.com>
Date: Thu, 13 Sep 2012 11:35:23 +0000 (+0300)
Subject: Renamed themes-compiled -> themes (#9598)
X-Git-Tag: 7.0.0.beta1~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0ce6f77ab353c1bc1decc7f02203cd07a5ff5d27;p=vaadin-framework.git

Renamed themes-compiled -> themes (#9598)
---

diff --git a/all/ivy.xml b/all/ivy.xml
index 4450eb168f..aebba5ba35 100644
--- a/all/ivy.xml
+++ b/all/ivy.xml
@@ -27,7 +27,7 @@
             rev="${vaadin.version}"/>
         <dependency org="com.vaadin" name="vaadin-theme-compiler"
             rev="${vaadin.version}"/>
-        <dependency org="com.vaadin" name="vaadin-themes-compiled"
+        <dependency org="com.vaadin" name="vaadin-themes"
             rev="${vaadin.version}"/>
         <dependency org="com.vaadin" name="vaadin-client-compiled"
             rev="${vaadin.version}"/>
diff --git a/common.xml b/common.xml
index 2d64fb88e5..a854ef4358 100644
--- a/common.xml
+++ b/common.xml
@@ -8,7 +8,7 @@
 	<dirname property="vaadin.basedir" file="${ant.file.common}" />
 	<property file="${vaadin.basedir}/build.properties" />
 
-	<property name="modules.to.publish.to.maven" value="shared,server,client,client-compiler,client-compiled,theme-compiler,themes-compiled" />
+	<property name="modules.to.publish.to.maven" value="shared,server,client,client-compiler,client-compiled,theme-compiler,themes" />
 	<property name="modules.to.publish.to.download" value="${modules.to.publish.to.maven},all" />
 
 	<ivy:settings file="${vaadin.basedir}/ivysettings.xml" />
diff --git a/ivysettings.xml b/ivysettings.xml
index 487fc921df..e1e2e45b3d 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -49,7 +49,7 @@
             resolver="build-temp" />
         <module organisation="com.vaadin" name="vaadin-theme-compiler"
             resolver="build-temp" />
-        <module organisation="com.vaadin" name="vaadin-themes-compiled"
+        <module organisation="com.vaadin" name="vaadin-themes"
             resolver="build-temp" />
     </modules>
 
diff --git a/themes-compiled/build.xml b/themes-compiled/build.xml
deleted file mode 100644
index b5e27c882f..0000000000
--- a/themes-compiled/build.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?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" />
-		<antcall target="common.pom.xml" />
-		
-		<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}" />
-			<arg value="--theme-version" />
-			<arg value="${vaadin.version}" />
-			<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
deleted file mode 100644
index ce5260c598..0000000000
--- a/themes-compiled/ivy.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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"
-    xmlns:m="http://ant.apache.org/ivy/maven">
-
-    <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" 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" />
-    </dependencies>
-
-</ivy-module>
diff --git a/themes/build.xml b/themes/build.xml
new file mode 100644
index 0000000000..d3a657cd18
--- /dev/null
+++ b/themes/build.xml
@@ -0,0 +1,106 @@
+<?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" />
+	<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" />
+		<antcall target="common.pom.xml" />
+		
+		<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}" />
+			<arg value="--theme-version" />
+			<arg value="${vaadin.version}" />
+			<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/ivy.xml b/themes/ivy.xml
new file mode 100644
index 0000000000..2f39771a95
--- /dev/null
+++ b/themes/ivy.xml
@@ -0,0 +1,25 @@
+<?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"
+    xmlns:m="http://ant.apache.org/ivy/maven">
+
+    <info organisation="com.vaadin" module="vaadin-themes"
+        revision="${vaadin.version}" />
+
+    <configurations>
+        <conf name="build" />
+        <conf name="compile-theme" 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>
+        <dependency org="com.vaadin" name="vaadin-theme-compiler"
+            rev="${vaadin.version}" conf="compile-theme->build" />
+    </dependencies>
+
+</ivy-module>
diff --git a/uitest/ivy.xml b/uitest/ivy.xml
index 2a9bc6b2ef..00a5dce703 100644
--- a/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@ -38,7 +38,7 @@
             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"
+        <dependency org="com.vaadin" name="vaadin-themes"
             rev="${vaadin.version}" conf="build->build"></dependency>
             
         <!-- For compiling TestingWidgetSet -->