#28 suppress wicket internal query and use the Sakai one

my-calendar/src/java/org/sakaiproject/widgets/mycalendar/WidgetApplication.java

@@ -1,6 +1,7 @@
 package org.sakaiproject.widgets.mycalendar;
 
 import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.request.resource.PackageResourceReference;
 import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
 import org.sakaiproject.widgets.mycalendar.ui.WidgetPage;
 
@@ -36,6 +37,9 @@ public void init() {
 		getMarkupSettings().setStripWicketTags(true);
 		getMarkupSettings().setStripComments(true);
 		getMarkupSettings().setCompressWhitespace(true);
+
+		// suppress jquery output
+		getJavaScriptLibrarySettings().setJQueryReference(new PackageResourceReference(WidgetApplication.class,"empty.js"));
 
 		// to put this app into deployment mode, see web.xml
 	}

my-calendar/src/java/org/sakaiproject/widgets/mycalendar/ui/WidgetPage.java

@@ -73,21 +73,20 @@ public void renderHead(final IHeaderResponse response) {
 		// Tool additions (at end so we can override if required)
 		response.render(StringHeaderItem.forString("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />"));
 
-		// for datepicker
-		response.render(new PriorityHeaderItem(
-				JavaScriptHeaderItem.forReference(getApplication().getJavaScriptLibrarySettings().getJQueryReference())));
+		// use Sakai jQuery (Wicket's one is suppressed in the Application#init)
+		response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forUrl(String.format("/library/webjars/jquery/1.11.3/jquery.min.js?version=%s", version))));
+
+		// for datepicker		
 		response.render(CssHeaderItem.forUrl(String.format("/library/webjars/jquery-ui/1.11.3/jquery-ui.min.css?version=%s", version)));
 		response.render(JavaScriptHeaderItem.forUrl(String.format("/library/webjars/jquery-ui/1.11.3/jquery-ui.min.js?version=%s", version)));
 		response.render(JavaScriptHeaderItem.forUrl(String.format("/library/webjars/momentjs/2.11.1/min/moment-with-locales.min.js?version=%s", version)));
-		response.render(
-				JavaScriptHeaderItem.forUrl(String.format("/my-calendar/scripts/moment-timezone-with-data.js?version=%s", version)));
+		response.render(JavaScriptHeaderItem.forUrl(String.format("/my-calendar/scripts/moment-timezone-with-data.js?version=%s", version)));
 
 		// templating
 		response.render(JavaScriptHeaderItem.forUrl(String.format("/my-calendar/scripts/jsrender.min.js?version=%s", version)));
 
 		// i18n
-		response.render(
-				JavaScriptHeaderItem.forUrl(String.format("/my-calendar/scripts/jquery.i18n.properties.min.js?version=%s", version)));
+		response.render(JavaScriptHeaderItem.forUrl(String.format("/my-calendar/scripts/jquery.i18n.properties.min.js?version=%s", version)));
 
 		// widget specific styles
 		response.render(CssHeaderItem.forUrl(String.format("/my-calendar/styles/widget-styles.css?version=%s", version)));

my-connections/src/java/org/sakaiproject/widgets/myconnections/WidgetApplication.java

@@ -1,6 +1,7 @@
 package org.sakaiproject.widgets.myconnections;
 
 import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.request.resource.PackageResourceReference;
 import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
 import org.sakaiproject.widgets.myconnections.ui.WidgetPage;
 
@@ -36,6 +37,10 @@ public void init() {
 		getMarkupSettings().setStripWicketTags(true);
 		getMarkupSettings().setStripComments(true);
 		getMarkupSettings().setCompressWhitespace(true);
+
+		// suppress jquery output
+		getJavaScriptLibrarySettings().setJQueryReference(new PackageResourceReference(WidgetApplication.class,"empty.js"));
+
 
 		// to put this app into deployment mode, see web.xml
 	}

site-information/src/java/org/sakaiproject/widgets/siteinformation/WidgetApplication.java

@@ -1,6 +1,7 @@
 package org.sakaiproject.widgets.siteinformation;
 
 import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.request.resource.PackageResourceReference;
 import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
 import org.sakaiproject.widgets.siteinformation.ui.WidgetPage;
 
@@ -36,6 +37,9 @@ public void init() {
 		getMarkupSettings().setStripWicketTags(true);
 		getMarkupSettings().setStripComments(true);
 		getMarkupSettings().setCompressWhitespace(true);
+
+		// suppress jquery output
+		getJavaScriptLibrarySettings().setJQueryReference(new PackageResourceReference(WidgetApplication.class,"empty.js"));
 
 		// to put this app into deployment mode, see web.xml
 	}

site-members/src/java/org/sakaiproject/widgets/sitemembers/WidgetApplication.java

@@ -1,6 +1,7 @@
 package org.sakaiproject.widgets.sitemembers;
 
 import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.request.resource.PackageResourceReference;
 import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
 import org.sakaiproject.widgets.sitemembers.ui.WidgetPage;
 
@@ -36,6 +37,9 @@ public void init() {
 		getMarkupSettings().setStripWicketTags(true);
 		getMarkupSettings().setStripComments(true);
 		getMarkupSettings().setCompressWhitespace(true);
+
+		// suppress jquery output
+		getJavaScriptLibrarySettings().setJQueryReference(new PackageResourceReference(WidgetApplication.class,"empty.js"));
 
 		// to put this app into deployment mode, see web.xml
 	}