From: Artur Signell <artur@vaadin.com>
Date: Thu, 13 Sep 2012 08:42:35 +0000 (+0300)
Subject: Moved Vaadin-Widgetsets to client package where it belongs (#9593)
X-Git-Tag: 7.0.0.beta1~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=47638e7f5c3e320958dbbe2ae7e7ef001a784420;p=vaadin-framework.git

Moved Vaadin-Widgetsets to client package where it belongs (#9593)
---

diff --git a/client-compiled/build.xml b/client-compiled/build.xml
index 9327e6da5f..be32dea853 100644
--- a/client-compiled/build.xml
+++ b/client-compiled/build.xml
@@ -106,8 +106,6 @@
 
 		<jar file="${compiled.jar}" compress="true">
 			<manifest>
-				<attribute name="Vaadin-Package-Version" value="1" />
-				<attribute name="Vaadin-Widgetsets" value="com.vaadin.DefaultWidgetSet" />
 				<attribute name="Implementation-Vendor" value="Vaadin Ltd" />
 				<attribute name="Implementation-URL" value="http://vaadin.com" />
 				<attribute name="Implementation-Version" value="${vaadin.version}" />
diff --git a/client/build.xml b/client/build.xml
index 47b113e90f..03c9c91401 100644
--- a/client/build.xml
+++ b/client/build.xml
@@ -22,9 +22,16 @@
 	<path id="classpath.tests.custom" />
 
 	<target name="jar">
+		<property name="jar.file" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
 		<antcall target="common.jar">
 			<reference refid="client.gwt.includes" torefid="extra.jar.includes" />
 		</antcall>
+		<jar destfile="${jar.file}" update="true">
+			<manifest>
+				<attribute name="Vaadin-Package-Version" value="1" />
+				<attribute name="Vaadin-Widgetsets" value="com.vaadin.DefaultWidgetSet" />
+			</manifest>
+		</jar>
 		<!-- Hack to add validation dependency with source classifier -->
 		<property name="pom.xml" location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" />
 		<copy file="${pom.xml}" tofile="${temp.pom}">