From: Artur Signell <artur@vaadin.com>
Date: Mon, 8 Oct 2012 12:56:55 +0000 (+0300)
Subject: Make vaadin.client-compiled a bundle (#9793)
X-Git-Tag: 7.0.0.beta6~84^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F73%2F73%2F1;p=vaadin-framework.git

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 be32dea853..f75a27ffcd 100644
--- 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>