From: Artur Signell <artur@vaadin.com>
Date: Fri, 5 Apr 2013 17:52:24 +0000 (+0300)
Subject: Added push meta module (#11498)
X-Git-Tag: 7.1.0.beta1~148
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e2578b2ac7df899853ea21397808d2bb8120de34;p=vaadin-framework.git

Added push meta module (#11498)

Change-Id: Ia95f4682333656fc34f04e563dc256ef45f987c1
---

diff --git a/all/ivy.xml b/all/ivy.xml
index 103d65e812..2b212f6675 100644
--- a/all/ivy.xml
+++ b/all/ivy.xml
@@ -32,6 +32,8 @@
             rev="${vaadin.version}"/>
         <dependency org="com.vaadin" name="vaadin-client-compiled"
             rev="${vaadin.version}"/>
+        <dependency org="com.vaadin" name="vaadin-push"
+            rev="${vaadin.version}"/>
 
     </dependencies>
 
diff --git a/common.xml b/common.xml
index eceb0b9077..d673273a53 100644
--- a/common.xml
+++ b/common.xml
@@ -9,7 +9,7 @@
 	<property name="gwt.basedir" location="${vaadin.basedir}/../gwt" />
 	<property file="${vaadin.basedir}/build.properties" />
 
-	<property name="modules.to.publish.to.maven" value="shared,server,client,client-compiler,client-compiled,theme-compiler,themes" />
+	<property name="modules.to.publish.to.maven" value="shared,server,client,client-compiler,client-compiled,theme-compiler,themes,push" />
 	<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 f43b9ccb14..288eae9036 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -51,6 +51,8 @@
             resolver="build-temp" />
         <module organisation="com.vaadin" name="vaadin-themes"
             resolver="build-temp" />
+        <module organisation="com.vaadin" name="vaadin-push"
+            resolver="build-temp" />
     </modules>
 
 
diff --git a/push/build.xml b/push/build.xml
new file mode 100644
index 0000000000..6fae99e760
--- /dev/null
+++ b/push/build.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+
+<project name="vaadin-push" basedir="." default="publish-local">
+	<description>
+		Meta package which defines dependencies needed for push
+	</description>
+	<include file="../build.xml" as="vaadin" />
+	<include file="../common.xml" as="common" />
+
+	<property name="module.name" value="vaadin-push" />
+	<property name="module.symbolic" value="com.vaadin.push" />
+	<property name="result.dir" location="result" />
+	<path id="classpath.compile.custom" />
+
+   	 <target name="jar">
+            <property name="server.osgi.import" value="" />
+            <antcall target="common.jar">
+                    <param name="require-bundle" value="" />
+                    <param name="import-package" value="${server.osgi.import}" />
+           		  <reference torefid="extra.jar.includes"
+           		  refid="empty.reference" />
+	    </antcall>
+	 </target>
+
+         <target name="publish-local" depends="jar">
+             <antcall target="common.publish-local" />
+         </target>
+
+         <target name="clean">
+             <antcall target="common.clean" />
+         </target>
+         <target name="checkstyle">
+	 </target>
+
+	<target name="test" depends="checkstyle">
+	</target>
+</project>
\ No newline at end of file
diff --git a/push/ivy.xml b/push/ivy.xml
new file mode 100644
index 0000000000..6e648bfc01
--- /dev/null
+++ b/push/ivy.xml
@@ -0,0 +1,35 @@
+<?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-push"
+        revision="${vaadin.version}" />
+
+    <configurations>
+        <conf name="build" />
+        <conf name="build-provided" />
+        <conf name="ide" visibility="private" />
+        <conf name="test" 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>
+	
+		
+        <!-- API DEPENDENCIES -->
+           
+        <!-- Atmosphere -->
+        <dependency org="org.atmosphere" name="atmosphere-runtime" rev="1.0.12"
+        	conf="build,ide,test -> default">
+        </dependency>
+    </dependencies>
+
+</ivy-module>
diff --git a/uitest/ivy.xml b/uitest/ivy.xml
index 55f682e14e..ad00b93bfd 100644
--- a/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@ -40,6 +40,8 @@
             rev="${vaadin.version}" conf="build->build"></dependency>
         <dependency org="com.vaadin" name="vaadin-themes"
             rev="${vaadin.version}" conf="build->build"></dependency>
+        <dependency org="com.vaadin" name="vaadin-push"
+            rev="${vaadin.version}" conf="build->build"></dependency>
             
         <!-- For compiling TestingWidgetSet -->
         <dependency org="com.vaadin" name="vaadin-client-compiler"