diff options
| author | Artur Signell <artur@vaadin.com> | 2015-12-20 11:35:40 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2016-07-16 15:10:06 +0000 |
| commit | a6e9d0de179758c578cdb482f20af6d243ebf5f0 (patch) | |
| tree | 3b5da54ef2062c9c5d67b2e31fe000abd0f9b67e /push/pom.xml | |
| parent | c9ceada8cf73b9e5044c05c0fc071ec7b8c13e0a (diff) | |
| download | vaadin-framework-a6e9d0de179758c578cdb482f20af6d243ebf5f0.tar.gz vaadin-framework-a6e9d0de179758c578cdb482f20af6d243ebf5f0.zip | |
Use pure JS instead of JQuery JS for Atmosphere (#19396)
Change-Id: I20c6e98fe84f0e42c3aa7544a85d4283e2a21537
Diffstat (limited to 'push/pom.xml')
| -rw-r--r-- | push/pom.xml | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/push/pom.xml b/push/pom.xml index 51c2557d47..d1ebfd4e4e 100644 --- a/push/pom.xml +++ b/push/pom.xml @@ -26,7 +26,7 @@ </dependency> <dependency> <groupId>com.vaadin.external.atmosphere.client</groupId> - <artifactId>jquery</artifactId> + <artifactId>javascript</artifactId> <version>${atmosphere.js.version}</version> <type>war</type> <scope>provided</scope> @@ -48,7 +48,7 @@ <!-- <inherited>false</inherited> --> <configuration> <target> - <property name="jquery.unpack" location="${project.build.directory}/temp" /> + <property name="javascript.unpack" location="${project.build.directory}/temp" /> <property name="vaadinPush.js" location="${project.build.outputDirectory}/VAADIN/vaadinPush.debug.js" /> <property name="templates.dir" @@ -56,24 +56,21 @@ <!-- Unzip to temp dir --> <unzip - src="${maven.dependency.com.vaadin.external.atmosphere.client.jquery.war.path}" - dest="${jquery.unpack}"> + src="${maven.dependency.com.vaadin.external.atmosphere.client.javascript.war.path}" + dest="${javascript.unpack}"> <patternset> - <include name="**/jquery.atmosphere.js" /> + <include name="**/atmosphere.js" /> </patternset> <mapper type="flatten" /> </unzip> - <loadfile srcfile="${templates.dir}/jquery-1.11.0.js" - property="jquery.js.contents" /> - <loadfile srcfile="${jquery.unpack}/jquery.atmosphere.js" - property="jquery.atmosphere.js.contents" /> + <loadfile srcfile="${javascript.unpack}/atmosphere.js" + property="atmosphere.js.contents" /> <loadfile srcfile="${templates.dir}/vaadinPush.js.tpl" property="vaadinPush.js.contents"> <filterchain> <replacetokens begintoken="@" endtoken="@"> - <token key="jquery.js" value="${jquery.js.contents}" /> - <token key="jquery.atmosphere.js" value="${jquery.atmosphere.js.contents}" /> + <token key="atmosphere.js" value="${atmosphere.js.contents}" /> </replacetokens> </filterchain> </loadfile> |