Renamed themes-compiled -> themes (#9598)

diff --git a/all/ivy.xml b/all/ivy.xml
index 4450eb168f5a25f4b3ec6815442d2f33d13ff363..aebba5ba35307bda5c05dfea1f79a4eb33c63442 100644 (file)
--- 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 2d64fb88e560960620a5daa55467f659bc124db5..a854ef4358da7d8d3a6b3211daba44f4be8cd27f 100644 (file)
--- 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 487fc921dffca17cd1c15734ba0f1943890ff4ca..e1e2e45b3d0aae6300b00f4703b2bba67eb79663 100644 (file)
--- 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 (file)
index b5e27c8..0000000
--- 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 (file)
index ce5260c..0000000
--- 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 (file)
index 0000000..d3a657c
--- /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 (file)
index 0000000..2f39771
--- /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 2a9bc6b2ef0c7d5af73290fc3dd836fb3df84533..00a5dce70370659b946cfd64069eb30682e4be31 100644 (file)
--- 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 -->