You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/08/15 12:03:46 UTC
[12/18] git commit: WICKET-5674 Use jquery.atmosphere.js as a Webjar
WICKET-5674 Use jquery.atmosphere.js as a Webjar
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cd5d8f2b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cd5d8f2b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cd5d8f2b
Branch: refs/heads/wicket-6.x
Commit: cd5d8f2b9084f923457b986a45c870620b1320e3
Parents: 5ee5396
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Aug 13 15:21:45 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Aug 13 15:21:45 2014 +0200
----------------------------------------------------------------------
.../atmosphere/AtmosphereApplication.java | 4 +
wicket-experimental/wicket-atmosphere/pom.xml | 17 +
...JQueryWicketAtmosphereResourceReference.java | 5 +-
.../wicket/atmosphere/jquery.atmosphere.js | 3012 ------------------
.../atmosphere/tester/AtmosphereTester.java | 2 +
5 files changed, 26 insertions(+), 3014 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd5d8f2b/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/AtmosphereApplication.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/AtmosphereApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/AtmosphereApplication.java
index df8d32e..52c6b14 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/AtmosphereApplication.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/atmosphere/AtmosphereApplication.java
@@ -21,6 +21,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
+import de.agilecoders.wicket.webjars.WicketWebjars;
import org.apache.wicket.Application;
import org.apache.wicket.atmosphere.EventBus;
import org.apache.wicket.atmosphere.config.AtmosphereLogLevel;
@@ -55,6 +56,9 @@ public class AtmosphereApplication extends WebApplication
public void init()
{
super.init();
+
+ WicketWebjars.install(this);
+
eventBus = new EventBus(this);
eventBus.getParameters().setTransport(AtmosphereTransport.STREAMING);
eventBus.getParameters().setLogLevel(AtmosphereLogLevel.DEBUG);
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd5d8f2b/wicket-experimental/wicket-atmosphere/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/pom.xml b/wicket-experimental/wicket-atmosphere/pom.xml
index d92b0b5..a55ad3c 100644
--- a/wicket-experimental/wicket-atmosphere/pom.xml
+++ b/wicket-experimental/wicket-atmosphere/pom.xml
@@ -28,6 +28,7 @@
<packaging>jar</packaging>
<properties>
<atmosphere.version>2.1.8</atmosphere.version>
+ <jquery.atmosphere.version>2.1.6</jquery.atmosphere.version>
</properties>
<name>Wicket-Atmosphere</name>
<description>Wicket-Atmosphere provides integration of the Atmosphere Framework in Wicket.</description>
@@ -53,6 +54,22 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>jquery-atmosphere</artifactId>
+ <version>${jquery.atmosphere.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.webjars</groupId>
+ <artifactId>jquery</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>de.agilecoders.wicket.webjars</groupId>
+ <artifactId>wicket-webjars</artifactId>
+ <version>0.4.2</version>
+ </dependency>
+ <dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>1.3.9</version>
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd5d8f2b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/JQueryWicketAtmosphereResourceReference.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/JQueryWicketAtmosphereResourceReference.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/JQueryWicketAtmosphereResourceReference.java
index 53c5f06..f746b50 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/JQueryWicketAtmosphereResourceReference.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/JQueryWicketAtmosphereResourceReference.java
@@ -18,6 +18,7 @@ package org.apache.wicket.atmosphere;
import java.util.Arrays;
+import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.resource.JQueryPluginResourceReference;
@@ -49,7 +50,7 @@ public class JQueryWicketAtmosphereResourceReference extends JQueryPluginResourc
@Override
public Iterable<? extends HeaderItem> getDependencies()
{
- return Arrays.asList(JavaScriptHeaderItem.forReference(new JQueryPluginResourceReference(
- JQueryWicketAtmosphereResourceReference.class, "jquery.atmosphere.js")));
+ WebjarsJavaScriptResourceReference jqueryAtmosphereReference = new WebjarsJavaScriptResourceReference("jquery-atmosphere/current/jquery.atmosphere.js");
+ return Arrays.asList(JavaScriptHeaderItem.forReference(jqueryAtmosphereReference));
}
}