Make vaadin.client-compiled a bundle (#9793)

Refactored client-compiled/build.xml to use the common.xml jar target

Change-Id: Ia25f247cd91b2a93b7abd739e015a34ee46268be

diff --git a/client-compiled/build.xml b/client-compiled/build.xml
index be32dea853c04c1761d40950ca3a03c0f6f30346..f75a27ffcd400765a3e5617aa495d2ec74a53996 100644 (file)
--- a/client-compiled/build.xml
+++ b/client-compiled/build.xml
@@ -18,6 +18,12 @@
        <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" />
 
+       <union id="jar.includes">
+               <fileset dir="${result.dir}">
+                       <include name="VAADIN/widgetsets/com.vaadin*/**" />
+               </fileset>
+       </union>
+       
        <target name="default-widgetset-cache">
                <antcall target="compile-module-cache">
                        <param name="module" value="com.vaadin.DefaultWidgetSet" />
@@ -100,26 +106,13 @@
                </jar>
        </target>
 
-       <target name="client-compiled.jar" depends="default-widgetset">
-               <antcall target="common.pom.xml">
+       <target name="jar" depends="default-widgetset">
+               <antcall target="common.jar">
+                       <reference torefid="extra.jar.includes" refid="jar.includes" />
                </antcall>
-
-               <jar file="${compiled.jar}" compress="true">
-                       <manifest>
-                               <attribute name="Implementation-Vendor" value="Vaadin Ltd" />
-                               <attribute name="Implementation-URL" value="http://vaadin.com" />
-                               <attribute name="Implementation-Version" value="${vaadin.version}" />
-                       </manifest>
-                       <fileset dir="${result.dir}">
-                               <include name="VAADIN/widgetsets/com.vaadin*/**" />
-                       </fileset>
-                       <fileset refid="common.files.for.all.jars" />
-               </jar>
-
-
        </target>
-
-       <target name="publish-local" depends="client-compiled.jar">
+       
+       <target name="publish-local" depends="jar">
                <antcall target="common.publish-local">
                        <param name="conf" value="build" />
                </antcall>