summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.classpath5
-rw-r--r--push/ivy.xml33
2 files changed, 36 insertions, 2 deletions
diff --git a/.classpath b/.classpath
index 517b236661..70997e763b 100644
--- a/.classpath
+++ b/.classpath
@@ -2,14 +2,15 @@
<classpath>
<classpathentry kind="src" path="server/tests/src"/>
<classpathentry kind="src" path="client/tests/src"/>
- <classpathentry kind="src" path="shared/tests/src"/>
+ <classpathentry kind="src" path="shared/src/test/java"/>
<classpathentry kind="src" path="client/src"/>
<classpathentry kind="src" path="server/src"/>
<classpathentry kind="src" path="client-compiler/src"/>
<classpathentry kind="src" path="client-compiler/tests/src"/>
<classpathentry kind="src" path="uitest/src"/>
+ <classpathentry kind="src" path="shared/src/main/java"/>
+ <classpathentry kind="src" path="shared/src/main/java-templates"/>
<classpathentry kind="src" path="buildhelpers/src"/>
- <classpathentry kind="src" path="shared/src"/>
<classpathentry kind="src" path="widgets/src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes>
diff --git a/push/ivy.xml b/push/ivy.xml
new file mode 100644
index 0000000000..8bd9bc3d80
--- /dev/null
+++ b/push/ivy.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE ivy-module [
+<!-- Keep the version number in sync with build.xml -->
+ <!ENTITY atmosphere.runtime.version "2.2.7.vaadin1">
+
+ <!ENTITY atmosphere.js.version "2.2.13.vaadin3">
+]>
+<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="ide" visibility="private" />
+ </configurations>
+
+ <dependencies>
+ <!-- API DEPENDENCIES -->
+
+ <!-- @WebListener is used for JSR356 websockets so we need to compile with servlet 3 API -->
+ <dependency org="javax.servlet" name="javax.servlet-api"
+ rev="3.0.1" conf="ide -> default" />
+
+ <!-- Atmosphere -->
+ <dependency org="com.vaadin.external.atmosphere"
+ name="atmosphere-runtime" rev="&atmosphere.runtime.version;"
+ conf="ide -> default" />
+ <dependency org="com.vaadin.external.atmosphere.client"
+ name="jquery" rev="&atmosphere.js.version;" conf="ide -> default" />
+ </dependencies>
+</ivy-module> \ No newline at end of file