From bf22a254cc0b3787d4658da9f5c603c7a10d7435 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 27 Feb 2016 10:01:19 +0100 Subject: [PATCH 1/3] Upgrade to Atmosphere 2.4.2 --- wicket-experimental/wicket-atmosphere/pom.xml | 5 +- .../wicket/atmosphere/AtmosphereBehavior.java | 527 ++++++++++-------- .../AtmosphereEventSubscriptionCollector.java | 13 +- .../atmosphere/AtmosphereInternalEvent.java | 2 +- .../atmosphere/AtmosphereRequestHandler.java | 17 +- .../atmosphere/AtmosphereWebRequest.java | 15 +- .../atmosphere/AtmosphereWebResponse.java | 4 +- .../apache/wicket/atmosphere/EventBus.java | 144 ++--- .../wicket/atmosphere/EventSubscription.java | 15 +- .../apache/wicket/atmosphere/Initializer.java | 2 +- ...ueryWicketAtmosphereResourceReference.java | 5 +- .../ResourceRegistrationListener.java | 4 +- .../apache/wicket/atmosphere/Subscribe.java | 11 +- ...ibeAnnotationEventSubscriptionInvoker.java | 16 +- .../config/AtmosphereParameters.java | 4 +- .../atmosphere/tester/AtmosphereTester.java | 38 +- .../atmosphere/tester/TesterAsyncSupport.java | 9 +- .../tester/TesterAtmosphereBehavior.java | 59 +- .../atmosphere/tester/TesterBroadcaster.java | 37 +- .../tester/TesterBroadcasterFactory.java | 3 - .../atmosphere/AtmosphereTesterTest.java | 12 +- .../apache/wicket/atmosphere/HomePage.java | 10 +- .../wicket/atmosphere/ReceiverFilter.java | 3 +- 23 files changed, 513 insertions(+), 442 deletions(-) diff --git a/wicket-experimental/wicket-atmosphere/pom.xml b/wicket-experimental/wicket-atmosphere/pom.xml index dd8c10822f8..47e09f3bf04 100644 --- a/wicket-experimental/wicket-atmosphere/pom.xml +++ b/wicket-experimental/wicket-atmosphere/pom.xml @@ -24,7 +24,7 @@ ../pom.xml wicket-atmosphere - 0.24-SNAPSHOT + 0.26-SNAPSHOT jar Wicket-Atmosphere Wicket-Atmosphere provides integration of the Atmosphere Framework in Wicket. @@ -41,7 +41,7 @@ - 2.2.8 + 2.4.2 2.2.7 @@ -87,6 +87,7 @@ org.apache.wicket wicket-core + 7.2.0 org.atmosphere diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java index 1152303efbe..fb20715508a 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java @@ -16,11 +16,7 @@ */ package org.apache.wicket.atmosphere; -import org.apache.wicket.Application; -import org.apache.wicket.Component; -import org.apache.wicket.MetaDataKey; -import org.apache.wicket.Page; -import org.apache.wicket.WicketRuntimeException; +import org.apache.wicket.*; import org.apache.wicket.ajax.json.JSONException; import org.apache.wicket.ajax.json.JSONObject; import org.apache.wicket.behavior.AbstractAjaxBehavior; @@ -31,248 +27,309 @@ import org.apache.wicket.request.Url; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.http.WebRequest; +import org.apache.wicket.request.http.WebResponse; import org.apache.wicket.resource.CoreLibrariesContributor; import org.apache.wicket.util.string.Strings; -import org.atmosphere.cpr.AtmosphereRequest; -import org.atmosphere.cpr.AtmosphereResource; -import org.atmosphere.cpr.AtmosphereResourceEvent; -import org.atmosphere.cpr.AtmosphereResourceEventListener; -import org.atmosphere.cpr.HeaderConfig; -import org.atmosphere.cpr.Meteor; +import org.atmosphere.cpr.*; +import org.atmosphere.handler.AtmosphereHandlerAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletResponse; +import java.io.IOException; + /** * {@code AtmosphereBehavior} manages the suspended connection from the client. It adds the required * javascript libraries to the markup which setup a suspended connection. This connection can be * websocket, streaming http or long-polling, depending on what the client and server support. This * behavior is added automatically to pages with components with event subscriptions. - * + * * @author papegaaij */ public class AtmosphereBehavior extends AbstractAjaxBehavior - implements - AtmosphereResourceEventListener + implements + AtmosphereResourceEventListener { - private static final Logger log = LoggerFactory.getLogger(AtmosphereBehavior.class); - - /** - * The key under which a unique id is stored in the page. This id is unique for all clients. - */ - public static final MetaDataKey ATMOSPHERE_UUID = new MetaDataKey() - { - private static final long serialVersionUID = 1L; - }; - - private static final long serialVersionUID = 1L; - - private String applicationKey; - - - /** - * Construct. - */ - public AtmosphereBehavior() - { - applicationKey = Application.get().getApplicationKey(); - } - - private EventBus findEventBus() - { - return EventBus.get(Application.get(applicationKey)); - } - - @Override - public final boolean getStatelessHint(Component component) - { - return false; - } - - @Override - public void onPreSuspend(AtmosphereResourceEvent event) - { - } - - @Override - public void onClose(AtmosphereResourceEvent event) - { - } - - - @Override - public void onRequest() - { - RequestCycle requestCycle = RequestCycle.get(); - ServletWebRequest request = (ServletWebRequest)requestCycle.getRequest(); - - // Grab a Meteor - Meteor meteor = Meteor.build(request.getContainerRequest()); - // Add us to the listener list. - meteor.addListener(this); - meteor.suspend(-1); - - String uuid = meteor.getAtmosphereResource().uuid(); - Page page = getComponent().getPage(); - page.setMetaData(ATMOSPHERE_UUID, uuid); - findEventBus().registerPage(uuid, page); - } - - @Override - public void onBroadcast(AtmosphereResourceEvent event) - { - if (log.isDebugEnabled()) - { - log.debug("onBroadcast: {}", event.getMessage()); - } - - // If we are using long-polling, resume the connection as soon as we get - // an event. - String transport = event.getResource() - .getRequest() - .getHeader(HeaderConfig.X_ATMOSPHERE_TRANSPORT); - - if (HeaderConfig.LONG_POLLING_TRANSPORT.equalsIgnoreCase(transport)) - { - Meteor meteor = Meteor.lookup(event.getResource().getRequest()); - meteor.resume(); - } - EventBus eventBus = findEventBus(); - if (eventBus.isWantAtmosphereNotifications()) - { - eventBus.post(new AtmosphereInternalEvent(AtmosphereInternalEvent.Type.Broadcast, event)); - } - } - - @Override - public void onSuspend(AtmosphereResourceEvent event) - { - if (log.isDebugEnabled()) - { - AtmosphereRequest atmosphereRequest = event.getResource().getRequest(); - String transport = atmosphereRequest.getHeader(HeaderConfig.X_ATMOSPHERE_TRANSPORT); - log.debug(String.format("Suspending the %s response from ip %s:%s", transport == null - ? "websocket" : transport, atmosphereRequest.getRemoteAddr(), atmosphereRequest.getRemotePort())); - } - } - - @Override - public void onResume(AtmosphereResourceEvent event) - { - if (log.isDebugEnabled()) - { - AtmosphereRequest atmosphereRequest = event.getResource().getRequest(); - String transport = atmosphereRequest.getHeader(HeaderConfig.X_ATMOSPHERE_TRANSPORT); - log.debug(String.format("Resuming the %s response from ip %s:%s", transport == null - ? "websocket" : transport, atmosphereRequest.getRemoteAddr(), atmosphereRequest.getRemotePort())); - } - EventBus eventBus = findEventBus(); - if (eventBus.isWantAtmosphereNotifications()) - { - eventBus.post(new AtmosphereInternalEvent(AtmosphereInternalEvent.Type.Resume, event)); - } - } - - @Override - public void onDisconnect(AtmosphereResourceEvent event) - { - if (log.isDebugEnabled()) - { - AtmosphereRequest atmosphereRequest = event.getResource().getRequest(); - String transport = atmosphereRequest.getHeader(HeaderConfig.X_ATMOSPHERE_TRANSPORT); - log.debug(String.format("%s connection dropped from ip %s:%s", transport == null - ? "websocket" : transport, atmosphereRequest.getRemoteAddr(), atmosphereRequest.getRemotePort())); - } - // It is possible that the application has already been destroyed, in which case - // unregistration is no longer needed - EventBus eventBus = findEventBus(); - if (Application.get(applicationKey) != null) - { - eventBus.unregisterConnection(event.getResource().uuid()); - } - - if (eventBus.isWantAtmosphereNotifications()) - { - eventBus.post(new AtmosphereInternalEvent(AtmosphereInternalEvent.Type.Disconnect, event)); - } - } - - @Override - public void onThrowable(AtmosphereResourceEvent event) - { - Throwable throwable = event.throwable(); - log.error(throwable.getMessage(), throwable); - - EventBus eventBus = findEventBus(); - if (eventBus.isWantAtmosphereNotifications()) - { - eventBus.post(new AtmosphereInternalEvent(AtmosphereInternalEvent.Type.Throwable, event)); - } - } - - @Override - public void onHeartbeat(AtmosphereResourceEvent event) - { - } - - @Override - public void renderHead(Component component, IHeaderResponse response) - { - super.renderHead(component, response); - try - { - CoreLibrariesContributor.contributeAjax(component.getApplication(), response); - - response.render(JavaScriptHeaderItem.forReference(JQueryWicketAtmosphereResourceReference.get())); - JSONObject options = findEventBus().getParameters().toJSON(); - options.put("url", getCallbackUrl()); - response.render(OnDomReadyHeaderItem.forScript("jQuery('#" + component.getMarkupId() + - "').wicketAtmosphere(" + options.toString() + ")")); - } - catch (JSONException e) - { - throw new WicketRuntimeException(e); - } - } - - /** - * Make it look like a normal Ajax call so the page id/renderCount are not incremented when Atmosphere makes - * the "upgrade" request - * - * @return the url to this behavior's listener interface - */ - @Override - public CharSequence getCallbackUrl() - { - RequestCycle requestCycle = getComponent().getRequestCycle(); - Url baseUrl = requestCycle.getUrlRenderer().getBaseUrl(); - CharSequence ajaxBaseUrl = Strings.escapeMarkup(baseUrl.toString()); - - return new StringBuilder(256) - .append(super.getCallbackUrl()) - .append('&').append(WebRequest.PARAM_AJAX).append("=true&") - .append(WebRequest.PARAM_AJAX_BASE_URL).append('=').append(ajaxBaseUrl); - } - - /** - * Find the Atmosphere UUID for the suspended connection for the given page (if any). - * - * @param page - * @return The UUID of the Atmosphere Resource, or null if no resource is suspended for the - * page. - */ - public static String getUUID(Page page) - { - return page.getMetaData(ATMOSPHERE_UUID); - } - - /** - * @param resource - * @return the unique id for the given suspended connection - * @deprecated use {@link AtmosphereResource#uuid()} - */ - @Deprecated - public static String getUUID(AtmosphereResource resource) - { - return resource.uuid(); - } + private static final Logger log = LoggerFactory.getLogger(AtmosphereBehavior.class); + + /** + * The key under which a unique id is stored in the page. This id is unique for all clients. + */ + public static final MetaDataKey ATMOSPHERE_UUID = new MetaDataKey() + { + private static final long serialVersionUID = 1L; + }; + + private static final long serialVersionUID = 1L; + + private String applicationKey; + + + /** + * Construct. + */ + public AtmosphereBehavior() + { + applicationKey = Application.get().getApplicationKey(); + } + + private EventBus findEventBus() + { + return EventBus.get(Application.get(applicationKey)); + } + + @Override + public final boolean getStatelessHint(Component component) + { + return false; + } + + @Override + public void onPreSuspend(AtmosphereResourceEvent event) + { + } + + @Override + public void onClose(AtmosphereResourceEvent event) + { + } + + + @Override + public void onRequest() + { + RequestCycle requestCycle = RequestCycle.get(); + ServletWebRequest request = (ServletWebRequest)requestCycle.getRequest(); + WebResponse response = (WebResponse)requestCycle.getResponse(); + AtmosphereRequest aRequest = AtmosphereRequestImpl.newInstance(); + aRequest.setRequest(request.getContainerRequest()); + AtmosphereResponse aResponse = AtmosphereResponseImpl.newInstance(); + aResponse.setResponse((ServletResponse)response.getContainerResponse()); + + Broadcaster broadcaster = EventBus.get().getBroadcaster(); + + AtmosphereResource atmosphereResource = new AtmosphereResourceImpl(); + TesterAsyncSupport asyncSupport = new TesterAsyncSupport(); + atmosphereResource.initialize( + broadcaster.getBroadcasterConfig().getAtmosphereConfig(), + broadcaster, + aRequest, + aResponse, + asyncSupport, + new AtmosphereHandlerAdapter() + ); + + atmosphereResource.setBroadcaster(broadcaster).suspend(); + broadcaster.addAtmosphereResource(atmosphereResource); + request.getContainerRequest().setAttribute(FrameworkConfig.ATMOSPHERE_RESOURCE, atmosphereResource); + + // Grab a Meteor + Meteor meteor = Meteor.build(request.getContainerRequest()); + // Add us to the listener list. + meteor.addListener(this); + meteor.suspend(-1); + + String uuid = meteor.getAtmosphereResource().uuid(); + Page page = getComponent().getPage(); + page.setMetaData(ATMOSPHERE_UUID, uuid); + findEventBus().registerPage(uuid, page); + } + + @Override + public void onBroadcast(AtmosphereResourceEvent event) + { + if (log.isDebugEnabled()) + { + log.debug("onBroadcast: {}", event.getMessage()); + } + + // If we are using long-polling, resume the connection as soon as we get + // an event. + String transport = event.getResource() + .getRequest() + .getHeader(HeaderConfig.X_ATMOSPHERE_TRANSPORT); + + if (HeaderConfig.LONG_POLLING_TRANSPORT.equalsIgnoreCase(transport)) + { + Meteor meteor = Meteor.lookup(event.getResource().getRequest()); + meteor.resume(); + } + EventBus eventBus = findEventBus(); + if (eventBus.isWantAtmosphereNotifications()) + { + eventBus.post(new AtmosphereInternalEvent(AtmosphereInternalEvent.Type.Broadcast, event)); + } + } + + @Override + public void onSuspend(AtmosphereResourceEvent event) + { + if (log.isDebugEnabled()) + { + AtmosphereRequest atmosphereRequest = event.getResource().getRequest(); + String transport = atmosphereRequest.getHeader(HeaderConfig.X_ATMOSPHERE_TRANSPORT); + log.debug(String.format("Suspending the %s response from ip %s:%s", transport == null + ? "websocket" : transport, atmosphereRequest.getRemoteAddr(), atmosphereRequest.getRemotePort())); + } + } + + @Override + public void onResume(AtmosphereResourceEvent event) + { + if (log.isDebugEnabled()) + { + AtmosphereRequest atmosphereRequest = event.getResource().getRequest(); + String transport = atmosphereRequest.getHeader(HeaderConfig.X_ATMOSPHERE_TRANSPORT); + log.debug(String.format("Resuming the %s response from ip %s:%s", transport == null + ? "websocket" : transport, atmosphereRequest.getRemoteAddr(), atmosphereRequest.getRemotePort())); + } + EventBus eventBus = findEventBus(); + if (eventBus.isWantAtmosphereNotifications()) + { + eventBus.post(new AtmosphereInternalEvent(AtmosphereInternalEvent.Type.Resume, event)); + } + } + + @Override + public void onDisconnect(AtmosphereResourceEvent event) + { + if (log.isDebugEnabled()) + { + AtmosphereRequest atmosphereRequest = event.getResource().getRequest(); + String transport = atmosphereRequest.getHeader(HeaderConfig.X_ATMOSPHERE_TRANSPORT); + log.debug(String.format("%s connection dropped from ip %s:%s", transport == null + ? "websocket" : transport, atmosphereRequest.getRemoteAddr(), atmosphereRequest.getRemotePort())); + } + // It is possible that the application has already been destroyed, in which case + // unregistration is no longer needed + EventBus eventBus = findEventBus(); + if (Application.get(applicationKey) != null) + { + eventBus.unregisterConnection(event.getResource().uuid()); + } + + if (eventBus.isWantAtmosphereNotifications()) + { + eventBus.post(new AtmosphereInternalEvent(AtmosphereInternalEvent.Type.Disconnect, event)); + } + } + + @Override + public void onThrowable(AtmosphereResourceEvent event) + { + Throwable throwable = event.throwable(); + log.error(throwable.getMessage(), throwable); + + EventBus eventBus = findEventBus(); + if (eventBus.isWantAtmosphereNotifications()) + { + eventBus.post(new AtmosphereInternalEvent(AtmosphereInternalEvent.Type.Throwable, event)); + } + } + + @Override + public void onHeartbeat(AtmosphereResourceEvent event) + { + } + + @Override + public void renderHead(Component component, IHeaderResponse response) + { + super.renderHead(component, response); + try + { + CoreLibrariesContributor.contributeAjax(component.getApplication(), response); + + response.render(JavaScriptHeaderItem.forReference(JQueryWicketAtmosphereResourceReference.get())); + JSONObject options = findEventBus().getParameters().toJSON(); + options.put("url", getCallbackUrl()); + response.render(OnDomReadyHeaderItem.forScript("jQuery('#" + component.getMarkupId() + + "').wicketAtmosphere(" + options.toString() + ")")); + } + catch (JSONException e) + { + throw new WicketRuntimeException(e); + } + } + + /** + * Make it look like a normal Ajax call so the page id/renderCount are not incremented when Atmosphere makes + * the "upgrade" request + * + * @return the url to this behavior's listener interface + */ + @Override + public CharSequence getCallbackUrl() + { + RequestCycle requestCycle = getComponent().getRequestCycle(); + Url baseUrl = requestCycle.getUrlRenderer().getBaseUrl(); + CharSequence ajaxBaseUrl = Strings.escapeMarkup(baseUrl.toString()); + + return new StringBuilder(256) + .append(super.getCallbackUrl()) + .append('&').append(WebRequest.PARAM_AJAX).append("=true&") + .append(WebRequest.PARAM_AJAX_BASE_URL).append('=').append(ajaxBaseUrl); + } + + /** + * Find the Atmosphere UUID for the suspended connection for the given page (if any). + * + * @param page + * @return The UUID of the Atmosphere Resource, or null if no resource is suspended for the + * page. + */ + public static String getUUID(Page page) + { + return page.getMetaData(ATMOSPHERE_UUID); + } + + /** + * @param resource + * @return the unique id for the given suspended connection + * @deprecated use {@link AtmosphereResource#uuid()} + */ + @Deprecated + public static String getUUID(AtmosphereResource resource) + { + return resource.uuid(); + } + + class TesterAsyncSupport implements AsyncSupport + { + @Override + public String getContainerName() + { + return "wicket-atmosphere-tester"; + } + + @Override + public void init(ServletConfig sc) throws ServletException + { + } + + @Override + public Action service(AtmosphereRequest req, AtmosphereResponse res) throws IOException, ServletException + { + return Action.CONTINUE; + } + + @Override + public void action(E actionEvent) + { + } + + @Override + public boolean supportWebSocket() + { + return true; + } + + @Override + public AsyncSupport complete(E r) + { + return this; + } + } } diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereEventSubscriptionCollector.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereEventSubscriptionCollector.java index 61ebd4a0685..35701f29688 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereEventSubscriptionCollector.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereEventSubscriptionCollector.java @@ -16,10 +16,9 @@ */ package org.apache.wicket.atmosphere; -import java.lang.reflect.Method; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; - +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; +import com.google.common.collect.ImmutableList; import org.apache.wicket.Component; import org.apache.wicket.Page; import org.apache.wicket.WicketRuntimeException; @@ -27,9 +26,9 @@ import org.apache.wicket.application.IComponentOnBeforeRenderListener; import org.apache.wicket.behavior.Behavior; -import com.google.common.cache.Cache; -import com.google.common.cache.CacheBuilder; -import com.google.common.collect.ImmutableList; +import java.lang.reflect.Method; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; /** * Collects {@linkplain Subscribe event subscriptions} on components. Subscriptions are refreshed on diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereInternalEvent.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereInternalEvent.java index 46b8da655a7..11fd8c6df56 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereInternalEvent.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereInternalEvent.java @@ -45,7 +45,7 @@ public class AtmosphereInternalEvent * * Suspend type is not supported because it is not possible to push messages with suspended connection */ - public static enum Type + public enum Type { PreSuspend, /*Suspend,*/ Resume, Disconnect, Broadcast, Throwable, Close } diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java index 4fd5f028245..8f984ef2cb0 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java @@ -16,8 +16,6 @@ */ package org.apache.wicket.atmosphere; -import java.util.Iterator; - import org.apache.wicket.Component; import org.apache.wicket.Page; import org.apache.wicket.Session; @@ -27,10 +25,13 @@ import org.apache.wicket.request.IRequestCycle; import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.cycle.RequestCycle; +import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.lang.Args; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Iterator; + /** * Handles pseudo requests triggered by an event. An {@link AjaxRequestTarget} is scheduled and the * subscribed methods are invoked. @@ -73,7 +74,19 @@ public void respond(IRequestCycle requestCycle) { WebApplication application = WebApplication.get(); Integer pageId = pageKey.getPageId(); + Session.get().getPageManager().touchPage(new Page() { + @Override + public PageParameters getPageParameters() { + return super.getPageParameters(); + } + + @Override + public int getPageId() { + return 0; + } + }); Page page = (Page) Session.get().getPageManager().getPage(pageId); + if (page != null) { page.dirty(); diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereWebRequest.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereWebRequest.java index 592227018ca..c727b1d48fb 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereWebRequest.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereWebRequest.java @@ -16,14 +16,6 @@ */ package org.apache.wicket.atmosphere; -import java.nio.charset.Charset; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; - -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; - import org.apache.commons.fileupload.FileItemFactory; import org.apache.commons.fileupload.FileUploadException; import org.apache.wicket.protocol.http.RequestUtils; @@ -34,6 +26,13 @@ import org.apache.wicket.util.lang.Bytes; import org.apache.wicket.util.time.Time; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import java.nio.charset.Charset; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; + /** * Internal request to signal the processing of an event. This request will be mapped by * {@link AtmosphereRequestMapper} to an {@link AtmosphereRequestHandler}. The response will be diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereWebResponse.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereWebResponse.java index de09ed87520..0eca6c7c08f 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereWebResponse.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereWebResponse.java @@ -16,13 +16,13 @@ */ package org.apache.wicket.atmosphere; -import javax.servlet.http.Cookie; - import org.apache.wicket.request.http.WebResponse; import org.apache.wicket.util.string.AppendingStringBuffer; import org.apache.wicket.util.time.Time; import org.atmosphere.cpr.AtmosphereResponse; +import javax.servlet.http.Cookie; + /** * Internal response class to wrap {@code AtmosphereResponse} to a {@link WebResponse}. * diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java index 6ddb2e416b3..5ec86c59dcb 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java @@ -16,23 +16,8 @@ */ package org.apache.wicket.atmosphere; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.CopyOnWriteArrayList; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; - -import org.apache.wicket.Application; -import org.apache.wicket.Component; -import org.apache.wicket.MetaDataKey; -import org.apache.wicket.Page; -import org.apache.wicket.Session; -import org.apache.wicket.ThreadContext; -import org.apache.wicket.WicketRuntimeException; +import com.google.common.collect.*; +import org.apache.wicket.*; import org.apache.wicket.application.IComponentOnBeforeRenderListener; import org.apache.wicket.atmosphere.config.AtmosphereParameters; import org.apache.wicket.protocol.http.WebApplication; @@ -40,21 +25,20 @@ import org.apache.wicket.protocol.http.servlet.ServletWebRequest; import org.apache.wicket.request.Response; import org.apache.wicket.session.ISessionStore.UnboundListener; -import org.atmosphere.cpr.AtmosphereConfig; -import org.atmosphere.cpr.AtmosphereFramework; -import org.atmosphere.cpr.AtmosphereResource; -import org.atmosphere.cpr.AtmosphereResourceFactory; -import org.atmosphere.cpr.Broadcaster; -import org.atmosphere.cpr.BroadcasterFactory; +import org.atmosphere.cpr.*; +import org.atmosphere.util.SimpleBroadcaster; import org.atmosphere.util.Version; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -import com.google.common.collect.Maps; -import com.google.common.collect.Multimap; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.concurrent.CopyOnWriteArrayList; /** * Broadcasts events to methods on components annotated with {@link Subscribe}. @@ -98,8 +82,8 @@ public static EventBus get(Application application) if (eventBus == null) { throw new WicketRuntimeException( - "There is no EventBus registered for the given application: " + - application.getName()); + "There is no EventBus registered for the given application: " + + application.getName()); } return eventBus; } @@ -125,6 +109,8 @@ public static boolean isInstalled(Application application) private Broadcaster broadcaster; + private AtmosphereFramework framework; + /** * A flag indicating whether to be notified about Atmosphere internal events * @@ -143,24 +129,35 @@ public static boolean isInstalled(Application application) */ public EventBus(WebApplication application) { - this(application, null); + this.application = application; + this.framework = new AtmosphereFramework(); + framework.init(); + + DefaultBroadcasterFactory factory = new DefaultBroadcasterFactory(); + + factory.configure( + SimpleBroadcaster.class, + BroadcasterLifeCyclePolicy.ATMOSPHERE_RESOURCE_POLICY.NEVER.name(), + framework.getAtmosphereConfig() + ); + new EventBus(application, factory.get()); } - private static Broadcaster lookupDefaultBroadcaster() + private Broadcaster lookupDefaultBroadcaster() { - BroadcasterFactory factory = BroadcasterFactory.getDefault(); - if (factory == null) + if (framework == null) { throw new WicketRuntimeException( - "There is no Atmosphere BroadcasterFactory configured. Did you include the " - + "atmosphere.xml configuration file and configured AtmosphereServlet?"); + "There is no Atmosphere Framework configured. Did you include the " + + "atmosphere.xml configuration file and configured AtmosphereServlet?"); } + BroadcasterFactory factory = framework.getBroadcasterFactory(); Collection allBroadcasters = factory.lookupAll(); if (allBroadcasters.isEmpty()) { throw new WicketRuntimeException( - "The Atmosphere BroadcasterFactory has no Broadcasters, " - + "something is wrong with your Atmosphere configuration."); + "The Atmosphere BroadcasterFactory has no Broadcasters, " + + "something is wrong with your Atmosphere configuration."); } return allBroadcasters.iterator().next(); } @@ -178,7 +175,7 @@ public EventBus(WebApplication application, Broadcaster broadcaster) application.setMetaData(EVENT_BUS_KEY, this); application.mount(new AtmosphereRequestMapper(createEventSubscriptionInvoker())); application.getComponentPostOnBeforeRenderListeners().add( - createEventSubscriptionCollector()); + createEventSubscriptionCollector()); application.getSessionStore().registerUnboundListener(this); checkEnabledAnalytics(getBroadcaster().getBroadcasterConfig().getAtmosphereConfig()); } @@ -262,7 +259,7 @@ public synchronized void registerPage(String trackingId, Page page) if (log.isDebugEnabled()) { log.debug("registered page {} for session {}", pageKey.getPageId(), - pageKey.getSessionId()); + pageKey.getSessionId()); } } @@ -277,14 +274,12 @@ public synchronized void register(Page page, EventSubscription subscription) if (log.isDebugEnabled()) { log.debug( - "registering {} for page {} for session {}: {}{}", - new Object[] { - subscription.getBehaviorIndex() == null ? "component" : "behavior", - page.getPageId(), - Session.get().getId(), - subscription.getComponentPath(), - subscription.getBehaviorIndex() == null ? "" : ":" + - subscription.getBehaviorIndex() }); + "registering {} for page {} for session {}: {}{}", + subscription.getBehaviorIndex() == null ? "component" : "behavior", + page.getPageId(), + Session.get().getId(), + subscription.getComponentPath(), + subscription.getBehaviorIndex() == null ? "" : ":" + subscription.getBehaviorIndex()); } PageKey pageKey = new PageKey(page.getPageId(), Session.get().getId()); if (!subscriptions.containsEntry(pageKey, subscription)) @@ -304,14 +299,12 @@ public synchronized void unregister(Page page, EventSubscription subscription) if (log.isDebugEnabled()) { log.debug( - "unregistering {} for page {} for session {}: {}{}", - new Object[] { - subscription.getBehaviorIndex() == null ? "component" : "behavior", - page.getPageId(), - Session.get().getId(), - subscription.getComponentPath(), - subscription.getBehaviorIndex() == null ? "" : ":" + - subscription.getBehaviorIndex() }); + "unregistering {} for page {} for session {}: {}{}", + subscription.getBehaviorIndex() == null ? "component" : "behavior", + page.getPageId(), + Session.get().getId(), + subscription.getComponentPath(), + subscription.getBehaviorIndex() == null ? "" : ":" + subscription.getBehaviorIndex()); } PageKey pageKey = new PageKey(page.getPageId(), Session.get().getId()); subscriptions.remove(pageKey, subscription); @@ -366,7 +359,7 @@ public synchronized void unregisterConnection(String trackingId) if (log.isDebugEnabled()) { log.debug("unregistering page {} for session {}", pageKey.getPageId(), - pageKey.getSessionId()); + pageKey.getSessionId()); } } } @@ -382,7 +375,9 @@ public synchronized void unregisterConnection(String trackingId) */ public void post(Object event, String resourceUuid) { - AtmosphereResource resource = AtmosphereResourceFactory.getDefault().find(resourceUuid); +// AtmosphereResource resource = AtmosphereResourceFactory.getDefault().find(resourceUuid); + AtmosphereResourceFactory factory = new DefaultAtmosphereResourceFactory(); + AtmosphereResource resource = factory.find(resourceUuid); if (resource != null) { post(event, resource); @@ -458,12 +453,15 @@ private void postToSingleResource(Object payload, AtmosphereResource resource) } private void post(AtmosphereResource resource, PageKey pageKey, - Iterator subscriptionsForPage, AtmosphereEvent event) + Iterator subscriptionsForPage, AtmosphereEvent event) { String filterPath = WebApplication.get() - .getWicketFilter() - .getFilterConfig() - .getInitParameter(WicketFilter.FILTER_MAPPING_PARAM); + .getWicketFilter() + .getFilterConfig() + .getInitParameter(WicketFilter.FILTER_MAPPING_PARAM); + if (filterPath == null) { + filterPath = resource.getAtmosphereConfig().getInitParameter(WicketFilter.FILTER_MAPPING_PARAM); + } filterPath = filterPath.substring(1, filterPath.length() - 1); HttpServletRequest httpRequest = new HttpServletRequestWrapper(resource.getRequest()) { @@ -473,10 +471,28 @@ public String getContextPath() String ret = super.getContextPath(); return ret == null ? "" : ret; } + + @Override + public String getRequestURI() { + return "/bus"; + } + + @Override + public String getServerName() { + return "localhost"; + } + + @Override + public int getServerPort() { + return 8443; + } }; AtmosphereWebRequest request = new AtmosphereWebRequest( - (ServletWebRequest)application.newWebRequest(httpRequest, filterPath), pageKey, - subscriptionsForPage, event); + (ServletWebRequest)application.newWebRequest(httpRequest, filterPath), + pageKey, + subscriptionsForPage, + event + ); Response response = new AtmosphereWebResponse(resource.getResponse()); if (application.createRequestCycle(request, response).processRequestAndDetach()) getBroadcaster().broadcast(response.toString(), resource); diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventSubscription.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventSubscription.java index f7080bd66ea..ddb2d367e36 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventSubscription.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventSubscription.java @@ -16,15 +16,14 @@ */ package org.apache.wicket.atmosphere; -import java.lang.reflect.Method; - +import com.google.common.base.Objects; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; import org.apache.wicket.Component; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.behavior.Behavior; -import com.google.common.base.Objects; -import com.google.common.base.Predicate; -import com.google.common.base.Predicates; +import java.lang.reflect.Method; /** * The subscription of a method on a component to certain events. This is used by {@link EventBus} @@ -101,11 +100,7 @@ private static Predicate createFilter( { return filterClass.newInstance(); } - catch (InstantiationException e) - { - throw new WicketRuntimeException(e); - } - catch (IllegalAccessException e) + catch (InstantiationException | IllegalAccessException e) { throw new WicketRuntimeException(e); } diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/Initializer.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/Initializer.java index 9ca643d4754..45f44f2f352 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/Initializer.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/Initializer.java @@ -29,7 +29,7 @@ public class Initializer implements IInitializer @Override public void init(Application application) { - if (WicketWebjars.isInstalled(application) == false) + if (!WicketWebjars.isInstalled(application)) { WicketWebjars.install((org.apache.wicket.protocol.http.WebApplication) application); } 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 d1c35d278ff..29df966af55 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 @@ -16,13 +16,12 @@ */ package org.apache.wicket.atmosphere; -import java.util.List; - +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; -import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference; +import java.util.List; /** * Resource reference for the jquery.atmosphere.js module and the wicket glue. diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/ResourceRegistrationListener.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/ResourceRegistrationListener.java index cdeb439c574..bb7051dcc60 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/ResourceRegistrationListener.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/ResourceRegistrationListener.java @@ -40,12 +40,12 @@ public interface ResourceRegistrationListener * @param uuid * @param page */ - public void resourceRegistered(String uuid, Page page); + void resourceRegistered(String uuid, Page page); /** * Invoked when a suspended connection is terminated and unregistered. * * @param uuid */ - public void resourceUnregistered(String uuid); + void resourceUnregistered(String uuid); } diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/Subscribe.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/Subscribe.java index 5bf9f611601..4fa493e3c08 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/Subscribe.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/Subscribe.java @@ -16,16 +16,15 @@ */ package org.apache.wicket.atmosphere; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - +import com.google.common.base.Predicate; import org.apache.wicket.Session; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.request.cycle.RequestCycle; -import com.google.common.base.Predicate; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Subscribes a method on a component to receive events of a certain type. The method should have 2 diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/SubscribeAnnotationEventSubscriptionInvoker.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/SubscribeAnnotationEventSubscriptionInvoker.java index 81d0a14f4e9..a0f009422f7 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/SubscribeAnnotationEventSubscriptionInvoker.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/SubscribeAnnotationEventSubscriptionInvoker.java @@ -16,12 +16,12 @@ */ package org.apache.wicket.atmosphere; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.ajax.AjaxRequestTarget; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + /** * Handles invocations of methods annotated with {@link Subscribe} annotation. */ @@ -42,15 +42,7 @@ public void invoke(AjaxRequestTarget target, EventSubscription subscription, Obj curMethod.setAccessible(true); curMethod.invoke(base, target, event.getPayload()); } - catch (IllegalAccessException e) - { - throw new WicketRuntimeException(e); - } - catch (IllegalArgumentException e) - { - throw new WicketRuntimeException(e); - } - catch (InvocationTargetException e) + catch (IllegalAccessException | InvocationTargetException | IllegalArgumentException e) { throw new WicketRuntimeException(e); } diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/config/AtmosphereParameters.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/config/AtmosphereParameters.java index c72a7965988..8b7cab41f86 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/config/AtmosphereParameters.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/config/AtmosphereParameters.java @@ -16,12 +16,12 @@ */ package org.apache.wicket.atmosphere.config; -import java.util.List; - import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.ajax.json.JSONException; import org.apache.wicket.ajax.json.JSONObject; +import java.util.List; + /** * Contains the parameters passed to the Atmosphere JQuery plugin. See * {@link "https://github.com/Atmosphere/atmosphere/wiki/jQuery.atmosphere.js-API"} for details. diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/AtmosphereTester.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/AtmosphereTester.java index eee9b19a2bb..200089c0df8 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/AtmosphereTester.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/AtmosphereTester.java @@ -16,18 +16,16 @@ */ package org.apache.wicket.atmosphere.tester; -import java.util.List; - import org.apache.wicket.Page; import org.apache.wicket.atmosphere.AtmosphereBehavior; import org.apache.wicket.atmosphere.EventBus; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.protocol.http.mock.MockHttpServletResponse; import org.apache.wicket.util.tester.WicketTester; -import org.atmosphere.cpr.AtmosphereConfig; -import org.atmosphere.cpr.AtmosphereFramework; -import org.atmosphere.cpr.AtmosphereResource; -import org.atmosphere.cpr.HeaderConfig; +import org.atmosphere.cpr.*; +import org.atmosphere.util.SimpleBroadcaster; + +import java.util.List; /** * A helper for testing Atmosphere enabled pages @@ -41,7 +39,7 @@ public class AtmosphereTester private final EventBus eventBus; private final WicketTester wicketTester; - + /** * The response which will be suspended by Atmosphere and * all pushes/post will go to @@ -49,7 +47,7 @@ public class AtmosphereTester private MockHttpServletResponse suspendedResponse; private MockHttpServletResponse lastResponse; - + /** * Constructor. * @@ -64,9 +62,10 @@ public AtmosphereTester(final WicketTester wicketTester, Page page) WebApplication application = wicketTester.getApplication(); - TesterBroadcaster broadcaster = createBroadcaster(); + Broadcaster broadcaster = createBroadcaster(); - if (EventBus.isInstalled(application)) + + if (EventBus.isInstalled(application)) { this.eventBus = EventBus.get(application); this.eventBus.setBroadcaster(broadcaster); @@ -100,19 +99,20 @@ private void initialize(final WicketTester wicketTester, Page page) wicketTester.executeBehavior(atmosphereBehavior); } - private TesterBroadcaster createBroadcaster() + private Broadcaster createBroadcaster() { - TesterBroadcaster broadcaster = new TesterBroadcaster(); - - AtmosphereFramework framework = new AtmosphereFramework(); - AtmosphereConfig config = new AtmosphereConfig(framework); + AtmosphereFramework framework = new AtmosphereFramework(); + framework.init(); - TesterBroadcasterFactory broadcasterFactory = new TesterBroadcasterFactory(config, broadcaster); - framework.setBroadcasterFactory(broadcasterFactory); + BroadcasterFactory factory = new DefaultBroadcasterFactory(); - broadcaster.initialize("wicket-atmosphere-tester", config); + factory.configure( + SimpleBroadcaster.class, + BroadcasterLifeCyclePolicy.ATMOSPHERE_RESOURCE_POLICY.NEVER.name(), + framework.getAtmosphereConfig() + ); - return broadcaster; + return factory.get(); } /** diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterAsyncSupport.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterAsyncSupport.java index 18bb39c08e7..ecf483ca31f 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterAsyncSupport.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterAsyncSupport.java @@ -16,16 +16,11 @@ */ package org.apache.wicket.atmosphere.tester; -import java.io.IOException; +import org.atmosphere.cpr.*; import javax.servlet.ServletConfig; import javax.servlet.ServletException; - -import org.atmosphere.cpr.Action; -import org.atmosphere.cpr.AsyncSupport; -import org.atmosphere.cpr.AtmosphereRequest; -import org.atmosphere.cpr.AtmosphereResource; -import org.atmosphere.cpr.AtmosphereResponse; +import java.io.IOException; /** * diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterAtmosphereBehavior.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterAtmosphereBehavior.java index d6632fe2ca4..fd197af1a7e 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterAtmosphereBehavior.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterAtmosphereBehavior.java @@ -20,10 +20,7 @@ import org.apache.wicket.atmosphere.AtmosphereBehavior; import org.apache.wicket.atmosphere.EventBus; import org.apache.wicket.util.tester.WicketTester; -import org.atmosphere.cpr.AtmosphereRequest; -import org.atmosphere.cpr.AtmosphereResource; -import org.atmosphere.cpr.AtmosphereResourceImpl; -import org.atmosphere.cpr.AtmosphereResponse; +import org.atmosphere.cpr.*; import org.atmosphere.handler.AtmosphereHandlerAdapter; /** @@ -32,34 +29,40 @@ */ class TesterAtmosphereBehavior extends AtmosphereBehavior { - private final EventBus eventBus; - private final WicketTester wicketTester; + private final EventBus eventBus; + private final WicketTester wicketTester; - TesterAtmosphereBehavior(WicketTester wicketTester, EventBus eventBus) - { - this.wicketTester = wicketTester; - this.eventBus = eventBus; - } + TesterAtmosphereBehavior(WicketTester wicketTester, EventBus eventBus) + { + this.wicketTester = wicketTester; + this.eventBus = eventBus; + } - @Override - public void onRequest() - { - TesterBroadcaster broadcaster = (TesterBroadcaster) eventBus.getBroadcaster(); + @Override + public void onRequest() + { + Broadcaster broadcaster = eventBus.getBroadcaster(); - AtmosphereResource atmosphereResource = new AtmosphereResourceImpl(); - AtmosphereRequest atmosphereRequest = AtmosphereRequest.wrap(wicketTester.getRequest()); - AtmosphereResponse atmosphereResponse = AtmosphereResponse.wrap(wicketTester.getResponse()); - TesterAsyncSupport asyncSupport = new TesterAsyncSupport(); - atmosphereResource.initialize(broadcaster.getApplicationConfig(), broadcaster, atmosphereRequest, atmosphereResponse, - asyncSupport, new AtmosphereHandlerAdapter()); + AtmosphereResource atmosphereResource = new AtmosphereResourceImpl(); + AtmosphereRequest atmosphereRequest = AtmosphereRequestImpl.wrap(wicketTester.getRequest()); + AtmosphereResponse atmosphereResponse = AtmosphereResponseImpl.wrap(wicketTester.getResponse()); + TesterAsyncSupport asyncSupport = new TesterAsyncSupport(); + atmosphereResource.initialize( + broadcaster.getBroadcasterConfig().getAtmosphereConfig(), + broadcaster, + atmosphereRequest, + atmosphereResponse, + asyncSupport, + new AtmosphereHandlerAdapter() + ); - atmosphereResource.setBroadcaster(broadcaster); - broadcaster.addAtmosphereResource(atmosphereResource); + atmosphereResource.setBroadcaster(broadcaster).suspend(); + broadcaster.addAtmosphereResource(atmosphereResource); - String uuid = atmosphereResource.uuid(); - Page page = getComponent().getPage(); + String uuid = atmosphereResource.uuid(); + Page page = getComponent().getPage(); - page.setMetaData(ATMOSPHERE_UUID, uuid); - eventBus.registerPage(uuid, page); - } + page.setMetaData(ATMOSPHERE_UUID, uuid); + eventBus.registerPage(uuid, page); + } } diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcaster.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcaster.java index 7ec23ac5529..323b51c59f9 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcaster.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcaster.java @@ -16,9 +16,7 @@ */ package org.apache.wicket.atmosphere.tester; -import org.atmosphere.cpr.AtmosphereConfig; -import org.atmosphere.cpr.AtmosphereResponse; -import org.atmosphere.cpr.Deliver; +import org.atmosphere.cpr.*; import org.atmosphere.util.SimpleBroadcaster; /** @@ -26,16 +24,27 @@ */ class TesterBroadcaster extends SimpleBroadcaster { - public AtmosphereConfig getApplicationConfig() - { - return config; - } + public AtmosphereConfig getApplicationConfig() + { + return config; + } + + @Override + public Broadcaster initialize(String id, AtmosphereConfig config) { + return super.initialize(id, config); + } + + @Override + protected void push(Deliver entry) + { + AtmosphereResponse response = entry.getResource().getResponse(); + String message = entry.getMessage().toString(); + response.write(message); + } + + @Override + protected BroadcasterConfig createBroadcasterConfig(AtmosphereConfig config) { + return super.createBroadcasterConfig(config); + } - @Override - protected void push(Deliver entry) - { - AtmosphereResponse response = entry.getResource().getResponse(); - String message = entry.getMessage().toString(); - response.write(message); - } } diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcasterFactory.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcasterFactory.java index ef559c1077e..b8a20e47b3f 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcasterFactory.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/tester/TesterBroadcasterFactory.java @@ -34,9 +34,6 @@ class TesterBroadcasterFactory extends DefaultBroadcasterFactory super(SimpleBroadcaster.class, BroadcasterLifeCyclePolicy.ATMOSPHERE_RESOURCE_POLICY.NEVER.name(), c); this.singleBroadcaster = broadcaster; - - // expose myself as BroadcasterFactory.getDefault(); - factory = this; } @SuppressWarnings("unchecked") diff --git a/wicket-experimental/wicket-atmosphere/src/test/java/org/apache/wicket/atmosphere/AtmosphereTesterTest.java b/wicket-experimental/wicket-atmosphere/src/test/java/org/apache/wicket/atmosphere/AtmosphereTesterTest.java index 0d249102b9c..3d80d6eaf5b 100644 --- a/wicket-experimental/wicket-atmosphere/src/test/java/org/apache/wicket/atmosphere/AtmosphereTesterTest.java +++ b/wicket-experimental/wicket-atmosphere/src/test/java/org/apache/wicket/atmosphere/AtmosphereTesterTest.java @@ -16,13 +16,6 @@ */ package org.apache.wicket.atmosphere; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; - -import java.util.Date; -import java.util.concurrent.atomic.AtomicBoolean; - import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.atmosphere.tester.AtmosphereTester; import org.apache.wicket.request.mapper.parameter.PageParameters; @@ -31,6 +24,11 @@ import org.junit.Assert; import org.junit.Test; +import java.util.Date; +import java.util.concurrent.atomic.AtomicBoolean; + +import static org.hamcrest.CoreMatchers.*; + /** * */ diff --git a/wicket-experimental/wicket-atmosphere/src/test/java/org/apache/wicket/atmosphere/HomePage.java b/wicket-experimental/wicket-atmosphere/src/test/java/org/apache/wicket/atmosphere/HomePage.java index 34063c7e57f..9e436a1eca2 100644 --- a/wicket-experimental/wicket-atmosphere/src/test/java/org/apache/wicket/atmosphere/HomePage.java +++ b/wicket-experimental/wicket-atmosphere/src/test/java/org/apache/wicket/atmosphere/HomePage.java @@ -16,8 +16,6 @@ */ package org.apache.wicket.atmosphere; -import java.util.Date; - import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink; @@ -28,6 +26,8 @@ import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; +import java.util.Date; + public class HomePage extends WebPage { private static final long serialVersionUID = 1L; @@ -44,10 +44,10 @@ public HomePage(final PageParameters parameters) add(timeLabel = new Label("time", Model.of("start")).setOutputMarkupId(true)); add(messageLabel = new Label("message", Model.of("-")).setOutputMarkupId(true)); - Form form = new Form("form"); + Form form = new Form<>("form"); add(form); - form.add(receiver = new TextField("receiver", Model.of(""))); - form.add(input = new TextField("input", Model.of(""))); + form.add(receiver = new TextField<>("receiver", Model.of(""))); + form.add(input = new TextField<>("input", Model.of(""))); form.add(new AjaxSubmitLink("send", form) { private static final long serialVersionUID = 1L; diff --git a/wicket-experimental/wicket-atmosphere/src/test/java/org/apache/wicket/atmosphere/ReceiverFilter.java b/wicket-experimental/wicket-atmosphere/src/test/java/org/apache/wicket/atmosphere/ReceiverFilter.java index f035433c130..b360791848c 100644 --- a/wicket-experimental/wicket-atmosphere/src/test/java/org/apache/wicket/atmosphere/ReceiverFilter.java +++ b/wicket-experimental/wicket-atmosphere/src/test/java/org/apache/wicket/atmosphere/ReceiverFilter.java @@ -16,9 +16,8 @@ */ package org.apache.wicket.atmosphere; -import org.apache.wicket.Session; - import com.google.common.base.Predicate; +import org.apache.wicket.Session; public class ReceiverFilter implements Predicate { From 9ae7ac2c166be6833b96bc988abe8a3a1bf51a92 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Mar 2016 07:36:26 +0100 Subject: [PATCH 2/3] Upgrade to Atmosphere 2.4.2 --- .../wicket/atmosphere/AtmosphereBehavior.java | 6 +++++- .../wicket/atmosphere/AtmosphereRequestHandler.java | 13 ------------- .../java/org/apache/wicket/atmosphere/EventBus.java | 1 - 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java index fb20715508a..b1c61ffcb3b 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereBehavior.java @@ -16,7 +16,11 @@ */ package org.apache.wicket.atmosphere; -import org.apache.wicket.*; +import org.apache.wicket.Application; +import org.apache.wicket.Component; +import org.apache.wicket.MetaDataKey; +import org.apache.wicket.Page; +import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.ajax.json.JSONException; import org.apache.wicket.ajax.json.JSONObject; import org.apache.wicket.behavior.AbstractAjaxBehavior; diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java index 8f984ef2cb0..6875b2cad5f 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java @@ -25,7 +25,6 @@ import org.apache.wicket.request.IRequestCycle; import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.cycle.RequestCycle; -import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.lang.Args; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -74,19 +73,7 @@ public void respond(IRequestCycle requestCycle) { WebApplication application = WebApplication.get(); Integer pageId = pageKey.getPageId(); - Session.get().getPageManager().touchPage(new Page() { - @Override - public PageParameters getPageParameters() { - return super.getPageParameters(); - } - - @Override - public int getPageId() { - return 0; - } - }); Page page = (Page) Session.get().getPageManager().getPage(pageId); - if (page != null) { page.dirty(); diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java index 5ec86c59dcb..f25b0b14055 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java @@ -375,7 +375,6 @@ public synchronized void unregisterConnection(String trackingId) */ public void post(Object event, String resourceUuid) { -// AtmosphereResource resource = AtmosphereResourceFactory.getDefault().find(resourceUuid); AtmosphereResourceFactory factory = new DefaultAtmosphereResourceFactory(); AtmosphereResource resource = factory.find(resourceUuid); if (resource != null) From d829d97f31cf817b2b9eb642af5fc841d92dbf84 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 21 May 2016 07:54:09 +0200 Subject: [PATCH 3/3] Upgrade to Atmosphere 2.4.2 --- CHANGELOG-7.x | 175 + NOTICE | 14 +- README | 4 +- archetypes/quickstart/pom.xml | 2 +- .../resources/archetype-resources/pom.xml | 12 +- .../src/main/webapp/WEB-INF/web.xml | 4 +- build-changelog.sh | 22 +- pom.xml | 195 +- release-dashorst.sh | 621 - release-igor.sh | 124 - release-milestone.sh | 408 - release.sh | 646 +- revert-release.sh | 55 - testing/wicket-arquillian/pom.xml | 381 +- .../arquillian/testing/model/Contact.java | 165 +- .../testing/pages/InsertContact.java | 84 +- .../testing/pages/ListContacts.java | 2 +- .../util/ResourceWebApplicationPath.java | 10 +- .../testing/ApacheLicenceHeaderTest.java | 2 - .../testing/TestWicketJavaEEApplication.java | 16 +- .../deployment/AbstractDeploymentTest.java | 154 +- .../testing/pages/InsertContactTest.java | 55 +- .../ArquillianContainerProvidedTest.java | 86 +- testing/wicket-common-tests/pom.xml | 12 +- testing/wicket-js-tests/package.json | 12 +- testing/wicket-js-tests/pom.xml | 8 +- wicket-auth-roles/pom.xml | 2 +- wicket-bean-validation/pom.xml | 2 +- wicket-cdi-1.1/pom.xml | 2 +- wicket-cdi/pom.xml | 2 +- wicket-core/pom.xml | 2 +- .../java/org/apache/wicket/Application.java | 7 +- .../apache/wicket/Application_de.properties | 1 + .../java/org/apache/wicket/Component.java | 4 +- .../org/apache/wicket/MarkupContainer.java | 106 + .../java/org/apache/wicket/SystemMapper.java | 69 +- .../ajax/attributes/IAjaxCallListener.java | 3 + .../ajax/markup/html/form/AjaxButton.java | 13 - .../wicket/ajax/res/js/wicket-ajax-jquery.js | 13 +- .../wicket/ajax/res/js/wicket-event-jquery.js | 3 +- .../core/request/mapper/CryptoMapper.java | 2 +- .../request/mapper/StalePageException.java | 1 + .../wicket/core/util/lang/WicketObjects.java | 5 + .../html/SecurePackageResourceGuard.java | 1 + .../wicket/markup/html/border/Border.java | 2 +- .../markup/html/form/NumberTextField.java | 5 +- .../markup/html/media/MediaComponent.java | 69 + .../panel/AbstractMarkupSourcingStrategy.java | 12 +- .../markup/parser/AbstractMarkupFilter.java | 37 +- .../apache/wicket/model/ChainingModel.java | 2 +- .../apache/wicket/page/PartialPageUpdate.java | 11 +- .../memory/HttpSessionDataStore.java | 18 +- .../http/servlet/ServletWebResponse.java | 8 - .../DynamicJQueryResourceReference.java | 2 +- .../resource/JQueryResourceReference.java | 2 +- .../wicket/resource/jquery/jquery-1.12.1.js | 11026 ---------------- .../wicket/resource/jquery/jquery-2.2.1.js | 9831 -------------- .../filter/XmlCleaningResponseFilter.java | 7 +- .../wicket/serialize/java/JavaSerializer.java | 6 +- .../wicket/settings/ApplicationSettings.java | 2 +- .../apache/wicket/settings/DebugSettings.java | 2 +- .../wicket/settings/ExceptionSettings.java | 2 +- .../settings/JavaScriptLibrarySettings.java | 2 +- .../wicket/settings/MarkupSettings.java | 2 +- .../apache/wicket/settings/PageSettings.java | 2 +- .../wicket/settings/RequestCycleSettings.java | 2 +- .../wicket/settings/ResourceSettings.java | 2 +- .../wicket/settings/SecuritySettings.java | 2 +- .../apache/wicket/settings/StoreSettings.java | 2 +- .../wicket/util/tester/BaseWicketTester.java | 31 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../apache/wicket/MarkupContainerTest.java | 91 +- .../wicket/TestDetachPageAjaxResult.html | 2 +- .../wicket/TestDetachPageExpectedResult.html | 2 +- .../ajax/AjaxBehaviorEnabled_expected.html | 2 +- ...HeaderContributionPage2_ajax_expected.html | 2 +- .../AjaxHeaderContributionPage2_expected.html | 2 +- ...xHeaderContributionPage_ajax_expected.html | 2 +- .../AjaxHeaderContributionPage_expected.html | 2 +- .../ajax/DomReadyOrderPage_ajax_expected.html | 2 +- .../ajax/DomReadyOrderPage_expected.html | 2 +- .../form/AjaxFormSubmitTestPage_expected.html | 2 +- .../form/AjaxFormValidatingBehaviorTest.java | 4 +- ...OnChangeAjaxBehaviorTestPage_expected.html | 2 +- .../ajaxLink/AjaxLinkPageExpectedResult.html | 2 +- .../AjaxLinkWithBorderPageExpectedResult.html | 2 +- .../ajaxLink/AjaxPage2_ExpectedResult.html | 2 +- .../SimpleTestPageExpectedResult-1.html | 2 +- .../SimpleTestPageExpectedResult.html | 2 +- .../ajax/markup/html/form/AjaxButtonTest.java | 6 +- .../core/request/mapper/CryptoMapperTest.java | 22 + .../filter/FilteredHeaderPageExpected.html | 2 +- .../AutocomponetsGenerationTest.java | 30 +- .../basic/SimplePageExpectedResult_13.html | 2 +- .../HideableBorderPage_ExpectedResult.html | 2 +- .../markup/html/internal/EnclosureTest.java | 10 + .../InlineEnclosureWithWicketMessagePage.java | 7 + ...hWicketMessagePage_invisible_expected.html | 2 +- ...ithWicketMessagePage_visible_expected.html | 2 +- .../InlinePanelPageExpectedResult_7.html | 2 +- .../InlinePanelPageExpectedResult_8.html | 2 +- .../wicket/page/XmlPartialPageUpdateTest.java | 31 +- .../http/servlet/ServletWebResponseTest.java | 4 +- .../MinifiedAwareResourceReferenceTest.java | 14 +- .../request/resource/ResouceBundleTest.java | 8 + .../ResourceReferenceLocatingTest.java | 7 + .../wicket/resource/CssUrlReplacerTest.java | 9 + .../ResourceAggregatorTest1Page_results.html | 2 +- .../ResourceAggregatorTest2Page_results.html | 2 +- .../wicket/util/tester/WicketTesterTest.java | 23 +- wicket-core/src/test/js/ajax.js | 6 +- wicket-core/src/test/js/all.html | 2 +- wicket-core/src/test/js/amd.html | 2 +- wicket-datetime/pom.xml | 2 +- .../yui/calendar/DateTimeField.java | 13 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../calendar/DatesPage1_ExpectedResult.html | 2 +- wicket-devutils/pom.xml | 2 +- wicket-examples/pom.xml | 66 +- .../org/apache/wicket/examples/media/Home.css | 4 +- .../apache/wicket/examples/media/Home.html | 2 +- .../apache/wicket/examples/media/Home.java | 39 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../src/main/webapp/js-test/lib/jquery.js | 121 +- wicket-extensions/pom.xml | 18 +- .../ajax/markup/html/modal/ModalWindow.java | 13 +- .../data/sort/AjaxFallbackOrderByBorder.java | 30 +- .../data/sort/AjaxFallbackOrderByLink.java | 91 +- .../markup/html/form/palette/Palette.java | 13 +- .../repeater/data/table/AbstractColumn.java | 15 + .../repeater/data/table/HeadersToolbar.java | 14 +- .../requestlogger/JsonRequestLogger.java | 10 +- wicket-guice/pom.xml | 2 +- .../src/main/resources/META-INF/NOTICE | 2 +- wicket-ioc/pom.xml | 2 +- wicket-jmx/pom.xml | 2 +- wicket-native-websocket/pom.xml | 4 +- .../wicket-native-websocket-core/pom.xml | 2 +- .../ws/api/AbstractWebSocketProcessor.java | 9 +- .../protocol/ws/api/WebSocketBehavior.java | 20 +- .../wicket-native-websocket-javax/pom.xml | 2 +- .../ws/javax/JavaxWebSocketProcessor.java | 2 - .../wicket-native-websocket-tomcat/pom.xml | 2 +- wicket-objectsizeof-agent/pom.xml | 2 +- wicket-request/pom.xml | 2 +- .../wicket/request/http/WebRequest.java | 9 +- .../request/mapper/CompoundRequestMapper.java | 3 - wicket-spring/pom.xml | 2 +- .../annot/AnnotProxyFieldValueFactory.java | 23 +- .../annot/SpringBeanWithGenericsTest.java | 14 +- .../grails-app/conf/Config.groovy | 4 +- wicket-user-guide/pom.xml | 5 +- .../src/docs/guide/advanced/advanced_5.gdoc | 8 +- .../src/docs/guide/forms2/forms2_11.gdoc | 2 +- .../src/docs/guide/forms2/forms2_3.gdoc | 8 +- .../src/docs/guide/forms2/forms2_4.gdoc | 2 +- .../src/docs/guide/forms2/forms2_5.gdoc | 38 +- .../src/docs/guide/forms2/forms2_8.gdoc | 74 +- .../src/docs/guide/forms2/forms2_9.gdoc | 4 +- .../docs/guide/modelsforms/modelsforms_3.gdoc | 8 +- .../src/docs/guide/repeaters/repeaters_2.gdoc | 14 +- .../src/docs/guide/repeaters/repeaters_3.gdoc | 6 +- .../src/docs/guide/repeaters/repeaters_4.gdoc | 4 +- .../src/docs/guide/resources/resources_8.gdoc | 4 +- wicket-user-guide/src/docs/guide/toc.yml | 7 + .../docs/guide/wicketstuff/wicketstuff_6.gdoc | 2 +- .../docs/guide/wicketstuff/wicketstuff_7.gdoc | 2 +- wicket-util/pom.xml | 2 +- .../wicket/util/encoding/UrlEncoder.java | 68 +- .../util/listener/ChangeListenerSet.java | 44 +- .../wicket/util/encoding/UrlEncoderTest.java | 43 - wicket-velocity/pom.xml | 2 +- wicket/pom.xml | 2 +- 173 files changed, 2734 insertions(+), 23106 deletions(-) delete mode 100755 release-dashorst.sh delete mode 100755 release-igor.sh delete mode 100755 release-milestone.sh delete mode 100755 revert-release.sh delete mode 100644 wicket-core/src/main/java/org/apache/wicket/resource/jquery/jquery-1.12.1.js delete mode 100644 wicket-core/src/main/java/org/apache/wicket/resource/jquery/jquery-2.2.1.js diff --git a/CHANGELOG-7.x b/CHANGELOG-7.x index b0f3839e099..cb4a3925176 100644 --- a/CHANGELOG-7.x +++ b/CHANGELOG-7.x @@ -2,6 +2,181 @@ This file contains all changes done in releases for Apache Wicket 7.x. ======================================================================= +Release Notes - Wicket - Version 7.3.0 + +** Bug + + * [WICKET-6069] - OnChangeAjaxBehavior does not work if the url contains a request parameter with same name as wicket id + * [WICKET-6078] - Problem with queued components and auto linking + * [WICKET-6079] - Problem with queued components and label + * [WICKET-6080] - Encapsulation of 3 enclosures leads to WicketRuntimeException + * [WICKET-6084] - ajax request failure handler receives incorrect arguments + * [WICKET-6085] - AjaxTimerBehavior with failure handler cause memory leak in browser + * [WICKET-6087] - Invalid AbstractRequestWrapperFactory.needsWrapper method scope: package - cannot create a custom implementation + * [WICKET-6088] - Problem with queued components and setting the model + * [WICKET-6091] - NPE in RequestLoggerRequestCycleListener when using native-websockets + * [WICKET-6093] - MarkupException due to ID collision in RelativePathPrefixHandler + * [WICKET-6094] - Find adequate ResourceReference with mount parameters + * [WICKET-6097] - JsonRequestLogger --> JsonMappingException --> StackOverflowError Infinite recursion + * [WICKET-6102] - StackoverflowError related to enclosures + * [WICKET-6108] - Closing a ModalWindow with jQuery 2.2.0 produces javascript errors + * [WICKET-6109] - Enclosure - "IllegalArgumentException: Argument 'markup' may not be null" after app restart + * [WICKET-6111] - Empty redirect on redirect to home page if home page already shown + * [WICKET-6116] - Exception 'A child already exists' when backing to a page with some markups in a Border + * [WICKET-6131] - IndexOutOfBoundsException in org.apache.wicket.core.request.mapper.CryptoMapper.decryptEntireUrl + * [WICKET-6133] - Failing test SpringBeanWithGenericsTest in 7.3.0.0 SNAPSHOT + * [WICKET-6134] - NPE when using ListView with missing markup + * [WICKET-6135] - There is no good way to get POST body content + * [WICKET-6139] - AjaxButton forces rendering type="button" + * [WICKET-6141] - Runtime Exception rendering ComponentTag with RelativePathPrefixHandler + * [WICKET-6151] - DebugBar/PageSizeDebugPanel throws NullPointerException (need wrapper exception with more detail) + +** Improvement + + * [WICKET-6053] - Allow to reuse the same application instance in several tests + * [WICKET-6081] - Add "assertNotRequired" to the WicketTester + * [WICKET-6098] - Add logging to HttpSessionDataStore + * [WICKET-6100] - Upgrade jQuery to 1.12.3/2.2.3 + * [WICKET-6103] - Synchronization on JSR 356 connection + * [WICKET-6106] - Propagate JSR 356 WebSocket connection error to a page + * [WICKET-6107] - Broadcast onClose event regardless of the JSR 356 WebSocket connection closed state + * [WICKET-6110] - Add a message to StalePageException for better debugging + * [WICKET-6122] - Add .map to the list of allowed file extensions in SecurePackageResourceGuard + * [WICKET-6123] - Remove 'abstract' from ChainingModel + * [WICKET-6127] - Add metrics for request duration + * [WICKET-6128] - Add metrics for currently active sessions + * [WICKET-6130] - Make it easier to override parts of SystemMapper + * [WICKET-6144] - Wicket-ajax parameter / header may be used to bypass proper exception handling + * [WICKET-6145] - Enable DeltaManager to replicate PageTable in Sessions + * [WICKET-6152] - Allow to add more than one WebSocketBehavior in the component tree + +** New Feature + + * [WICKET-6120] - Wicket Metrics + +** Wish + + * [WICKET-6095] - Multiline headers in DataTable + +======================================================================= + +Release Notes - Wicket - Version 7.2.0 + +** Bug + + * [WICKET-6001] - Exception raised while refreshing a page with queued components missing in the markup + * [WICKET-6002] - FileUploadField makes form-component models become null on submit + * [WICKET-6006] - ModalWindow.closeCurrent() causes 414 status error + * [WICKET-6010] - Downloading filenames containing ',' or ';' gives problems + * [WICKET-6011] - NPE in case DebugBar is added to AjaxRequestTarget + * [WICKET-6013] - CLONE - AjaxFallbackOrderByBorder wicketOrder[Up|Down|None] class missing in 7.1.0 + * [WICKET-6014] - TransparentWebMarkupContainer breaks OnChangeAjaxBehavior for Select2 + * [WICKET-6017] - Tests fail when executed with not expected locale + * [WICKET-6018] - TransparentWebMarkupContainer is not really "transparent" + * [WICKET-6020] - GuiceFieldValueFactory returns the NULL_SENTINEL from the cache + * [WICKET-6021] - ConcurrentModificationException in MarkupContainer#iterator#next + * [WICKET-6024] - Possible issue with Border and LoadableDetachableModel in 7.1.0 + * [WICKET-6026] - Problem in detecting child id on nested + * [WICKET-6027] - Nested TransparentWebMarkupContainer, markup of inner component not found + * [WICKET-6028] - Detach called on enclosure component while it had a non-empty queue + * [WICKET-6031] - NPE in PackageResourceReference#getResource() when there is no request + * [WICKET-6032] - Wicket.Ajax.done() called twice on redirect + * [WICKET-6034] - AjaxFallbackOrderByBorder does not generate any CSS class in order link + * [WICKET-6036] - Failure to process markup with nested tags inside a Label + * [WICKET-6037] - ModalWindow vulnerable to Javascript injection through title model + * [WICKET-6043] - Cannot set wicket:enclosure on queued component in ListView + * [WICKET-6044] - AjaxFormChoiceComponentUpdatingBehavior: Duplicate input values according to WICKET-5948 + * [WICKET-6045] - ListView NullPointerException when viewSize is set explicitly + * [WICKET-6048] - German Translation for EqualInputValidator wrong + * [WICKET-6050] - Wicket Ajax (Wicket.From.serializeElement) causes 400 bad request + * [WICKET-6052] - CSS header contribution overlap + * [WICKET-6058] - Error in calculation of byte ranges + * [WICKET-6059] - TransparentWebMarkupContainer can not resolve autocomponents in its parent + * [WICKET-6062] - MockHttpSession should renew its id after invalidation + * [WICKET-6063] - Add support for WebSocketRequest#getUrl() and other properties which are available in the handshake request + * [WICKET-6064] - WebSocketResponse.sendRedirect could be supported with ... + * [WICKET-6065] - Calling http://examples7x.wicket.apache.org/resourceaggregation/ generate Internal error + * [WICKET-6068] - The key RangeValidator.exact is not mapped in Application_de.properties + * [WICKET-6076] - Problem with queued components and enclosure + * [WICKET-6077] - Border's body is not added as a child due to dequeuing + +** Improvement + + * [WICKET-5950] - Model and GenericBaseModel could both implement IObjectClassAwareModel + * [WICKET-5969] - Please give us access to PageTable.index pageId queue + * [WICKET-6015] - AjaxFallbackOrderByBorder/Link should support updateAjaxAttributes() idiom + * [WICKET-6019] - Remove 'final' modifier for Localizer#getStringIgnoreSettings() methods + * [WICKET-6023] - small tweak for component queuing for the AbstractRepeater + * [WICKET-6029] - Make Border's methods consistent with commit f14e03f + * [WICKET-6046] - Wicket Quickstart Example Application shows deployment memory leak in Tomcat + * [WICKET-6051] - Improve performance of CssUrlReplacer + * [WICKET-6054] - Provide a factory method for the WebSocketResponse & WebSocketRequest + * [WICKET-6061] - Improved PackageResource#getCacheKey + * [WICKET-6070] - Provide factory methods for WizardButtonBar buttons + * [WICKET-6072] - Improve the quickstart to make it easier to use JSR-356 web sockets + +** New Feature + + * [WICKET-6025] - Read resource files with Java's NIO API + * [WICKET-6042] - Implementation of ExternalImage component + +** Task + + * [WICKET-6049] - Update the site to point to the new deployments of the examples + * [WICKET-6057] - Upgrade commons-collections to 4.1 + * [WICKET-6071] - Upgrade jQuery to 1.12 / 2.2.0 + +** Wish + + * [WICKET-6067] - Provide an Ajax Behavior that prevents form submit on ENTER + +======================================================================= + +Release Notes - Wicket - Version 7.1.0 + +** Bug + + * [WICKET-5882] - AutoComplete suggestion list disappear when I click on autoComplete scrollbar in IE + * [WICKET-5941] - Headers not rendered for components inside TransparentWebMarkupContainer on ajax update + * [WICKET-5959] - HTML input placeholder text breaks AutoCompleteTextField in IE11 + * [WICKET-5960] - Page header isn't rendered for pages where URL has changed during render + * [WICKET-5964] - Queuing a component within an enclosure + * [WICKET-5965] - Queuing a component in head + * [WICKET-5966] - ResourceUtils.getLocaleFromFilename can't handle minimized resources well + * [WICKET-5967] - Unable to load i18n minified js + * [WICKET-5968] - CachingResourceLocator lookup key doesn't take strict into account + * [WICKET-5970] - UrlRenderer does not render fragments + * [WICKET-5973] - IllegalArgumentException 'bytes' cannot be negative. on opening Inspector + * [WICKET-5975] - AjaxFallbackOrderByBorder wicketOrder[Up|Down|None] class missing + * [WICKET-5978] - LazyInitProxyFactory fills permgen space + * [WICKET-5980] - When using Servlet 3.0 filter Wicket calculates filter path wrong + * [WICKET-5981] - Significant Performance Degradation From Wicket 6.20.0 to Wicket 7.0.0 + * [WICKET-5983] - O(n^2) complexity in MarkupContainer.add + * [WICKET-5988] - WICKET-5981 breaks forms inside borders + * [WICKET-5989] - BaseWicketTester#startComponentInPage fails for pages with placeholder + * [WICKET-5993] - AjaxButton - image is not shown even though type="image" is in html-template + * [WICKET-5994] - Mounted TemplateResourceReference throws org.apache.wicket.WicketRuntimeException when https is used + * [WICKET-5995] - "Range" header parsing is broken + * [WICKET-5996] - Mounted packages throw IllegalArgumentException when visiting base package url. + * [WICKET-5997] - Compatibility problem with Websphere liberty profile + * [WICKET-5999] - AjaxFormValidatingBehavior not updates initially hidden feedback component + * [WICKET-6005] - WicketRuntimeException from AjaxPagingNavigator#onAjaxEvent + +** Improvement + + * [WICKET-5948] - wicket-ajax.js probably doesn't traverse the children of
or + * [WICKET-5971] - Code cleanup in ServletWebResponse + * [WICKET-5974] - Change AjaxPagingNavigator#onAjaxEvent() to only consider parent components that have setOutputMarkupId(true) + * [WICKET-5976] - Improve the documentation of FeedbackMessages first(int level) + * [WICKET-5984] - ReplaceHandlerException lacks an accessor for the replacement RequestHandler + * [WICKET-5986] - NumberTextField should use Models for minimum, maximum and step + +** Task + + * [WICKET-5951] - Upgrade Atmosphere to 2.2.8 + +======================================================================= + Release Notes - Wicket - Version 7.0.0 ** Bug diff --git a/NOTICE b/NOTICE index 61a0b9b3e41..c2b4544b95b 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache Wicket -Copyright 2006-2012 The Apache Software Foundation +Copyright 2006-2016 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). @@ -116,4 +116,16 @@ src/./wicket-datetime This product includes software developed by Joda.org (http://www.joda.org/). + +--------------------------------------------------------------------------- +src/./wicket-metrics +--------------------------------------------------------------------------- + + Apache Wicket Metrics + Copyright 2006-2016 Apache Software Foundation + + This product includes software developed at + The Apache Software Foundation (http://www.apache.org/). + This product uses AspectJ, developed at Eclipse, and licensed + under the Eclipse Public License. (https://eclipse.org/aspectj/). \ No newline at end of file diff --git a/README b/README index 436937c2f18..1f4f0bc65a3 100644 --- a/README +++ b/README @@ -75,6 +75,7 @@ You will find the source code here: |-- wicket-spring |-- wicket-util |-- wicket-user-guide + |-- wicket-metrics `-- wicket-velocity @@ -117,6 +118,7 @@ Here is a list of projects in this distribution and what they do. - wicket-eclipse-settings: specifies Eclipse settings for a uniform development environment. Most notably the formatting rules; - wicket-user-guide: the user guide of wicket + - wicket-metrics: collects data of a running wicket application Getting started --------------- @@ -247,7 +249,7 @@ Getting help - Read the online documentation available on our website (http://wicket.apache.org) - - Read the migration guide (migration-to-wicket-60.html) + - Read the migration guide (migration-to-wicket-70.html) - Read the mailing archives available on Nabble, GMane and Apache diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml index d46dba5dcdb..50f620b0c87 100644 --- a/archetypes/quickstart/pom.xml +++ b/archetypes/quickstart/pom.xml @@ -20,7 +20,7 @@ org.apache.wicket wicket-parent - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT ../../pom.xml wicket-archetype-quickstart diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml index f0e38741f9f..9cb6e7ba944 100644 --- a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml @@ -42,8 +42,8 @@ - 7.0.0-SNAPSHOT - 9.3.5.v20151012 + 7.2.0-SNAPSHOT + 9.2.13.v20150730 2.5 4.12 UTF-8 @@ -131,10 +131,10 @@ true org.apache.maven.plugins maven-compiler-plugin - 3.3 + 3.1 - 1.8 - 1.8 + 1.7 + 1.7 UTF-8 true true @@ -157,7 +157,7 @@ org.apache.maven.plugins maven-eclipse-plugin - 2.10 + 2.9 true ${wtp.version} diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml index 0f9598afb0b..d9d680a21b1 100644 --- a/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml +++ b/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/web-app_3_0.xsd" + version="3.0"> ${artifactId} diff --git a/build-changelog.sh b/build-changelog.sh index 2c9c3d97045..cb3dfbf7a8a 100755 --- a/build-changelog.sh +++ b/build-changelog.sh @@ -117,7 +117,7 @@ echo "done" echo " - merging release notes into changelog: \c" -echo "This file contains all changes done in releases for Apache Wicket 7.x. +echo "This file contains all changes done in releases for Apache Wicket $major_version.x. ======================================================================= $(cat /tmp/release-notes-$version.txt) @@ -127,21 +127,21 @@ $(tail -n +4 CHANGELOG-$major_version.x) " > /tmp/changelog-$version.txt cp /tmp/changelog-$version.txt CHANGELOG-$major_version.x -echo "done" +echo "done +" +git diff -echo " -The CHANGELOG-$major_version.x file has been updated. Please check the contents -and commit the changes. +echo "" -To see the status: +git add CHANGELOG-$major_version.x +git commit -m "Added CHANGELOG for release $version" - git status - git diff +echo " +The CHANGELOG-$major_version.x file has been updated and committed. -To add and commit the CHANGELOG: +To revert the changes to the CHANGELOG: - git add CHANGELOG-$major_version.x - git commit -m \"Added CHANGELOG for release $version + git reset HEAD^ --hard Have fun! " diff --git a/pom.xml b/pom.xml index 373a3128402..cf418b2ef05 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 4.0.0 - 3.0.4 + 3.3.9 org.apache @@ -27,7 +27,7 @@ org.apache.wicket wicket-parent - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT pom Wicket Parent Wicket is a Java-based open source component web application framework. @@ -123,31 +123,34 @@ true true true - 1.8 - 1.8 + 1.7 + 1.7 - 0.7.5.201505241946 - 9.3.5.v20151012 - 2.9 + 0.7.4.201502262128 + 8.1.16.v20140903 + 9.0.7.v20131107 + 2.7 4.12 - 4.2.5.RELEASE - 3.1.0 + 4.1.7.RELEASE + 3.0.1 2.10.3 - 2.18.1 - 1.10.19 - 1.7.15 + 2.18 + 1.10.16 + 1.7.12 2.0.0.0 - 2.2 + 2.1 2.2.4 + 1.8.9 + 3.1.2 com.google.code.findbugs jsr305 - 3.0.1 + 3.0.0 provided @@ -177,7 +180,7 @@ javax.websocket javax.websocket-api - 1.1 + 1.0 provided @@ -187,34 +190,16 @@ provided - org.eclipse.jetty - jetty-server + org.eclipse.jetty.aggregate + jetty-all-server ${jetty.version} - test - - - org.eclipse.jetty - jetty-webapp - ${jetty.version} - test - - - org.eclipse.jetty - jetty-util - ${jetty.version} - test - - - org.eclipse.jetty - jetty-jmx - ${jetty.version} - test + provided cglib cglib - 3.2.0 + 3.1 @@ -226,7 +211,7 @@ com.fasterxml.jackson.core jackson-databind - 2.7.1-1 + 2.6.5 true @@ -252,7 +237,7 @@ de.agilecoders.wicket.webjars wicket-webjars - 0.5.3 + 0.5.2 javax.inject @@ -283,7 +268,7 @@ org.apache.wicket wicket - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT @@ -292,120 +277,138 @@ org.apache.wicket wicket-auth-roles - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT jar org.apache.wicket wicket-bean-validation - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT jar org.apache.wicket wicket-cdi - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT jar org.apache.wicket wicket-cdi-1.1 - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT jar org.apache.wicket wicket-core - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT jar org.apache.wicket wicket-datetime - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT jar org.apache.wicket wicket-devutils - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT jar org.apache.wicket wicket-eclipse-settings - 3 + 2 org.apache.wicket wicket-extensions - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT jar org.apache.wicket wicket-guice - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT jar org.apache.wicket wicket-ioc - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT jar org.apache.wicket wicket-jmx - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT jar org.apache.wicket wicket-native-websocket-core - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT jar org.apache.wicket wicket-native-websocket-javax - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT + jar + + + org.apache.wicket + wicket-native-websocket-jetty + 7.4.0-SNAPSHOT + jar + + + org.apache.wicket + wicket-native-websocket-jetty9 + 7.4.0-SNAPSHOT jar org.apache.wicket wicket-native-websocket-tomcat - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT jar org.apache.wicket wicket-request - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT jar org.apache.wicket wicket-spring - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT jar org.apache.wicket wicket-util - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT jar org.apache.wicket wicket-velocity - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT + jar + + + org.apache.wicket.experimental.wicket7 + wicket-metrics + 0.2-SNAPSHOT jar org.apache.wicket.experimental.wicket7 wicket-atmosphere - 0.24-SNAPSHOT + 0.27-SNAPSHOT jar @@ -426,7 +429,7 @@ org.ow2.asm asm-util - 5.0.4 + 5.0.3 org.slf4j @@ -475,12 +478,12 @@ junit ${junit.version} test - - - org.hamcrest - hamcrest-core - - + + + org.hamcrest + hamcrest-core + + org.glassfish @@ -498,18 +501,18 @@ org.hamcrest hamcrest-junit ${hamcrest.version} - provided + test org.hamcrest java-hamcrest ${hamcrest.version} - provided + test org.hibernate hibernate-validator - 5.2.2.Final + 5.1.2.Final test @@ -529,12 +532,22 @@ mockito-core ${mockito.version} test - - - org.hamcrest - hamcrest-core - - + + + org.hamcrest + hamcrest-core + + + + + org.aspectj + aspectjrt + ${aspectj.version} + + + io.dropwizard.metrics + metrics-core + ${metrics.version} @@ -579,7 +592,7 @@ org.apache.maven.wagon wagon-ssh-external - 2.10 + 2.6 @@ -691,7 +704,7 @@ org.apache.felix maven-bundle-plugin - 3.0.0 + 2.5.3 bundle-manifest @@ -713,12 +726,12 @@ org.apache.maven.plugins maven-archetype-plugin - 2.4 + 2.3 org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + 3.5 true @@ -732,7 +745,7 @@ org.apache.maven.plugins maven-eclipse-plugin - 2.10 + 2.9 true @@ -746,14 +759,14 @@ org.apache.wicket wicket-eclipse-settings - 3 + 2 org.apache.maven.plugins maven-enforcer-plugin - 1.4.1 + 1.4 @@ -797,7 +810,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.6 + 2.5 true @@ -826,10 +839,8 @@ 256m true - http://docs.oracle.com/javase/8/docs/api/ + http://docs.oracle.com/javase/7/docs/api/ - false - -Xdoclint:none @@ -949,13 +960,11 @@ org.codehaus.mojo clirr-maven-plugin - 2.7 + 2.6.1 7.0.0 true true - - true @@ -998,7 +1007,7 @@ - + @@ -1046,7 +1055,7 @@ - org.eclipse.jetty + org.mortbay.jetty jetty-maven-plugin ${jetty.version} @@ -1191,7 +1200,7 @@ true org.apache.maven.plugins maven-project-info-reports-plugin - 2.8.1 + 2.8 diff --git a/release-dashorst.sh b/release-dashorst.sh deleted file mode 100755 index 981a43ceb1a..00000000000 --- a/release-dashorst.sh +++ /dev/null @@ -1,621 +0,0 @@ -#!/bin/sh -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# set -e -# set -x - -function fail { - >&2 echo "\033[31m -FATAL ERROR ------------ -$1 -\033[0m" - exit 1 -} - -function getJavaVersionFromPom { - cat << EOF | xmllint --noent --shell pom.xml | grep content | cut -f2 -d= -setns pom=http://maven.apache.org/POM/4.0.0 -xpath /pom:project/pom:properties/pom:maven.compiler.source/text() -EOF -} - -function getProjectVersionFromPom { - cat << EOF | xmllint --noent --shell pom.xml | grep content | cut -f2 -d= -setns pom=http://maven.apache.org/POM/4.0.0 -xpath /pom:project/pom:version/text() -EOF -} - -function getJdkToolchain { - xmllint ~/.m2/toolchains.xml --xpath "/toolchains/toolchain[provides/version/text() = '$JAVA_VERSION']/configuration/jdkHome/text()" -} - -function generate_promotion_script { - echo "Generating release promotion script 'promote-$version.sh'" -read -d '' script <<- EOF -#!/bin/sh -echo -n "Promoting release $version - -Actions about to be performed: ------------------------------- - -$(cat \$0 | tail -n +14) - ------------------------------------------- -Press enter to continue or CTRL-C to abort" - -read - -# push the build branch to ASF git repo - -git push origin $branch:refs/heads/$branch - -# push the release tag to ASF git repo - -git push origin $tag - -# promote the source distribution by moving it from the staging area to the release area - -svn mv https://dist.apache.org/repos/dist/dev/wicket/$version https://dist.apache.org/repos/dist/release/wicket -m "Upload release to the mirrors" - -mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-release -DstagingRepositoryId=$stagingrepoid -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https -Ddescription="Release vote has passed" - -# Renumber the next development iteration $next_version: - -git checkout $GIT_BRANCH -mvn release:update-versions --batch-mode -find . ! \( -type d -name "target" -prune \) -name pom.xml -exec sed -i "" -E "s/$mvn_version_to_replace/$next_version/g" {} \; -find . ! \( -type d -name "target" -prune \) -name pom.xml -exec sed -i "" -E "s/$mvn_version_to_replace/$next_version/g" {} \; -git add \` find . ! \( -type d -name "target" -prune \) -name pom.xml \` -git commit -m "Start next development version" -git push - -echo "Remove the previous version of Wicket using this command: - - svn rm https://dist.apache.org/repos/dist/release/wicket/$previous_version -m \"Remove previous version from mirrors\" - -" -EOF - -echo "$script" > promote-$version.sh - chmod +x promote-$version.sh - git add promote-$version.sh -} - -function generate_rollback_script { - echo "Generating release rollback script 'revert-$version.sh'" -read -d '' script <<- EOF -#!/bin/sh -echo -n "Reverting release $version - -Actions about to be performed: ------------------------------- - -$(cat $0 | tail -n +14) - ------------------------------------------- -Press enter to continue or CTRL-C to abort" - -read - -# clean up local repository -git checkout $GIT_BRANCH -git branch -D $branch -git tag -d $tag - -# clean up staging repository -git push staging --delete refs/heads/$branch -git push staging --delete $tag - -# clean up staging dist area -svn rm https://dist.apache.org/repos/dist/dev/wicket/$version -m "Release vote has failed" - -# clean up staging maven repository -mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-drop -DstagingRepositoryId=$stagingrepoid -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https -Ddescription="Release vote has failed" - -# clean up remaining release files -find . -name "*.releaseBackup" -exec rm {} \; -[ -f release.properties ] && rm release.properties - -EOF -echo "$script" > revert-$version.sh - - chmod +x revert-$version.sh - git add revert-$version.sh -} - -function generate_signatures_from_release { - - echo "======================================================================== - - The signatures for the source release artefacts: - - " > /tmp/release-$version-sigs.txt - - pushd target/dist > /dev/null - for i in apache-wicket*{zip,tar.gz} - do - echo "Signature for $i: - - $(cat $i.asc) - " >> /tmp/release-$version-sigs.txt - done - popd > /dev/null - - echo "======================================================================== - - CHANGELOG for $version: - " >> /tmp/release-$version-sigs.txt - - if [ -f "/tmp/release-notes-$version.txt" ] ; then - tail -n +4 /tmp/release-notes-$version.txt >> /tmp/release-$version-sigs.txt - else - awk "/Release Notes - Wicket - Version $version/{flag=1;next} /==================/{flag=0} flag { print }" CHANGELOG-$major_version.x >> /tmp/release-$version-sigs.txt - fi -} - -function generate_release_vote_email { - - echo "Generating Vote email" - - echo "This is a vote to release Apache Wicket $version - - Please download the source distributions found in our staging area - linked below. - - I have included the signatures for both the source archives. This vote - lasts for 72 hours minimum. - - [ ] Yes, release Apache Wicket $version - [ ] No, don't release Apache Wicket $version, because ... - - Distributions, changelog, keys and signatures can be found at: - - https://dist.apache.org/repos/dist/dev/wicket/$version - - Staging repository: - - https://repository.apache.org/content/repositories/$stagingrepoid/ - - The binaries are available in the above link, as are a staging - repository for Maven. Typically the vote is on the source, but should - you find a problem with one of the binaries, please let me know, I can - re-roll them some way or the other. - - Staging git repository data: - - Repository: $(git config --get remote.staging.url) - Branch: $branch - Release tag: $tag - - " > release-vote.txt - - cat /tmp/release-$version-sigs.txt >> release-vote.txt - git add release-vote.txt -} - -function generate_announce_email { - echo "The Apache Wicket PMC is proud to announce Apache Wicket $version! - - This release marks another minor release of Wicket $major_version. We - use semantic versioning for the development of Wicket, and as such no - API breaks are present breaks are present in this release compared to - $major_version.0.0. - - New and noteworthy - ------------------ - - - - Using this release - ------------------ - - With Apache Maven update your dependency to (and don't forget to - update any other dependencies on Wicket projects to the same version): - - - org.apache.wicket - wicket-core - $version - - - Or download and build the distribution yourself, or use our - convenience binary package - - * Source: http://www.apache.org/dyn/closer.cgi/wicket/$version - * Binary: http://www.apache.org/dyn/closer.cgi/wicket/$version/binaries - - Upgrading from earlier versions - ------------------------------- - - If you upgrade from $major_version.y.z this release is a drop in replacement. If - you come from a version prior to $major_version.0.0, please read our Wicket $major_version - migration guide found at - - * http://s.apache.org/wicket${major_version}migrate - - Have fun! - - — The Wicket team - - " > release-announce.txt - - cat /tmp/release-$version-sigs.txt >> release-announce.txt - git add release-announce.txt -} - -# the branch on which the code base lives for this version (master is -# always current development version) -GIT_BRANCH=master - -JAVA_VERSION=$(getJavaVersionFromPom) - -echo " -Apache Wicket Release script ----------------------------- -Building a release for Apache Wicket. - -This script assumes you are running on OS X, it hasn't been tested on any other -operating systems, and you can bet it won't work on Windows... - -REQUIREMENTS: - - - A Java version $JAVA_VERSION configured through the Maven toolchain - - Maven 3.3.0 (older releases are b0rked, just don't bother) - - gpg, gpg-agent and pinentry for signing -" - -if [ ! $( git config --get remote.staging.url ) ] ; then - fail " -No staging remote git repository found. The staging repository is used to temporarily -publish the build artifacts during the voting process. Since no staging repository is -available at Apache, it is best to use a git mirror on your personal github account. - -First fork the github Apache Wicket mirror (https://github.com/apache/wicket) and then -add the remote staging repository with the following command: - - $ git remote add staging git@github.com:/wicket.git - $ git fetch staging - $ git push staging - -This will bring the staging area in sync with the origin and the release script can -push the build branch and the tag to the staging area. -" -fi - -if [ ! -f ~/.m2/toolchains.xml ] ; then - fail " -Maven will load the Java $JAVA_VERSION environment from the toolchain specified in -~/.m2/toolchains.xml - -You don't have a toolchains.xml file in your .m2 folder. Please specify your -JDK's in the toolchains.xml file. -" -fi - -grep -q "$JAVA_VERSION" ~/.m2/toolchains.xml - -if [ $? -ne 0 ] ; then - fail " -Your ~/.m2/toolchains.xml file doesn't provide a Java $JAVA_VERSION toolchain. -" -fi - -echo "Java version for running Maven is: $(java -version 2>&1 | tail -n 2 | head -n 1) -Java used to compile (from toolchain) is: $(getJdkToolchain) -" - -agentcount=`ps aux|grep gpg-agent|wc -l` - -current_version=$(getProjectVersionFromPom) -major_version=$(expr $current_version : '\(.*\)\..*\..*\-.*') -minor_version=$(expr $current_version : '.*\.\(.*\)\..*\-.*') -bugfix_version=$(expr $current_version : '.*\..*\.\(.*\)-.*') -version="$major_version.$minor_version.0" - -default_version="$version" - -version= - -while [[ ! $version =~ ^[0-9]+\.[0-9]+\.[0-9]+(-M[0-9]+)?$ ]] -do - read -p "Version to release (default is $default_version): " -e t1 - if [ -n "$t1" ] - then - version="$t1" - else - version="$default_version" - fi -done - -# recalculate the version coordinates for the current release -major_version=$(expr $version : '\(.*\)\..*\..*') -minor_version=$(expr $version : '.*\.\(.*\)\..*') -bugfix_version=$(expr $version : '.*\..*\.\(.*\)') - -if [[ $version =~ .+-M[0-9]+ ]] -then - milestone_version=$(expr $version : '.*\..*-M\(.*\)') -fi - -if [ ! -z "$milestone_version" ] ; then - next_version="$major_version.0.0-SNAPSHOT" - previous_version="$major_version.0.0-SNAPSHOT" -else - next_version="$major_version.$(expr $minor_version + 1).0-SNAPSHOT" - previous_minor_version=$(expr $minor_version - 1) - if [ $previous_minor_version -lt 0 ] ; then - previous_version="$major_version.0.0-SNAPSHOT" - else - previous_version="$major_version.$(expr $minor_version - 1).0" - fi -fi - -# work around for versions upgrade (TODO maybe no longer necessary?) -mvn_version_to_replace="$major_version.$minor_version.1-SNAPSHOT" -mvn_version_to_replace2="$major_version.$minor_version.0-SNAPSHOT" - -# Check if the changelog has the issues this release - -grep -q "$version\$" CHANGELOG-$major_version.x -if [ $? -ne 0 ] ; then - fail "You have forgotten to add the closed tickets for Wicket $version to the CHANGELOG-$major_version.x file - -Use build-changelog.sh to add the release notes to the changelog. -" -fi - -git status --porcelain CHANGELOG-$major_version.x | grep -q "M" -if [ $? -eq 0 ] ; then - fail "You have changes in your workspace that have not been committed. - -$(git status) -" -fi - -echo "Cleaning up any release artifacts that might linger" -mvn -q release:clean - -log=$(pwd)/release.out - -if [ -f $log ] ; then - rm $log -fi - -branch="build/wicket-$version" -tag="wicket-$version" - -echo "# Release configuration for Wicket-$version -scm.tag=${tag} -" > release.properties - -./build-versions.py $version $next_version >> release.properties - -echo "Contents of the release properties generated for Maven: -------------------------------------------------------------------------------- -$(cat ./release.properties) -------------------------------------------------------------------------------- - -Writing detailed log to $log - -This script will release version: Apache Wicket $version and continue -development with $next_version - -Press enter to continue or CTRL-C to abort \c" -read - -echo "Ensuring we are starting from wicket-$major_version.x" -# otherwise we can't remove a previous release branch that failed -git checkout $GIT_BRANCH - -echo "Removing previous release tag $tag (if exists)" -oldtag=`git tag -l |grep -e "$tag"|wc -l` >> release.out -[ "$oldtag" -ne 0 ] && git tag -d $tag >> release.out - -echo "Removing previous build branch $branch (if exists)" -oldbranch=`git branch |grep -e "$branch"|wc -l` >> release.out -[ "$oldbranch" -ne 0 ] && git branch -D $branch >> release.out - -echo "Removing previous staging branch (if exists)" -git push staging --delete refs/heads/$branch >> release.out -git push staging --delete $tag >> release.out - - -echo "Creating release branch" -git checkout -b $branch >> release.out - -# Clear the current NOTICE.txt file -echo "Creating notice file." - -NOTICE=NOTICE - -echo "Apache Wicket -Copyright 2006-$(date +%Y) The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -This is an aggregated NOTICE file for the Apache Wicket projects included -in this distribution. - -NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUTIONS TO THIS FILE, BUT IN THE - NOTICE FILE OF THE CORRESPONDING PROJECT. THE RELEASE PROCEDURE WILL - AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE. -" > $NOTICE - -# next concatenate all NOTICE files from sub projects to the root file -for i in `find . -name "NOTICE" -not -regex ".*/target/.*" -not -regex "./NOTICE"` -do - echo "---------------------------------------------------------------------------" >> $NOTICE - echo "src/"$i | sed -e "s/\/src.*//g" >> $NOTICE - echo "---------------------------------------------------------------------------" >> $NOTICE - cat $i >> $NOTICE - echo >> $NOTICE -done - -echo "Fixing the quickstart to use the correct wicket version" -sed -e "s/\.*\<\/wicket\.version\>/\$version\<\/wicket.version\>/g" -i "" archetypes/quickstart/src/main/resources/archetype-resources/pom.xml - -echo "Committing changes" -git commit -am "Changes to notice files and quickstart archetype" - -# clean all projects -echo "Clean all projects" -mvn -q clean -Pall - -# package and assemble the release -echo "Prepare the release" -mvn --batch-mode release:prepare -l $log -DpreparationGoals="clean" -Dtag=$tag -Papache-release,release -if [ $? -ne 0 ] ; then - fail "ERROR: mvn release:prepare was not successful" -fi - -echo "Performing the release using Maven" -mvn -Dgpg.passphrase="$passphrase" -ff -l $log release:perform -DlocalCheckout=true -Dtag=$tag -Papache-release,release -if [ $? -ne 0 ] ; then - fail "ERROR: mvn release:perform was not successful" -fi - -# Determine the staging repository and close it after deploying the release to the staging area -stagingrepoid=$(mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-list -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https | grep -v "CLOSED" | grep -Eo "(orgapachewicket-\d+)";) - -echo "Closing staging repository with id $stagingrepoid" -mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-close -DstagingRepositoryId=$stagingrepoid -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https -Ddescription="Release has been built, awaiting vote" - -generate_promotion_script -generate_rollback_script - -echo "Create and sign the source tarballs" - -mkdir -p target/dist/binaries - -git archive --format=tar.gz --prefix=apache-wicket-$version/ -o target/dist/apache-wicket-$version.tar.gz $tag -git archive --format=zip --prefix=apache-wicket-$version/ -o target/dist/apache-wicket-$version.zip $tag -gpg --armor --detach-sign --use-agent --sign target/dist/apache-wicket-$version.tar.gz -gpg --armor --detach-sign --use-agent --sign target/dist/apache-wicket-$version.zip -gpg --print-md SHA1 target/dist/apache-wicket-$version.tar.gz > target/dist/apache-wicket-$version.tar.gz.sha -gpg --print-md MD5 target/dist/apache-wicket-$version.tar.gz > target/dist/apache-wicket-$version.tar.gz.md5 -gpg --print-md SHA1 target/dist/apache-wicket-$version.zip > target/dist/apache-wicket-$version.zip.sha -gpg --print-md MD5 target/dist/apache-wicket-$version.zip > target/dist/apache-wicket-$version.zip.md5 - -echo "Create and sign the binaries" -mkdir target/apache-wicket-$version-bin -pushd target/apache-wicket-$version-bin -find ../checkout ! \( -type d -name "WEB-INF" -prune \) -regex ".*wicket-.*.[jw]ar" ! -name "*-sources*" ! -name "*-javadoc*" ! -name "*wicket-archetype-quickstart*" ! -name "wicket-common-tests*" -type f -exec cp {} . \; -find ../checkout ! \( -type d -name "WEB-INF" -prune \) -regex ".*wicket-.*.[jw]ar\.asc" ! -name "*-sources*" ! -name "*-javadoc*" ! -name "*wicket-archetype-quickstart*" ! -name "wicket-common-tests*" -type f -exec cp {} . \; -cp ../../LICENSE . -cp ../../README . -cp ../../NOTICE . -cp ../../CHANGELOG* . -popd - -pushd target - -tar cfz dist/binaries/apache-wicket-$version-bin.tar.gz apache-wicket-$version-bin -zip -r dist/binaries/apache-wicket-$version-bin.zip apache-wicket-$version-bin -gpg --armor --detach-sign --use-agent --sign dist/binaries/apache-wicket-$version-bin.tar.gz -gpg --armor --detach-sign --use-agent --sign dist/binaries/apache-wicket-$version-bin.zip -gpg --print-md SHA1 dist/binaries/apache-wicket-$version-bin.tar.gz > dist/binaries/apache-wicket-$version-bin.tar.gz.sha -gpg --print-md MD5 dist/binaries/apache-wicket-$version-bin.tar.gz > dist/binaries/apache-wicket-$version-bin.tar.gz.md5 -gpg --print-md SHA1 dist/binaries/apache-wicket-$version-bin.zip > dist/binaries/apache-wicket-$version-bin.zip.sha -gpg --print-md MD5 dist/binaries/apache-wicket-$version-bin.zip > dist/binaries/apache-wicket-$version-bin.zip.md5 -popd - -echo "Uploading release to dist.apache.org" -pushd target/dist -svn mkdir https://dist.apache.org/repos/dist/dev/wicket/$version -m "Create $version release staging area" -svn co --force --depth=empty https://dist.apache.org/repos/dist/dev/wicket/$version . -cp ../../CHANGELOG* . -svn add * -svn commit -m "Upload wicket-$version to staging area" -popd - -generate_signatures_from_release -generate_release_vote_email -generate_announce_email - -# Done with the tasks, now print out the next things the release manager -# needs to do - -pushd target/dist -find . -name "*.asc" -exec gpg --verify {} \; -popd - -echo " -The release has been created. It is up to you to check if the release is up -to par, and perform the following commands yourself when you start the vote -to enable future development during the vote and after. - -A vote email has been generated in release-vote.txt, you can copy/paste it using: - - cat release-vote.txt | pbcopy - -You can find the distribution in target/dist. - - -Failed release --------------- - -To rollback a release due to a failed vote or some other complication use: - - $ ./revert-$version.sh - -This will clean up the artfifacts from the staging areas, including Nexus, -dist.apache.org and the release branch and tag. - - -Successful release ------------------- - -Congratulations on the successful release vote! - -Use the release-announce.txt as a starter for the release announcement: - - cat release-announce.txt | pbcopy - -To promote the release after a successful vote, run: - - $ ./promote-$version.sh - -This will promote the Nexus staging repository to Maven Central, and move -the release artifacts from the staging area to dist.apache.org. It will -also sign the release tag and push the release branch to git.apache.org - -You can read this message at a later time using: - - $ cat release.txt - -Happy voting! -" > release.txt - -git add release.txt - -echo "Adding post-release scripts and vote/release email templates to build branch" -git commit -m "Added post-release scripts and vote/release email templates" - -echo "Signing the release tag" -git checkout $tag -git tag --sign --force --message \"Signed release tag for Apache Wicket $version\" $tag >> $log -git checkout $branch - -echo "Pushing build artifacts to the staging repository" -git push staging $branch:refs/heads/$branch - -echo "Pushing release tag to the staging repository" -git push staging $tag - -cat release.txt diff --git a/release-igor.sh b/release-igor.sh deleted file mode 100755 index 660dc2e9bf3..00000000000 --- a/release-igor.sh +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/sh -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -e - -echo "Apache Wicket Release script" -echo "----------------------------" -echo "Building a release for Apache Wicket. We will need the passphrase for" -echo "GPG to sign the release." -echo "This program assumes you use a jdk 1.5 explicitly configured when" -echo "invoking the 'mvn5' Maven 2 command." -echo "" - -echo "Enter release version:" -read version - -echo "Enter your GPG passphrase (input will be hidden)" -stty_orig=`stty -g` -stty -echo -read passphrase -stty $stty_orig - -# test the GPGP passphrase to fail-fast: -echo "$passphrase" | gpg --passphrase-fd 0 --armor --output pom.xml.asc --detach-sig pom.xml -gpg --verify pom.xml.asc -if [ $? -ne 0 ]; then - echo "It appears that you fat-fingered your GPG passphrase" - exit $? -fi -rm pom.xml.asc - -branch="build/wicket-$version" - -echo "Removing previous build branch $branch (if exists)" -oldbranch=`git branch |grep -e "$branch"|wc -l` -[ "$oldbranch" -ne 0 ] && git branch -D $branch - -echo "Switching to branch $branch" -git checkout -b $branch - -echo "Modifying poms with the new version: $version" -mvn5 versions:set -DnewVersion=$version -mvn5 versions:commit -find . -name "pom.xml" | xargs sed -i -e "s/1.5-SNAPSHOT/$version/g" -find . -name "pom.xml" | xargs sed -i -e "s/wicket\/trunk/wicket\/releases\/$version/g" - -echo "Committing changes" -git commit -am "modified poms for release $version" - -# Clear the current NOTICE.txt file -echo "Creating notice file." - -NOTICE=NOTICE -> $NOTICE -echo "Apache Wicket" >> $NOTICE -echo "Copyright 2006-$(date +%Y) The Apache Software Foundation" >> $NOTICE -echo "" >> $NOTICE -echo "This product includes software developed at" >> $NOTICE -echo "The Apache Software Foundation (http://www.apache.org/)." >> $NOTICE -echo "" >> $NOTICE -echo "This is an aggregated NOTICE file for the Apache Wicket projects included" >> $NOTICE -echo "in this distribution." >> $NOTICE -echo "" >> $NOTICE -echo "NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUTIONS TO THIS FILE, BUT IN THE" >> $NOTICE -echo " NOTICE FILE OF THE CORRESPONDING PROJECT. THE RELEASE PROCEDURE WILL" >> $NOTICE -echo " AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE." >> $NOTICE -echo "" >> $NOTICE - -# next concatenate all NOTICE files from sub projects to the root file -for i in `find . -name "NOTICE" -not -regex ".*/target/.*" -not -regex "./NOTICE"` -do - echo "---------------------------------------------------------------------------" >> $NOTICE - echo "src/"$i | sed -e "s/\/src.*//g" >> $NOTICE - echo "---------------------------------------------------------------------------" >> $NOTICE - cat $i >> $NOTICE - echo >> $NOTICE -done - -echo "Committing changes" -git commit -am "changes to notice files" - -# prebuilding to work around javadoc generation problem -mvn5 clean install -DskipTests=true -mvn5 javadoc:jar - -# clean all projects -echo "Clean all projects" -mvn5 clean -Pall - -# package and assemble the release -echo "Package and assemble the release" -mvn5 -ff -Dgpg.passphrase="$passphrase" -Prelease deploy javadoc:javadoc assembly:attached $1 - -filename=`ls target/dist/apache-wicket*gz` -gpg --print-md MD5 $filename > $filename.md5 -gpg --print-md SHA1 $filename > $filename.sha -echo "$passphrase" | gpg --passphrase-fd 0 --armor --output $filename.asc --detach-sig $filename - -filename=`ls target/dist/apache-wicket*zip` -gpg --print-md MD5 $filename > $filename.md5 -gpg --print-md SHA1 $filename > $filename.sha -echo "$passphrase" | gpg --passphrase-fd 0 --armor --output $filename.asc --detach-sig $filename - -echo "Publishing build branch" -git push origin $branch:refs/heads/$branch - -echo "Uploading release" -svn export http://svn.apache.org/repos/asf/wicket/common/KEYS target/dist/KEYS -ssh people.apache.org mkdir public_html/wicket-$version -scp -r target/dist people.apache.org:public_html/wicket-$version - diff --git a/release-milestone.sh b/release-milestone.sh deleted file mode 100755 index 1cc45d23e4d..00000000000 --- a/release-milestone.sh +++ /dev/null @@ -1,408 +0,0 @@ -#!/bin/sh -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -function fail { - echo "$1" - if [ -f $log ] ; then - echo "" - cat $log - fi - exit -} - -function getVersion { - cat << EOF | xmllint --noent --shell pom.xml | grep content | cut -f2 -d= -setns pom=http://maven.apache.org/POM/4.0.0 -xpath /pom:project/pom:version/text() -EOF -} - -# set -e - -echo " -Apache Wicket Release script ----------------------------- -Building a release for Apache Wicket. - -This script assumes you are running on OS X, it hasn't been tested on any other -operating systems, and you can bet it won't work on Windows... - -REQUIREMENTS: - - - a pure JDK 7 environment, JDK 8 or newer won't cut it - - Maven 3.2.3 - - gpg, gpg-agent and pinentry for signing" - -export JAVA_HOME=`/usr/libexec/java_home -v1.7` -echo " -Current Java version is: $(java -version 2>&1 | tail -n 2 | head -n 1) -" - -agentcount=`ps aux|grep gpg-agent|wc -l` - -current_version=$(getVersion) -major_version=$(expr $current_version : '\(.*\)\..*\..*\-SNAPSHOT') -minor_version=$(expr $current_version : '.*\.\(.*\)\..*\-SNAPSHOT') -bugfix_version=$(expr $current_version : '.*\..*\.\(.*\)-SNAPSHOT') - -read -p "What is the version to be released? " version - -current_milestone_version=$(expr $version : '.*-M(\d+)') - -#previous_version="$major_version.$(expr $minor_version - 1).0" -previous_version="7.0.0-M$(expr $current_milestone_version - 1)" - -log=/tmp/wicketrelease-$version.out - -branch="build/wicket-$version" -tag="wicket-$version" - -grep -q "$version\$" CHANGELOG-7.x -if [ $? -ne 0 ] ; then - fail " -You have forgotten to add the closed tickets for Wicket $version to the CHANGELOG-7.x file - -Go to https://issues.apache.org/jira/secure/ConfigureReleaseNote.jspa?projectId=12310561 -and export the issues to the changelog. -" -fi - -read -p " -This script will release version: Apache Wicket $version and continue -development with 7.0.0-SNAPSHOT - -Press enter to continue or CTRL-C to abort" - -# setup_gpg - -echo "Ensuring we are starting from wicket-7.x" -# otherwise we can't remove a previous release branch that failed -git checkout master - -echo "Cleaning up any release artifacts that might linger" -mvn -q release:clean - -echo "Removing previous release tag $tag (if exists)" -oldtag=`git tag -l |grep -e "$tag"|wc -l` -[ "$oldtag" -ne 0 ] && git tag -d $tag - -echo "Removing previous build branch $branch (if exists)" -oldbranch=`git branch |grep -e "$branch"|wc -l` -[ "$oldbranch" -ne 0 ] && git branch -D $branch - -git checkout -b $branch - -echo "# Release configuration for Wicket-$version -scm.tag=${tag} -" > release.properties - -./build-versions.py $version 7.0.0-SNAPSHOT >> release.properties - -cat ./release.properties - -# Clear the current NOTICE.txt file -echo "Creating notice file." - -NOTICE=NOTICE - -echo "Apache Wicket -Copyright 2006-$(date +%Y) The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -This is an aggregated NOTICE file for the Apache Wicket projects included -in this distribution. - -NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUTIONS TO THIS FILE, BUT IN THE - NOTICE FILE OF THE CORRESPONDING PROJECT. THE RELEASE PROCEDURE WILL - AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE. - -" > $NOTICE - -# next concatenate all NOTICE files from sub projects to the root file -for i in `find . -name "NOTICE" -not -regex ".*/target/.*" -not -regex "./NOTICE"` -do - echo "---------------------------------------------------------------------------" >> $NOTICE - echo "src/"$i | sed -e "s/\/src.*//g" >> $NOTICE - echo "---------------------------------------------------------------------------" >> $NOTICE - cat $i >> $NOTICE - echo >> $NOTICE -done - -echo "Fixing the quickstart to use the correct wicket version" -sed -e "s/\.*\<\/wicket\.version\>/\$version\<\/wicket.version\>/g" -i "" archetypes/quickstart/src/main/resources/archetype-resources/pom.xml - -echo "Committing changes" -git commit -am "Changes to notice files and quickstart archetype" - -# clean all projects -echo "Clean all projects" -mvn -q clean -Pall - -# package and assemble the release -echo "Prepare the release" -mvn --batch-mode release:prepare -l $log -DpreparationGoals="clean" -Dtag=$tag -Papache-release -if [ $? -ne 0 ] ; then - fail "ERROR: mvn release:prepare was not successful" -fi - -# this needs to be done before signing the tag otherwise the snapshot version -# is tagged -#echo "Rollback the last commit of the release plugin" -#git reset HEAD^ --hard >> $log - -#echo "Sign the tag" -# TODO the git tag --sign doesn't utilize the gpg-agent for some reason -#git tag --sign --force --message "Signed release tag for Apache Wicket $version" $tag >> $log - -echo "Performing the release using Maven" -mvn -Dgpg.passphrase="$passphrase" -ff -l $log release:perform -DlocalCheckout=true -Dtag=$tag -Papache-release -if [ $? -ne 0 ] ; then - fail "ERROR: mvn release:perform was not successful" -fi -stagingrepoid=$(mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-list -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https | grep -v "CLOSED" | grep -Eo "(orgapachewicket-\d+)";) - - -echo "Closing staging repository with id $stagingrepoid" - -mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-close -DstagingRepositoryId=$stagingrepoid -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https -Ddescription="Release has been built, awaiting vote" - - -echo "Create and sign the source tarballs" - -mkdir -p target/dist/binaries - -git archive --format=tar.gz --prefix=apache-wicket-$version/ -o target/dist/apache-wicket-$version.tar.gz $tag -git archive --format=zip --prefix=apache-wicket-$version/ -o target/dist/apache-wicket-$version.zip $tag -gpg --armor --detach-sign --use-agent --sign target/dist/apache-wicket-$version.tar.gz -gpg --armor --detach-sign --use-agent --sign target/dist/apache-wicket-$version.zip -gpg --print-md SHA1 target/dist/apache-wicket-$version.tar.gz > target/dist/apache-wicket-$version.tar.gz.sha -gpg --print-md MD5 target/dist/apache-wicket-$version.tar.gz > target/dist/apache-wicket-$version.tar.gz.md5 -gpg --print-md SHA1 target/dist/apache-wicket-$version.zip > target/dist/apache-wicket-$version.zip.sha -gpg --print-md MD5 target/dist/apache-wicket-$version.zip > target/dist/apache-wicket-$version.zip.md5 - -echo "Create and sign the binaries" -mkdir target/apache-wicket-$version-bin -pushd target/apache-wicket-$version-bin -find ../checkout ! \( -type d -name "WEB-INF" -prune \) -regex ".*wicket-.*.[jw]ar" ! -name "*-sources*" ! -name "*-javadoc*" ! -name "*wicket-archetype-quickstart*" ! -name "wicket-common-tests*" -type f -exec cp {} . \; -find ../checkout ! \( -type d -name "WEB-INF" -prune \) -regex ".*wicket-.*.[jw]ar\.asc" ! -name "*-sources*" ! -name "*-javadoc*" ! -name "*wicket-archetype-quickstart*" ! -name "wicket-common-tests*" -type f -exec cp {} . \; -cp ../../LICENSE . -cp ../../README . -cp ../../NOTICE . -cp ../../CHANGELOG* . -popd - -pushd target - -tar cfz dist/binaries/apache-wicket-$version-bin.tar.gz apache-wicket-$version-bin -zip -r dist/binaries/apache-wicket-$version-bin.zip apache-wicket-$version-bin -gpg --armor --detach-sign --use-agent --sign dist/binaries/apache-wicket-$version-bin.tar.gz -gpg --armor --detach-sign --use-agent --sign dist/binaries/apache-wicket-$version-bin.zip -gpg --print-md SHA1 dist/binaries/apache-wicket-$version-bin.tar.gz > dist/binaries/apache-wicket-$version-bin.tar.gz.sha -gpg --print-md MD5 dist/binaries/apache-wicket-$version-bin.tar.gz > dist/binaries/apache-wicket-$version-bin.tar.gz.md5 -gpg --print-md SHA1 dist/binaries/apache-wicket-$version-bin.zip > dist/binaries/apache-wicket-$version-bin.zip.sha -gpg --print-md MD5 dist/binaries/apache-wicket-$version-bin.zip > dist/binaries/apache-wicket-$version-bin.zip.md5 -popd - -echo "Uploading release" -pushd target/dist -svn mkdir https://dist.apache.org/repos/dist/dev/wicket/$version -m "Create $version release staging area" -svn co --force --depth=empty https://dist.apache.org/repos/dist/dev/wicket/$version . -cp ../../CHANGELOG* . -svn add * -svn commit -m "Upload wicket-$version to staging area" -popd - -echo "======================================================================== - -The signatures for the source release artefacts: - -" > /tmp/release-$version-sigs.txt - -pushd target/dist > /dev/null -for i in apache-wicket*{zip,tar.gz} -do - echo "Signature for $i: - -$(cat $i.asc) -" >> /tmp/release-$version-sigs.txt -done -popd > /dev/null - -echo "======================================================================== - -CHANGELOG for $version: -" >> /tmp/release-$version-sigs.txt - -awk "/Release Notes - Wicket - Version $version/{flag=1;next} /==================/{flag=0} flag { print }" CHANGELOG-7.x >> /tmp/release-$version-sigs.txt - - -echo "Generating Vote email" - -echo "This is a vote to release Apache Wicket $version - -Please download the source distributions found in our staging area -linked below. - -I have included the signatures for both the source archives. This vote -lasts for 72 hours minimum. - -[ ] Yes, release Apache Wicket $version -[ ] No, don't release Apache Wicket $version, because ... - -Distributions, changelog, keys and signatures can be found at: - - https://dist.apache.org/repos/dist/dev/wicket/$version - -Staging repository: - - https://repository.apache.org/content/repositories/$stagingrepoid/ - -The binaries are available in the above link, as are a staging -repository for Maven. Typically the vote is on the source, but should -you find a problem with one of the binaries, please let me know, I can -re-roll them some way or the other. - -" > release-vote.txt - -cat /tmp/release-$version-sigs.txt >> release-vote.txt - -echo "The Apache Wicket PMC is proud to announce Apache Wicket $version! - -We have released another milestone release for Apache Wicket 7. We aim -to finalise Wicket 7 over the coming months and request your help in -testing the new major version. - -Caveats -------- - -It is still a development version so expect API breaks to happen over -the course of the coming milestone releases. - -New and noteworthy ------------------- - - - -Semantic versioning -------------------- - -As we adopted semver Wicket 7 will be the first release since 6.0 where -we are able to refactor the API. We will continue to use semver when we -have made Wicket 7 final and maintain api compatibility between minor -versions of Wicket 7. - -Requirements ------------- - -Wicket 7 requires the following: - - - Java 7 - - Servlet 3 compatible container - -You can't mix wicket libraries from prior Wicket versions with Wicket 7. - -Migration guide ---------------- - -As usual we have a migration guide available online for people -migrating their applications to Wicket 7. We will continue to update -the guide as development progresses. If you find something that is not -in the guide, please update the guide, or let us know so we can update -the guide. - -You can find the guide here: http://s.apache.org/wicket7migrate - -Using this release ------------------- - -With Apache Maven update your dependency to (and don't forget to -update any other dependencies on Wicket projects to the same version): - - - org.apache.wicket - wicket-core - $version - - -Or download and build the distribution yourself, or use our -convenience binary package - - * Source: http://www.apache.org/dyn/closer.cgi/wicket/$version - * Binary: http://www.apache.org/dyn/closer.cgi/wicket/$version/binaries - -" > release-announce.txt - -cat /tmp/release-$version-sigs.txt >> release-announce.txt - -echo " -Have fun! - -— The Wicket team - -" >> release-announce.txt - -echo " -The release has been created. It is up to you to check if the release is up -to par, and perform the following commands yourself when you start the vote -to enable future development during the vote and after. - -A vote email has been generated in release-vote.txt, you can copy/paste it using: - - cat release-vote.txt | pbcopy - -An announce email has been generated in release-announce.txt, you can copy/paste it using: - - cat release-announce.txt | pbcopy - -You can find the distribution in target/dist - - cd target/dist - -To verify all signatures: - - find . -name \"*.asc\" -exec gpg --verify {} \; - -To push the release branch to ASF git servers - - git push origin $branch:refs/heads/$branch - -To move the release from staging to the mirrors: - - svn mv https://dist.apache.org/repos/dist/dev/wicket/$version https://dist.apache.org/repos/dist/release/wicket -m \"Upload release to the mirrors\" - -Remove previous version $previous_version from the mirrors - - svn rm https://dist.apache.org/repos/dist/release/wicket/$previous_version -m \"Remove previous version from mirrors\" - -To sign the release tag issue the following three commands: - - git checkout $tag - git tag --sign --force --message \"Signed release tag for Apache Wicket $version\" $tag >> $log - git checkout $branch - -To release the Maven artefacts: - - mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-release -DstagingRepositoryId=$stagingrepoid -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https -Ddescription=\"Release vote has passed\" - -Or in case of a failed vote, to drop the staging repository: - - mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-drop -DstagingRepositoryId=$stagingrepoid -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https -Ddescription=\"Release vote has failed\" -" > release.txt - -cat release.txt - diff --git a/release.sh b/release.sh index bfa7f651025..7c8e721c25c 100755 --- a/release.sh +++ b/release.sh @@ -13,72 +13,612 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -echo "Apache Wicket Release script" -echo "----------------------------" -echo "Building a release for Apache Wicket. We will need the passphrase for" -echo "GPG to sign the release." -echo "This program assumes you use a jdk 1.5 explicitly configured when" -echo "invoking the 'mvn5' Maven 2 command." -echo "" - -echo "Enter your GPG passphrase (input will be hidden)" -stty_orig=`stty -g` -stty -echo -read passphrase -stty $stty_orig - -# test the GPGP passphrase to fail-fast: -echo "$passphrase" | gpg --passphrase-fd 0 --armor --output pom.xml.asc --detach-sig pom.xml -gpg --verify pom.xml.asc -if [ $? -ne 0 ]; then - echo "It appears that you fat-fingered your GPG passphrase" - exit $? + +# set -e +# set -x + +function fail { + >&2 echo "\033[31m +FATAL ERROR +----------- +$1 +\033[0m" + exit 1 +} + +function getJavaVersionFromPom { + cat << EOF | xmllint --noent --shell pom.xml | grep content | cut -f2 -d= +setns pom=http://maven.apache.org/POM/4.0.0 +xpath /pom:project/pom:properties/pom:maven.compiler.source/text() +EOF +} + +function getProjectVersionFromPom { + cat << EOF | xmllint --noent --shell pom.xml | grep content | cut -f2 -d= +setns pom=http://maven.apache.org/POM/4.0.0 +xpath /pom:project/pom:version/text() +EOF +} + +function getJdkToolchain { + xmllint ~/.m2/toolchains.xml --xpath "/toolchains/toolchain[provides/version/text() = '$JAVA_VERSION']/configuration/jdkHome/text()" +} + +function generate_promotion_script { + echo "Generating release promotion script 'promote-$version.sh'" +read -d '' script <<- EOF +#!/bin/sh +echo "Promoting release $version + +Actions about to be performed: +------------------------------ + +\$(cat \$0 | tail -n +14) + +------------------------------------------" + +read --prompt "Press enter to continue or CTRL-C to abort" + +# push the release tag to ASF git repo + +git push origin $tag + +# promote the source distribution by moving it from the staging area to the release area + +svn mv https://dist.apache.org/repos/dist/dev/wicket/$version https://dist.apache.org/repos/dist/release/wicket -m "Upload release to the mirrors" + +mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-release -DstagingRepositoryId=$stagingrepoid -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https -Ddescription="Release vote has passed" + +# Renumber the next development iteration $next_version: + +git checkout $GIT_BRANCH +mvn release:update-versions --batch-mode +mvn versions:set versions:commit -DnewVersion=$next_version +git add \` find . ! \( -type d -name "target" -prune \) -name pom.xml \` + +echo " +Check the new versions and commit and push them to origin: + + git commit -m \"Start next development version\" + git push + +Remove the previous version of Wicket using this command: + + svn rm https://dist.apache.org/repos/dist/release/wicket/$previous_version -m \\\"Remove previous version from mirrors\\\" + +" +EOF + +echo "$script" > promote-$version.sh + chmod +x promote-$version.sh + git add promote-$version.sh +} + +function generate_rollback_script { + echo "Generating release rollback script 'revert-$version.sh'" +read -d '' script <<- EOF +#!/bin/sh +echo -n "Reverting release $version + +Actions about to be performed: +------------------------------ + +\$(cat \$0 | tail -n +14) + +------------------------------------------ +Press enter to continue or CTRL-C to abort" + +read + +# clean up local repository +git checkout $GIT_BRANCH +git branch -D $branch +git tag -d $tag + +# clean up staging repository +git push staging --delete refs/heads/$branch +git push staging --delete $tag + +# clean up staging dist area +svn rm https://dist.apache.org/repos/dist/dev/wicket/$version -m "Release vote has failed" + +# clean up staging maven repository +mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-drop -DstagingRepositoryId=$stagingrepoid -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https -Ddescription="Release vote has failed" + +# clean up remaining release files +find . -name "*.releaseBackup" -exec rm {} \\; +[ -f release.properties ] && rm release.properties + +EOF +echo "$script" > revert-$version.sh + + chmod +x revert-$version.sh + git add revert-$version.sh +} + +function generate_signatures_from_release { + + echo "======================================================================== + + The signatures for the source release artefacts: + + " > /tmp/release-$version-sigs.txt + + pushd target/dist > /dev/null + for i in apache-wicket*{zip,tar.gz} + do + echo "Signature for $i: + + $(cat $i.asc) + " >> /tmp/release-$version-sigs.txt + done + popd > /dev/null + + echo "======================================================================== + + CHANGELOG for $version: + " >> /tmp/release-$version-sigs.txt + + if [ -f "/tmp/release-notes-$version.txt" ] ; then + tail -n +4 /tmp/release-notes-$version.txt >> /tmp/release-$version-sigs.txt + else + awk "/Release Notes - Wicket - Version $version/{flag=1;next} /==================/{flag=0} flag { print }" CHANGELOG-$major_version.x >> /tmp/release-$version-sigs.txt + fi +} + +function generate_release_vote_email { + + echo "Generating Vote email" + + echo " +This is a vote to release Apache Wicket $version + +Please download the source distributions found in our staging area +linked below. + +I have included the signatures for both the source archives. This vote +lasts for 72 hours minimum. + +[ ] Yes, release Apache Wicket $version +[ ] No, don't release Apache Wicket $version, because ... + +Distributions, changelog, keys and signatures can be found at: + + https://dist.apache.org/repos/dist/dev/wicket/$version + +Staging repository: + + https://repository.apache.org/content/repositories/$stagingrepoid/ + +The binaries are available in the above link, as are a staging +repository for Maven. Typically the vote is on the source, but should +you find a problem with one of the binaries, please let me know, I can +re-roll them some way or the other. + +Staging git repository data: + + Repository: $(git config --get remote.staging.url) + Branch: $branch + Release tag: $tag + +" | tail -n+2 > release-vote.txt + + cat /tmp/release-$version-sigs.txt >> release-vote.txt + git add release-vote.txt +} + +function generate_announce_email { + echo " +The Apache Wicket PMC is proud to announce Apache Wicket $version! + +Apache Wicket is an open source Java component oriented web application +framework that powers thousands of web applications and web sites for +governments, stores, universities, cities, banks, email providers, and +more. You can find more about Apache Wicket at https://wicket.apache.org + +This release marks another minor release of Wicket $major_version. We +use semantic versioning for the development of Wicket, and as such no +API breaks are present breaks are present in this release compared to +$major_version.0.0. + + New and noteworthy + ------------------ + +Using this release +------------------ + +With Apache Maven update your dependency to (and don't forget to +update any other dependencies on Wicket projects to the same version): + + + org.apache.wicket + wicket-core + $version + + +Or download and build the distribution yourself, or use our +convenience binary package + + * Source: http://www.apache.org/dyn/closer.cgi/wicket/$version + * Binary: http://www.apache.org/dyn/closer.cgi/wicket/$version/binaries + +Upgrading from earlier versions +------------------------------- + +If you upgrade from $major_version.y.z this release is a drop in replacement. If +you come from a version prior to $major_version.0.0, please read our Wicket $major_version +migration guide found at + + * http://s.apache.org/wicket${major_version}migrate + +Have fun! + +— The Wicket team + +" | tail -n+2 > release-announce.txt + + cat /tmp/release-$version-sigs.txt >> release-announce.txt + git add release-announce.txt +} + +# the branch on which the code base lives for this version (master is +# always current development version) +GIT_BRANCH=wicket-7.x + +JAVA_VERSION=$(getJavaVersionFromPom) + +echo " +Apache Wicket Release script +---------------------------- +Building a release for Apache Wicket. + +This script assumes you are running on OS X, it hasn't been tested on any other +operating systems, and you can bet it won't work on Windows... + +REQUIREMENTS: + + - A Java version $JAVA_VERSION configured through the Maven toolchain + - Maven 3.3.0 (older releases are b0rked, just don't bother) + - gpg, gpg-agent and pinentry for signing +" + +if [ ! $( git config --get remote.staging.url ) ] ; then + fail " +No staging remote git repository found. The staging repository is used to temporarily +publish the build artifacts during the voting process. Since no staging repository is +available at Apache, it is best to use a git mirror on your personal github account. + +First fork the github Apache Wicket mirror (https://github.com/apache/wicket) and then +add the remote staging repository with the following command: + + $ git remote add staging git@github.com:/wicket.git + $ git fetch staging + $ git push staging + +This will bring the staging area in sync with the origin and the release script can +push the build branch and the tag to the staging area. +" +fi + +if [ ! -f ~/.m2/toolchains.xml ] ; then + fail " +Maven will load the Java $JAVA_VERSION environment from the toolchain specified in +~/.m2/toolchains.xml + +You don't have a toolchains.xml file in your .m2 folder. Please specify your +JDK's in the toolchains.xml file. +" fi -rm pom.xml.asc + +grep -q "$JAVA_VERSION" ~/.m2/toolchains.xml + +if [ $? -ne 0 ] ; then + fail " +Your ~/.m2/toolchains.xml file doesn't provide a Java $JAVA_VERSION toolchain. +" +fi + +echo "Java version for running Maven is: $(java -version 2>&1 | tail -n 2 | head -n 1) +Java used to compile (from toolchain) is: $(getJdkToolchain) +" + +agentcount=`ps aux|grep gpg-agent|wc -l` + +current_version=$(getProjectVersionFromPom) +major_version=$(expr $current_version : '\(.*\)\..*\..*\-.*') +minor_version=$(expr $current_version : '.*\.\(.*\)\..*\-.*') +bugfix_version=$(expr $current_version : '.*\..*\.\(.*\)-.*') +version="$major_version.$minor_version.0" + +default_version="$version" + +version= + +while [[ ! $version =~ ^[0-9]+\.[0-9]+\.[0-9]+(-M[0-9]+)?$ ]] +do + read -p "Version to release (default is $default_version): " -e t1 + if [ -n "$t1" ] + then + version="$t1" + else + version="$default_version" + fi +done + +# recalculate the version coordinates for the current release +major_version=$(expr $version : '\(.*\)\..*\..*') +minor_version=$(expr $version : '.*\.\(.*\)\..*') +bugfix_version=$(expr $version : '.*\..*\.\(.*\)') + +if [[ $version =~ .+-M[0-9]+ ]] +then + milestone_version=$(expr $version : '.*\..*-M\(.*\)') +fi + +if [ ! -z "$milestone_version" ] ; then + next_version="$major_version.0.0-SNAPSHOT" + previous_version="$major_version.0.0-SNAPSHOT" +else + next_version="$major_version.$(expr $minor_version + 1).0-SNAPSHOT" + previous_minor_version=$(expr $minor_version - 1) + if [ $previous_minor_version -lt 0 ] ; then + previous_version="$major_version.0.0-SNAPSHOT" + else + previous_version="$major_version.$(expr $minor_version - 1).0" + fi +fi + +# work around for versions upgrade (TODO maybe no longer necessary?) +mvn_version_to_replace="$major_version.$minor_version.1-SNAPSHOT" +mvn_version_to_replace2="$major_version.$minor_version.0-SNAPSHOT" + +# Check if the changelog has the issues this release + +grep -q "$version\$" CHANGELOG-$major_version.x +if [ $? -ne 0 ] ; then + fail "You have forgotten to add the closed tickets for Wicket $version to the CHANGELOG-$major_version.x file + +Use build-changelog.sh to add the release notes to the changelog. +" +fi + +git status --porcelain CHANGELOG-$major_version.x | grep -q "M" +if [ $? -eq 0 ] ; then + fail "You have changes in your workspace that have not been committed. + +$(git status) +" +fi + +echo "Cleaning up any release artifacts that might linger" +mvn -q release:clean + +log=$(pwd)/release.out + +if [ -f $log ] ; then + rm $log +fi + +branch="build/wicket-$version" +tag="rel/wicket-$version" + +echo "# Release configuration for Wicket-$version +scm.tag=${tag} +" > release.properties + +./build-versions.py $version $next_version >> release.properties + +echo "Contents of the release properties generated for Maven: +------------------------------------------------------------------------------- +$(cat ./release.properties) +------------------------------------------------------------------------------- + +Writing detailed log to $log + +This script will release version: Apache Wicket $version and continue +development with $next_version + +Press enter to continue or CTRL-C to abort \c" +read + +echo "Ensuring we are starting from wicket-$major_version.x" +# otherwise we can't remove a previous release branch that failed +git checkout $GIT_BRANCH + +echo "Removing previous release tag $tag (if exists)" +oldtag=`git tag -l |grep -e "$tag"|wc -l` >> release.out +[ "$oldtag" -ne 0 ] && git tag -d $tag >> release.out + +echo "Removing previous build branch $branch (if exists)" +oldbranch=`git branch |grep -e "$branch"|wc -l` >> release.out +[ "$oldbranch" -ne 0 ] && git branch -D $branch >> release.out + +echo "Removing previous staging branch (if exists)" +git push staging --delete refs/heads/$branch >> release.out +git push staging --delete $tag >> release.out + + +echo "Creating release branch" +git checkout -b $branch >> release.out # Clear the current NOTICE.txt file echo "Creating notice file." NOTICE=NOTICE -> $NOTICE -echo "Apache Wicket" >> $NOTICE -echo "Copyright 2006-$(date +%Y) The Apache Software Foundation" >> $NOTICE -echo "" >> $NOTICE -echo "This product includes software developed at" >> $NOTICE -echo "The Apache Software Foundation (http://www.apache.org/)." >> $NOTICE -echo "" >> $NOTICE -echo "This is an aggregated NOTICE file for the Apache Wicket projects included" >> $NOTICE -echo "in this distribution." >> $NOTICE -echo "" >> $NOTICE -echo "NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUTIONS TO THIS FILE, BUT IN THE" >> $NOTICE -echo " NOTICE FILE OF THE CORRESPONDING PROJECT. THE RELEASE PROCEDURE WILL" >> $NOTICE -echo " AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE." >> $NOTICE -echo "" >> $NOTICE + +echo "Apache Wicket +Copyright 2006-$(date +%Y) The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +This is an aggregated NOTICE file for the Apache Wicket projects included +in this distribution. + +NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUTIONS TO THIS FILE, BUT IN THE + NOTICE FILE OF THE CORRESPONDING PROJECT. THE RELEASE PROCEDURE WILL + AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE. +" > $NOTICE # next concatenate all NOTICE files from sub projects to the root file for i in `find . -name "NOTICE" -not -regex ".*/target/.*" -not -regex "./NOTICE"` do - echo "---------------------------------------------------------------------------" >> $NOTICE - echo "src/"$i | sed -e "s/\/src.*//g" >> $NOTICE - echo "---------------------------------------------------------------------------" >> $NOTICE - cat $i >> $NOTICE - echo >> $NOTICE + echo "---------------------------------------------------------------------------" >> $NOTICE + echo "src/"$i | sed -e "s/\/src.*//g" >> $NOTICE + echo "---------------------------------------------------------------------------" >> $NOTICE + cat $i >> $NOTICE + echo >> $NOTICE done +echo "Fixing the quickstart to use the correct wicket version" +sed -e "s/\.*\<\/wicket\.version\>/\$version\<\/wicket.version\>/g" -i "" archetypes/quickstart/src/main/resources/archetype-resources/pom.xml + +echo "Committing changes" +git commit -am "Changes to notice files and quickstart archetype" + # clean all projects echo "Clean all projects" -mvn5 clean -Pall +mvn -q clean -Pall # package and assemble the release -echo "Package and assemble the release" -mvn5 -ff -Dgpg.passphrase="$passphrase" -Prelease deploy javadoc:javadoc assembly:attached $1 - -filename=`ls target/dist/apache-wicket*gz` -gpg --print-md MD5 $filename > $filename.md5 -gpg --print-md SHA1 $filename > $filename.sha -echo "$passphrase" | gpg --passphrase-fd 0 --armor --output $filename.asc --detach-sig $filename - -filename=`ls target/dist/apache-wicket*zip` -gpg --print-md MD5 $filename > $filename.md5 -gpg --print-md SHA1 $filename > $filename.sha -echo "$passphrase" | gpg --passphrase-fd 0 --armor --output $filename.asc --detach-sig $filename +echo "Prepare the release" +mvn --batch-mode release:prepare -X -l $log -DpreparationGoals="clean" -Dtag=$tag -Papache-release,release +if [ $? -ne 0 ] ; then + fail "ERROR: mvn release:prepare was not successful" +fi + +echo "Performing the release using Maven" +mvn -Dgpg.passphrase="$passphrase" -ff -l $log release:perform -DlocalCheckout=true -Dtag=$tag -Papache-release,release +if [ $? -ne 0 ] ; then + fail "ERROR: mvn release:perform was not successful" +fi + +# Determine the staging repository and close it after deploying the release to the staging area +stagingrepoid=$(mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-list -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https | grep -v "CLOSED" | grep -Eo "(orgapachewicket-\d+)";) + +echo "Closing staging repository with id $stagingrepoid" +mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-close -DstagingRepositoryId=$stagingrepoid -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https -Ddescription="Release has been built, awaiting vote" + +generate_promotion_script +generate_rollback_script + +echo "Create and sign the source tarballs" + +mkdir -p target/dist/binaries + +git archive --format=tar.gz --prefix=apache-wicket-$version/ -o target/dist/apache-wicket-$version.tar.gz $tag +git archive --format=zip --prefix=apache-wicket-$version/ -o target/dist/apache-wicket-$version.zip $tag +gpg --armor --detach-sign --use-agent --sign target/dist/apache-wicket-$version.tar.gz +gpg --armor --detach-sign --use-agent --sign target/dist/apache-wicket-$version.zip +gpg --print-md SHA1 target/dist/apache-wicket-$version.tar.gz > target/dist/apache-wicket-$version.tar.gz.sha +gpg --print-md MD5 target/dist/apache-wicket-$version.tar.gz > target/dist/apache-wicket-$version.tar.gz.md5 +gpg --print-md SHA1 target/dist/apache-wicket-$version.zip > target/dist/apache-wicket-$version.zip.sha +gpg --print-md MD5 target/dist/apache-wicket-$version.zip > target/dist/apache-wicket-$version.zip.md5 + +echo "Create and sign the binaries" +mkdir target/apache-wicket-$version-bin +pushd target/apache-wicket-$version-bin +find ../checkout ! \( -type d -name "WEB-INF" -prune \) -regex ".*wicket-[^/]*.[j]ar" ! -name "*-sources*" ! -name "*-javadoc*" ! -name "*wicket-archetype-quickstart*" ! -name "wicket-common-tests*" -type f -exec cp {} . \; +find ../checkout ! \( -type d -name "WEB-INF" -prune \) -regex ".*wicket-[^/]*.[j]ar\.asc" ! -name "*-sources*" ! -name "*-javadoc*" ! -name "*wicket-archetype-quickstart*" ! -name "wicket-common-tests*" -type f -exec cp {} . \; +cp ../../LICENSE . +cp ../../README . +cp ../../NOTICE . +cp ../../CHANGELOG* . +popd + +pushd target + +tar cfz dist/binaries/apache-wicket-$version-bin.tar.gz apache-wicket-$version-bin +zip -r dist/binaries/apache-wicket-$version-bin.zip apache-wicket-$version-bin +gpg --armor --detach-sign --use-agent --sign dist/binaries/apache-wicket-$version-bin.tar.gz +gpg --armor --detach-sign --use-agent --sign dist/binaries/apache-wicket-$version-bin.zip +gpg --print-md SHA1 dist/binaries/apache-wicket-$version-bin.tar.gz > dist/binaries/apache-wicket-$version-bin.tar.gz.sha +gpg --print-md MD5 dist/binaries/apache-wicket-$version-bin.tar.gz > dist/binaries/apache-wicket-$version-bin.tar.gz.md5 +gpg --print-md SHA1 dist/binaries/apache-wicket-$version-bin.zip > dist/binaries/apache-wicket-$version-bin.zip.sha +gpg --print-md MD5 dist/binaries/apache-wicket-$version-bin.zip > dist/binaries/apache-wicket-$version-bin.zip.md5 +popd + +echo "Uploading release to dist.apache.org" +pushd target/dist +svn mkdir https://dist.apache.org/repos/dist/dev/wicket/$version -m "Create $version release staging area" +svn co --force --depth=empty https://dist.apache.org/repos/dist/dev/wicket/$version . +cp ../../CHANGELOG* . +svn add * +svn commit -m "Upload wicket-$version to staging area" +popd + +generate_signatures_from_release +generate_release_vote_email +generate_announce_email + +# Done with the tasks, now print out the next things the release manager +# needs to do + +pushd target/dist +find . -name "*.asc" -exec gpg --verify {} \; +popd + +echo " +The release has been created. It is up to you to check if the release is up +to par, and perform the following commands yourself when you start the vote +to enable future development during the vote and after. + +A vote email has been generated in release-vote.txt, you can copy/paste it using: + + cat release-vote.txt | pbcopy + +You can find the distribution in target/dist. + + +Failed release +-------------- + +To rollback a release due to a failed vote or some other complication use: + + $ ./revert-$version.sh + +This will clean up the artfifacts from the staging areas, including Nexus, +dist.apache.org and the release branch and tag. + + +Successful release +------------------ + +Congratulations on the successful release vote! + +Use the release-announce.txt as a starter for the release announcement: + + cat release-announce.txt | pbcopy + +To promote the release after a successful vote, run: + + $ ./promote-$version.sh + +This will promote the Nexus staging repository to Maven Central, and move +the release artifacts from the staging area to dist.apache.org. It will +also sign the release tag and push the release branch to git.apache.org + +You can read this message at a later time using: + + $ cat release.txt + +Happy voting! +" > release.txt + +git add release.txt + +echo "Adding post-release scripts and vote/release email templates to build branch" +git commit -m "Added post-release scripts and vote/release email templates" + +echo "Signing the release tag" +git checkout $tag +git tag --sign --force --message \"Signed release tag for Apache Wicket $version\" $tag >> $log +git checkout $branch + +echo "Pushing build artifacts to the staging repository" +git push staging $branch:refs/heads/$branch + +echo "Pushing release tag to the staging repository" +git push staging $tag + +cat release.txt diff --git a/revert-release.sh b/revert-release.sh deleted file mode 100755 index c45def2470f..00000000000 --- a/revert-release.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -function getVersion { - cat << EOF | xmllint --noent --shell pom.xml | grep content | cut -f2 -d= -setns pom=http://maven.apache.org/POM/4.0.0 -xpath /pom:project/pom:version/text() -EOF -} - -# current_version=$(getVersion) -# major_version=$(expr $current_version : '\(.*\)\..*\..*\-SNAPSHOT') -# minor_version=$(expr $current_version : '.*\.\(.*\)\..*\-SNAPSHOT') -# bugfix_version=$(expr $current_version : '.*\..*\.\(.*\)-SNAPSHOT') -# version="$major_version.$minor_version.0" - -read -p "Revert which version? " version - -echo "" -echo "Revert the current in-progress release for apache-wicket-$version" - -echo "" -echo "Press enter to continue or CTRL-C to abort \c" -read - -branch="build/wicket-$version" -tag="wicket-$version" - -git checkout master -git branch -D $branch -git tag -d $tag - -svn rm https://dist.apache.org/repos/dist/dev/wicket/$version -m "Reverting release $version" - -find . -name "*.releaseBackup" -exec rm {} \; -rm release.properties release.txt > /dev/null - -echo "" -echo "Cleaned up the release" -echo "" -echo "Don't forget to drop the Maven staging repository" -echo "" diff --git a/testing/wicket-arquillian/pom.xml b/testing/wicket-arquillian/pom.xml index 26c9c0fb12e..e7452b6de41 100644 --- a/testing/wicket-arquillian/pom.xml +++ b/testing/wicket-arquillian/pom.xml @@ -1,4 +1,4 @@ - + - + 4.0.0 - + org.apache.wicket wicket-parent - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT ../../pom.xml - + wicket-arquillian-testing war @@ -36,149 +35,341 @@ WAR version (everything in a single .war file). + - 1.1.10.Final - 2.10 - 2.18.1 - UTF-8 - 1.7.12 - 8.2.1.Final + 1.0.2.Final - 1.0.3.Final + 8.2.0.Final + + + 3.0.3.Final + + + 2.1.1 + + + 1.1.8.Final + + org.jboss.arquillian.container + arquillian-container-test-impl-base + ${version.arquillian_core} + tests + + + org.jboss.arquillian.core + arquillian-core-impl-base + ${version.arquillian_core} + tests + + + org.jboss.logging + jboss-logging + 3.1.4.GA + + + org.jboss.marshalling + jboss-marshalling + 1.4.9.Final + + + org.jboss.marshalling + jboss-marshalling-river + 1.4.9.Final + + + org.jboss.remoting + jboss-remoting + 4.0.6.Final + + + org.jboss.xnio + xnio-api + 3.3.0.Final + + + org.jboss.xnio + xnio-nio + 3.3.0.Final + + + org.wildfly + wildfly-arquillian-container-managed + ${version.wildfly_8} + + + org.jboss.arquillian arquillian-bom - ${arquillian.version} + ${version.arquillian_core} + pom + import + + + org.jboss.shrinkwrap.resolver + shrinkwrap-resolver-bom + ${version.shrinkwrap.resolvers} import pom + + + org.jboss.spec + jboss-javaee-6.0 + ${version.jboss.spec.javaee.6.0} + pom + import + + + + + + + - org.jboss.spec - jboss-javaee-7.0 - ${jee.spec.version} - pom + javax.enterprise + cdi-api + provided + + + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + provided + + + + + org.jboss.spec.javax.annotation + jboss-annotations-api_1.1_spec + provided + + + + + org.jboss.spec.javax.ejb + jboss-ejb-api_3.1_spec provided + + + + org.apache.wicket + wicket-cdi + + + + + org.apache.wicket + wicket-core + + + + + org.jboss.spec.javax.servlet + jboss-servlet-api_3.0_spec + + + junit junit test + + - org.wildfly - wildfly-arquillian-container-embedded - ${wildfly.version} + org.jboss.arquillian.container + arquillian-container-spi + test - org.wildfly - wildfly-embedded - ${wildfly.version} + org.jboss.arquillian.container + arquillian-container-test-impl-base + tests + test + + + org.jboss.arquillian.container + arquillian-container-test-spi + test + + + org.jboss.arquillian.core + arquillian-core-api + test + + + org.jboss.arquillian.core + arquillian-core-impl-base + tests + test + + + org.jboss.arquillian.core + arquillian-core-spi + test org.jboss.arquillian.junit arquillian-junit-container test - - org.apache.wicket - wicket-cdi + org.jboss.arquillian.protocol + arquillian-protocol-servlet + test - - - org.apache.wicket - wicket-core + org.jboss.arquillian.test + arquillian-test-spi + test + org.jboss.shrinkwrap.resolver - shrinkwrap-resolver-impl-maven + shrinkwrap-resolver-depchain + test + pom + + - org.jboss.shrinkwrap.resolver - shrinkwrap-resolver-spi + org.wildfly + wildfly-arquillian-container-managed + test - - - - - org.apache.maven.plugins - maven-dependency-plugin - ${maven.dependency.plugin.version} - - - unpack - process-test-classes - - unpack - - - - - org.wildfly - wildfly-dist - ${wildfly.version} - zip - false - ${project.build.directory} - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.surefire.plugin.version} - - - org.jboss.logmanager.LogManager - ${project.build.directory}/wildfly-${wildfly.version} - ${project.build.directory}/wildfly-${wildfly.version}/modules - - false - - - - org.wildfly.plugins - wildfly-maven-plugin - ${version.wildfly.maven.plugin} - - target/${project.build.finalName}.war - - - - - - + + + src/test/resources + true + + + + ${project.artifactId} + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.10 + + + unpack + process-test-classes + + unpack + + + + + org.wildfly + wildfly-dist + ${version.wildfly_8} + zip + true + ${project.build.directory} + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${project.build.directory}/wildfly-${version.wildfly_8} + + + ${version.wildfly_8} + + + + + + org.wildfly.plugins + wildfly-maven-plugin + ${version.wildfly.maven.plugin} + + target/${project.build.finalName}.war + + + + + org.apache.maven.plugins maven-dependency-plugin - + - org.apache.maven.plugins + org.apache.maven.plugins maven-surefire-plugin - + org.wildfly.plugins wildfly-maven-plugin - - + + - + + + release + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-javadoc-plugin + + true + + + + org.apache.maven.plugins + maven-release-plugin + + true + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + + diff --git a/testing/wicket-arquillian/src/main/java/org/apache/wicket/arquillian/testing/model/Contact.java b/testing/wicket-arquillian/src/main/java/org/apache/wicket/arquillian/testing/model/Contact.java index e5a2bcc6ede..d6c100ff57b 100644 --- a/testing/wicket-arquillian/src/main/java/org/apache/wicket/arquillian/testing/model/Contact.java +++ b/testing/wicket-arquillian/src/main/java/org/apache/wicket/arquillian/testing/model/Contact.java @@ -41,85 +41,96 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; - /** - * * @author Filippo Diotalevi */ -@SuppressWarnings("serial") +@SuppressWarnings({ "serial", "javadoc" }) @Entity -public class Contact implements Serializable { - - @Id - @GeneratedValue(strategy = IDENTITY) - private Long id; - private String name; - - @Column(unique=true) - private String email; - - public Contact() { - } - - public Contact(Long id, String name, String email) { - this.id = id; - this.name = name; - this.email = email; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((email == null) ? 0 : email.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - Contact other = (Contact) obj; - if (email == null) { - if (other.email != null) - return false; - } else if (!email.equals(other.email)) - return false; - return true; - } - - @Override - public String toString() { - return "Name: " + name + " / E-mail: " + email; - } - +public class Contact implements Serializable +{ + + @Id + @GeneratedValue(strategy = IDENTITY) + private Long id; + private String name; + + @Column(unique = true) + private String email; + + public Contact() + { + } + + public Contact(Long id, String name, String email) + { + this.id = id; + this.name = name; + this.email = email; + } + + public String getEmail() + { + return email; + } + + public void setEmail(String email) + { + this.email = email; + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + + public Long getId() + { + return id; + } + + public void setId(Long id) + { + this.id = id; + } + + @Override + public int hashCode() + { + final int prime = 31; + int result = 1; + result = prime * result + ((email == null) ? 0 : email.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) + { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Contact other = (Contact)obj; + if (email == null) + { + if (other.email != null) + return false; + } + else if (!email.equals(other.email)) + return false; + return true; + } + + @Override + public String toString() + { + return "Name: " + name + " / E-mail: " + email; + } } diff --git a/testing/wicket-arquillian/src/main/java/org/apache/wicket/arquillian/testing/pages/InsertContact.java b/testing/wicket-arquillian/src/main/java/org/apache/wicket/arquillian/testing/pages/InsertContact.java index e78831af557..b8e2c766cef 100644 --- a/testing/wicket-arquillian/src/main/java/org/apache/wicket/arquillian/testing/pages/InsertContact.java +++ b/testing/wicket-arquillian/src/main/java/org/apache/wicket/arquillian/testing/pages/InsertContact.java @@ -43,59 +43,57 @@ import org.apache.wicket.model.PropertyModel; /** - * * @author Filippo Diotalevi */ -@SuppressWarnings("serial") +@SuppressWarnings({ "serial", "javadoc" }) public class InsertContact extends WebPage { - private Form insertForm; - - private String name; - - private String email; - - @Inject - private ContactDao contactDao; + private Form insertForm; + + private String name; + + private String email; + + @Inject + private ContactDao contactDao; - public InsertContact() - { - add(new FeedbackPanel("feedback")); + public InsertContact() + { + add(new FeedbackPanel("feedback")); - insertForm = new Form("insertForm") { + insertForm = new Form("insertForm") + { + @Override + protected void onSubmit() + { + contactDao.addContact(name, email); + setResponsePage(ListContacts.class); + } + }; - @Override - protected void onSubmit() { - contactDao.addContact(name, email); - setResponsePage(ListContacts.class); - } - }; + insertForm.add(new RequiredTextField<>("name", new PropertyModel(this, "name"))); + insertForm.add(new RequiredTextField<>("email", new PropertyModel(this, "email"))); + add(insertForm); + } - insertForm.add(new RequiredTextField<>("name", - new PropertyModel(this, "name"))); - insertForm.add(new RequiredTextField<>("email", new PropertyModel(this, - "email"))); - add(insertForm); - } - - public String getEmail() - { - return email; - } + public String getEmail() + { + return email; + } - public void setEmail(String email) - { - this.email = email; - } + public void setEmail(String email) + { + this.email = email; + } - public String getName() - { - return name; - } + public String getName() + { + return name; + } - public void setName(String name) - { - this.name = name; - } + public void setName(String name) + { + this.name = name; + } } diff --git a/testing/wicket-arquillian/src/main/java/org/apache/wicket/arquillian/testing/pages/ListContacts.java b/testing/wicket-arquillian/src/main/java/org/apache/wicket/arquillian/testing/pages/ListContacts.java index f08ff55201c..7f922c202e7 100644 --- a/testing/wicket-arquillian/src/main/java/org/apache/wicket/arquillian/testing/pages/ListContacts.java +++ b/testing/wicket-arquillian/src/main/java/org/apache/wicket/arquillian/testing/pages/ListContacts.java @@ -48,7 +48,7 @@ * * @author Filippo Diotalevi */ -@SuppressWarnings("serial") +@SuppressWarnings({ "serial", "javadoc" }) public class ListContacts extends WebPage { // Inject the ContactDao using @Inject diff --git a/testing/wicket-arquillian/src/main/java/org/apache/wicket/arquillian/testing/util/ResourceWebApplicationPath.java b/testing/wicket-arquillian/src/main/java/org/apache/wicket/arquillian/testing/util/ResourceWebApplicationPath.java index d6476266c8b..d1a10ab3291 100644 --- a/testing/wicket-arquillian/src/main/java/org/apache/wicket/arquillian/testing/util/ResourceWebApplicationPath.java +++ b/testing/wicket-arquillian/src/main/java/org/apache/wicket/arquillian/testing/util/ResourceWebApplicationPath.java @@ -29,8 +29,7 @@ * Maintain a list of paths which might either be ordinary folders of the filesystem or relative * paths to the web application's servlet context. * - * @author felipecalmeida - * Modified to look inside servletContext and same package as Application. + * @author felipecalmeida Modified to look inside servletContext and same package as Application. */ public final class ResourceWebApplicationPath implements IResourceFinder { @@ -38,17 +37,20 @@ public final class ResourceWebApplicationPath implements IResourceFinder /** The web apps servlet context */ private final ServletContext servletContext; - + /** basePath of the project org/apache/wicket/arquillian/testing **/ private String basePath; /** * Constructor * + * @param basePath + * basePath of the project org/apache/wicket/arquillian/testing + * * @param servletContext * The webapplication context where the resources must be loaded from */ - public ResourceWebApplicationPath(String basePath,final ServletContext servletContext) + public ResourceWebApplicationPath(String basePath, final ServletContext servletContext) { this.basePath = basePath.replaceAll("\\.", "\\/"); this.servletContext = servletContext; diff --git a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/ApacheLicenceHeaderTest.java b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/ApacheLicenceHeaderTest.java index ac5aa022399..1a528c01e80 100644 --- a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/ApacheLicenceHeaderTest.java +++ b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/ApacheLicenceHeaderTest.java @@ -16,8 +16,6 @@ */ package org.apache.wicket.arquillian.testing; -import java.util.Arrays; - import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase; /** diff --git a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/TestWicketJavaEEApplication.java b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/TestWicketJavaEEApplication.java index 9f2d146b5f3..4e906da2184 100644 --- a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/TestWicketJavaEEApplication.java +++ b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/TestWicketJavaEEApplication.java @@ -24,12 +24,14 @@ * @author felipecalmeida * @since 06/20/2015 */ -public class TestWicketJavaEEApplication extends WicketJavaEEApplication { - +public class TestWicketJavaEEApplication extends WicketJavaEEApplication +{ // Has some security ignores during the test (example: accept all roles). - - @Override - protected void initResourceFinder() { - getResourceSettings().getResourceFinders().add(new ResourceWebApplicationPath(TestWicketJavaEEApplication.class.getPackage().getName(), getServletContext())); - } + + @Override + protected void initResourceFinder() + { + getResourceSettings().getResourceFinders().add(new ResourceWebApplicationPath( + TestWicketJavaEEApplication.class.getPackage().getName(), getServletContext())); + } } diff --git a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java index 7a3e1a2ab0a..2f0eac5f037 100644 --- a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java +++ b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java @@ -20,7 +20,6 @@ import static org.junit.Assert.assertNotNull; import java.io.File; -import java.util.Locale; import javax.servlet.ServletContext; @@ -41,114 +40,143 @@ import org.slf4j.LoggerFactory; /** - * WARNING: If this error occurs - org.jboss.arquillian.container.spi.client.container.LifecycleException: The server is already running! Managed containers do not support connecting to running server instances due to the possible harmful effect of connecting to the wrong server. Please stop server before running or change to another type of container. - * To disable this check and allow Arquillian to connect to a running server, set allowConnectingToRunningServer to true in the container configuration. - * - * SOLUTION: Search and kill wildfly or jboss proccess instance that are using port 8080. + * WARNING: If this error occurs - + * org.jboss.arquillian.container.spi.client.container.LifecycleException: The server is already + * running! Managed containers do not support connecting to running server instances due to the + * possible harmful effect of connecting to the wrong server. Please stop server before running or + * change to another type of container. To disable this check and allow Arquillian to connect to a + * running server, set allowConnectingToRunningServer to true in the container configuration. * - * If you can't run inside eclipse, add as source the folder src/test/resources and try again. + * SOLUTION: Search and kill wildfly or jboss proccess instance that are using port 8080. + * + * If you can't run inside eclipse, add as source the folder src/test/resources and try + * again. * * @author felipecalmeida * @since 06/23/2015 - * */ @Category(SlowTests.class) -public abstract class AbstractDeploymentTest { - +public abstract class AbstractDeploymentTest +{ + private static final Logger log = LoggerFactory.getLogger(AbstractDeploymentTest.class); - + private static final String WEBAPP_SRC = "src/main/webapp"; private static final String WEBAPP_TEST_SRC = "src/test/webapp"; + /** + * Creates a deployment for Arquillian. + * + * @return the deployment webarchive + */ @Deployment - public static WebArchive deployment() { + public static WebArchive deployment() + { // Create webapp files from src/main/webapp. (WEB AS NORMAL) - GenericArchive webapp = ShrinkWrap.create(GenericArchive.class).as(ExplodedImporter.class).importDirectory(WEBAPP_SRC).as(GenericArchive.class); - + GenericArchive webapp = ShrinkWrap.create(GenericArchive.class) + .as(ExplodedImporter.class) + .importDirectory(WEBAPP_SRC) + .as(GenericArchive.class); + // Create webapptest files from src/test/webapp. (TEST) - GenericArchive webappTest = ShrinkWrap.create(GenericArchive.class).as(ExplodedImporter.class).importDirectory(WEBAPP_TEST_SRC).as(GenericArchive.class); - + GenericArchive webappTest = ShrinkWrap.create(GenericArchive.class) + .as(ExplodedImporter.class) + .importDirectory(WEBAPP_TEST_SRC) + .as(GenericArchive.class); + // Some configurations to create a manifest.mf. ByteArrayAsset resource = new ByteArrayAsset("Dependencies: org.jboss.msc".getBytes()); - + // Create libs from POM.XML. File[] asFile = Maven.configureResolver() - // I'm not using internet directly, I have a Nexus Repository that handles the libs for me. - .workOffline().withMavenCentralRepo(false) - // Load everything from pom, that is compile and runtime, as a file and transitivity to don't loose anything and cause exceptions. - .loadPomFromFile("./pom.xml").importCompileAndRuntimeDependencies() - .resolve().withTransitivity().asFile(); - + // I'm not using internet directly, I have a Nexus Repository that handles the libs for + // me. + .workOffline() + .withMavenCentralRepo(false) + // Load everything from pom, that is compile and runtime, as a file and transitivity to + // don't loose anything and cause exceptions. + .loadPomFromFile("./pom.xml") + .importCompileAndRuntimeDependencies() + .resolve() + .withTransitivity() + .asFile(); + // Create the WAR. - return ShrinkWrap.create(WebArchive.class, "wicket-servletContext8.war") - // Add packages and/or classes. - .addPackages(true, TestWicketJavaEEApplication.class.getPackage()) - // Add the persistence.xml - .addAsResource("META-INF/persistence.xml") - // Add a manifest. - .addAsManifestResource(resource, "MANIFEST.MF") - // Add WEBAPP files. - .merge(webapp,"/",Filters.exclude(".*\\web.xml")) - // Add WEBAPP TEST files. - .merge(webappTest,"/",Filters.includeAll()) - // Add LIBS from POM.XML. - .addAsLibraries(asFile); + return ShrinkWrap.create(WebArchive.class, "wicket-servletContext.war") + // Add packages and/or classes. + .addPackages(true, TestWicketJavaEEApplication.class.getPackage()) + // Add the persistence.xml + .addAsResource("META-INF/persistence.xml") + // Add a manifest. + .addAsManifestResource(resource, "MANIFEST.MF") + // Add WEBAPP files. + .merge(webapp, "/", Filters.exclude(".*\\web.xml")) + // Add WEBAPP TEST files. + .merge(webappTest, "/", Filters.includeAll()) + // Add LIBS from POM.XML. + .addAsLibraries(asFile); } - + protected WicketTester wicketTester; - + /** * Set a new instance of wicketTester. * * @param wicketTester */ - public void setWicketTester(WicketTester wicketTester) { + public void setWicketTester(WicketTester wicketTester) + { this.wicketTester = wicketTester; } - + /** - * Get an instance of wicketTester. The first time verify and create a new one. + * Get an instance of WicketTester. The first time verify and create a new one. * - * @return + * @return a WicketTester */ - public WicketTester getWicketTester() { - if(wicketTester == null) { - wicketTester = new WicketTester(useServletContextContainer(),false) { - @Override - protected Locale servletRequestLocale() { - return Locale.US; - } - }; + public WicketTester getWicketTester() + { + if (wicketTester == null) + { + wicketTester = new WicketTester(useServletContextContainer(), false); } return wicketTester; } - + /** * Loading the TestWicketJavaEEApplication from src/test/webapp/WEB-INF/web.xml. * - * @return + * @return the (test) WebApplication */ - protected WebApplication useServletContextContainer() { + protected WebApplication useServletContextContainer() + { WebApplication webApplication = null; - try { + try + { webApplication = TestWicketJavaEEApplication.get(); - } catch (Exception e) { - log.error("If not using arquillian, maybe org.apache.wicket.Application has a message for you " + e.getMessage()); - // I didn't test it, just supposing that i'm not using arquillian, so should show this message. - assertEquals("There is no application attached to current thread " + Thread.currentThread().getName(), e.getMessage()); } - + catch (Exception e) + { + log.error( + "If not using arquillian, maybe org.apache.wicket.Application has a message for you " + + e.getMessage()); + // I didn't test it, just supposing that i'm not using arquillian, so should show this + // message. + assertEquals("There is no application attached to current thread " + + Thread.currentThread().getName(), e.getMessage()); + } + assertNotNull(webApplication); - + log.info("WebApplication Name: " + webApplication.getName()); - + ServletContext servletContext = webApplication.getServletContext(); assertNotNull(servletContext); log.info("ServletContext Name: " + servletContext.getServletContextName()); - assertEquals("Wicket Arquillian WildFly Quickstart: Wicket TEST WAR",servletContext.getServletContextName()); - + assertEquals("Wicket Arquillian WildFly Quickstart: Wicket TEST WAR", + servletContext.getServletContextName()); + log.info("Server info: " + servletContext.getServerInfo()); return webApplication; } - } diff --git a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/pages/InsertContactTest.java b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/pages/InsertContactTest.java index 38df50075c0..241916634e5 100644 --- a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/pages/InsertContactTest.java +++ b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/pages/InsertContactTest.java @@ -35,22 +35,27 @@ import org.slf4j.LoggerFactory; /** - * WARNING: If this error occurs - org.jboss.arquillian.container.spi.client.container.LifecycleException: The server is already running! Managed containers do not support connecting to running server instances due to the possible harmful effect of connecting to the wrong server. Please stop server before running or change to another type of container. - * To disable this check and allow Arquillian to connect to a running server, set allowConnectingToRunningServer to true in the container configuration. - * - * SOLUTION: Search and kill wildfly or jboss proccess instance that are using port 8080. + * WARNING: If this error occurs - + * org.jboss.arquillian.container.spi.client.container.LifecycleException: The server is already + * running! Managed containers do not support connecting to running server instances due to the + * possible harmful effect of connecting to the wrong server. Please stop server before running or + * change to another type of container. To disable this check and allow Arquillian to connect to a + * running server, set allowConnectingToRunningServer to true in the container configuration. * - * If you can't run inside eclipse, add as source the folder src/test/resources and try again. + * SOLUTION: Search and kill wildfly or jboss proccess instance that are using port 8080. + * + * If you can't run inside eclipse, add as source the folder src/test/resources and try + * again. * * Just a class test to show that everything is working. * * @author felipecalmeida * @since 06/21/2015 - * */ +@SuppressWarnings("javadoc") @RunWith(Arquillian.class) -public class InsertContactTest extends AbstractDeploymentTest { - +public class InsertContactTest extends AbstractDeploymentTest +{ private static final String EMAIL_IS_REQUIRED = "'email' is required."; private static final String NAME_IS_REQUIRED = "'name' is required."; @@ -68,8 +73,8 @@ public class InsertContactTest extends AbstractDeploymentTest { private static final Logger log = LoggerFactory.getLogger(InsertContactTest.class); @Inject - private ContactDao contactDao; - + private ContactDao contactDao; + @Before public void before() { @@ -77,47 +82,49 @@ public void before() } @Test - public void testErrorMessagesInsertContact() { + public void testErrorMessagesInsertContact() + { Class pageClass = InsertContact.class; getWicketTester().startPage(pageClass); getWicketTester().assertRenderedPage(pageClass); - + FormTester formTester = getWicketTester().newFormTester(INSERT_FORM); formTester.submit(); getWicketTester().assertErrorMessages(NAME_IS_REQUIRED, EMAIL_IS_REQUIRED); log.info("Required Messages: " + NAME_IS_REQUIRED + " and " + EMAIL_IS_REQUIRED); - + getWicketTester().assertRenderedPage(pageClass); } - + @Test - public void testInsertContact() { + public void testInsertContact() + { Class pageClass = InsertContact.class; getWicketTester().startPage(pageClass); getWicketTester().assertRenderedPage(pageClass); - + FormTester formTester = getWicketTester().newFormTester(INSERT_FORM); formTester.setValue(NAME, WICKET_ARQUILLIAN_TEST); formTester.setValue(EMAIL, WICKET_ARQUILLIAN_TEST_APACHE_ORG); formTester.submit(); - + getWicketTester().assertNoErrorMessage(); getWicketTester().assertRenderedPage(ListContacts.class); - + log.info("Retrieving contacts to assert:"); List contacts = contactDao.getContacts(); int contactsSize = contacts.size(); assertEquals(1, contactsSize); - + Contact contact = contacts.get(0); assertNotNull(contact.getId()); - assertEquals(WICKET_ARQUILLIAN_TEST,contact.getName()); - assertEquals(WICKET_ARQUILLIAN_TEST_APACHE_ORG,contact.getEmail()); - + assertEquals(WICKET_ARQUILLIAN_TEST, contact.getName()); + assertEquals(WICKET_ARQUILLIAN_TEST_APACHE_ORG, contact.getEmail()); + log.info("Contacts size: " + contactsSize); - for (Contact infoContact : contacts) { + for (Contact infoContact : contacts) + { log.info("Contacts info: " + infoContact); } } - } diff --git a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/servletcontext/ArquillianContainerProvidedTest.java b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/servletcontext/ArquillianContainerProvidedTest.java index a3ec33cec95..8cd20edd57c 100644 --- a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/servletcontext/ArquillianContainerProvidedTest.java +++ b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/servletcontext/ArquillianContainerProvidedTest.java @@ -36,37 +36,46 @@ import org.slf4j.LoggerFactory; /** - * WARNING: If this error occurs - org.jboss.arquillian.container.spi.client.container.LifecycleException: The server is already running! Managed containers do not support connecting to running server instances due to the possible harmful effect of connecting to the wrong server. Please stop server before running or change to another type of container. - * To disable this check and allow Arquillian to connect to a running server, set allowConnectingToRunningServer to true in the container configuration. - * - * SOLUTION: Search and kill wildfly or jboss proccess instance that are using port 8080. + * WARNING: If this error occurs - + * org.jboss.arquillian.container.spi.client.container.LifecycleException: The server is already + * running! Managed containers do not support connecting to running server instances due to the + * possible harmful effect of connecting to the wrong server. Please stop server before running or + * change to another type of container. To disable this check and allow Arquillian to connect to a + * running server, set allowConnectingToRunningServer to true in the container configuration. * - * If you can't run inside eclipse, add as source the folder src/test/resources and try again. + * SOLUTION: Search and kill wildfly or jboss proccess instance that are using port 8080. + * + * If you can't run inside eclipse, add as source the folder src/test/resources and try + * again. * * @author felipecalmeida * @since 06/23/2015 - * */ +@SuppressWarnings("javadoc") @RunWith(Arquillian.class) -public class ArquillianContainerProvidedTest extends AbstractDeploymentTest { - - private static final Logger log = LoggerFactory.getLogger(ArquillianContainerProvidedTest.class); +public class ArquillianContainerProvidedTest extends AbstractDeploymentTest +{ + private static final Logger log = LoggerFactory + .getLogger(ArquillianContainerProvidedTest.class); private static final String RESOURCE_PAGES_INSERT_CONTACT_HTML_NOT_FOUND = "Resource /pages/InsertContact.html not found."; /** - * Using container's servlet context and/or filter provided configured in web.xml and using Arquillian. + * Using container's servlet context and/or filter provided configured in web.xml and using + * Arquillian. */ @Test public void testFindResourcesServletContextFromContainer() throws MalformedURLException { - WebApplication webApplication = useServletContextContainer(); - setWicketTester(new WicketTester(webApplication, webApplication.getServletContext(), false)); + WebApplication webApplication = useServletContextContainer(); + setWicketTester( + new WicketTester(webApplication, webApplication.getServletContext(), false)); findResourcesServletContext(); } - + /** - * Using container's servlet context and/or filter provided configured in web.xml and using Arquillian. + * Using container's servlet context and/or filter provided configured in web.xml and using + * Arquillian. */ @Test public void testFindResourcesWebApplicationFromContainer() throws MalformedURLException @@ -75,38 +84,48 @@ public void testFindResourcesWebApplicationFromContainer() throws MalformedURLEx setWicketTester(new WicketTester(webApplication, false)); findResourcesServletContext(); } - + /** * Creating another application and trying to reuse the ServletContext/Filter. */ @Test - public void testNewApplicationTryReuseServletContextFilter() { - try { + public void testNewApplicationTryReuseServletContextFilter() + { + try + { log.info("Trying to reuse container's ServletContext/Filter."); setWicketTester(new WicketTester(new TestWicketJavaEEApplication(), false)); fail("Should not be able to reuse the servlet context"); - } catch (IllegalStateException e) { - assertEquals("servletContext is not set yet. Any code in your Application object that uses the wicket filter instance should be put in the init() method instead of your constructor", e.getMessage()); + } + catch (IllegalStateException e) + { + assertEquals( + "servletContext is not set yet. Any code in your Application object that uses the wicket filter instance should be put in the init() method instead of your constructor", + e.getMessage()); } assertNull(wicketTester); } - + /** * Null application to test error. */ @Test - public void testNullApplication() { - try { + public void testNullApplication() + { + try + { log.info("Trying to use a null application."); setWicketTester(new WicketTester(null, false)); fail("WebApplication cannot be null"); - } catch (IllegalArgumentException iax) { + } + catch (IllegalArgumentException iax) + { assertEquals("Argument 'application' may not be null.", iax.getMessage()); } assertNull(wicketTester); } - + /** * Test with new application. */ @@ -116,16 +135,20 @@ public void testNewApplication() throws MalformedURLException setWicketTester(new WicketTester(new TestWicketJavaEEApplication())); assertNotNull(getWicketTester().getApplication()); log.info("Using mock servletcontext."); - log.info("WebApplication MOCK after wicketTester Name: " + getWicketTester().getApplication().getName()); - log.info("ServletContext MOCK after wicketTester Name: " + getWicketTester().getServletContext().getServletContextName()); + log.info("WebApplication MOCK after wicketTester Name: " + + getWicketTester().getApplication().getName()); + log.info("ServletContext MOCK after wicketTester Name: " + + getWicketTester().getServletContext().getServletContextName()); log.info("Server info: " + getWicketTester().getServletContext().getServerInfo()); - assertEquals("Wicket Mock Test Environment v1.0", getWicketTester().getServletContext().getServerInfo()); + assertEquals("Wicket Mock Test Environment v1.0", + getWicketTester().getServletContext().getServerInfo()); // USING MOCK. try { findResourcesServletContext(); - fail("Should not be able to find '/pages/InsertContact.html' in the mocked servlet context"); + fail( + "Should not be able to find '/pages/InsertContact.html' in the mocked servlet context"); } catch (IllegalStateException isx) { @@ -139,12 +162,13 @@ public void testNewApplication() throws MalformedURLException private void findResourcesServletContext() throws MalformedURLException { // Doing the same thing that ResourceWebApplicationPath does. - URL resource = getWicketTester().getServletContext().getResource("/pages/InsertContact.html"); - if (resource == null) { + URL resource = getWicketTester().getServletContext() + .getResource("/pages/InsertContact.html"); + if (resource == null) + { throw new IllegalStateException(RESOURCE_PAGES_INSERT_CONTACT_HTML_NOT_FOUND); } log.info("Resource found " + resource.getFile()); assertTrue(resource.getFile().contains("/pages/InsertContact.html")); } - } diff --git a/testing/wicket-common-tests/pom.xml b/testing/wicket-common-tests/pom.xml index 7d9e8f04c8f..e27e7252f53 100644 --- a/testing/wicket-common-tests/pom.xml +++ b/testing/wicket-common-tests/pom.xml @@ -20,7 +20,7 @@ org.apache.wicket wicket-parent - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT ../../pom.xml wicket-common-tests @@ -97,6 +97,16 @@ wicket-native-websocket-javax test + + org.apache.wicket + wicket-native-websocket-jetty + test + + + org.apache.wicket + wicket-native-websocket-jetty9 + test + org.apache.wicket wicket-native-websocket-tomcat diff --git a/testing/wicket-js-tests/package.json b/testing/wicket-js-tests/package.json index ee5cafdd778..69206059c5b 100644 --- a/testing/wicket-js-tests/package.json +++ b/testing/wicket-js-tests/package.json @@ -8,12 +8,12 @@ "url" : "http://git-wip-us.apache.org/repos/asf/wicket.git" }, "devDependencies": { - "grunt": "~0.4.5", - "grunt-cli": "~0.1.13", - "grunt-contrib-jshint": "~0.12.0", - "grunt-contrib-qunit": "~1.0.1", - "grunt-contrib-connect": "~0.11.2", - "grunt-contrib-nodeunit": "~0.4.1" + "grunt": "~1.0.1", + "grunt-cli": "~1.2.0", + "grunt-contrib-jshint": "~1.0.0", + "grunt-contrib-qunit": "~1.2.0", + "grunt-contrib-connect": "~1.0.1", + "grunt-contrib-nodeunit": "~1.0.0" }, "scripts": { "test": "grunt --verbose" diff --git a/testing/wicket-js-tests/pom.xml b/testing/wicket-js-tests/pom.xml index f0db9af4802..3650197aec4 100644 --- a/testing/wicket-js-tests/pom.xml +++ b/testing/wicket-js-tests/pom.xml @@ -20,7 +20,7 @@ org.apache.wicket wicket-parent - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT ../../pom.xml wicket-js-tests @@ -63,7 +63,7 @@ com.github.eirslett frontend-maven-plugin - 0.0.28 + 1.0 install node and npm @@ -72,8 +72,8 @@ generate-resources - 3.7.1 - v5.5.0 + 3.8.6 + v5.10.1 diff --git a/wicket-auth-roles/pom.xml b/wicket-auth-roles/pom.xml index 4ee971ee721..8f3ac47426a 100644 --- a/wicket-auth-roles/pom.xml +++ b/wicket-auth-roles/pom.xml @@ -20,7 +20,7 @@ org.apache.wicket wicket-parent - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT ../pom.xml wicket-auth-roles diff --git a/wicket-bean-validation/pom.xml b/wicket-bean-validation/pom.xml index 260bfa2bac7..9de0eb45aec 100644 --- a/wicket-bean-validation/pom.xml +++ b/wicket-bean-validation/pom.xml @@ -4,7 +4,7 @@ org.apache.wicket wicket-parent - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT ../pom.xml wicket-bean-validation diff --git a/wicket-cdi-1.1/pom.xml b/wicket-cdi-1.1/pom.xml index c05d5687122..c1bd27dc712 100644 --- a/wicket-cdi-1.1/pom.xml +++ b/wicket-cdi-1.1/pom.xml @@ -20,7 +20,7 @@ org.apache.wicket wicket-parent - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT ../pom.xml wicket-cdi-1.1 diff --git a/wicket-cdi/pom.xml b/wicket-cdi/pom.xml index 7412d495add..d06532529ca 100644 --- a/wicket-cdi/pom.xml +++ b/wicket-cdi/pom.xml @@ -20,7 +20,7 @@ org.apache.wicket wicket-parent - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT ../pom.xml wicket-cdi diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml index add921d65c4..a5d655021e5 100644 --- a/wicket-core/pom.xml +++ b/wicket-core/pom.xml @@ -20,7 +20,7 @@ org.apache.wicket wicket-parent - 8.0.0-SNAPSHOT + 7.4.0-SNAPSHOT ../pom.xml wicket-core diff --git a/wicket-core/src/main/java/org/apache/wicket/Application.java b/wicket-core/src/main/java/org/apache/wicket/Application.java index a65d02d73b2..9f3516856ba 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Application.java +++ b/wicket-core/src/main/java/org/apache/wicket/Application.java @@ -622,9 +622,10 @@ public final void initializeComponents() while (resources.hasNext()) { final URL url = resources.next(); - log.warn("Found '{}'. /wicket.properties location is deprecated. Please move the file to" + - " /META-INF/wicket/ folder and give it a name that matches your packages' name," + - " e.g. com.example.myapp.properties", url); + log.warn("Found '{}'. /wicket.properties location is deprecated. " + + "Please see https://issues.apache.org/jira/browse/WICKET-5997 for more " + + "details and report an issue for the library that still uses it.", + url); final Properties properties = new Properties(); try (InputStream in = Streams.readNonCaching(url)) { diff --git a/wicket-core/src/main/java/org/apache/wicket/Application_de.properties b/wicket-core/src/main/java/org/apache/wicket/Application_de.properties index 014d991a50c..23bdea40e7d 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Application_de.properties +++ b/wicket-core/src/main/java/org/apache/wicket/Application_de.properties @@ -15,6 +15,7 @@ Required=Bitte tragen Sie einen Wert im Feld '${label}' ein. IConverter=Der Wert von '${label}' ist kein g\u00fcltiger Wert f\u00fcr '${type}'. +RangeValidator.exact=Der Wert von '${label}' muss genau ${minimum} betragen. RangeValidator.range=Der Wert von '${label}' muss zwischen ${minimum} und ${maximum} liegen. RangeValidator.minimum=Der Wert von '${label}' ist kleiner als der erlaubte Minimalwert ${minimum}. RangeValidator.maximum=Der Wert von '${label}' ist gr\u00f6\u00dfer als der erlaubte Maximalwert ${maximum}. diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java index 10ac0269a75..a3dde9eca27 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Component.java +++ b/wicket-core/src/main/java/org/apache/wicket/Component.java @@ -3066,7 +3066,9 @@ public final Component setDefaultModelObject(final Object object) if (model == null) { throw new IllegalStateException( - "Attempt to set model object on null model of component: " + getPageRelativePath()); + "Attempt to set a model object on a component without a model! " + + "Either pass an IModel to the constructor or use #setDefaultModel(new SomeModel(object)). " + + "Component: " + getPageRelativePath()); } // Check authorization diff --git a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java index 7a5210b0c8e..798cc67ee74 100644 --- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java @@ -45,6 +45,7 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.IWrapModel; import org.apache.wicket.settings.DebugSettings; +import org.apache.wicket.util.iterator.ComponentHierarchyIterator; import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.lang.Classes; import org.apache.wicket.util.lang.Generics; @@ -982,6 +983,31 @@ public final R visitChildren(final IVisitor visitor) return Visits.visitChildren(this, visitor); } + /** + * @return A iterator which iterators over all children and grand-children the Component + * @deprecated ComponentHierarchyIterator is deprecated. + * Use {@link #visitChildren(org.apache.wicket.util.visit.IVisitor)} instead + */ + @Deprecated + public final ComponentHierarchyIterator visitChildren() + { + return new ComponentHierarchyIterator(this); + } + + /** + * @param clazz + * Filter condition + * @return A iterator which iterators over all children and grand-children the Component, + * returning only components which implement (instanceof) the provided clazz. + * @deprecated ComponentHierarchyIterator is deprecated. + * Use {@link #visitChildren(Class, org.apache.wicket.util.visit.IVisitor)} instead. + */ + @Deprecated + public final ComponentHierarchyIterator visitChildren(final Class clazz) + { + return new ComponentHierarchyIterator(this).filterByClass(clazz); + } + /** * @param child * Component being added @@ -1063,6 +1089,35 @@ public void component(final Component component, final IVisit visit) }); } + /** + * Returns child component at the specified index. Note that this method has O(n) complexity on + * the number of children. + * + * @param index + * the index of the child in this container + * @throws ArrayIndexOutOfBoundsException + * when {@code index} exceeds {@code size()} + * @return child component at the specified index + * @deprecated this method is marked for deletion for WICKET8 + */ + @Deprecated + public final Component get(int index) + { + final int requestedIndex = index; + Component childAtIndex = null; + Iterator childIterator = iterator(); + while (index >= 0 && childIterator.hasNext()) + { + childAtIndex = childIterator.next(); + index--; + } + if(index >= 0 || childAtIndex == null) + { + throw new ArrayIndexOutOfBoundsException(Integer.toString(requestedIndex)); + } + return childAtIndex; + } + /* * === Internal management for keeping track of child components === * @@ -1830,6 +1885,57 @@ protected void onAfterRenderChildren() super.onAfterRenderChildren(); } + /** + * Swaps position of children. This method is particularly useful for adjusting positions of + * repeater's items without rebuilding the component hierarchy + * + * @param idx1 + * index of first component to be swapped + * @param idx2 + * index of second component to be swapped + * @deprecated this method is marked for deletion for WICKET8 + */ + @Deprecated + public final void swap(int idx1, int idx2) + { + int size = children_size(); + if (idx1 < 0 || idx1 >= size) + { + throw new IndexOutOfBoundsException( + "Argument idx is out of bounds: " + idx1 + "<>[0," + size + ")"); + } + + if (idx2 < 0 || idx2 >= size) + { + throw new IndexOutOfBoundsException( + "Argument idx is out of bounds: " + idx2 + "<>[0," + size + ")"); + } + + if (idx1 == idx2) + { + return; + } + + if (children instanceof List) + { + @SuppressWarnings("unchecked") + List childrenList = (List)children; + childrenList.set(idx1, childrenList.set(idx2, childrenList.get(idx1))); + } + else + { + @SuppressWarnings("unchecked") + Map childrenMap = (Map)children; + List childrenList = copyChildren(); + childrenList.set(idx1, childrenList.set(idx2, childrenList.get(idx1))); + childrenMap.clear(); + for (Component child : childrenList) + { + childrenMap.put(child.getId(), child); + } + } + } + @Override protected void onDetach() { diff --git a/wicket-core/src/main/java/org/apache/wicket/SystemMapper.java b/wicket-core/src/main/java/org/apache/wicket/SystemMapper.java index 9157daf5265..845f1d66932 100644 --- a/wicket-core/src/main/java/org/apache/wicket/SystemMapper.java +++ b/wicket-core/src/main/java/org/apache/wicket/SystemMapper.java @@ -16,23 +16,22 @@ */ package org.apache.wicket; -import java.util.function.Supplier; - import org.apache.wicket.core.request.mapper.BookmarkableMapper; import org.apache.wicket.core.request.mapper.BufferedResponseMapper; import org.apache.wicket.core.request.mapper.HomePageMapper; import org.apache.wicket.core.request.mapper.PageInstanceMapper; import org.apache.wicket.core.request.mapper.ResourceReferenceMapper; +import org.apache.wicket.request.IRequestMapper; import org.apache.wicket.request.component.IRequestablePage; import org.apache.wicket.request.mapper.CompoundRequestMapper; import org.apache.wicket.request.mapper.parameter.PageParametersEncoder; import org.apache.wicket.request.resource.caching.IResourceCachingStrategy; +import org.apache.wicket.util.IProvider; /** * Mapper that encapsulates mappers that are necessary for Wicket to function. * * @author igor.vaynberg - * */ public class SystemMapper extends CompoundRequestMapper { @@ -46,26 +45,66 @@ public class SystemMapper extends CompoundRequestMapper public SystemMapper(final Application application) { this.application = application; - add(new PageInstanceMapper()); - add(new BookmarkableMapper()); - add(new HomePageMapper(new HomePageProvider(application))); - add(new ResourceReferenceMapper(new PageParametersEncoder(), + + add(newPageInstanceMapper()); + add(newBookmarkableMapper()); + add(newHomePageMapper(new HomePageProvider(application))); + add(newResourceReferenceMapper(new PageParametersEncoder(), new ParentFolderPlaceholderProvider(application), getResourceCachingStrategy())); - add(new UrlResourceReferenceMapper()); + add(newUrlResourceReferenceMapper()); add(RestartResponseAtInterceptPageException.MAPPER); - add(new BufferedResponseMapper()); + add(newBufferedResponseMapper()); + } + + protected IRequestMapper newBufferedResponseMapper() + { + return new BufferedResponseMapper(); + } + + protected IRequestMapper newUrlResourceReferenceMapper() + { + return new UrlResourceReferenceMapper(); + } + + private IRequestMapper newResourceReferenceMapper(PageParametersEncoder pageParametersEncoder, + ParentFolderPlaceholderProvider parentFolderPlaceholderProvider, + IProvider resourceCachingStrategy) + { + return new ResourceReferenceMapper(pageParametersEncoder, parentFolderPlaceholderProvider,resourceCachingStrategy); + } + + protected IRequestMapper newBookmarkableMapper() + { + return new BookmarkableMapper(); } - private Supplier getResourceCachingStrategy() + protected IRequestMapper newPageInstanceMapper() { - return () -> application.getResourceSettings().getCachingStrategy(); + return new PageInstanceMapper(); + } + + protected IRequestMapper newHomePageMapper(IProvider> homePageProvider) + { + return new HomePageMapper(homePageProvider); + } + + protected IProvider getResourceCachingStrategy() + { + return new IProvider() + { + @Override + public IResourceCachingStrategy get() + { + return application.getResourceSettings().getCachingStrategy(); + } + }; } - private static class ParentFolderPlaceholderProvider implements Supplier + protected static class ParentFolderPlaceholderProvider implements IProvider { private final Application application; - public ParentFolderPlaceholderProvider(Application application) + protected ParentFolderPlaceholderProvider(Application application) { this.application = application; } @@ -77,11 +116,11 @@ public String get() } } - private static class HomePageProvider implements Supplier> + protected static class HomePageProvider implements IProvider> { private final Application application; - private HomePageProvider(final Application application) + protected HomePageProvider(final Application application) { this.application = application; } diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/IAjaxCallListener.java b/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/IAjaxCallListener.java index 02747664057..e671c0a2999 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/IAjaxCallListener.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/IAjaxCallListener.java @@ -134,6 +134,9 @@ public interface IAjaxCallListener * will be executed in a function that receives the following parameters: *
    *
  1. attrs - the AjaxRequestAttributes as JSON
    2. + *
  2. jqXHR - the jQuery XMLHttpRequest object
    3. + *
  3. errorMessage - in case of HTTP error the textual portion of the HTTP status
    4. + *
  4. textStatus - type of failure: null, "timeout", "error", "abort" or "parsererror"
    5. *
* * @param component diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java index 6feb38be1bc..87064148ba5 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java @@ -19,7 +19,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior; -import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.html.form.Button; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.IModel; @@ -167,18 +166,6 @@ public Form getForm() } } - @Override - protected void onComponentTag(ComponentTag tag) - { - // WICKET-5594 prevent non-Ajax submit - if ("submit".equals(tag.getAttribute("type"))) - { - tag.put("type", "button"); - } - - super.onComponentTag(tag); - } - /** * This method is never called. * diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js index aff555639e0..55e6e61828c 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js @@ -1955,9 +1955,12 @@ Wicket.Event.add(attrs.c, evt, function (jqEvent, data) { var call = new Wicket.Ajax.Call(); var attributes = jQuery.extend({}, attrs); - attributes.event = Wicket.Event.fix(jqEvent); - if (data) { - attributes.event.extraData = data; + + if (evt !== "domready") { + attributes.event = Wicket.Event.fix(jqEvent); + if (data) { + attributes.event.extraData = data; + } } call._executeHandlers(attributes.ih, attributes); @@ -1975,7 +1978,9 @@ else { call.ajax(attributes); } - Wicket.Ajax._handleEventCancelation(attributes); + if (evt !== "domready") { + Wicket.Ajax._handleEventCancelation(attributes); + } }, null, attrs.sel); }); }, diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js index 7e0322c08d3..9fb0aa26601 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js @@ -177,8 +177,7 @@ * If no event is given as argument (IE), window.event is returned. */ fix: function (evt) { - var evnt = evt || window.event; - return jQuery.event.fix(evnt); + return evt || jQuery.event.fix(window.event); }, fire: function (element, event) { diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/CryptoMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/CryptoMapper.java index fcc52a7855e..4f038ec6fbb 100755 --- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/CryptoMapper.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/CryptoMapper.java @@ -500,7 +500,7 @@ protected Url decryptEntireUrl(final Request request, final Url encryptedUrl) int segNo = 1; for (; segNo < encryptedNumberOfSegments; segNo++) { - if (segNo > originalNumberOfSegments) + if (segNo >= originalNumberOfSegments) { break; } diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/StalePageException.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/StalePageException.java index 4d0511c1cfb..5fc4ea21fed 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/StalePageException.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/StalePageException.java @@ -40,6 +40,7 @@ public class StalePageException extends WicketRuntimeException implements IWicke */ public StalePageException(IRequestablePage page) { + super(String.format("A request to page '%s' has been made with stale 'renderCount'. The page will be re-rendered.", page)); this.page = page; } diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/lang/WicketObjects.java b/wicket-core/src/main/java/org/apache/wicket/core/util/lang/WicketObjects.java index 728b03625a6..0f4564c164b 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/util/lang/WicketObjects.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/util/lang/WicketObjects.java @@ -310,6 +310,11 @@ public static T cloneObject(final T object) serializer = new JavaSerializer(WicketObjects.class.getName()); } byte[] serialized = serializer.serialize(object); + if (serialized == null) + { + throw new IllegalStateException("A problem occurred while serializing an object. " + + "Please check the earlier logs for more details. Problematic object: " + object); + } Object deserialized = serializer.deserialize(serialized); return (T) deserialized; } diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java index 48949dbac14..957ba805826 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java @@ -112,6 +112,7 @@ public SecurePackageResourceGuard(final ConcurrentMap cache) addPattern("+*.gif"); addPattern("+*.ico"); addPattern("+*.cur"); + addPattern("+*.map"); // WICKET-208 non page templates may be served addPattern("+*.html"); diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java index 63da8f3d9a9..5ef0468e7e1 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java @@ -218,7 +218,7 @@ public Border add(final Component... children) { for (Component component : children) { - if (component == body) + if (component == body || component.isAuto()) { addToBorder(component); } diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/NumberTextField.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/NumberTextField.java index 0b5cc9281e8..f0c995c229c 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/NumberTextField.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/NumberTextField.java @@ -29,7 +29,10 @@ /** * A {@link TextField} for HTML5 <input> with type number. - * + *

+ * The {@code }'s value will be rendered in floating-point representation, as required by + * the HTML specification. Use a simple + * {@code TextField} to use a locale specific conversion of numbers. *

* Automatically validates the input against the configured {@link #setMinimum(N) min} and * {@link #setMaximum(N) max} attributes. If any of them is null then respective diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaComponent.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaComponent.java index 88a60769e38..cb1b4cfb74f 100755 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaComponent.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaComponent.java @@ -128,6 +128,8 @@ public String getRealName() private Cors crossOrigin; + private String type; + private PageParameters pageParameters; private final ResourceReference resourceReference; @@ -337,6 +339,12 @@ else if (url != null) { tag.put("crossorigin", cors.getRealName()); } + + String type = getType(); + if (type != null) + { + tag.put("type", type); + } } /** @@ -608,4 +616,65 @@ public void setCrossOrigin(Cors crossOrigin) { this.crossOrigin = crossOrigin; } + + /** + * Gets the type + * + * @see {@link #setType(String)} + * + * @return the type of this media element + */ + public String getType() + { + return type; + } + + /** + * Sets the type
+ *
+ * + * * The following list shows some examples of how to use the codecs= MIME parameter in the type + * attribute.
+ *
+ * + * H.264 Constrained baseline profile video (main and extended video compatible) level 3 and + * Low-Complexity AAC audio in MP4 container
+ * <source src='video.mp4' type='video/mp4; codecs="avc1.42E01E, mp4a.40.2"'>
+ * H.264 Extended profile video (baseline-compatible) level 3 and Low-Complexity AAC audio in + * MP4 container
+ * <source src='video.mp4' type='video/mp4; codecs="avc1.58A01E, mp4a.40.2"'>
+ * H.264 Main profile video level 3 and Low-Complexity AAC audio in MP4 container
+ * <source src='video.mp4' type='video/mp4; codecs="avc1.4D401E, mp4a.40.2"'>
+ * H.264 'High' profile video (incompatible with main, baseline, or extended profiles) level 3 + * and Low-Complexity AAC audio in MP4 container
+ * <source src='video.mp4' type='video/mp4; codecs="avc1.64001E, mp4a.40.2"'>
+ * MPEG-4 Visual Simple Profile Level 0 video and Low-Complexity AAC audio in MP4 container
+ * <source src='video.mp4' type='video/mp4; codecs="mp4v.20.8, mp4a.40.2"'>
+ * MPEG-4 Advanced Simple Profile Level 0 video and Low-Complexity AAC audio in MP4 container + *
+ * <source src='video.mp4' type='video/mp4; codecs="mp4v.20.240, mp4a.40.2"'>
+ * MPEG-4 Visual Simple Profile Level 0 video and AMR audio in 3GPP container
+ * <source src='video.3gp' type='video/3gpp; codecs="mp4v.20.8, samr"'>
+ * Theora video and Vorbis audio in Ogg container
+ * <source src='video.ogv' type='video/ogg; codecs="theora, vorbis"'>
+ * Theora video and Speex audio in Ogg container
+ * <source src='video.ogv' type='video/ogg; codecs="theora, speex"'>
+ * Vorbis audio alone in Ogg container
+ * <source src='audio.ogg' type='audio/ogg; codecs=vorbis'>
+ * Speex audio alone in Ogg container
+ * <source src='audio.spx' type='audio/ogg; codecs=speex'>
+ * FLAC audio alone in Ogg container
+ * <source src='audio.oga' type='audio/ogg; codecs=flac'>
+ * Dirac video and Vorbis audio in Ogg container
+ * <source src='video.ogv' type='video/ogg; codecs="dirac, vorbis"'>
+ * Theora video and Vorbis audio in Matroska container
+ * <source src='video.mkv' type='video/x-matroska; codecs="theora, vorbis"'>
+ * + * @param type + * the type of this media element + */ + public void setType(String type) + { + this.type = type; + } } diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AbstractMarkupSourcingStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AbstractMarkupSourcingStrategy.java index ce5c1a1fa79..2132390c505 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AbstractMarkupSourcingStrategy.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AbstractMarkupSourcingStrategy.java @@ -61,7 +61,7 @@ public AbstractMarkupSourcingStrategy() * the parent container. * @param * containerMarkup - * the markup of the parent container. + * the markup of the container. * @param child * The component to find the markup for. * @return the markup fragment for the child, or {@code null}. @@ -70,7 +70,7 @@ protected IMarkupFragment searchMarkupInTransparentResolvers(MarkupContainer con IMarkupFragment containerMarkup, Component child) { IMarkupFragment childMarkupFound = null; - Iterator childrenIterator = container.iterator(); + Iterator siblingsIterator = container.iterator(); final List componentResolvers = new ArrayList<>(); //collect all "transparent" (i.e. component resolvers) children @@ -82,11 +82,11 @@ public void component(MarkupContainer child, IVisit visit) componentResolvers.add(child); } }); - - while (childrenIterator.hasNext() && childMarkupFound == null) - { - Component sibling = childrenIterator.next(); + while (siblingsIterator.hasNext() && childMarkupFound == null) + { + Component sibling = siblingsIterator.next(); + if (sibling == child || !sibling.isVisible() || !(sibling instanceof MarkupContainer)) { continue; diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/AbstractMarkupFilter.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/AbstractMarkupFilter.java index db53a77bf48..a29f774f150 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/AbstractMarkupFilter.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/AbstractMarkupFilter.java @@ -17,6 +17,8 @@ package org.apache.wicket.markup.parser; import java.text.ParseException; +import java.util.HashMap; +import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import org.apache.wicket.MetaDataKey; @@ -44,8 +46,13 @@ public abstract class AbstractMarkupFilter implements IMarkupFilter /** The next MarkupFilter in the chain */ private IMarkupFilter parent; - /** A key for a request-relative counter (see {@link #getRequestUniqueId()}) **/ - private final static MetaDataKey REQUEST_COUNTER_KEY = new MetaDataKey() + /** + * A key for a request-relative map of counters. + * As map keys we use the {@link org.apache.wicket.markup.MarkupResourceStream} cacheKey, + * meaning that each {@link org.apache.wicket.markup.MarkupResourceStream} has its own counter. + * The counters are used by {@link #getRequestUniqueId()} to get unique ids for markup tags. + * **/ + private final static MetaDataKey> REQUEST_COUNTER_KEY = new MetaDataKey>() { private static final long serialVersionUID = 1L; }; @@ -196,8 +203,9 @@ else if (markupResourceStream != null) } /** - * Returns an id using a request-relative counter. This can be - * useful for autocomponent tags that need to get a tag id. + * Returns an id using the request-relative counter associated with the + * underlying {@link org.apache.wicket.markup.MarkupResourceStream}. + * This can be useful for autocomponent tags that need to get a tag id. * * @return * the request-relative id @@ -205,15 +213,28 @@ else if (markupResourceStream != null) protected int getRequestUniqueId() { RequestCycle requestCycle = RequestCycle.get(); - AtomicInteger counter = requestCycle.getMetaData(REQUEST_COUNTER_KEY); + Map markupUniqueCounters = requestCycle.getMetaData(REQUEST_COUNTER_KEY); + String cacheKey = getMarkupResourceStream().getCacheKey(); + + if (markupUniqueCounters == null) + { + markupUniqueCounters = new HashMap<>(); + + requestCycle.setMetaData(REQUEST_COUNTER_KEY, markupUniqueCounters); + } + + AtomicInteger counter = markupUniqueCounters.get(cacheKey); if (counter == null) { counter = new AtomicInteger(); - - requestCycle.setMetaData(REQUEST_COUNTER_KEY, counter); + markupUniqueCounters.put(cacheKey, counter); } - return counter.getAndIncrement(); + int cacheHash = cacheKey == null ? 0 : cacheKey.hashCode(); + + //add the counter value to the string hash + //using the same algorithm of String#hashCode() + return cacheHash * 31 + counter.getAndIncrement(); } } diff --git a/wicket-core/src/main/java/org/apache/wicket/model/ChainingModel.java b/wicket-core/src/main/java/org/apache/wicket/model/ChainingModel.java index b88c15bc4f5..c37b8ecf51f 100644 --- a/wicket-core/src/main/java/org/apache/wicket/model/ChainingModel.java +++ b/wicket-core/src/main/java/org/apache/wicket/model/ChainingModel.java @@ -31,7 +31,7 @@ * * @since 6.0.0 */ -public abstract class ChainingModel implements IChainingModel +public class ChainingModel implements IChainingModel { private static final Logger LOG = LoggerFactory.getLogger(ChainingModel.class); diff --git a/wicket-core/src/main/java/org/apache/wicket/page/PartialPageUpdate.java b/wicket-core/src/main/java/org/apache/wicket/page/PartialPageUpdate.java index 9efcafbcd89..2bef5e2d1c0 100644 --- a/wicket-core/src/main/java/org/apache/wicket/page/PartialPageUpdate.java +++ b/wicket-core/src/main/java/org/apache/wicket/page/PartialPageUpdate.java @@ -113,6 +113,8 @@ public abstract class PartialPageUpdate protected final ResponseBuffer headerBuffer; protected HtmlHeaderContainer header = null; + + private Component originalHeaderContainer = null; // whether a header contribution is being rendered private boolean headerRendering = false; @@ -123,7 +125,7 @@ public abstract class PartialPageUpdate * The page which components are being updated. */ private final Page page; - + /** * Constructor. * @@ -133,7 +135,8 @@ public abstract class PartialPageUpdate public PartialPageUpdate(final Page page) { this.page = page; - + this.originalHeaderContainer = page.get(HtmlHeaderSectionHandler.HEADER_ID); + WebResponse response = (WebResponse) page.getResponse(); bodyBuffer = new ResponseBuffer(response); headerBuffer = new ResponseBuffer(response); @@ -172,9 +175,9 @@ public void writeTo(final Response response, final String encoding) writeFooter(response, encoding); } finally { - if (header != null) { + if (header != null && originalHeaderContainer!= null) { // restore a normal header - page.replace(new HtmlHeaderContainer(HtmlHeaderSectionHandler.HEADER_ID)); + page.replace(originalHeaderContainer); header = null; } } diff --git a/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/HttpSessionDataStore.java b/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/HttpSessionDataStore.java index 89fed6bde3b..fcc4f7ae214 100644 --- a/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/HttpSessionDataStore.java +++ b/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/HttpSessionDataStore.java @@ -27,15 +27,15 @@ /** * A {@link IDataStore} which stores the pages in the {@link HttpSession}. Uses * {@link IDataStoreEvictionStrategy} to keep the memory footprint reasonable. - * + * *

* Usage: - * + * * 

  * 
  * MyApp#init()
  * {
- * 
+ *
  * 	setPageManagerProvider(new DefaultPageManagerProvider(this)
  * 	{
  * 		protected IDataStore newDataStore() 
@@ -79,7 +79,7 @@ public HttpSessionDataStore(IPageManagerContext pageManagerContext,
 	@Override
 	public byte[] getData(String sessionId, int pageId)
 	{
-		PageTable pageTable = getPageTable(false);
+		PageTable pageTable = getPageTable(false, false);
 		byte[] pageAsBytes = null;
 		if (pageTable != null)
 		{
@@ -100,7 +100,7 @@ public byte[] getData(String sessionId, int pageId)
 	@Override
 	public void removeData(String sessionId, int pageId)
 	{
-		PageTable pageTable = getPageTable(false);
+		PageTable pageTable = getPageTable(false, true);
 		if (pageTable != null)
 		{
 			byte[] bytes = pageTable.removePage(pageId);
@@ -115,7 +115,7 @@ public void removeData(String sessionId, int pageId)
 	@Override
 	public void removeData(String sessionId)
 	{
-		PageTable pageTable = getPageTable(false);
+		PageTable pageTable = getPageTable(false, true);
 		if (pageTable != null)
 		{
 			pageTable.clear();
@@ -126,7 +126,7 @@ public void removeData(String sessionId)
 	@Override
 	public void storeData(String sessionId, int pageId, byte[] pageAsBytes)
 	{
-		PageTable pageTable = getPageTable(true);
+		PageTable pageTable = getPageTable(true, true);
 		if (pageTable != null)
 		{
 			pageTable.storePage(pageId, pageAsBytes);
@@ -158,7 +158,7 @@ public boolean isReplicated()
 		return true;
 	}
 
-	private PageTable getPageTable(boolean create)
+	private PageTable getPageTable(boolean create, boolean rewriteToSession)
 	{
 		PageTable pageTable = null;
 		if (Session.exists())
@@ -168,6 +168,8 @@ private PageTable getPageTable(boolean create)
 			{
 				pageTable = new PageTable();
 				pageManagerContext.setSessionAttribute(PAGE_TABLE_KEY, pageTable);
+			} else if (rewriteToSession) {
+				pageManagerContext.setSessionAttribute(PAGE_TABLE_KEY, pageTable);
 			}
 		}
 		return pageTable;
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
index 304480d6a51..a1e5c8c3ffb 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
@@ -285,14 +285,6 @@ public void sendRedirect(String url)
 			}
 			else
 			{
-				if (url.startsWith("./"))
-				{
-					/*
-					 * WICKET-4260 Tomcat does not canonalize urls, which leads to problems with IE
-					 * when url is relative and starts with a dot
-					 */
-					url = url.substring(2);
-				}
 				httpServletResponse.sendRedirect(url);
 			}
 		}
diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/DynamicJQueryResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/resource/DynamicJQueryResourceReference.java
index 8cf53b2dd8c..3aa5e83ca68 100644
--- a/wicket-core/src/main/java/org/apache/wicket/resource/DynamicJQueryResourceReference.java
+++ b/wicket-core/src/main/java/org/apache/wicket/resource/DynamicJQueryResourceReference.java
@@ -50,7 +50,7 @@ public class DynamicJQueryResourceReference extends JQueryResourceReference
 	/**
 	 * jQuery ver. 2.x - works only on modern browsers
 	 */
-	public static final String VERSION_2 = "jquery/jquery-2.2.1.js";
+	public static final String VERSION_2 = "jquery/jquery-2.2.3.js";
 
 	public DynamicJQueryResourceReference()
 	{
diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/JQueryResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/resource/JQueryResourceReference.java
index 5f7c6305fac..12e3988f922 100644
--- a/wicket-core/src/main/java/org/apache/wicket/resource/JQueryResourceReference.java
+++ b/wicket-core/src/main/java/org/apache/wicket/resource/JQueryResourceReference.java
@@ -34,7 +34,7 @@ public class JQueryResourceReference extends JavaScriptResourceReference
 	/**
 	 * jQuery ver. 1.x - works on modern browsers and IE 6/7/8
 	 */
-	public static final String VERSION_1 = "jquery/jquery-1.12.1.js";
+	public static final String VERSION_1 = "jquery/jquery-1.12.3.js";
 
 	private static final JQueryResourceReference INSTANCE = new JQueryResourceReference();
 
diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/jquery/jquery-1.12.1.js b/wicket-core/src/main/java/org/apache/wicket/resource/jquery/jquery-1.12.1.js
deleted file mode 100644
index d888910a863..00000000000
--- a/wicket-core/src/main/java/org/apache/wicket/resource/jquery/jquery-1.12.1.js
+++ /dev/null
@@ -1,11026 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.12.1
- * http://jquery.com/
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2016-02-22T19:07Z
- */
-
-(function( global, factory ) {
-
-	if ( typeof module === "object" && typeof module.exports === "object" ) {
-		// For CommonJS and CommonJS-like environments where a proper `window`
-		// is present, execute the factory and get jQuery.
-		// For environments that do not have a `window` with a `document`
-		// (such as Node.js), expose a factory as module.exports.
-		// This accentuates the need for the creation of a real `window`.
-		// e.g. var jQuery = require("jquery")(window);
-		// See ticket #14549 for more info.
-		module.exports = global.document ?
-			factory( global, true ) :
-			function( w ) {
-				if ( !w.document ) {
-					throw new Error( "jQuery requires a window with a document" );
-				}
-				return factory( w );
-			};
-	} else {
-		factory( global );
-	}
-
-// Pass this if window is not defined yet
-}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
-
-// Support: Firefox 18+
-// Can't be in strict mode, several libs including ASP.NET trace
-// the stack via arguments.caller.callee and Firefox dies if
-// you try to trace through "use strict" call chains. (#13335)
-//"use strict";
-var deletedIds = [];
-
-var document = window.document;
-
-var slice = deletedIds.slice;
-
-var concat = deletedIds.concat;
-
-var push = deletedIds.push;
-
-var indexOf = deletedIds.indexOf;
-
-var class2type = {};
-
-var toString = class2type.toString;
-
-var hasOwn = class2type.hasOwnProperty;
-
-var support = {};
-
-
-
-var
-	version = "1.12.1",
-
-	// Define a local copy of jQuery
-	jQuery = function( selector, context ) {
-
-		// The jQuery object is actually just the init constructor 'enhanced'
-		// Need init if jQuery is called (just allow error to be thrown if not included)
-		return new jQuery.fn.init( selector, context );
-	},
-
-	// Support: Android<4.1, IE<9
-	// Make sure we trim BOM and NBSP
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
-	// Matches dashed string for camelizing
-	rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([\da-z])/gi,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	};
-
-jQuery.fn = jQuery.prototype = {
-
-	// The current version of jQuery being used
-	jquery: version,
-
-	constructor: jQuery,
-
-	// Start with an empty selector
-	selector: "",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	toArray: function() {
-		return slice.call( this );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num != null ?
-
-			// Return just the one element from the set
-			( num < 0 ? this[ num + this.length ] : this[ num ] ) :
-
-			// Return all the elements in a clean array
-			slice.call( this );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems ) {
-
-		// Build a new jQuery matched element set
-		var ret = jQuery.merge( this.constructor(), elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-		ret.context = this.context;
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	each: function( callback ) {
-		return jQuery.each( this, callback );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map( this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		} ) );
-	},
-
-	slice: function() {
-		return this.pushStack( slice.apply( this, arguments ) );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	eq: function( i ) {
-		var len = this.length,
-			j = +i + ( i < 0 ? len : 0 );
-		return this.pushStack( j >= 0 && j < len ? [ this[ j ] ] : [] );
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor();
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: push,
-	sort: deletedIds.sort,
-	splice: deletedIds.splice
-};
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var src, copyIsArray, copy, name, options, clone,
-		target = arguments[ 0 ] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-
-		// skip the boolean and the target
-		target = arguments[ i ] || {};
-		i++;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction( target ) ) {
-		target = {};
-	}
-
-	// extend jQuery itself if only one argument is passed
-	if ( i === length ) {
-		target = this;
-		i--;
-	}
-
-	for ( ; i < length; i++ ) {
-
-		// Only deal with non-null/undefined values
-		if ( ( options = arguments[ i ] ) != null ) {
-
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject( copy ) ||
-					( copyIsArray = jQuery.isArray( copy ) ) ) ) {
-
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray( src ) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject( src ) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend( {
-
-	// Unique for each copy of jQuery on the page
-	expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
-
-	// Assume jQuery is ready without the ready module
-	isReady: true,
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	noop: function() {},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return jQuery.type( obj ) === "function";
-	},
-
-	isArray: Array.isArray || function( obj ) {
-		return jQuery.type( obj ) === "array";
-	},
-
-	isWindow: function( obj ) {
-		/* jshint eqeqeq: false */
-		return obj != null && obj == obj.window;
-	},
-
-	isNumeric: function( obj ) {
-
-		// parseFloat NaNs numeric-cast false positives (null|true|false|"")
-		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
-		// subtraction forces infinities to NaN
-		// adding 1 corrects loss of precision from parseFloat (#15100)
-		var realStringObj = obj && obj.toString();
-		return !jQuery.isArray( obj ) && ( realStringObj - parseFloat( realStringObj ) + 1 ) >= 0;
-	},
-
-	isEmptyObject: function( obj ) {
-		var name;
-		for ( name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	isPlainObject: function( obj ) {
-		var key;
-
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		try {
-
-			// Not own constructor property must be Object
-			if ( obj.constructor &&
-				!hasOwn.call( obj, "constructor" ) &&
-				!hasOwn.call( obj.constructor.prototype, "isPrototypeOf" ) ) {
-				return false;
-			}
-		} catch ( e ) {
-
-			// IE8,9 Will throw exceptions on certain host objects #9897
-			return false;
-		}
-
-		// Support: IE<9
-		// Handle iteration over inherited properties before own properties.
-		if ( !support.ownFirst ) {
-			for ( key in obj ) {
-				return hasOwn.call( obj, key );
-			}
-		}
-
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-		for ( key in obj ) {}
-
-		return key === undefined || hasOwn.call( obj, key );
-	},
-
-	type: function( obj ) {
-		if ( obj == null ) {
-			return obj + "";
-		}
-		return typeof obj === "object" || typeof obj === "function" ?
-			class2type[ toString.call( obj ) ] || "object" :
-			typeof obj;
-	},
-
-	// Workarounds based on findings by Jim Driscoll
-	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
-	globalEval: function( data ) {
-		if ( data && jQuery.trim( data ) ) {
-
-			// We use execScript on Internet Explorer
-			// We use an anonymous function so that context is window
-			// rather than jQuery in Firefox
-			( window.execScript || function( data ) {
-				window[ "eval" ].call( window, data ); // jscs:ignore requireDotNotation
-			} )( data );
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-	},
-
-	each: function( obj, callback ) {
-		var length, i = 0;
-
-		if ( isArrayLike( obj ) ) {
-			length = obj.length;
-			for ( ; i < length; i++ ) {
-				if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
-					break;
-				}
-			}
-		} else {
-			for ( i in obj ) {
-				if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
-					break;
-				}
-			}
-		}
-
-		return obj;
-	},
-
-	// Support: Android<4.1, IE<9
-	trim: function( text ) {
-		return text == null ?
-			"" :
-			( text + "" ).replace( rtrim, "" );
-	},
-
-	// results is for internal usage only
-	makeArray: function( arr, results ) {
-		var ret = results || [];
-
-		if ( arr != null ) {
-			if ( isArrayLike( Object( arr ) ) ) {
-				jQuery.merge( ret,
-					typeof arr === "string" ?
-					[ arr ] : arr
-				);
-			} else {
-				push.call( ret, arr );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, arr, i ) {
-		var len;
-
-		if ( arr ) {
-			if ( indexOf ) {
-				return indexOf.call( arr, elem, i );
-			}
-
-			len = arr.length;
-			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
-
-			for ( ; i < len; i++ ) {
-
-				// Skip accessing in sparse arrays
-				if ( i in arr && arr[ i ] === elem ) {
-					return i;
-				}
-			}
-		}
-
-		return -1;
-	},
-
-	merge: function( first, second ) {
-		var len = +second.length,
-			j = 0,
-			i = first.length;
-
-		while ( j < len ) {
-			first[ i++ ] = second[ j++ ];
-		}
-
-		// Support: IE<9
-		// Workaround casting of .length to NaN on otherwise arraylike objects (e.g., NodeLists)
-		if ( len !== len ) {
-			while ( second[ j ] !== undefined ) {
-				first[ i++ ] = second[ j++ ];
-			}
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, invert ) {
-		var callbackInverse,
-			matches = [],
-			i = 0,
-			length = elems.length,
-			callbackExpect = !invert;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( ; i < length; i++ ) {
-			callbackInverse = !callback( elems[ i ], i );
-			if ( callbackInverse !== callbackExpect ) {
-				matches.push( elems[ i ] );
-			}
-		}
-
-		return matches;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var length, value,
-			i = 0,
-			ret = [];
-
-		// Go through the array, translating each of the items to their new values
-		if ( isArrayLike( elems ) ) {
-			length = elems.length;
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret.push( value );
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( i in elems ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret.push( value );
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		var args, proxy, tmp;
-
-		if ( typeof context === "string" ) {
-			tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		args = slice.call( arguments, 2 );
-		proxy = function() {
-			return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
-		};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	now: function() {
-		return +( new Date() );
-	},
-
-	// jQuery.support is not used in Core but other projects attach their
-	// properties to it so it needs to exist.
-	support: support
-} );
-
-// JSHint would error on this code due to the Symbol not being defined in ES5.
-// Defining this global in .jshintrc would create a danger of using the global
-// unguarded in another place, it seems safer to just disable JSHint for these
-// three lines.
-/* jshint ignore: start */
-if ( typeof Symbol === "function" ) {
-	jQuery.fn[ Symbol.iterator ] = deletedIds[ Symbol.iterator ];
-}
-/* jshint ignore: end */
-
-// Populate the class2type map
-jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
-function( i, name ) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-} );
-
-function isArrayLike( obj ) {
-
-	// Support: iOS 8.2 (not reproducible in simulator)
-	// `in` check used to prevent JIT error (gh-2145)
-	// hasOwn isn't used here due to false negatives
-	// regarding Nodelist length in IE
-	var length = !!obj && "length" in obj && obj.length,
-		type = jQuery.type( obj );
-
-	if ( type === "function" || jQuery.isWindow( obj ) ) {
-		return false;
-	}
-
-	return type === "array" || length === 0 ||
-		typeof length === "number" && length > 0 && ( length - 1 ) in obj;
-}
-var Sizzle =
-/*!
- * Sizzle CSS Selector Engine v2.2.1
- * http://sizzlejs.com/
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2015-10-17
- */
-(function( window ) {
-
-var i,
-	support,
-	Expr,
-	getText,
-	isXML,
-	tokenize,
-	compile,
-	select,
-	outermostContext,
-	sortInput,
-	hasDuplicate,
-
-	// Local document vars
-	setDocument,
-	document,
-	docElem,
-	documentIsHTML,
-	rbuggyQSA,
-	rbuggyMatches,
-	matches,
-	contains,
-
-	// Instance-specific data
-	expando = "sizzle" + 1 * new Date(),
-	preferredDoc = window.document,
-	dirruns = 0,
-	done = 0,
-	classCache = createCache(),
-	tokenCache = createCache(),
-	compilerCache = createCache(),
-	sortOrder = function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-		}
-		return 0;
-	},
-
-	// General-purpose constants
-	MAX_NEGATIVE = 1 << 31,
-
-	// Instance methods
-	hasOwn = ({}).hasOwnProperty,
-	arr = [],
-	pop = arr.pop,
-	push_native = arr.push,
-	push = arr.push,
-	slice = arr.slice,
-	// Use a stripped-down indexOf as it's faster than native
-	// http://jsperf.com/thor-indexof-vs-for/5
-	indexOf = function( list, elem ) {
-		var i = 0,
-			len = list.length;
-		for ( ; i < len; i++ ) {
-			if ( list[i] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
-
-	// Regular expressions
-
-	// http://www.w3.org/TR/css3-selectors/#whitespace
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-
-	// http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
-
-	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
-	attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace +
-		// Operator (capture 2)
-		"*([*^$|!~]?=)" + whitespace +
-		// "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
-		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
-		"*\\]",
-
-	pseudos = ":(" + identifier + ")(?:\\((" +
-		// To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
-		// 1. quoted (capture 3; capture 4 or capture 5)
-		"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
-		// 2. simple (capture 6)
-		"((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
-		// 3. anything else (capture 2)
-		".*" +
-		")\\)|)",
-
-	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-	rwhitespace = new RegExp( whitespace + "+", "g" ),
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
-
-	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
-
-	rpseudo = new RegExp( pseudos ),
-	ridentifier = new RegExp( "^" + identifier + "$" ),
-
-	matchExpr = {
-		"ID": new RegExp( "^#(" + identifier + ")" ),
-		"CLASS": new RegExp( "^\\.(" + identifier + ")" ),
-		"TAG": new RegExp( "^(" + identifier + "|[*])" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
-		// For use in libraries implementing .is()
-		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
-	},
-
-	rinputs = /^(?:input|select|textarea|button)$/i,
-	rheader = /^h\d$/i,
-
-	rnative = /^[^{]+\{\s*\[native \w/,
-
-	// Easily-parseable/retrievable ID or TAG or CLASS selectors
-	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
-	rsibling = /[+~]/,
-	rescape = /'|\\/g,
-
-	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
-	funescape = function( _, escaped, escapedWhitespace ) {
-		var high = "0x" + escaped - 0x10000;
-		// NaN means non-codepoint
-		// Support: Firefox<24
-		// Workaround erroneous numeric interpretation of +"0x"
-		return high !== high || escapedWhitespace ?
-			escaped :
-			high < 0 ?
-				// BMP codepoint
-				String.fromCharCode( high + 0x10000 ) :
-				// Supplemental Plane codepoint (surrogate pair)
-				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
-	},
-
-	// Used for iframes
-	// See setDocument()
-	// Removing the function wrapper causes a "Permission Denied"
-	// error in IE
-	unloadHandler = function() {
-		setDocument();
-	};
-
-// Optimize for push.apply( _, NodeList )
-try {
-	push.apply(
-		(arr = slice.call( preferredDoc.childNodes )),
-		preferredDoc.childNodes
-	);
-	// Support: Android<4.0
-	// Detect silently failing push.apply
-	arr[ preferredDoc.childNodes.length ].nodeType;
-} catch ( e ) {
-	push = { apply: arr.length ?
-
-		// Leverage slice if possible
-		function( target, els ) {
-			push_native.apply( target, slice.call(els) );
-		} :
-
-		// Support: IE<9
-		// Otherwise append directly
-		function( target, els ) {
-			var j = target.length,
-				i = 0;
-			// Can't trust NodeList.length
-			while ( (target[j++] = els[i++]) ) {}
-			target.length = j - 1;
-		}
-	};
-}
-
-function Sizzle( selector, context, results, seed ) {
-	var m, i, elem, nid, nidselect, match, groups, newSelector,
-		newContext = context && context.ownerDocument,
-
-		// nodeType defaults to 9, since context defaults to document
-		nodeType = context ? context.nodeType : 9;
-
-	results = results || [];
-
-	// Return early from calls with invalid selector or context
-	if ( typeof selector !== "string" || !selector ||
-		nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) {
-
-		return results;
-	}
-
-	// Try to shortcut find operations (as opposed to filters) in HTML documents
-	if ( !seed ) {
-
-		if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-			setDocument( context );
-		}
-		context = context || document;
-
-		if ( documentIsHTML ) {
-
-			// If the selector is sufficiently simple, try using a "get*By*" DOM method
-			// (excepting DocumentFragment context, where the methods don't exist)
-			if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) {
-
-				// ID selector
-				if ( (m = match[1]) ) {
-
-					// Document context
-					if ( nodeType === 9 ) {
-						if ( (elem = context.getElementById( m )) ) {
-
-							// Support: IE, Opera, Webkit
-							// TODO: identify versions
-							// getElementById can match elements by name instead of ID
-							if ( elem.id === m ) {
-								results.push( elem );
-								return results;
-							}
-						} else {
-							return results;
-						}
-
-					// Element context
-					} else {
-
-						// Support: IE, Opera, Webkit
-						// TODO: identify versions
-						// getElementById can match elements by name instead of ID
-						if ( newContext && (elem = newContext.getElementById( m )) &&
-							contains( context, elem ) &&
-							elem.id === m ) {
-
-							results.push( elem );
-							return results;
-						}
-					}
-
-				// Type selector
-				} else if ( match[2] ) {
-					push.apply( results, context.getElementsByTagName( selector ) );
-					return results;
-
-				// Class selector
-				} else if ( (m = match[3]) && support.getElementsByClassName &&
-					context.getElementsByClassName ) {
-
-					push.apply( results, context.getElementsByClassName( m ) );
-					return results;
-				}
-			}
-
-			// Take advantage of querySelectorAll
-			if ( support.qsa &&
-				!compilerCache[ selector + " " ] &&
-				(!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
-
-				if ( nodeType !== 1 ) {
-					newContext = context;
-					newSelector = selector;
-
-				// qSA looks outside Element context, which is not what we want
-				// Thanks to Andrew Dupont for this workaround technique
-				// Support: IE <=8
-				// Exclude object elements
-				} else if ( context.nodeName.toLowerCase() !== "object" ) {
-
-					// Capture the context ID, setting it first if necessary
-					if ( (nid = context.getAttribute( "id" )) ) {
-						nid = nid.replace( rescape, "\\$&" );
-					} else {
-						context.setAttribute( "id", (nid = expando) );
-					}
-
-					// Prefix every selector in the list
-					groups = tokenize( selector );
-					i = groups.length;
-					nidselect = ridentifier.test( nid ) ? "#" + nid : "[id='" + nid + "']";
-					while ( i-- ) {
-						groups[i] = nidselect + " " + toSelector( groups[i] );
-					}
-					newSelector = groups.join( "," );
-
-					// Expand context for sibling selectors
-					newContext = rsibling.test( selector ) && testContext( context.parentNode ) ||
-						context;
-				}
-
-				if ( newSelector ) {
-					try {
-						push.apply( results,
-							newContext.querySelectorAll( newSelector )
-						);
-						return results;
-					} catch ( qsaError ) {
-					} finally {
-						if ( nid === expando ) {
-							context.removeAttribute( "id" );
-						}
-					}
-				}
-			}
-		}
-	}
-
-	// All others
-	return select( selector.replace( rtrim, "$1" ), context, results, seed );
-}
-
-/**
- * Create key-value caches of limited size
- * @returns {function(string, object)} Returns the Object data after storing it on itself with
- *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- *	deleting the oldest entry
- */
-function createCache() {
-	var keys = [];
-
-	function cache( key, value ) {
-		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
-		if ( keys.push( key + " " ) > Expr.cacheLength ) {
-			// Only keep the most recent entries
-			delete cache[ keys.shift() ];
-		}
-		return (cache[ key + " " ] = value);
-	}
-	return cache;
-}
-
-/**
- * Mark a function for special use by Sizzle
- * @param {Function} fn The function to mark
- */
-function markFunction( fn ) {
-	fn[ expando ] = true;
-	return fn;
-}
-
-/**
- * Support testing using an element
- * @param {Function} fn Passed the created div and expects a boolean result
- */
-function assert( fn ) {
-	var div = document.createElement("div");
-
-	try {
-		return !!fn( div );
-	} catch (e) {
-		return false;
-	} finally {
-		// Remove from its parent by default
-		if ( div.parentNode ) {
-			div.parentNode.removeChild( div );
-		}
-		// release memory in IE
-		div = null;
-	}
-}
-
-/**
- * Adds the same handler for all of the specified attrs
- * @param {String} attrs Pipe-separated list of attributes
- * @param {Function} handler The method that will be applied
- */
-function addHandle( attrs, handler ) {
-	var arr = attrs.split("|"),
-		i = arr.length;
-
-	while ( i-- ) {
-		Expr.attrHandle[ arr[i] ] = handler;
-	}
-}
-
-/**
- * Checks document order of two siblings
- * @param {Element} a
- * @param {Element} b
- * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
- */
-function siblingCheck( a, b ) {
-	var cur = b && a,
-		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
-			( ~b.sourceIndex || MAX_NEGATIVE ) -
-			( ~a.sourceIndex || MAX_NEGATIVE );
-
-	// Use IE sourceIndex if available on both nodes
-	if ( diff ) {
-		return diff;
-	}
-
-	// Check if b follows a
-	if ( cur ) {
-		while ( (cur = cur.nextSibling) ) {
-			if ( cur === b ) {
-				return -1;
-			}
-		}
-	}
-
-	return a ? 1 : -1;
-}
-
-/**
- * Returns a function to use in pseudos for input types
- * @param {String} type
- */
-function createInputPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for buttons
- * @param {String} type
- */
-function createButtonPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for positionals
- * @param {Function} fn
- */
-function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
-		argument = +argument;
-		return markFunction(function( seed, matches ) {
-			var j,
-				matchIndexes = fn( [], seed.length, argument ),
-				i = matchIndexes.length;
-
-			// Match elements found at the specified indexes
-			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
-				}
-			}
-		});
-	});
-}
-
-/**
- * Checks a node for validity as a Sizzle context
- * @param {Element|Object=} context
- * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
- */
-function testContext( context ) {
-	return context && typeof context.getElementsByTagName !== "undefined" && context;
-}
-
-// Expose support vars for convenience
-support = Sizzle.support = {};
-
-/**
- * Detects XML nodes
- * @param {Element|Object} elem An element or a document
- * @returns {Boolean} True iff elem is a non-HTML XML node
- */
-isXML = Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833)
-	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-/**
- * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
- * @returns {Object} Returns the current document
- */
-setDocument = Sizzle.setDocument = function( node ) {
-	var hasCompare, parent,
-		doc = node ? node.ownerDocument || node : preferredDoc;
-
-	// Return early if doc is invalid or already selected
-	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
-		return document;
-	}
-
-	// Update global variables
-	document = doc;
-	docElem = document.documentElement;
-	documentIsHTML = !isXML( document );
-
-	// Support: IE 9-11, Edge
-	// Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936)
-	if ( (parent = document.defaultView) && parent.top !== parent ) {
-		// Support: IE 11
-		if ( parent.addEventListener ) {
-			parent.addEventListener( "unload", unloadHandler, false );
-
-		// Support: IE 9 - 10 only
-		} else if ( parent.attachEvent ) {
-			parent.attachEvent( "onunload", unloadHandler );
-		}
-	}
-
-	/* Attributes
-	---------------------------------------------------------------------- */
-
-	// Support: IE<8
-	// Verify that getAttribute really returns attributes and not properties
-	// (excepting IE8 booleans)
-	support.attributes = assert(function( div ) {
-		div.className = "i";
-		return !div.getAttribute("className");
-	});
-
-	/* getElement(s)By*
-	---------------------------------------------------------------------- */
-
-	// Check if getElementsByTagName("*") returns only elements
-	support.getElementsByTagName = assert(function( div ) {
-		div.appendChild( document.createComment("") );
-		return !div.getElementsByTagName("*").length;
-	});
-
-	// Support: IE<9
-	support.getElementsByClassName = rnative.test( document.getElementsByClassName );
-
-	// Support: IE<10
-	// Check if getElementById returns elements by name
-	// The broken getElementById methods don't pick up programatically-set names,
-	// so use a roundabout getElementsByName test
-	support.getById = assert(function( div ) {
-		docElem.appendChild( div ).id = expando;
-		return !document.getElementsByName || !document.getElementsByName( expando ).length;
-	});
-
-	// ID find and filter
-	if ( support.getById ) {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
-				var m = context.getElementById( id );
-				return m ? [ m ] : [];
-			}
-		};
-		Expr.filter["ID"] = function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				return elem.getAttribute("id") === attrId;
-			};
-		};
-	} else {
-		// Support: IE6/7
-		// getElementById is not reliable as a find shortcut
-		delete Expr.find["ID"];
-
-		Expr.filter["ID"] =  function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== "undefined" &&
-					elem.getAttributeNode("id");
-				return node && node.value === attrId;
-			};
-		};
-	}
-
-	// Tag
-	Expr.find["TAG"] = support.getElementsByTagName ?
-		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== "undefined" ) {
-				return context.getElementsByTagName( tag );
-
-			// DocumentFragment nodes don't have gEBTN
-			} else if ( support.qsa ) {
-				return context.querySelectorAll( tag );
-			}
-		} :
-
-		function( tag, context ) {
-			var elem,
-				tmp = [],
-				i = 0,
-				// By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
-				results = context.getElementsByTagName( tag );
-
-			// Filter out possible comments
-			if ( tag === "*" ) {
-				while ( (elem = results[i++]) ) {
-					if ( elem.nodeType === 1 ) {
-						tmp.push( elem );
-					}
-				}
-
-				return tmp;
-			}
-			return results;
-		};
-
-	// Class
-	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
-		if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) {
-			return context.getElementsByClassName( className );
-		}
-	};
-
-	/* QSA/matchesSelector
-	---------------------------------------------------------------------- */
-
-	// QSA and matchesSelector support
-
-	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-	rbuggyMatches = [];
-
-	// qSa(:focus) reports false when true (Chrome 21)
-	// We allow this because of a bug in IE8/9 that throws an error
-	// whenever `document.activeElement` is accessed on an iframe
-	// So, we allow :focus to pass through QSA all the time to avoid the IE error
-	// See http://bugs.jquery.com/ticket/13378
-	rbuggyQSA = [];
-
-	if ( (support.qsa = rnative.test( document.querySelectorAll )) ) {
-		// Build QSA regex
-		// Regex strategy adopted from Diego Perini
-		assert(function( div ) {
-			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explicitly
-			// setting a boolean content attribute,
-			// since its presence should be enough
-			// http://bugs.jquery.com/ticket/12359
-			docElem.appendChild( div ).innerHTML = "" +
-				"";
-
-			// Support: IE8, Opera 11-12.16
-			// Nothing should be selected when empty strings follow ^= or $= or *=
-			// The test attribute must be unknown in Opera but "safe" for WinRT
-			// http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
-			if ( div.querySelectorAll("[msallowcapture^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
-			}
-
-			// Support: IE8
-			// Boolean attributes and "value" are not treated correctly
-			if ( !div.querySelectorAll("[selected]").length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
-			}
-
-			// Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+
-			if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
-				rbuggyQSA.push("~=");
-			}
-
-			// Webkit/Opera - :checked should return selected option elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
-			}
-
-			// Support: Safari 8+, iOS 8+
-			// https://bugs.webkit.org/show_bug.cgi?id=136851
-			// In-page `selector#id sibing-combinator selector` fails
-			if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) {
-				rbuggyQSA.push(".#.+[+~]");
-			}
-		});
-
-		assert(function( div ) {
-			// Support: Windows 8 Native Apps
-			// The type and name attributes are restricted during .innerHTML assignment
-			var input = document.createElement("input");
-			input.setAttribute( "type", "hidden" );
-			div.appendChild( input ).setAttribute( "name", "D" );
-
-			// Support: IE8
-			// Enforce case-sensitivity of name attribute
-			if ( div.querySelectorAll("[name=d]").length ) {
-				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
-			}
-
-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":enabled").length ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			// Opera 10-11 does not throw on post-comma invalid pseudos
-			div.querySelectorAll("*,:x");
-			rbuggyQSA.push(",.*:");
-		});
-	}
-
-	if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
-		docElem.webkitMatchesSelector ||
-		docElem.mozMatchesSelector ||
-		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector) )) ) {
-
-		assert(function( div ) {
-			// Check to see if it's possible to do matchesSelector
-			// on a disconnected node (IE 9)
-			support.disconnectedMatch = matches.call( div, "div" );
-
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( div, "[s!='']:x" );
-			rbuggyMatches.push( "!=", pseudos );
-		});
-	}
-
-	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
-	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
-
-	/* Contains
-	---------------------------------------------------------------------- */
-	hasCompare = rnative.test( docElem.compareDocumentPosition );
-
-	// Element contains another
-	// Purposefully self-exclusive
-	// As in, an element does not contain itself
-	contains = hasCompare || rnative.test( docElem.contains ) ?
-		function( a, b ) {
-			var adown = a.nodeType === 9 ? a.documentElement : a,
-				bup = b && b.parentNode;
-			return a === bup || !!( bup && bup.nodeType === 1 && (
-				adown.contains ?
-					adown.contains( bup ) :
-					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			));
-		} :
-		function( a, b ) {
-			if ( b ) {
-				while ( (b = b.parentNode) ) {
-					if ( b === a ) {
-						return true;
-					}
-				}
-			}
-			return false;
-		};
-
-	/* Sorting
-	---------------------------------------------------------------------- */
-
-	// Document order sorting
-	sortOrder = hasCompare ?
-	function( a, b ) {
-
-		// Flag for duplicate removal
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		// Sort on method existence if only one input has compareDocumentPosition
-		var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
-		if ( compare ) {
-			return compare;
-		}
-
-		// Calculate position if both inputs belong to the same document
-		compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
-			a.compareDocumentPosition( b ) :
-
-			// Otherwise we know they are disconnected
-			1;
-
-		// Disconnected nodes
-		if ( compare & 1 ||
-			(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
-
-			// Choose the first element that is related to our preferred document
-			if ( a === document || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
-				return -1;
-			}
-			if ( b === document || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
-				return 1;
-			}
-
-			// Maintain original order
-			return sortInput ?
-				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
-				0;
-		}
-
-		return compare & 4 ? -1 : 1;
-	} :
-	function( a, b ) {
-		// Exit early if the nodes are identical
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		var cur,
-			i = 0,
-			aup = a.parentNode,
-			bup = b.parentNode,
-			ap = [ a ],
-			bp = [ b ];
-
-		// Parentless nodes are either documents or disconnected
-		if ( !aup || !bup ) {
-			return a === document ? -1 :
-				b === document ? 1 :
-				aup ? -1 :
-				bup ? 1 :
-				sortInput ?
-				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
-				0;
-
-		// If the nodes are siblings, we can do a quick check
-		} else if ( aup === bup ) {
-			return siblingCheck( a, b );
-		}
-
-		// Otherwise we need full lists of their ancestors for comparison
-		cur = a;
-		while ( (cur = cur.parentNode) ) {
-			ap.unshift( cur );
-		}
-		cur = b;
-		while ( (cur = cur.parentNode) ) {
-			bp.unshift( cur );
-		}
-
-		// Walk down the tree looking for a discrepancy
-		while ( ap[i] === bp[i] ) {
-			i++;
-		}
-
-		return i ?
-			// Do a sibling check if the nodes have a common ancestor
-			siblingCheck( ap[i], bp[i] ) :
-
-			// Otherwise nodes in our document sort first
-			ap[i] === preferredDoc ? -1 :
-			bp[i] === preferredDoc ? 1 :
-			0;
-	};
-
-	return document;
-};
-
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	// Make sure that attribute selectors are quoted
-	expr = expr.replace( rattributeQuotes, "='$1']" );
-
-	if ( support.matchesSelector && documentIsHTML &&
-		!compilerCache[ expr + " " ] &&
-		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
-		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
-
-		try {
-			var ret = matches.call( elem, expr );
-
-			// IE 9's matchesSelector returns false on disconnected nodes
-			if ( ret || support.disconnectedMatch ||
-					// As well, disconnected nodes are said to be in a document
-					// fragment in IE 9
-					elem.document && elem.document.nodeType !== 11 ) {
-				return ret;
-			}
-		} catch (e) {}
-	}
-
-	return Sizzle( expr, document, null, [ elem ] ).length > 0;
-};
-
-Sizzle.contains = function( context, elem ) {
-	// Set document vars if needed
-	if ( ( context.ownerDocument || context ) !== document ) {
-		setDocument( context );
-	}
-	return contains( context, elem );
-};
-
-Sizzle.attr = function( elem, name ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	var fn = Expr.attrHandle[ name.toLowerCase() ],
-		// Don't get fooled by Object.prototype properties (jQuery #13807)
-		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
-			fn( elem, name, !documentIsHTML ) :
-			undefined;
-
-	return val !== undefined ?
-		val :
-		support.attributes || !documentIsHTML ?
-			elem.getAttribute( name ) :
-			(val = elem.getAttributeNode(name)) && val.specified ?
-				val.value :
-				null;
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-/**
- * Document sorting and removing duplicates
- * @param {ArrayLike} results
- */
-Sizzle.uniqueSort = function( results ) {
-	var elem,
-		duplicates = [],
-		j = 0,
-		i = 0;
-
-	// Unless we *know* we can detect duplicates, assume their presence
-	hasDuplicate = !support.detectDuplicates;
-	sortInput = !support.sortStable && results.slice( 0 );
-	results.sort( sortOrder );
-
-	if ( hasDuplicate ) {
-		while ( (elem = results[i++]) ) {
-			if ( elem === results[ i ] ) {
-				j = duplicates.push( i );
-			}
-		}
-		while ( j-- ) {
-			results.splice( duplicates[ j ], 1 );
-		}
-	}
-
-	// Clear input after sorting to release objects
-	// See https://github.com/jquery/sizzle/pull/225
-	sortInput = null;
-
-	return results;
-};
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( !nodeType ) {
-		// If no nodeType, this is expected to be an array
-		while ( (node = elem[i++]) ) {
-			// Do not traverse comment nodes
-			ret += getText( node );
-		}
-	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-		// Use textContent for elements
-		// innerText usage removed for consistency of new lines (jQuery #11153)
-		if ( typeof elem.textContent === "string" ) {
-			return elem.textContent;
-		} else {
-			// Traverse its children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				ret += getText( elem );
-			}
-		}
-	} else if ( nodeType === 3 || nodeType === 4 ) {
-		return elem.nodeValue;
-	}
-	// Do not include comment or processing instruction nodes
-
-	return ret;
-};
-
-Expr = Sizzle.selectors = {
-
-	// Can be adjusted by the user
-	cacheLength: 50,
-
-	createPseudo: markFunction,
-
-	match: matchExpr,
-
-	attrHandle: {},
-
-	find: {},
-
-	relative: {
-		">": { dir: "parentNode", first: true },
-		" ": { dir: "parentNode" },
-		"+": { dir: "previousSibling", first: true },
-		"~": { dir: "previousSibling" }
-	},
-
-	preFilter: {
-		"ATTR": function( match ) {
-			match[1] = match[1].replace( runescape, funescape );
-
-			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
-
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
-			}
-
-			return match.slice( 0, 4 );
-		},
-
-		"CHILD": function( match ) {
-			/* matches from matchExpr["CHILD"]
-				1 type (only|nth|...)
-				2 what (child|of-type)
-				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-				4 xn-component of xn+y argument ([+-]?\d*n|)
-				5 sign of xn-component
-				6 x of xn-component
-				7 sign of y-component
-				8 y of y-component
-			*/
-			match[1] = match[1].toLowerCase();
-
-			if ( match[1].slice( 0, 3 ) === "nth" ) {
-				// nth-* requires argument
-				if ( !match[3] ) {
-					Sizzle.error( match[0] );
-				}
-
-				// numeric x and y parameters for Expr.filter.CHILD
-				// remember that false/true cast respectively to 0/1
-				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
-
-			// other types prohibit arguments
-			} else if ( match[3] ) {
-				Sizzle.error( match[0] );
-			}
-
-			return match;
-		},
-
-		"PSEUDO": function( match ) {
-			var excess,
-				unquoted = !match[6] && match[2];
-
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
-				return null;
-			}
-
-			// Accept quoted arguments as-is
-			if ( match[3] ) {
-				match[2] = match[4] || match[5] || "";
-
-			// Strip excess characters from unquoted arguments
-			} else if ( unquoted && rpseudo.test( unquoted ) &&
-				// Get excess from tokenize (recursively)
-				(excess = tokenize( unquoted, true )) &&
-				// advance to the next closing parenthesis
-				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
-				// excess is a negative index
-				match[0] = match[0].slice( 0, excess );
-				match[2] = unquoted.slice( 0, excess );
-			}
-
-			// Return only captures needed by the pseudo filter method (type and argument)
-			return match.slice( 0, 3 );
-		}
-	},
-
-	filter: {
-
-		"TAG": function( nodeNameSelector ) {
-			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
-			return nodeNameSelector === "*" ?
-				function() { return true; } :
-				function( elem ) {
-					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-				};
-		},
-
-		"CLASS": function( className ) {
-			var pattern = classCache[ className + " " ];
-
-			return pattern ||
-				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-				classCache( className, function( elem ) {
-					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
-				});
-		},
-
-		"ATTR": function( name, operator, check ) {
-			return function( elem ) {
-				var result = Sizzle.attr( elem, name );
-
-				if ( result == null ) {
-					return operator === "!=";
-				}
-				if ( !operator ) {
-					return true;
-				}
-
-				result += "";
-
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
-					false;
-			};
-		},
-
-		"CHILD": function( type, what, argument, first, last ) {
-			var simple = type.slice( 0, 3 ) !== "nth",
-				forward = type.slice( -4 ) !== "last",
-				ofType = what === "of-type";
-
-			return first === 1 && last === 0 ?
-
-				// Shortcut for :nth-*(n)
-				function( elem ) {
-					return !!elem.parentNode;
-				} :
-
-				function( elem, context, xml ) {
-					var cache, uniqueCache, outerCache, node, nodeIndex, start,
-						dir = simple !== forward ? "nextSibling" : "previousSibling",
-						parent = elem.parentNode,
-						name = ofType && elem.nodeName.toLowerCase(),
-						useCache = !xml && !ofType,
-						diff = false;
-
-					if ( parent ) {
-
-						// :(first|last|only)-(child|of-type)
-						if ( simple ) {
-							while ( dir ) {
-								node = elem;
-								while ( (node = node[ dir ]) ) {
-									if ( ofType ?
-										node.nodeName.toLowerCase() === name :
-										node.nodeType === 1 ) {
-
-										return false;
-									}
-								}
-								// Reverse direction for :only-* (if we haven't yet done so)
-								start = dir = type === "only" && !start && "nextSibling";
-							}
-							return true;
-						}
-
-						start = [ forward ? parent.firstChild : parent.lastChild ];
-
-						// non-xml :nth-child(...) stores cache data on `parent`
-						if ( forward && useCache ) {
-
-							// Seek `elem` from a previously-cached index
-
-							// ...in a gzip-friendly way
-							node = parent;
-							outerCache = node[ expando ] || (node[ expando ] = {});
-
-							// Support: IE <9 only
-							// Defend against cloned attroperties (jQuery gh-1709)
-							uniqueCache = outerCache[ node.uniqueID ] ||
-								(outerCache[ node.uniqueID ] = {});
-
-							cache = uniqueCache[ type ] || [];
-							nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
-							diff = nodeIndex && cache[ 2 ];
-							node = nodeIndex && parent.childNodes[ nodeIndex ];
-
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-
-								// Fallback to seeking `elem` from the start
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								// When found, cache indexes on `parent` and break
-								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									uniqueCache[ type ] = [ dirruns, nodeIndex, diff ];
-									break;
-								}
-							}
-
-						} else {
-							// Use previously-cached element index if available
-							if ( useCache ) {
-								// ...in a gzip-friendly way
-								node = elem;
-								outerCache = node[ expando ] || (node[ expando ] = {});
-
-								// Support: IE <9 only
-								// Defend against cloned attroperties (jQuery gh-1709)
-								uniqueCache = outerCache[ node.uniqueID ] ||
-									(outerCache[ node.uniqueID ] = {});
-
-								cache = uniqueCache[ type ] || [];
-								nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
-								diff = nodeIndex;
-							}
-
-							// xml :nth-child(...)
-							// or :nth-last-child(...) or :nth(-last)?-of-type(...)
-							if ( diff === false ) {
-								// Use the same loop as above to seek `elem` from the start
-								while ( (node = ++nodeIndex && node && node[ dir ] ||
-									(diff = nodeIndex = 0) || start.pop()) ) {
-
-									if ( ( ofType ?
-										node.nodeName.toLowerCase() === name :
-										node.nodeType === 1 ) &&
-										++diff ) {
-
-										// Cache the index of each encountered element
-										if ( useCache ) {
-											outerCache = node[ expando ] || (node[ expando ] = {});
-
-											// Support: IE <9 only
-											// Defend against cloned attroperties (jQuery gh-1709)
-											uniqueCache = outerCache[ node.uniqueID ] ||
-												(outerCache[ node.uniqueID ] = {});
-
-											uniqueCache[ type ] = [ dirruns, diff ];
-										}
-
-										if ( node === elem ) {
-											break;
-										}
-									}
-								}
-							}
-						}
-
-						// Incorporate the offset, then check against cycle size
-						diff -= last;
-						return diff === first || ( diff % first === 0 && diff / first >= 0 );
-					}
-				};
-		},
-
-		"PSEUDO": function( pseudo, argument ) {
-			// pseudo-class names are case-insensitive
-			// http://www.w3.org/TR/selectors/#pseudo-classes
-			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-			// Remember that setFilters inherits from pseudos
-			var args,
-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
-
-			// The user may use createPseudo to indicate that
-			// arguments are needed to create the filter function
-			// just as Sizzle does
-			if ( fn[ expando ] ) {
-				return fn( argument );
-			}
-
-			// But maintain support for old signatures
-			if ( fn.length > 1 ) {
-				args = [ pseudo, pseudo, "", argument ];
-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
-						var idx,
-							matched = fn( seed, argument ),
-							i = matched.length;
-						while ( i-- ) {
-							idx = indexOf( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
-						}
-					}) :
-					function( elem ) {
-						return fn( elem, 0, args );
-					};
-			}
-
-			return fn;
-		}
-	},
-
-	pseudos: {
-		// Potentially complex pseudos
-		"not": markFunction(function( selector ) {
-			// Trim the selector passed to compile
-			// to avoid treating leading and trailing
-			// spaces as combinators
-			var input = [],
-				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
-
-			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
-					var elem,
-						unmatched = matcher( seed, null, xml, [] ),
-						i = seed.length;
-
-					// Match elements unmatched by `matcher`
-					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
-						}
-					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
-					matcher( input, null, xml, results );
-					// Don't keep the element (issue #299)
-					input[0] = null;
-					return !results.pop();
-				};
-		}),
-
-		"has": markFunction(function( selector ) {
-			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
-			};
-		}),
-
-		"contains": markFunction(function( text ) {
-			text = text.replace( runescape, funescape );
-			return function( elem ) {
-				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-			};
-		}),
-
-		// "Whether an element is represented by a :lang() selector
-		// is based solely on the element's language value
-		// being equal to the identifier C,
-		// or beginning with the identifier C immediately followed by "-".
-		// The matching of C against the element's language value is performed case-insensitively.
-		// The identifier C does not have to be a valid language name."
-		// http://www.w3.org/TR/selectors/#lang-pseudo
-		"lang": markFunction( function( lang ) {
-			// lang value must be a valid identifier
-			if ( !ridentifier.test(lang || "") ) {
-				Sizzle.error( "unsupported lang: " + lang );
-			}
-			lang = lang.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				var elemLang;
-				do {
-					if ( (elemLang = documentIsHTML ?
-						elem.lang :
-						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
-
-						elemLang = elemLang.toLowerCase();
-						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
-					}
-				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
-				return false;
-			};
-		}),
-
-		// Miscellaneous
-		"target": function( elem ) {
-			var hash = window.location && window.location.hash;
-			return hash && hash.slice( 1 ) === elem.id;
-		},
-
-		"root": function( elem ) {
-			return elem === docElem;
-		},
-
-		"focus": function( elem ) {
-			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
-		},
-
-		// Boolean properties
-		"enabled": function( elem ) {
-			return elem.disabled === false;
-		},
-
-		"disabled": function( elem ) {
-			return elem.disabled === true;
-		},
-
-		"checked": function( elem ) {
-			// In CSS3, :checked should return both checked and selected elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-		},
-
-		"selected": function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-
-			return elem.selected === true;
-		},
-
-		// Contents
-		"empty": function( elem ) {
-			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
-			//   but not by others (comment: 8; processing instruction: 7; etc.)
-			// nodeType < 6 works because attributes (2) do not appear as children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				if ( elem.nodeType < 6 ) {
-					return false;
-				}
-			}
-			return true;
-		},
-
-		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
-		},
-
-		// Element/input types
-		"header": function( elem ) {
-			return rheader.test( elem.nodeName );
-		},
-
-		"input": function( elem ) {
-			return rinputs.test( elem.nodeName );
-		},
-
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
-		},
-
-		"text": function( elem ) {
-			var attr;
-			return elem.nodeName.toLowerCase() === "input" &&
-				elem.type === "text" &&
-
-				// Support: IE<8
-				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
-		},
-
-		// Position-in-collection
-		"first": createPositionalPseudo(function() {
-			return [ 0 ];
-		}),
-
-		"last": createPositionalPseudo(function( matchIndexes, length ) {
-			return [ length - 1 ];
-		}),
-
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ argument < 0 ? argument + length : argument ];
-		}),
-
-		"even": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 0;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"odd": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 1;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; --i >= 0; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; ++i < length; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		})
-	}
-};
-
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Add button/input type pseudos
-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
-	Expr.pseudos[ i ] = createInputPseudo( i );
-}
-for ( i in { submit: true, reset: true } ) {
-	Expr.pseudos[ i ] = createButtonPseudo( i );
-}
-
-// Easy API for creating new setFilters
-function setFilters() {}
-setFilters.prototype = Expr.filters = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
-	var matched, match, tokens, type,
-		soFar, groups, preFilters,
-		cached = tokenCache[ selector + " " ];
-
-	if ( cached ) {
-		return parseOnly ? 0 : cached.slice( 0 );
-	}
-
-	soFar = selector;
-	groups = [];
-	preFilters = Expr.preFilter;
-
-	while ( soFar ) {
-
-		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
-			if ( match ) {
-				// Don't consume trailing commas as valid
-				soFar = soFar.slice( match[0].length ) || soFar;
-			}
-			groups.push( (tokens = []) );
-		}
-
-		matched = false;
-
-		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
-			matched = match.shift();
-			tokens.push({
-				value: matched,
-				// Cast descendant combinators to space
-				type: match[0].replace( rtrim, " " )
-			});
-			soFar = soFar.slice( matched.length );
-		}
-
-		// Filters
-		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				(match = preFilters[ type ]( match ))) ) {
-				matched = match.shift();
-				tokens.push({
-					value: matched,
-					type: type,
-					matches: match
-				});
-				soFar = soFar.slice( matched.length );
-			}
-		}
-
-		if ( !matched ) {
-			break;
-		}
-	}
-
-	// Return the length of the invalid excess
-	// if we're just parsing
-	// Otherwise, throw an error or return tokens
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
-			// Cache the tokens
-			tokenCache( selector, groups ).slice( 0 );
-};
-
-function toSelector( tokens ) {
-	var i = 0,
-		len = tokens.length,
-		selector = "";
-	for ( ; i < len; i++ ) {
-		selector += tokens[i].value;
-	}
-	return selector;
-}
-
-function addCombinator( matcher, combinator, base ) {
-	var dir = combinator.dir,
-		checkNonElements = base && dir === "parentNode",
-		doneName = done++;
-
-	return combinator.first ?
-		// Check against closest ancestor/preceding element
-		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
-				if ( elem.nodeType === 1 || checkNonElements ) {
-					return matcher( elem, context, xml );
-				}
-			}
-		} :
-
-		// Check against all ancestor/preceding elements
-		function( elem, context, xml ) {
-			var oldCache, uniqueCache, outerCache,
-				newCache = [ dirruns, doneName ];
-
-			// We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching
-			if ( xml ) {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						if ( matcher( elem, context, xml ) ) {
-							return true;
-						}
-					}
-				}
-			} else {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || (elem[ expando ] = {});
-
-						// Support: IE <9 only
-						// Defend against cloned attroperties (jQuery gh-1709)
-						uniqueCache = outerCache[ elem.uniqueID ] || (outerCache[ elem.uniqueID ] = {});
-
-						if ( (oldCache = uniqueCache[ dir ]) &&
-							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
-
-							// Assign to newCache so results back-propagate to previous elements
-							return (newCache[ 2 ] = oldCache[ 2 ]);
-						} else {
-							// Reuse newcache so results back-propagate to previous elements
-							uniqueCache[ dir ] = newCache;
-
-							// A match means we're done; a fail means we have to keep checking
-							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-		};
-}
-
-function elementMatcher( matchers ) {
-	return matchers.length > 1 ?
-		function( elem, context, xml ) {
-			var i = matchers.length;
-			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
-					return false;
-				}
-			}
-			return true;
-		} :
-		matchers[0];
-}
-
-function multipleContexts( selector, contexts, results ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
-	}
-	return results;
-}
-
-function condense( unmatched, map, filter, context, xml ) {
-	var elem,
-		newUnmatched = [],
-		i = 0,
-		len = unmatched.length,
-		mapped = map != null;
-
-	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
-			if ( !filter || filter( elem, context, xml ) ) {
-				newUnmatched.push( elem );
-				if ( mapped ) {
-					map.push( i );
-				}
-			}
-		}
-	}
-
-	return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-	if ( postFilter && !postFilter[ expando ] ) {
-		postFilter = setMatcher( postFilter );
-	}
-	if ( postFinder && !postFinder[ expando ] ) {
-		postFinder = setMatcher( postFinder, postSelector );
-	}
-	return markFunction(function( seed, results, context, xml ) {
-		var temp, i, elem,
-			preMap = [],
-			postMap = [],
-			preexisting = results.length,
-
-			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
-
-			// Prefilter to get matcher input, preserving a map for seed-results synchronization
-			matcherIn = preFilter && ( seed || !selector ) ?
-				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
-
-			matcherOut = matcher ?
-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-					// ...intermediate processing is necessary
-					[] :
-
-					// ...otherwise use results directly
-					results :
-				matcherIn;
-
-		// Find primary matches
-		if ( matcher ) {
-			matcher( matcherIn, matcherOut, context, xml );
-		}
-
-		// Apply postFilter
-		if ( postFilter ) {
-			temp = condense( matcherOut, postMap );
-			postFilter( temp, [], context, xml );
-
-			// Un-match failing elements by moving them back to matcherIn
-			i = temp.length;
-			while ( i-- ) {
-				if ( (elem = temp[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
-				}
-			}
-		}
-
-		if ( seed ) {
-			if ( postFinder || preFilter ) {
-				if ( postFinder ) {
-					// Get the final matcherOut by condensing this intermediate into postFinder contexts
-					temp = [];
-					i = matcherOut.length;
-					while ( i-- ) {
-						if ( (elem = matcherOut[i]) ) {
-							// Restore matcherIn since elem is not yet a final match
-							temp.push( (matcherIn[i] = elem) );
-						}
-					}
-					postFinder( null, (matcherOut = []), temp, xml );
-				}
-
-				// Move matched elements from seed to results to keep them synchronized
-				i = matcherOut.length;
-				while ( i-- ) {
-					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
-
-						seed[temp] = !(results[temp] = elem);
-					}
-				}
-			}
-
-		// Add elements to results, through postFinder if defined
-		} else {
-			matcherOut = condense(
-				matcherOut === results ?
-					matcherOut.splice( preexisting, matcherOut.length ) :
-					matcherOut
-			);
-			if ( postFinder ) {
-				postFinder( null, results, matcherOut, xml );
-			} else {
-				push.apply( results, matcherOut );
-			}
-		}
-	});
-}
-
-function matcherFromTokens( tokens ) {
-	var checkContext, matcher, j,
-		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
-		i = leadingRelative ? 1 : 0,
-
-		// The foundational matcher ensures that elements are reachable from top-level context(s)
-		matchContext = addCombinator( function( elem ) {
-			return elem === checkContext;
-		}, implicitRelative, true ),
-		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf( checkContext, elem ) > -1;
-		}, implicitRelative, true ),
-		matchers = [ function( elem, context, xml ) {
-			var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
-					matchContext( elem, context, xml ) :
-					matchAnyContext( elem, context, xml ) );
-			// Avoid hanging onto element (issue #299)
-			checkContext = null;
-			return ret;
-		} ];
-
-	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
-		} else {
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-			// Return special upon seeing a positional matcher
-			if ( matcher[ expando ] ) {
-				// Find the next relative operator (if any) for proper handling
-				j = ++i;
-				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
-						break;
-					}
-				}
-				return setMatcher(
-					i > 1 && elementMatcher( matchers ),
-					i > 1 && toSelector(
-						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
-						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
-					).replace( rtrim, "$1" ),
-					matcher,
-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-					j < len && toSelector( tokens )
-				);
-			}
-			matchers.push( matcher );
-		}
-	}
-
-	return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	var bySet = setMatchers.length > 0,
-		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, outermost ) {
-			var elem, j, matcher,
-				matchedCount = 0,
-				i = "0",
-				unmatched = seed && [],
-				setMatched = [],
-				contextBackup = outermostContext,
-				// We must always have either seed elements or outermost context
-				elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
-				// Use integer dirruns iff this is the outermost matcher
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
-				len = elems.length;
-
-			if ( outermost ) {
-				outermostContext = context === document || context || outermost;
-			}
-
-			// Add elements passing elementMatchers directly to results
-			// Support: IE<9, Safari
-			// Tolerate NodeList properties (IE: "length"; Safari: ) matching elements by id
-			for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
-				if ( byElement && elem ) {
-					j = 0;
-					if ( !context && elem.ownerDocument !== document ) {
-						setDocument( elem );
-						xml = !documentIsHTML;
-					}
-					while ( (matcher = elementMatchers[j++]) ) {
-						if ( matcher( elem, context || document, xml) ) {
-							results.push( elem );
-							break;
-						}
-					}
-					if ( outermost ) {
-						dirruns = dirrunsUnique;
-					}
-				}
-
-				// Track unmatched elements for set filters
-				if ( bySet ) {
-					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
-						matchedCount--;
-					}
-
-					// Lengthen the array for every element, matched or not
-					if ( seed ) {
-						unmatched.push( elem );
-					}
-				}
-			}
-
-			// `i` is now the count of elements visited above, and adding it to `matchedCount`
-			// makes the latter nonnegative.
-			matchedCount += i;
-
-			// Apply set filters to unmatched elements
-			// NOTE: This can be skipped if there are no unmatched elements (i.e., `matchedCount`
-			// equals `i`), unless we didn't visit _any_ elements in the above loop because we have
-			// no element matchers and no seed.
-			// Incrementing an initially-string "0" `i` allows `i` to remain a string only in that
-			// case, which will result in a "00" `matchedCount` that differs from `i` but is also
-			// numerically zero.
-			if ( bySet && i !== matchedCount ) {
-				j = 0;
-				while ( (matcher = setMatchers[j++]) ) {
-					matcher( unmatched, setMatched, context, xml );
-				}
-
-				if ( seed ) {
-					// Reintegrate element matches to eliminate the need for sorting
-					if ( matchedCount > 0 ) {
-						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
-							}
-						}
-					}
-
-					// Discard index placeholder values to get only actual matches
-					setMatched = condense( setMatched );
-				}
-
-				// Add matches to results
-				push.apply( results, setMatched );
-
-				// Seedless set matches succeeding multiple successful matchers stipulate sorting
-				if ( outermost && !seed && setMatched.length > 0 &&
-					( matchedCount + setMatchers.length ) > 1 ) {
-
-					Sizzle.uniqueSort( results );
-				}
-			}
-
-			// Override manipulation of globals by nested matchers
-			if ( outermost ) {
-				dirruns = dirrunsUnique;
-				outermostContext = contextBackup;
-			}
-
-			return unmatched;
-		};
-
-	return bySet ?
-		markFunction( superMatcher ) :
-		superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
-	var i,
-		setMatchers = [],
-		elementMatchers = [],
-		cached = compilerCache[ selector + " " ];
-
-	if ( !cached ) {
-		// Generate a function of recursive functions that can be used to check each element
-		if ( !match ) {
-			match = tokenize( selector );
-		}
-		i = match.length;
-		while ( i-- ) {
-			cached = matcherFromTokens( match[i] );
-			if ( cached[ expando ] ) {
-				setMatchers.push( cached );
-			} else {
-				elementMatchers.push( cached );
-			}
-		}
-
-		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-
-		// Save selector and tokenization
-		cached.selector = selector;
-	}
-	return cached;
-};
-
-/**
- * A low-level selection function that works with Sizzle's compiled
- *  selector functions
- * @param {String|Function} selector A selector or a pre-compiled
- *  selector function built with Sizzle.compile
- * @param {Element} context
- * @param {Array} [results]
- * @param {Array} [seed] A set of elements to match against
- */
-select = Sizzle.select = function( selector, context, results, seed ) {
-	var i, tokens, token, type, find,
-		compiled = typeof selector === "function" && selector,
-		match = !seed && tokenize( (selector = compiled.selector || selector) );
-
-	results = results || [];
-
-	// Try to minimize operations if there is only one selector in the list and no seed
-	// (the latter of which guarantees us context)
-	if ( match.length === 1 ) {
-
-		// Reduce context if the leading compound selector is an ID
-		tokens = match[0] = match[0].slice( 0 );
-		if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-				support.getById && context.nodeType === 9 && documentIsHTML &&
-				Expr.relative[ tokens[1].type ] ) {
-
-			context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
-			if ( !context ) {
-				return results;
-
-			// Precompiled matchers will still verify ancestry, so step up a level
-			} else if ( compiled ) {
-				context = context.parentNode;
-			}
-
-			selector = selector.slice( tokens.shift().value.length );
-		}
-
-		// Fetch a seed set for right-to-left matching
-		i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
-		while ( i-- ) {
-			token = tokens[i];
-
-			// Abort if we hit a combinator
-			if ( Expr.relative[ (type = token.type) ] ) {
-				break;
-			}
-			if ( (find = Expr.find[ type ]) ) {
-				// Search, expanding context for leading sibling combinators
-				if ( (seed = find(
-					token.matches[0].replace( runescape, funescape ),
-					rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
-				)) ) {
-
-					// If seed is empty or no tokens remain, we can return early
-					tokens.splice( i, 1 );
-					selector = seed.length && toSelector( tokens );
-					if ( !selector ) {
-						push.apply( results, seed );
-						return results;
-					}
-
-					break;
-				}
-			}
-		}
-	}
-
-	// Compile and execute a filtering function if one is not provided
-	// Provide `match` to avoid retokenization if we modified the selector above
-	( compiled || compile( selector, match ) )(
-		seed,
-		context,
-		!documentIsHTML,
-		results,
-		!context || rsibling.test( selector ) && testContext( context.parentNode ) || context
-	);
-	return results;
-};
-
-// One-time assignments
-
-// Sort stability
-support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
-
-// Support: Chrome 14-35+
-// Always assume duplicates if they aren't passed to the comparison function
-support.detectDuplicates = !!hasDuplicate;
-
-// Initialize against the default document
-setDocument();
-
-// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
-// Detached nodes confoundingly follow *each other*
-support.sortDetached = assert(function( div1 ) {
-	// Should return 1, but returns 4 (following)
-	return div1.compareDocumentPosition( document.createElement("div") ) & 1;
-});
-
-// Support: IE<8
-// Prevent attribute/property "interpolation"
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert(function( div ) {
-	div.innerHTML = "";
-	return div.firstChild.getAttribute("href") === "#" ;
-}) ) {
-	addHandle( "type|href|height|width", function( elem, name, isXML ) {
-		if ( !isXML ) {
-			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
-		}
-	});
-}
-
-// Support: IE<9
-// Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert(function( div ) {
-	div.innerHTML = "";
-	div.firstChild.setAttribute( "value", "" );
-	return div.firstChild.getAttribute( "value" ) === "";
-}) ) {
-	addHandle( "value", function( elem, name, isXML ) {
-		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
-			return elem.defaultValue;
-		}
-	});
-}
-
-// Support: IE<9
-// Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert(function( div ) {
-	return div.getAttribute("disabled") == null;
-}) ) {
-	addHandle( booleans, function( elem, name, isXML ) {
-		var val;
-		if ( !isXML ) {
-			return elem[ name ] === true ? name.toLowerCase() :
-					(val = elem.getAttributeNode( name )) && val.specified ?
-					val.value :
-				null;
-		}
-	});
-}
-
-return Sizzle;
-
-})( window );
-
-
-
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[ ":" ] = jQuery.expr.pseudos;
-jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-
-var dir = function( elem, dir, until ) {
-	var matched = [],
-		truncate = until !== undefined;
-
-	while ( ( elem = elem[ dir ] ) && elem.nodeType !== 9 ) {
-		if ( elem.nodeType === 1 ) {
-			if ( truncate && jQuery( elem ).is( until ) ) {
-				break;
-			}
-			matched.push( elem );
-		}
-	}
-	return matched;
-};
-
-
-var siblings = function( n, elem ) {
-	var matched = [];
-
-	for ( ; n; n = n.nextSibling ) {
-		if ( n.nodeType === 1 && n !== elem ) {
-			matched.push( n );
-		}
-	}
-
-	return matched;
-};
-
-
-var rneedsContext = jQuery.expr.match.needsContext;
-
-var rsingleTag = ( /^<([\w-]+)\s*\/?>(?:<\/\1>|)$/ );
-
-
-
-var risSimple = /^.[^:#\[\.,]*$/;
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, not ) {
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep( elements, function( elem, i ) {
-			/* jshint -W018 */
-			return !!qualifier.call( elem, i, elem ) !== not;
-		} );
-
-	}
-
-	if ( qualifier.nodeType ) {
-		return jQuery.grep( elements, function( elem ) {
-			return ( elem === qualifier ) !== not;
-		} );
-
-	}
-
-	if ( typeof qualifier === "string" ) {
-		if ( risSimple.test( qualifier ) ) {
-			return jQuery.filter( qualifier, elements, not );
-		}
-
-		qualifier = jQuery.filter( qualifier, elements );
-	}
-
-	return jQuery.grep( elements, function( elem ) {
-		return ( jQuery.inArray( elem, qualifier ) > -1 ) !== not;
-	} );
-}
-
-jQuery.filter = function( expr, elems, not ) {
-	var elem = elems[ 0 ];
-
-	if ( not ) {
-		expr = ":not(" + expr + ")";
-	}
-
-	return elems.length === 1 && elem.nodeType === 1 ?
-		jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
-		jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
-			return elem.nodeType === 1;
-		} ) );
-};
-
-jQuery.fn.extend( {
-	find: function( selector ) {
-		var i,
-			ret = [],
-			self = this,
-			len = self.length;
-
-		if ( typeof selector !== "string" ) {
-			return this.pushStack( jQuery( selector ).filter( function() {
-				for ( i = 0; i < len; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			} ) );
-		}
-
-		for ( i = 0; i < len; i++ ) {
-			jQuery.find( selector, self[ i ], ret );
-		}
-
-		// Needed because $( selector, context ) becomes $( context ).find( selector )
-		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
-		ret.selector = this.selector ? this.selector + " " + selector : selector;
-		return ret;
-	},
-	filter: function( selector ) {
-		return this.pushStack( winnow( this, selector || [], false ) );
-	},
-	not: function( selector ) {
-		return this.pushStack( winnow( this, selector || [], true ) );
-	},
-	is: function( selector ) {
-		return !!winnow(
-			this,
-
-			// If this is a positional/relative selector, check membership in the returned set
-			// so $("p:first").is("p:last") won't return true for a doc with two "p".
-			typeof selector === "string" && rneedsContext.test( selector ) ?
-				jQuery( selector ) :
-				selector || [],
-			false
-		).length;
-	}
-} );
-
-
-// Initialize a jQuery object
-
-
-// A central reference to the root jQuery(document)
-var rootjQuery,
-
-	// A simple way to check for HTML strings
-	// Prioritize #id over  to avoid XSS via location.hash (#9521)
-	// Strict HTML recognition (#11290: must start with <)
-	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
-
-	init = jQuery.fn.init = function( selector, context, root ) {
-		var match, elem;
-
-		// HANDLE: $(""), $(null), $(undefined), $(false)
-		if ( !selector ) {
-			return this;
-		}
-
-		// init accepts an alternate rootjQuery
-		// so migrate can support jQuery.sub (gh-2101)
-		root = root || rootjQuery;
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			if ( selector.charAt( 0 ) === "<" &&
-				selector.charAt( selector.length - 1 ) === ">" &&
-				selector.length >= 3 ) {
-
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = rquickExpr.exec( selector );
-			}
-
-			// Match html or make sure no context is specified for #id
-			if ( match && ( match[ 1 ] || !context ) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[ 1 ] ) {
-					context = context instanceof jQuery ? context[ 0 ] : context;
-
-					// scripts is true for back-compat
-					// Intentionally let the error be thrown if parseHTML is not present
-					jQuery.merge( this, jQuery.parseHTML(
-						match[ 1 ],
-						context && context.nodeType ? context.ownerDocument || context : document,
-						true
-					) );
-
-					// HANDLE: $(html, props)
-					if ( rsingleTag.test( match[ 1 ] ) && jQuery.isPlainObject( context ) ) {
-						for ( match in context ) {
-
-							// Properties of context are called as methods if possible
-							if ( jQuery.isFunction( this[ match ] ) ) {
-								this[ match ]( context[ match ] );
-
-							// ...and otherwise set as attributes
-							} else {
-								this.attr( match, context[ match ] );
-							}
-						}
-					}
-
-					return this;
-
-				// HANDLE: $(#id)
-				} else {
-					elem = document.getElementById( match[ 2 ] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[ 2 ] ) {
-							return rootjQuery.find( selector );
-						}
-
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[ 0 ] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || root ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(DOMElement)
-		} else if ( selector.nodeType ) {
-			this.context = this[ 0 ] = selector;
-			this.length = 1;
-			return this;
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return typeof root.ready !== "undefined" ?
-				root.ready( selector ) :
-
-				// Execute immediately if ready is not present
-				selector( jQuery );
-		}
-
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	};
-
-// Give the init function the jQuery prototype for later instantiation
-init.prototype = jQuery.fn;
-
-// Initialize central reference
-rootjQuery = jQuery( document );
-
-
-var rparentsprev = /^(?:parents|prev(?:Until|All))/,
-
-	// methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
-
-jQuery.fn.extend( {
-	has: function( target ) {
-		var i,
-			targets = jQuery( target, this ),
-			len = targets.length;
-
-		return this.filter( function() {
-			for ( i = 0; i < len; i++ ) {
-				if ( jQuery.contains( this, targets[ i ] ) ) {
-					return true;
-				}
-			}
-		} );
-	},
-
-	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			matched = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( ; i < l; i++ ) {
-			for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) {
-
-				// Always skip document fragments
-				if ( cur.nodeType < 11 && ( pos ?
-					pos.index( cur ) > -1 :
-
-					// Don't pass non-elements to Sizzle
-					cur.nodeType === 1 &&
-						jQuery.find.matchesSelector( cur, selectors ) ) ) {
-
-					matched.push( cur );
-					break;
-				}
-			}
-		}
-
-		return this.pushStack( matched.length > 1 ? jQuery.uniqueSort( matched ) : matched );
-	},
-
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1;
-		}
-
-		// index in selector
-		if ( typeof elem === "string" ) {
-			return jQuery.inArray( this[ 0 ], jQuery( elem ) );
-		}
-
-		// Locate the position of the desired element
-		return jQuery.inArray(
-
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[ 0 ] : elem, this );
-	},
-
-	add: function( selector, context ) {
-		return this.pushStack(
-			jQuery.uniqueSort(
-				jQuery.merge( this.get(), jQuery( selector, context ) )
-			)
-		);
-	},
-
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter( selector )
-		);
-	}
-} );
-
-function sibling( cur, dir ) {
-	do {
-		cur = cur[ dir ];
-	} while ( cur && cur.nodeType !== 1 );
-
-	return cur;
-}
-
-jQuery.each( {
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return sibling( elem, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return sibling( elem, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return siblings( ( elem.parentNode || {} ).firstChild, elem );
-	},
-	children: function( elem ) {
-		return siblings( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return jQuery.nodeName( elem, "iframe" ) ?
-			elem.contentDocument || elem.contentWindow.document :
-			jQuery.merge( [], elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until );
-
-		if ( name.slice( -5 ) !== "Until" ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			ret = jQuery.filter( selector, ret );
-		}
-
-		if ( this.length > 1 ) {
-
-			// Remove duplicates
-			if ( !guaranteedUnique[ name ] ) {
-				ret = jQuery.uniqueSort( ret );
-			}
-
-			// Reverse order for parents* and prev-derivatives
-			if ( rparentsprev.test( name ) ) {
-				ret = ret.reverse();
-			}
-		}
-
-		return this.pushStack( ret );
-	};
-} );
-var rnotwhite = ( /\S+/g );
-
-
-
-// Convert String-formatted options into Object-formatted ones
-function createOptions( options ) {
-	var object = {};
-	jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) {
-		object[ flag ] = true;
-	} );
-	return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *	options: an optional list of space-separated options that will change how
- *			the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- *	once:			will ensure the callback list can only be fired once (like a Deferred)
- *
- *	memory:			will keep track of previous values and will call any callback added
- *					after the list has been fired right away with the latest "memorized"
- *					values (like a Deferred)
- *
- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
- *
- *	stopOnFalse:	interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( options ) {
-
-	// Convert options from String-formatted to Object-formatted if needed
-	// (we check in cache first)
-	options = typeof options === "string" ?
-		createOptions( options ) :
-		jQuery.extend( {}, options );
-
-	var // Flag to know if list is currently firing
-		firing,
-
-		// Last fire value for non-forgettable lists
-		memory,
-
-		// Flag to know if list was already fired
-		fired,
-
-		// Flag to prevent firing
-		locked,
-
-		// Actual callback list
-		list = [],
-
-		// Queue of execution data for repeatable lists
-		queue = [],
-
-		// Index of currently firing callback (modified by add/remove as needed)
-		firingIndex = -1,
-
-		// Fire callbacks
-		fire = function() {
-
-			// Enforce single-firing
-			locked = options.once;
-
-			// Execute callbacks for all pending executions,
-			// respecting firingIndex overrides and runtime changes
-			fired = firing = true;
-			for ( ; queue.length; firingIndex = -1 ) {
-				memory = queue.shift();
-				while ( ++firingIndex < list.length ) {
-
-					// Run callback and check for early termination
-					if ( list[ firingIndex ].apply( memory[ 0 ], memory[ 1 ] ) === false &&
-						options.stopOnFalse ) {
-
-						// Jump to end and forget the data so .add doesn't re-fire
-						firingIndex = list.length;
-						memory = false;
-					}
-				}
-			}
-
-			// Forget the data if we're done with it
-			if ( !options.memory ) {
-				memory = false;
-			}
-
-			firing = false;
-
-			// Clean up if we're done firing for good
-			if ( locked ) {
-
-				// Keep an empty list if we have data for future add calls
-				if ( memory ) {
-					list = [];
-
-				// Otherwise, this object is spent
-				} else {
-					list = "";
-				}
-			}
-		},
-
-		// Actual Callbacks object
-		self = {
-
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-
-					// If we have memory from a past run, we should fire after adding
-					if ( memory && !firing ) {
-						firingIndex = list.length - 1;
-						queue.push( memory );
-					}
-
-					( function add( args ) {
-						jQuery.each( args, function( _, arg ) {
-							if ( jQuery.isFunction( arg ) ) {
-								if ( !options.unique || !self.has( arg ) ) {
-									list.push( arg );
-								}
-							} else if ( arg && arg.length && jQuery.type( arg ) !== "string" ) {
-
-								// Inspect recursively
-								add( arg );
-							}
-						} );
-					} )( arguments );
-
-					if ( memory && !firing ) {
-						fire();
-					}
-				}
-				return this;
-			},
-
-			// Remove a callback from the list
-			remove: function() {
-				jQuery.each( arguments, function( _, arg ) {
-					var index;
-					while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-						list.splice( index, 1 );
-
-						// Handle firing indexes
-						if ( index <= firingIndex ) {
-							firingIndex--;
-						}
-					}
-				} );
-				return this;
-			},
-
-			// Check if a given callback is in the list.
-			// If no argument is given, return whether or not list has callbacks attached.
-			has: function( fn ) {
-				return fn ?
-					jQuery.inArray( fn, list ) > -1 :
-					list.length > 0;
-			},
-
-			// Remove all callbacks from the list
-			empty: function() {
-				if ( list ) {
-					list = [];
-				}
-				return this;
-			},
-
-			// Disable .fire and .add
-			// Abort any current/pending executions
-			// Clear all callbacks and values
-			disable: function() {
-				locked = queue = [];
-				list = memory = "";
-				return this;
-			},
-			disabled: function() {
-				return !list;
-			},
-
-			// Disable .fire
-			// Also disable .add unless we have memory (since it would have no effect)
-			// Abort any pending executions
-			lock: function() {
-				locked = true;
-				if ( !memory ) {
-					self.disable();
-				}
-				return this;
-			},
-			locked: function() {
-				return !!locked;
-			},
-
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				if ( !locked ) {
-					args = args || [];
-					args = [ context, args.slice ? args.slice() : args ];
-					queue.push( args );
-					if ( !firing ) {
-						fire();
-					}
-				}
-				return this;
-			},
-
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!fired;
-			}
-		};
-
-	return self;
-};
-
-
-jQuery.extend( {
-
-	Deferred: function( func ) {
-		var tuples = [
-
-				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks( "once memory" ), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks( "once memory" ), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks( "memory" ) ]
-			],
-			state = "pending",
-			promise = {
-				state: function() {
-					return state;
-				},
-				always: function() {
-					deferred.done( arguments ).fail( arguments );
-					return this;
-				},
-				then: function( /* fnDone, fnFail, fnProgress */ ) {
-					var fns = arguments;
-					return jQuery.Deferred( function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
-							var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
-
-							// deferred[ done | fail | progress ] for forwarding actions to newDefer
-							deferred[ tuple[ 1 ] ]( function() {
-								var returned = fn && fn.apply( this, arguments );
-								if ( returned && jQuery.isFunction( returned.promise ) ) {
-									returned.promise()
-										.progress( newDefer.notify )
-										.done( newDefer.resolve )
-										.fail( newDefer.reject );
-								} else {
-									newDefer[ tuple[ 0 ] + "With" ](
-										this === promise ? newDefer.promise() : this,
-										fn ? [ returned ] : arguments
-									);
-								}
-							} );
-						} );
-						fns = null;
-					} ).promise();
-				},
-
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					return obj != null ? jQuery.extend( obj, promise ) : promise;
-				}
-			},
-			deferred = {};
-
-		// Keep pipe for back-compat
-		promise.pipe = promise.then;
-
-		// Add list-specific methods
-		jQuery.each( tuples, function( i, tuple ) {
-			var list = tuple[ 2 ],
-				stateString = tuple[ 3 ];
-
-			// promise[ done | fail | progress ] = list.add
-			promise[ tuple[ 1 ] ] = list.add;
-
-			// Handle state
-			if ( stateString ) {
-				list.add( function() {
-
-					// state = [ resolved | rejected ]
-					state = stateString;
-
-				// [ reject_list | resolve_list ].disable; progress_list.lock
-				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
-			}
-
-			// deferred[ resolve | reject | notify ]
-			deferred[ tuple[ 0 ] ] = function() {
-				deferred[ tuple[ 0 ] + "With" ]( this === deferred ? promise : this, arguments );
-				return this;
-			};
-			deferred[ tuple[ 0 ] + "With" ] = list.fireWith;
-		} );
-
-		// Make the deferred a promise
-		promise.promise( deferred );
-
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-
-		// All done!
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( subordinate /* , ..., subordinateN */ ) {
-		var i = 0,
-			resolveValues = slice.call( arguments ),
-			length = resolveValues.length,
-
-			// the count of uncompleted subordinates
-			remaining = length !== 1 ||
-				( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
-
-			// the master Deferred.
-			// If resolveValues consist of only a single Deferred, just use that.
-			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
-			// Update function for both resolve and progress values
-			updateFunc = function( i, contexts, values ) {
-				return function( value ) {
-					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
-					if ( values === progressValues ) {
-						deferred.notifyWith( contexts, values );
-
-					} else if ( !( --remaining ) ) {
-						deferred.resolveWith( contexts, values );
-					}
-				};
-			},
-
-			progressValues, progressContexts, resolveContexts;
-
-		// add listeners to Deferred subordinates; treat others as resolved
-		if ( length > 1 ) {
-			progressValues = new Array( length );
-			progressContexts = new Array( length );
-			resolveContexts = new Array( length );
-			for ( ; i < length; i++ ) {
-				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-					resolveValues[ i ].promise()
-						.progress( updateFunc( i, progressContexts, progressValues ) )
-						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject );
-				} else {
-					--remaining;
-				}
-			}
-		}
-
-		// if we're not waiting on anything, resolve the master
-		if ( !remaining ) {
-			deferred.resolveWith( resolveContexts, resolveValues );
-		}
-
-		return deferred.promise();
-	}
-} );
-
-
-// The deferred used on DOM ready
-var readyList;
-
-jQuery.fn.ready = function( fn ) {
-
-	// Add the callback
-	jQuery.ready.promise().done( fn );
-
-	return this;
-};
-
-jQuery.extend( {
-
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-			return;
-		}
-
-		// Remember that the DOM is ready
-		jQuery.isReady = true;
-
-		// If a normal DOM Ready event fired, decrement, and wait if need be
-		if ( wait !== true && --jQuery.readyWait > 0 ) {
-			return;
-		}
-
-		// If there are functions bound, to execute
-		readyList.resolveWith( document, [ jQuery ] );
-
-		// Trigger any bound ready events
-		if ( jQuery.fn.triggerHandler ) {
-			jQuery( document ).triggerHandler( "ready" );
-			jQuery( document ).off( "ready" );
-		}
-	}
-} );
-
-/**
- * Clean-up method for dom ready events
- */
-function detach() {
-	if ( document.addEventListener ) {
-		document.removeEventListener( "DOMContentLoaded", completed );
-		window.removeEventListener( "load", completed );
-
-	} else {
-		document.detachEvent( "onreadystatechange", completed );
-		window.detachEvent( "onload", completed );
-	}
-}
-
-/**
- * The ready event handler and self cleanup method
- */
-function completed() {
-
-	// readyState === "complete" is good enough for us to call the dom ready in oldIE
-	if ( document.addEventListener ||
-		window.event.type === "load" ||
-		document.readyState === "complete" ) {
-
-		detach();
-		jQuery.ready();
-	}
-}
-
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
-
-		readyList = jQuery.Deferred();
-
-		// Catch cases where $(document).ready() is called
-		// after the browser event has already occurred.
-		// Support: IE6-10
-		// Older IE sometimes signals "interactive" too soon
-		if ( document.readyState === "complete" ||
-			( document.readyState !== "loading" && !document.documentElement.doScroll ) ) {
-
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			window.setTimeout( jQuery.ready );
-
-		// Standards-based browsers support DOMContentLoaded
-		} else if ( document.addEventListener ) {
-
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", completed );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", completed );
-
-		// If IE event model is used
-		} else {
-
-			// Ensure firing before onload, maybe late but safe also for iframes
-			document.attachEvent( "onreadystatechange", completed );
-
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", completed );
-
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var top = false;
-
-			try {
-				top = window.frameElement == null && document.documentElement;
-			} catch ( e ) {}
-
-			if ( top && top.doScroll ) {
-				( function doScrollCheck() {
-					if ( !jQuery.isReady ) {
-
-						try {
-
-							// Use the trick by Diego Perini
-							// http://javascript.nwbox.com/IEContentLoaded/
-							top.doScroll( "left" );
-						} catch ( e ) {
-							return window.setTimeout( doScrollCheck, 50 );
-						}
-
-						// detach all dom ready events
-						detach();
-
-						// and execute any waiting functions
-						jQuery.ready();
-					}
-				} )();
-			}
-		}
-	}
-	return readyList.promise( obj );
-};
-
-// Kick off the DOM ready check even if the user does not
-jQuery.ready.promise();
-
-
-
-
-// Support: IE<9
-// Iteration over object's inherited properties before its own
-var i;
-for ( i in jQuery( support ) ) {
-	break;
-}
-support.ownFirst = i === "0";
-
-// Note: most support tests are defined in their respective modules.
-// false until the test is run
-support.inlineBlockNeedsLayout = false;
-
-// Execute ASAP in case we need to set body.style.zoom
-jQuery( function() {
-
-	// Minified: var a,b,c,d
-	var val, div, body, container;
-
-	body = document.getElementsByTagName( "body" )[ 0 ];
-	if ( !body || !body.style ) {
-
-		// Return for frameset docs that don't have a body
-		return;
-	}
-
-	// Setup
-	div = document.createElement( "div" );
-	container = document.createElement( "div" );
-	container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
-	body.appendChild( container ).appendChild( div );
-
-	if ( typeof div.style.zoom !== "undefined" ) {
-
-		// Support: IE<8
-		// Check if natively block-level elements act like inline-block
-		// elements when setting their display to 'inline' and giving
-		// them layout
-		div.style.cssText = "display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1";
-
-		support.inlineBlockNeedsLayout = val = div.offsetWidth === 3;
-		if ( val ) {
-
-			// Prevent IE 6 from affecting layout for positioned elements #11048
-			// Prevent IE from shrinking the body in IE 7 mode #12869
-			// Support: IE<8
-			body.style.zoom = 1;
-		}
-	}
-
-	body.removeChild( container );
-} );
-
-
-( function() {
-	var div = document.createElement( "div" );
-
-	// Support: IE<9
-	support.deleteExpando = true;
-	try {
-		delete div.test;
-	} catch ( e ) {
-		support.deleteExpando = false;
-	}
-
-	// Null elements to avoid leaks in IE.
-	div = null;
-} )();
-var acceptData = function( elem ) {
-	var noData = jQuery.noData[ ( elem.nodeName + " " ).toLowerCase() ],
-		nodeType = +elem.nodeType || 1;
-
-	// Do not set data on non-element DOM nodes because it will not be cleared (#8335).
-	return nodeType !== 1 && nodeType !== 9 ?
-		false :
-
-		// Nodes accept data unless otherwise specified; rejection can be conditional
-		!noData || noData !== true && elem.getAttribute( "classid" ) === noData;
-};
-
-
-
-
-var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
-	rmultiDash = /([A-Z])/g;
-
-function dataAttr( elem, key, data ) {
-
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-
-		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-					data === "false" ? false :
-					data === "null" ? null :
-
-					// Only convert to a number if it doesn't change the string
-					+data + "" === data ? +data :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-					data;
-			} catch ( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			jQuery.data( elem, key, data );
-
-		} else {
-			data = undefined;
-		}
-	}
-
-	return data;
-}
-
-// checks a cache object for emptiness
-function isEmptyDataObject( obj ) {
-	var name;
-	for ( name in obj ) {
-
-		// if the public data object is empty, the private is still empty
-		if ( name === "data" && jQuery.isEmptyObject( obj[ name ] ) ) {
-			continue;
-		}
-		if ( name !== "toJSON" ) {
-			return false;
-		}
-	}
-
-	return true;
-}
-
-function internalData( elem, name, data, pvt /* Internal Use Only */ ) {
-	if ( !acceptData( elem ) ) {
-		return;
-	}
-
-	var ret, thisCache,
-		internalKey = jQuery.expando,
-
-		// We have to handle DOM nodes and JS objects differently because IE6-7
-		// can't GC object references properly across the DOM-JS boundary
-		isNode = elem.nodeType,
-
-		// Only DOM nodes need the global jQuery cache; JS object data is
-		// attached directly to the object so GC can occur automatically
-		cache = isNode ? jQuery.cache : elem,
-
-		// Only defining an ID for JS objects if its cache already exists allows
-		// the code to shortcut on the same path as a DOM node with no cache
-		id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
-
-	// Avoid doing any more work than we need to when trying to get data on an
-	// object that has no data at all
-	if ( ( !id || !cache[ id ] || ( !pvt && !cache[ id ].data ) ) &&
-		data === undefined && typeof name === "string" ) {
-		return;
-	}
-
-	if ( !id ) {
-
-		// Only DOM nodes need a new unique ID for each element since their data
-		// ends up in the global cache
-		if ( isNode ) {
-			id = elem[ internalKey ] = deletedIds.pop() || jQuery.guid++;
-		} else {
-			id = internalKey;
-		}
-	}
-
-	if ( !cache[ id ] ) {
-
-		// Avoid exposing jQuery metadata on plain JS objects when the object
-		// is serialized using JSON.stringify
-		cache[ id ] = isNode ? {} : { toJSON: jQuery.noop };
-	}
-
-	// An object can be passed to jQuery.data instead of a key/value pair; this gets
-	// shallow copied over onto the existing cache
-	if ( typeof name === "object" || typeof name === "function" ) {
-		if ( pvt ) {
-			cache[ id ] = jQuery.extend( cache[ id ], name );
-		} else {
-			cache[ id ].data = jQuery.extend( cache[ id ].data, name );
-		}
-	}
-
-	thisCache = cache[ id ];
-
-	// jQuery data() is stored in a separate object inside the object's internal data
-	// cache in order to avoid key collisions between internal data and user-defined
-	// data.
-	if ( !pvt ) {
-		if ( !thisCache.data ) {
-			thisCache.data = {};
-		}
-
-		thisCache = thisCache.data;
-	}
-
-	if ( data !== undefined ) {
-		thisCache[ jQuery.camelCase( name ) ] = data;
-	}
-
-	// Check for both converted-to-camel and non-converted data property names
-	// If a data property was specified
-	if ( typeof name === "string" ) {
-
-		// First Try to find as-is property data
-		ret = thisCache[ name ];
-
-		// Test for null|undefined property data
-		if ( ret == null ) {
-
-			// Try to find the camelCased property
-			ret = thisCache[ jQuery.camelCase( name ) ];
-		}
-	} else {
-		ret = thisCache;
-	}
-
-	return ret;
-}
-
-function internalRemoveData( elem, name, pvt ) {
-	if ( !acceptData( elem ) ) {
-		return;
-	}
-
-	var thisCache, i,
-		isNode = elem.nodeType,
-
-		// See jQuery.data for more information
-		cache = isNode ? jQuery.cache : elem,
-		id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
-
-	// If there is already no cache entry for this object, there is no
-	// purpose in continuing
-	if ( !cache[ id ] ) {
-		return;
-	}
-
-	if ( name ) {
-
-		thisCache = pvt ? cache[ id ] : cache[ id ].data;
-
-		if ( thisCache ) {
-
-			// Support array or space separated string names for data keys
-			if ( !jQuery.isArray( name ) ) {
-
-				// try the string as a key before any manipulation
-				if ( name in thisCache ) {
-					name = [ name ];
-				} else {
-
-					// split the camel cased version by spaces unless a key with the spaces exists
-					name = jQuery.camelCase( name );
-					if ( name in thisCache ) {
-						name = [ name ];
-					} else {
-						name = name.split( " " );
-					}
-				}
-			} else {
-
-				// If "name" is an array of keys...
-				// When data is initially created, via ("key", "val") signature,
-				// keys will be converted to camelCase.
-				// Since there is no way to tell _how_ a key was added, remove
-				// both plain key and camelCase key. #12786
-				// This will only penalize the array argument path.
-				name = name.concat( jQuery.map( name, jQuery.camelCase ) );
-			}
-
-			i = name.length;
-			while ( i-- ) {
-				delete thisCache[ name[ i ] ];
-			}
-
-			// If there is no data left in the cache, we want to continue
-			// and let the cache object itself get destroyed
-			if ( pvt ? !isEmptyDataObject( thisCache ) : !jQuery.isEmptyObject( thisCache ) ) {
-				return;
-			}
-		}
-	}
-
-	// See jQuery.data for more information
-	if ( !pvt ) {
-		delete cache[ id ].data;
-
-		// Don't destroy the parent cache unless the internal data object
-		// had been the only thing left in it
-		if ( !isEmptyDataObject( cache[ id ] ) ) {
-			return;
-		}
-	}
-
-	// Destroy the cache
-	if ( isNode ) {
-		jQuery.cleanData( [ elem ], true );
-
-	// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
-	/* jshint eqeqeq: false */
-	} else if ( support.deleteExpando || cache != cache.window ) {
-		/* jshint eqeqeq: true */
-		delete cache[ id ];
-
-	// When all else fails, undefined
-	} else {
-		cache[ id ] = undefined;
-	}
-}
-
-jQuery.extend( {
-	cache: {},
-
-	// The following elements (space-suffixed to avoid Object.prototype collisions)
-	// throw uncatchable exceptions if you attempt to set expando properties
-	noData: {
-		"applet ": true,
-		"embed ": true,
-
-		// ...but Flash objects (which have this classid) *can* handle expandos
-		"object ": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-	},
-
-	hasData: function( elem ) {
-		elem = elem.nodeType ? jQuery.cache[ elem[ jQuery.expando ] ] : elem[ jQuery.expando ];
-		return !!elem && !isEmptyDataObject( elem );
-	},
-
-	data: function( elem, name, data ) {
-		return internalData( elem, name, data );
-	},
-
-	removeData: function( elem, name ) {
-		return internalRemoveData( elem, name );
-	},
-
-	// For internal use only.
-	_data: function( elem, name, data ) {
-		return internalData( elem, name, data, true );
-	},
-
-	_removeData: function( elem, name ) {
-		return internalRemoveData( elem, name, true );
-	}
-} );
-
-jQuery.fn.extend( {
-	data: function( key, value ) {
-		var i, name, data,
-			elem = this[ 0 ],
-			attrs = elem && elem.attributes;
-
-		// Special expections of .data basically thwart jQuery.access,
-		// so implement the relevant behavior ourselves
-
-		// Gets all values
-		if ( key === undefined ) {
-			if ( this.length ) {
-				data = jQuery.data( elem );
-
-				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
-					i = attrs.length;
-					while ( i-- ) {
-
-						// Support: IE11+
-						// The attrs elements can be null (#14894)
-						if ( attrs[ i ] ) {
-							name = attrs[ i ].name;
-							if ( name.indexOf( "data-" ) === 0 ) {
-								name = jQuery.camelCase( name.slice( 5 ) );
-								dataAttr( elem, name, data[ name ] );
-							}
-						}
-					}
-					jQuery._data( elem, "parsedAttrs", true );
-				}
-			}
-
-			return data;
-		}
-
-		// Sets multiple values
-		if ( typeof key === "object" ) {
-			return this.each( function() {
-				jQuery.data( this, key );
-			} );
-		}
-
-		return arguments.length > 1 ?
-
-			// Sets one value
-			this.each( function() {
-				jQuery.data( this, key, value );
-			} ) :
-
-			// Gets one value
-			// Try to fetch any internally stored data first
-			elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : undefined;
-	},
-
-	removeData: function( key ) {
-		return this.each( function() {
-			jQuery.removeData( this, key );
-		} );
-	}
-} );
-
-
-jQuery.extend( {
-	queue: function( elem, type, data ) {
-		var queue;
-
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			queue = jQuery._data( elem, type );
-
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !queue || jQuery.isArray( data ) ) {
-					queue = jQuery._data( elem, type, jQuery.makeArray( data ) );
-				} else {
-					queue.push( data );
-				}
-			}
-			return queue || [];
-		}
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			startLength = queue.length,
-			fn = queue.shift(),
-			hooks = jQuery._queueHooks( elem, type ),
-			next = function() {
-				jQuery.dequeue( elem, type );
-			};
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-			startLength--;
-		}
-
-		if ( fn ) {
-
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
-			}
-
-			// clear up the last queue stop function
-			delete hooks.stop;
-			fn.call( elem, next, hooks );
-		}
-
-		if ( !startLength && hooks ) {
-			hooks.empty.fire();
-		}
-	},
-
-	// not intended for public consumption - generates a queueHooks object,
-	// or returns the current one
-	_queueHooks: function( elem, type ) {
-		var key = type + "queueHooks";
-		return jQuery._data( elem, key ) || jQuery._data( elem, key, {
-			empty: jQuery.Callbacks( "once memory" ).add( function() {
-				jQuery._removeData( elem, type + "queue" );
-				jQuery._removeData( elem, key );
-			} )
-		} );
-	}
-} );
-
-jQuery.fn.extend( {
-	queue: function( type, data ) {
-		var setter = 2;
-
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-			setter--;
-		}
-
-		if ( arguments.length < setter ) {
-			return jQuery.queue( this[ 0 ], type );
-		}
-
-		return data === undefined ?
-			this :
-			this.each( function() {
-				var queue = jQuery.queue( this, type, data );
-
-				// ensure a hooks for this queue
-				jQuery._queueHooks( this, type );
-
-				if ( type === "fx" && queue[ 0 ] !== "inprogress" ) {
-					jQuery.dequeue( this, type );
-				}
-			} );
-	},
-	dequeue: function( type ) {
-		return this.each( function() {
-			jQuery.dequeue( this, type );
-		} );
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, obj ) {
-		var tmp,
-			count = 1,
-			defer = jQuery.Deferred(),
-			elements = this,
-			i = this.length,
-			resolve = function() {
-				if ( !( --count ) ) {
-					defer.resolveWith( elements, [ elements ] );
-				}
-			};
-
-		if ( typeof type !== "string" ) {
-			obj = type;
-			type = undefined;
-		}
-		type = type || "fx";
-
-		while ( i-- ) {
-			tmp = jQuery._data( elements[ i ], type + "queueHooks" );
-			if ( tmp && tmp.empty ) {
-				count++;
-				tmp.empty.add( resolve );
-			}
-		}
-		resolve();
-		return defer.promise( obj );
-	}
-} );
-
-
-( function() {
-	var shrinkWrapBlocksVal;
-
-	support.shrinkWrapBlocks = function() {
-		if ( shrinkWrapBlocksVal != null ) {
-			return shrinkWrapBlocksVal;
-		}
-
-		// Will be changed later if needed.
-		shrinkWrapBlocksVal = false;
-
-		// Minified: var b,c,d
-		var div, body, container;
-
-		body = document.getElementsByTagName( "body" )[ 0 ];
-		if ( !body || !body.style ) {
-
-			// Test fired too early or in an unsupported environment, exit.
-			return;
-		}
-
-		// Setup
-		div = document.createElement( "div" );
-		container = document.createElement( "div" );
-		container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
-		body.appendChild( container ).appendChild( div );
-
-		// Support: IE6
-		// Check if elements with layout shrink-wrap their children
-		if ( typeof div.style.zoom !== "undefined" ) {
-
-			// Reset CSS: box-sizing; display; margin; border
-			div.style.cssText =
-
-				// Support: Firefox<29, Android 2.3
-				// Vendor-prefix box-sizing
-				"-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
-				"box-sizing:content-box;display:block;margin:0;border:0;" +
-				"padding:1px;width:1px;zoom:1";
-			div.appendChild( document.createElement( "div" ) ).style.width = "5px";
-			shrinkWrapBlocksVal = div.offsetWidth !== 3;
-		}
-
-		body.removeChild( container );
-
-		return shrinkWrapBlocksVal;
-	};
-
-} )();
-var pnum = ( /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/ ).source;
-
-var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" );
-
-
-var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
-
-var isHidden = function( elem, el ) {
-
-		// isHidden might be called from jQuery#filter function;
-		// in that case, element will be second argument
-		elem = el || elem;
-		return jQuery.css( elem, "display" ) === "none" ||
-			!jQuery.contains( elem.ownerDocument, elem );
-	};
-
-
-
-function adjustCSS( elem, prop, valueParts, tween ) {
-	var adjusted,
-		scale = 1,
-		maxIterations = 20,
-		currentValue = tween ?
-			function() { return tween.cur(); } :
-			function() { return jQuery.css( elem, prop, "" ); },
-		initial = currentValue(),
-		unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
-
-		// Starting value computation is required for potential unit mismatches
-		initialInUnit = ( jQuery.cssNumber[ prop ] || unit !== "px" && +initial ) &&
-			rcssNum.exec( jQuery.css( elem, prop ) );
-
-	if ( initialInUnit && initialInUnit[ 3 ] !== unit ) {
-
-		// Trust units reported by jQuery.css
-		unit = unit || initialInUnit[ 3 ];
-
-		// Make sure we update the tween properties later on
-		valueParts = valueParts || [];
-
-		// Iteratively approximate from a nonzero starting point
-		initialInUnit = +initial || 1;
-
-		do {
-
-			// If previous iteration zeroed out, double until we get *something*.
-			// Use string for doubling so we don't accidentally see scale as unchanged below
-			scale = scale || ".5";
-
-			// Adjust and apply
-			initialInUnit = initialInUnit / scale;
-			jQuery.style( elem, prop, initialInUnit + unit );
-
-		// Update scale, tolerating zero or NaN from tween.cur()
-		// Break the loop if scale is unchanged or perfect, or if we've just had enough.
-		} while (
-			scale !== ( scale = currentValue() / initial ) && scale !== 1 && --maxIterations
-		);
-	}
-
-	if ( valueParts ) {
-		initialInUnit = +initialInUnit || +initial || 0;
-
-		// Apply relative offset (+=/-=) if specified
-		adjusted = valueParts[ 1 ] ?
-			initialInUnit + ( valueParts[ 1 ] + 1 ) * valueParts[ 2 ] :
-			+valueParts[ 2 ];
-		if ( tween ) {
-			tween.unit = unit;
-			tween.start = initialInUnit;
-			tween.end = adjusted;
-		}
-	}
-	return adjusted;
-}
-
-
-// Multifunctional method to get and set values of a collection
-// The value/s can optionally be executed if it's a function
-var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
-	var i = 0,
-		length = elems.length,
-		bulk = key == null;
-
-	// Sets many values
-	if ( jQuery.type( key ) === "object" ) {
-		chainable = true;
-		for ( i in key ) {
-			access( elems, fn, i, key[ i ], true, emptyGet, raw );
-		}
-
-	// Sets one value
-	} else if ( value !== undefined ) {
-		chainable = true;
-
-		if ( !jQuery.isFunction( value ) ) {
-			raw = true;
-		}
-
-		if ( bulk ) {
-
-			// Bulk operations run against the entire set
-			if ( raw ) {
-				fn.call( elems, value );
-				fn = null;
-
-			// ...except when executing function values
-			} else {
-				bulk = fn;
-				fn = function( elem, key, value ) {
-					return bulk.call( jQuery( elem ), value );
-				};
-			}
-		}
-
-		if ( fn ) {
-			for ( ; i < length; i++ ) {
-				fn(
-					elems[ i ],
-					key,
-					raw ? value : value.call( elems[ i ], i, fn( elems[ i ], key ) )
-				);
-			}
-		}
-	}
-
-	return chainable ?
-		elems :
-
-		// Gets
-		bulk ?
-			fn.call( elems ) :
-			length ? fn( elems[ 0 ], key ) : emptyGet;
-};
-var rcheckableType = ( /^(?:checkbox|radio)$/i );
-
-var rtagName = ( /<([\w:-]+)/ );
-
-var rscriptType = ( /^$|\/(?:java|ecma)script/i );
-
-var rleadingWhitespace = ( /^\s+/ );
-
-var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|" +
-		"details|dialog|figcaption|figure|footer|header|hgroup|main|" +
-		"mark|meter|nav|output|picture|progress|section|summary|template|time|video";
-
-
-
-function createSafeFragment( document ) {
-	var list = nodeNames.split( "|" ),
-		safeFrag = document.createDocumentFragment();
-
-	if ( safeFrag.createElement ) {
-		while ( list.length ) {
-			safeFrag.createElement(
-				list.pop()
-			);
-		}
-	}
-	return safeFrag;
-}
-
-
-( function() {
-	var div = document.createElement( "div" ),
-		fragment = document.createDocumentFragment(),
-		input = document.createElement( "input" );
-
-	// Setup
-	div.innerHTML = "  
a";
-
-	// IE strips leading whitespace when .innerHTML is used
-	support.leadingWhitespace = div.firstChild.nodeType === 3;
-
-	// Make sure that tbody elements aren't automatically inserted
-	// IE will insert them into empty tables
-	support.tbody = !div.getElementsByTagName( "tbody" ).length;
-
-	// Make sure that link elements get serialized correctly by innerHTML
-	// This requires a wrapper element in IE
-	support.htmlSerialize = !!div.getElementsByTagName( "link" ).length;
-
-	// Makes sure cloning an html5 element does not cause problems
-	// Where outerHTML is undefined, this still works
-	support.html5Clone =
-		document.createElement( "nav" ).cloneNode( true ).outerHTML !== "<:nav>";
-
-	// Check if a disconnected checkbox will retain its checked
-	// value of true after appended to the DOM (IE6/7)
-	input.type = "checkbox";
-	input.checked = true;
-	fragment.appendChild( input );
-	support.appendChecked = input.checked;
-
-	// Make sure textarea (and checkbox) defaultValue is properly cloned
-	// Support: IE6-IE11+
-	div.innerHTML = "";
-	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
-
-	// #11217 - WebKit loses check when the name is after the checked attribute
-	fragment.appendChild( div );
-
-	// Support: Windows Web Apps (WWA)
-	// `name` and `type` must use .setAttribute for WWA (#14901)
-	input = document.createElement( "input" );
-	input.setAttribute( "type", "radio" );
-	input.setAttribute( "checked", "checked" );
-	input.setAttribute( "name", "t" );
-
-	div.appendChild( input );
-
-	// Support: Safari 5.1, iOS 5.1, Android 4.x, Android 2.3
-	// old WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Support: IE<9
-	// Cloned elements keep attachEvent handlers, we use addEventListener on IE9+
-	support.noCloneEvent = !!div.addEventListener;
-
-	// Support: IE<9
-	// Since attributes and properties are the same in IE,
-	// cleanData must set properties to undefined rather than use removeAttribute
-	div[ jQuery.expando ] = 1;
-	support.attributes = !div.getAttribute( jQuery.expando );
-} )();
-
-
-// We have to close these tags to support XHTML (#13200)
-var wrapMap = {
-	option: [ 1, "" ],
-	legend: [ 1, "
", "
" ],
-	area: [ 1, "", "" ],
-
-	// Support: IE8
-	param: [ 1, "", "" ],
-	thead: [ 1, "", "
" ],
-	tr: [ 2, "", "
" ],
-	col: [ 2, "", "
" ],
-	td: [ 3, "", "
" ],
-
-	// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
-	// unless wrapped in a div with non-breaking characters in front of it.
-	_default: support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X
", "
" ]
-};
-
-// Support: IE8-IE9
-wrapMap.optgroup = wrapMap.option;
-
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-
-function getAll( context, tag ) {
-	var elems, elem,
-		i = 0,
-		found = typeof context.getElementsByTagName !== "undefined" ?
-			context.getElementsByTagName( tag || "*" ) :
-			typeof context.querySelectorAll !== "undefined" ?
-				context.querySelectorAll( tag || "*" ) :
-				undefined;
-
-	if ( !found ) {
-		for ( found = [], elems = context.childNodes || context;
-			( elem = elems[ i ] ) != null;
-			i++
-		) {
-			if ( !tag || jQuery.nodeName( elem, tag ) ) {
-				found.push( elem );
-			} else {
-				jQuery.merge( found, getAll( elem, tag ) );
-			}
-		}
-	}
-
-	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-		jQuery.merge( [ context ], found ) :
-		found;
-}
-
-
-// Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
-	var elem,
-		i = 0;
-	for ( ; ( elem = elems[ i ] ) != null; i++ ) {
-		jQuery._data(
-			elem,
-			"globalEval",
-			!refElements || jQuery._data( refElements[ i ], "globalEval" )
-		);
-	}
-}
-
-
-var rhtml = /<|&#?\w+;/,
-	rtbody = / from table fragments
-				if ( !support.tbody ) {
-
-					// String was a , *may* have spurious 
-					elem = tag === "table" && !rtbody.test( elem ) ?
-						tmp.firstChild :
-
-						// String was a bare  or 
-						wrap[ 1 ] === "
" && !rtbody.test( elem ) ?
-							tmp :
-							0;
-
-					j = elem && elem.childNodes.length;
-					while ( j-- ) {
-						if ( jQuery.nodeName( ( tbody = elem.childNodes[ j ] ), "tbody" ) &&
-							!tbody.childNodes.length ) {
-
-							elem.removeChild( tbody );
-						}
-					}
-				}
-
-				jQuery.merge( nodes, tmp.childNodes );
-
-				// Fix #12392 for WebKit and IE > 9
-				tmp.textContent = "";
-
-				// Fix #12392 for oldIE
-				while ( tmp.firstChild ) {
-					tmp.removeChild( tmp.firstChild );
-				}
-
-				// Remember the top-level container for proper cleanup
-				tmp = safe.lastChild;
-			}
-		}
-	}
-
-	// Fix #11356: Clear elements from fragment
-	if ( tmp ) {
-		safe.removeChild( tmp );
-	}
-
-	// Reset defaultChecked for any radios and checkboxes
-	// about to be appended to the DOM in IE 6/7 (#8060)
-	if ( !support.appendChecked ) {
-		jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
-	}
-
-	i = 0;
-	while ( ( elem = nodes[ i++ ] ) ) {
-
-		// Skip elements already in the context collection (trac-4087)
-		if ( selection && jQuery.inArray( elem, selection ) > -1 ) {
-			if ( ignored ) {
-				ignored.push( elem );
-			}
-
-			continue;
-		}
-
-		contains = jQuery.contains( elem.ownerDocument, elem );
-
-		// Append to fragment
-		tmp = getAll( safe.appendChild( elem ), "script" );
-
-		// Preserve script evaluation history
-		if ( contains ) {
-			setGlobalEval( tmp );
-		}
-
-		// Capture executables
-		if ( scripts ) {
-			j = 0;
-			while ( ( elem = tmp[ j++ ] ) ) {
-				if ( rscriptType.test( elem.type || "" ) ) {
-					scripts.push( elem );
-				}
-			}
-		}
-	}
-
-	tmp = null;
-
-	return safe;
-}
-
-
-( function() {
-	var i, eventName,
-		div = document.createElement( "div" );
-
-	// Support: IE<9 (lack submit/change bubble), Firefox (lack focus(in | out) events)
-	for ( i in { submit: true, change: true, focusin: true } ) {
-		eventName = "on" + i;
-
-		if ( !( support[ i ] = eventName in window ) ) {
-
-			// Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP)
-			div.setAttribute( eventName, "t" );
-			support[ i ] = div.attributes[ eventName ].expando === false;
-		}
-	}
-
-	// Null elements to avoid leaks in IE.
-	div = null;
-} )();
-
-
-var rformElems = /^(?:input|select|textarea)$/i,
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
-	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
-
-function returnTrue() {
-	return true;
-}
-
-function returnFalse() {
-	return false;
-}
-
-// Support: IE9
-// See #13393 for more info
-function safeActiveElement() {
-	try {
-		return document.activeElement;
-	} catch ( err ) { }
-}
-
-function on( elem, types, selector, data, fn, one ) {
-	var origFn, type;
-
-	// Types can be a map of types/handlers
-	if ( typeof types === "object" ) {
-
-		// ( types-Object, selector, data )
-		if ( typeof selector !== "string" ) {
-
-			// ( types-Object, data )
-			data = data || selector;
-			selector = undefined;
-		}
-		for ( type in types ) {
-			on( elem, type, selector, data, types[ type ], one );
-		}
-		return elem;
-	}
-
-	if ( data == null && fn == null ) {
-
-		// ( types, fn )
-		fn = selector;
-		data = selector = undefined;
-	} else if ( fn == null ) {
-		if ( typeof selector === "string" ) {
-
-			// ( types, selector, fn )
-			fn = data;
-			data = undefined;
-		} else {
-
-			// ( types, data, fn )
-			fn = data;
-			data = selector;
-			selector = undefined;
-		}
-	}
-	if ( fn === false ) {
-		fn = returnFalse;
-	} else if ( !fn ) {
-		return elem;
-	}
-
-	if ( one === 1 ) {
-		origFn = fn;
-		fn = function( event ) {
-
-			// Can use an empty set, since event contains the info
-			jQuery().off( event );
-			return origFn.apply( this, arguments );
-		};
-
-		// Use same guid so caller can remove using origFn
-		fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-	}
-	return elem.each( function() {
-		jQuery.event.add( this, types, fn, data, selector );
-	} );
-}
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
-	global: {},
-
-	add: function( elem, types, handler, data, selector ) {
-		var tmp, events, t, handleObjIn,
-			special, eventHandle, handleObj,
-			handlers, type, namespaces, origType,
-			elemData = jQuery._data( elem );
-
-		// Don't attach events to noData or text/comment nodes (but allow plain objects)
-		if ( !elemData ) {
-			return;
-		}
-
-		// Caller can pass in an object of custom data in lieu of the handler
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-			selector = handleObjIn.selector;
-		}
-
-		// Make sure that the handler has a unique ID, used to find/remove it later
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure and main handler, if this is the first
-		if ( !( events = elemData.events ) ) {
-			events = elemData.events = {};
-		}
-		if ( !( eventHandle = elemData.handle ) ) {
-			eventHandle = elemData.handle = function( e ) {
-
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== "undefined" &&
-					( !e || jQuery.event.triggered !== e.type ) ?
-					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
-					undefined;
-			};
-
-			// Add elem as a property of the handle fn to prevent a memory leak
-			// with IE non-native events
-			eventHandle.elem = elem;
-		}
-
-		// Handle multiple events separated by a space
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[ t ] ) || [];
-			type = origType = tmp[ 1 ];
-			namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
-
-			// There *must* be a type, no attaching namespace-only handlers
-			if ( !type ) {
-				continue;
-			}
-
-			// If event changes its type, use the special event handlers for the changed type
-			special = jQuery.event.special[ type ] || {};
-
-			// If selector defined, determine special event api type, otherwise given type
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-
-			// Update special based on newly reset type
-			special = jQuery.event.special[ type ] || {};
-
-			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend( {
-				type: type,
-				origType: origType,
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join( "." )
-			}, handleObjIn );
-
-			// Init the event handler queue if we're the first
-			if ( !( handlers = events[ type ] ) ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
-
-				// Only use addEventListener/attachEvent if the special events handler returns false
-				if ( !special.setup ||
-					special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-
-					// Bind the global event handler to the element
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-
-					} else if ( elem.attachEvent ) {
-						elem.attachEvent( "on" + type, eventHandle );
-					}
-				}
-			}
-
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add to the element's handler list, delegates in front
-			if ( selector ) {
-				handlers.splice( handlers.delegateCount++, 0, handleObj );
-			} else {
-				handlers.push( handleObj );
-			}
-
-			// Keep track of which events have ever been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
-
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
-	},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
-		var j, handleObj, tmp,
-			origCount, t, events,
-			special, handlers, type,
-			namespaces, origType,
-			elemData = jQuery.hasData( elem ) && jQuery._data( elem );
-
-		if ( !elemData || !( events = elemData.events ) ) {
-			return;
-		}
-
-		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[ t ] ) || [];
-			type = origType = tmp[ 1 ];
-			namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
-
-			// Unbind all events (on this namespace, if provided) for the element
-			if ( !type ) {
-				for ( type in events ) {
-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
-				}
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-			handlers = events[ type ] || [];
-			tmp = tmp[ 2 ] &&
-				new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" );
-
-			// Remove matching events
-			origCount = j = handlers.length;
-			while ( j-- ) {
-				handleObj = handlers[ j ];
-
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					( !handler || handler.guid === handleObj.guid ) &&
-					( !tmp || tmp.test( handleObj.namespace ) ) &&
-					( !selector || selector === handleObj.selector ||
-						selector === "**" && handleObj.selector ) ) {
-					handlers.splice( j, 1 );
-
-					if ( handleObj.selector ) {
-						handlers.delegateCount--;
-					}
-					if ( special.remove ) {
-						special.remove.call( elem, handleObj );
-					}
-				}
-			}
-
-			// Remove generic event handler if we removed something and no more handlers exist
-			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( origCount && !handlers.length ) {
-				if ( !special.teardown ||
-					special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			delete elemData.handle;
-
-			// removeData also checks for emptiness and clears the expando if empty
-			// so use it instead of delete
-			jQuery._removeData( elem, "events" );
-		}
-	},
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-		var handle, ontype, cur,
-			bubbleType, special, tmp, i,
-			eventPath = [ elem || document ],
-			type = hasOwn.call( event, "type" ) ? event.type : event,
-			namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split( "." ) : [];
-
-		cur = tmp = elem = elem || document;
-
-		// Don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-			return;
-		}
-
-		if ( type.indexOf( "." ) > -1 ) {
-
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split( "." );
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-		ontype = type.indexOf( ":" ) < 0 && "on" + type;
-
-		// Caller can pass in a jQuery.Event object, Object, or just an event type string
-		event = event[ jQuery.expando ] ?
-			event :
-			new jQuery.Event( type, typeof event === "object" && event );
-
-		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
-		event.isTrigger = onlyHandlers ? 2 : 3;
-		event.namespace = namespaces.join( "." );
-		event.rnamespace = event.namespace ?
-			new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ) :
-			null;
-
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		if ( !event.target ) {
-			event.target = elem;
-		}
-
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data == null ?
-			[ event ] :
-			jQuery.makeArray( data, [ event ] );
-
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
-			return;
-		}
-
-		// Determine event propagation path in advance, per W3C events spec (#9951)
-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
-			bubbleType = special.delegateType || type;
-			if ( !rfocusMorph.test( bubbleType + type ) ) {
-				cur = cur.parentNode;
-			}
-			for ( ; cur; cur = cur.parentNode ) {
-				eventPath.push( cur );
-				tmp = cur;
-			}
-
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( tmp === ( elem.ownerDocument || document ) ) {
-				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
-			}
-		}
-
-		// Fire handlers on the event path
-		i = 0;
-		while ( ( cur = eventPath[ i++ ] ) && !event.isPropagationStopped() ) {
-
-			event.type = i > 1 ?
-				bubbleType :
-				special.bindType || type;
-
-			// jQuery handler
-			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] &&
-				jQuery._data( cur, "handle" );
-
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-
-			// Native handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && handle.apply && acceptData( cur ) ) {
-				event.result = handle.apply( cur, data );
-				if ( event.result === false ) {
-					event.preventDefault();
-				}
-			}
-		}
-		event.type = type;
-
-		// If nobody prevented the default action, do it now
-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
-			if (
-				( !special._default ||
-				 special._default.apply( eventPath.pop(), data ) === false
-				) && acceptData( elem )
-			) {
-
-				// Call a native DOM method on the target with the same name name as the event.
-				// Can't use an .isFunction() check here because IE6/7 fails that test.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) {
-
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					tmp = elem[ ontype ];
-
-					if ( tmp ) {
-						elem[ ontype ] = null;
-					}
-
-					// Prevent re-triggering of the same event, since we already bubbled it above
-					jQuery.event.triggered = type;
-					try {
-						elem[ type ]();
-					} catch ( e ) {
-
-						// IE<9 dies on focus/blur to hidden element (#1486,#12518)
-						// only reproducible on winXP IE8 native, not IE9 in IE8 mode
-					}
-					jQuery.event.triggered = undefined;
-
-					if ( tmp ) {
-						elem[ ontype ] = tmp;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	dispatch: function( event ) {
-
-		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event );
-
-		var i, j, ret, matched, handleObj,
-			handlerQueue = [],
-			args = slice.call( arguments ),
-			handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [],
-			special = jQuery.event.special[ event.type ] || {};
-
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[ 0 ] = event;
-		event.delegateTarget = this;
-
-		// Call the preDispatch hook for the mapped type, and let it bail if desired
-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-			return;
-		}
-
-		// Determine handlers
-		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
-
-		// Run delegates first; they may want to stop propagation beneath us
-		i = 0;
-		while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) {
-			event.currentTarget = matched.elem;
-
-			j = 0;
-			while ( ( handleObj = matched.handlers[ j++ ] ) &&
-				!event.isImmediatePropagationStopped() ) {
-
-				// Triggered event must either 1) have no namespace, or 2) have namespace(s)
-				// a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.rnamespace || event.rnamespace.test( handleObj.namespace ) ) {
-
-					event.handleObj = handleObj;
-					event.data = handleObj.data;
-
-					ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle ||
-						handleObj.handler ).apply( matched.elem, args );
-
-					if ( ret !== undefined ) {
-						if ( ( event.result = ret ) === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-				}
-			}
-		}
-
-		// Call the postDispatch hook for the mapped type
-		if ( special.postDispatch ) {
-			special.postDispatch.call( this, event );
-		}
-
-		return event.result;
-	},
-
-	handlers: function( event, handlers ) {
-		var i, matches, sel, handleObj,
-			handlerQueue = [],
-			delegateCount = handlers.delegateCount,
-			cur = event.target;
-
-		// Support (at least): Chrome, IE9
-		// Find delegate handlers
-		// Black-hole SVG  instance trees (#13180)
-		//
-		// Support: Firefox<=42+
-		// Avoid non-left-click in FF but don't block IE radio events (#3861, gh-2343)
-		if ( delegateCount && cur.nodeType &&
-			( event.type !== "click" || isNaN( event.button ) || event.button < 1 ) ) {
-
-			/* jshint eqeqeq: false */
-			for ( ; cur != this; cur = cur.parentNode || this ) {
-				/* jshint eqeqeq: true */
-
-				// Don't check non-elements (#13208)
-				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.nodeType === 1 && ( cur.disabled !== true || event.type !== "click" ) ) {
-					matches = [];
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-
-						// Don't conflict with Object.prototype properties (#13203)
-						sel = handleObj.selector + " ";
-
-						if ( matches[ sel ] === undefined ) {
-							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) > -1 :
-								jQuery.find( sel, this, null, [ cur ] ).length;
-						}
-						if ( matches[ sel ] ) {
-							matches.push( handleObj );
-						}
-					}
-					if ( matches.length ) {
-						handlerQueue.push( { elem: cur, handlers: matches } );
-					}
-				}
-			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		if ( delegateCount < handlers.length ) {
-			handlerQueue.push( { elem: this, handlers: handlers.slice( delegateCount ) } );
-		}
-
-		return handlerQueue;
-	},
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// Create a writable copy of the event object and normalize some properties
-		var i, prop, copy,
-			type = event.type,
-			originalEvent = event,
-			fixHook = this.fixHooks[ type ];
-
-		if ( !fixHook ) {
-			this.fixHooks[ type ] = fixHook =
-				rmouseEvent.test( type ) ? this.mouseHooks :
-				rkeyEvent.test( type ) ? this.keyHooks :
-				{};
-		}
-		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
-		event = new jQuery.Event( originalEvent );
-
-		i = copy.length;
-		while ( i-- ) {
-			prop = copy[ i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Support: IE<9
-		// Fix target property (#1925)
-		if ( !event.target ) {
-			event.target = originalEvent.srcElement || document;
-		}
-
-		// Support: Safari 6-8+
-		// Target should not be a text node (#504, #13143)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		// Support: IE<9
-		// For mouse/key events, metaKey==false if it's undefined (#3368, #11328)
-		event.metaKey = !!event.metaKey;
-
-		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
-	},
-
-	// Includes some event props shared by KeyEvent and MouseEvent
-	props: ( "altKey bubbles cancelable ctrlKey currentTarget detail eventPhase " +
-		"metaKey relatedTarget shiftKey target timeStamp view which" ).split( " " ),
-
-	fixHooks: {},
-
-	keyHooks: {
-		props: "char charCode key keyCode".split( " " ),
-		filter: function( event, original ) {
-
-			// Add which for key events
-			if ( event.which == null ) {
-				event.which = original.charCode != null ? original.charCode : original.keyCode;
-			}
-
-			return event;
-		}
-	},
-
-	mouseHooks: {
-		props: ( "button buttons clientX clientY fromElement offsetX offsetY " +
-			"pageX pageY screenX screenY toElement" ).split( " " ),
-		filter: function( event, original ) {
-			var body, eventDoc, doc,
-				button = original.button,
-				fromElement = original.fromElement;
-
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( event.pageX == null && original.clientX != null ) {
-				eventDoc = event.target.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
-
-				event.pageX = original.clientX +
-					( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) -
-					( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY +
-					( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) -
-					( doc && doc.clientTop  || body && body.clientTop  || 0 );
-			}
-
-			// Add relatedTarget, if necessary
-			if ( !event.relatedTarget && fromElement ) {
-				event.relatedTarget = fromElement === event.target ?
-					original.toElement :
-					fromElement;
-			}
-
-			// Add which for click: 1 === left; 2 === middle; 3 === right
-			// Note: button is not normalized, so don't use it
-			if ( !event.which && button !== undefined ) {
-				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-			}
-
-			return event;
-		}
-	},
-
-	special: {
-		load: {
-
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
-		},
-		focus: {
-
-			// Fire native event if possible so blur/focus sequence is correct
-			trigger: function() {
-				if ( this !== safeActiveElement() && this.focus ) {
-					try {
-						this.focus();
-						return false;
-					} catch ( e ) {
-
-						// Support: IE<9
-						// If we error on focus to hidden element (#1486, #12518),
-						// let .trigger() run the handlers
-					}
-				}
-			},
-			delegateType: "focusin"
-		},
-		blur: {
-			trigger: function() {
-				if ( this === safeActiveElement() && this.blur ) {
-					this.blur();
-					return false;
-				}
-			},
-			delegateType: "focusout"
-		},
-		click: {
-
-			// For checkbox, fire native event so checked state will be right
-			trigger: function() {
-				if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) {
-					this.click();
-					return false;
-				}
-			},
-
-			// For cross-browser consistency, don't fire native .click() on links
-			_default: function( event ) {
-				return jQuery.nodeName( event.target, "a" );
-			}
-		},
-
-		beforeunload: {
-			postDispatch: function( event ) {
-
-				// Support: Firefox 20+
-				// Firefox doesn't alert if the returnValue field is not set.
-				if ( event.result !== undefined && event.originalEvent ) {
-					event.originalEvent.returnValue = event.result;
-				}
-			}
-		}
-	},
-
-	// Piggyback on a donor event to simulate a different one
-	simulate: function( type, elem, event ) {
-		var e = jQuery.extend(
-			new jQuery.Event(),
-			event,
-			{
-				type: type,
-				isSimulated: true
-
-				// Previously, `originalEvent: {}` was set here, so stopPropagation call
-				// would not be triggered on donor event, since in our own
-				// jQuery.event.stopPropagation function we had a check for existence of
-				// originalEvent.stopPropagation method, so, consequently it would be a noop.
-				//
-				// Guard for simulated events was moved to jQuery.event.stopPropagation function
-				// since `originalEvent` should point to the original event for the
-				// constancy with other events and for more focused logic
-			}
-		);
-
-		jQuery.event.trigger( e, null, elem );
-
-		if ( e.isDefaultPrevented() ) {
-			event.preventDefault();
-		}
-	}
-};
-
-jQuery.removeEvent = document.removeEventListener ?
-	function( elem, type, handle ) {
-
-		// This "if" is needed for plain objects
-		if ( elem.removeEventListener ) {
-			elem.removeEventListener( type, handle );
-		}
-	} :
-	function( elem, type, handle ) {
-		var name = "on" + type;
-
-		if ( elem.detachEvent ) {
-
-			// #8545, #7054, preventing memory leaks for custom events in IE6-8
-			// detachEvent needed property on element, by name of that event,
-			// to properly expose it to GC
-			if ( typeof elem[ name ] === "undefined" ) {
-				elem[ name ] = null;
-			}
-
-			elem.detachEvent( name, handle );
-		}
-	};
-
-jQuery.Event = function( src, props ) {
-
-	// Allow instantiation without the 'new' keyword
-	if ( !( this instanceof jQuery.Event ) ) {
-		return new jQuery.Event( src, props );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = src.defaultPrevented ||
-				src.defaultPrevented === undefined &&
-
-				// Support: IE < 9, Android < 4.0
-				src.returnValue === false ?
-			returnTrue :
-			returnFalse;
-
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	constructor: jQuery.Event,
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse,
-
-	preventDefault: function() {
-		var e = this.originalEvent;
-
-		this.isDefaultPrevented = returnTrue;
-		if ( !e ) {
-			return;
-		}
-
-		// If preventDefault exists, run it on the original event
-		if ( e.preventDefault ) {
-			e.preventDefault();
-
-		// Support: IE
-		// Otherwise set the returnValue property of the original event to false
-		} else {
-			e.returnValue = false;
-		}
-	},
-	stopPropagation: function() {
-		var e = this.originalEvent;
-
-		this.isPropagationStopped = returnTrue;
-
-		if ( !e || this.isSimulated ) {
-			return;
-		}
-
-		// If stopPropagation exists, run it on the original event
-		if ( e.stopPropagation ) {
-			e.stopPropagation();
-		}
-
-		// Support: IE
-		// Set the cancelBubble property of the original event to true
-		e.cancelBubble = true;
-	},
-	stopImmediatePropagation: function() {
-		var e = this.originalEvent;
-
-		this.isImmediatePropagationStopped = returnTrue;
-
-		if ( e && e.stopImmediatePropagation ) {
-			e.stopImmediatePropagation();
-		}
-
-		this.stopPropagation();
-	}
-};
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-// so that event delegation works in jQuery.
-// Do the same for pointerenter/pointerleave and pointerover/pointerout
-//
-// Support: Safari 7 only
-// Safari sends mouseenter too often; see:
-// https://code.google.com/p/chromium/issues/detail?id=470258
-// for the description of the bug (it existed in older Chrome versions as well).
-jQuery.each( {
-	mouseenter: "mouseover",
-	mouseleave: "mouseout",
-	pointerenter: "pointerover",
-	pointerleave: "pointerout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var ret,
-				target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj;
-
-			// For mouseenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || ( related !== target && !jQuery.contains( target, related ) ) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
-			}
-			return ret;
-		}
-	};
-} );
-
-// IE submit delegation
-if ( !support.submit ) {
-
-	jQuery.event.special.submit = {
-		setup: function() {
-
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Lazy-add a submit handler when a descendant form may potentially be submitted
-			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
-
-				// Node name check avoids a VML-related crash in IE (#9807)
-				var elem = e.target,
-					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ?
-
-						// Support: IE <=8
-						// We use jQuery.prop instead of elem.form
-						// to allow fixing the IE8 delegated submit issue (gh-2332)
-						// by 3rd party polyfills/workarounds.
-						jQuery.prop( elem, "form" ) :
-						undefined;
-
-				if ( form && !jQuery._data( form, "submit" ) ) {
-					jQuery.event.add( form, "submit._submit", function( event ) {
-						event._submitBubble = true;
-					} );
-					jQuery._data( form, "submit", true );
-				}
-			} );
-
-			// return undefined since we don't need an event listener
-		},
-
-		postDispatch: function( event ) {
-
-			// If form was submitted by the user, bubble the event up the tree
-			if ( event._submitBubble ) {
-				delete event._submitBubble;
-				if ( this.parentNode && !event.isTrigger ) {
-					jQuery.event.simulate( "submit", this.parentNode, event );
-				}
-			}
-		},
-
-		teardown: function() {
-
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
-			jQuery.event.remove( this, "._submit" );
-		}
-	};
-}
-
-// IE change delegation and checkbox/radio fix
-if ( !support.change ) {
-
-	jQuery.event.special.change = {
-
-		setup: function() {
-
-			if ( rformElems.test( this.nodeName ) ) {
-
-				// IE doesn't fire change on a check/radio until blur; trigger it on click
-				// after a propertychange. Eat the blur-change in special.change.handle.
-				// This still fires onchange a second time for check/radio after blur.
-				if ( this.type === "checkbox" || this.type === "radio" ) {
-					jQuery.event.add( this, "propertychange._change", function( event ) {
-						if ( event.originalEvent.propertyName === "checked" ) {
-							this._justChanged = true;
-						}
-					} );
-					jQuery.event.add( this, "click._change", function( event ) {
-						if ( this._justChanged && !event.isTrigger ) {
-							this._justChanged = false;
-						}
-
-						// Allow triggered, simulated change events (#11500)
-						jQuery.event.simulate( "change", this, event );
-					} );
-				}
-				return false;
-			}
-
-			// Delegated event; lazy-add a change handler on descendant inputs
-			jQuery.event.add( this, "beforeactivate._change", function( e ) {
-				var elem = e.target;
-
-				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "change" ) ) {
-					jQuery.event.add( elem, "change._change", function( event ) {
-						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
-							jQuery.event.simulate( "change", this.parentNode, event );
-						}
-					} );
-					jQuery._data( elem, "change", true );
-				}
-			} );
-		},
-
-		handle: function( event ) {
-			var elem = event.target;
-
-			// Swallow native change events from checkbox/radio, we already triggered them above
-			if ( this !== elem || event.isSimulated || event.isTrigger ||
-				( elem.type !== "radio" && elem.type !== "checkbox" ) ) {
-
-				return event.handleObj.handler.apply( this, arguments );
-			}
-		},
-
-		teardown: function() {
-			jQuery.event.remove( this, "._change" );
-
-			return !rformElems.test( this.nodeName );
-		}
-	};
-}
-
-// Support: Firefox
-// Firefox doesn't have focus(in | out) events
-// Related ticket - https://bugzilla.mozilla.org/show_bug.cgi?id=687787
-//
-// Support: Chrome, Safari
-// focus(in | out) events fire after focus & blur events,
-// which is spec violation - http://www.w3.org/TR/DOM-Level-3-Events/#events-focusevent-event-order
-// Related ticket - https://code.google.com/p/chromium/issues/detail?id=449857
-if ( !support.focusin ) {
-	jQuery.each( { focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler on the document while someone wants focusin/focusout
-		var handler = function( event ) {
-			jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ) );
-		};
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				var doc = this.ownerDocument || this,
-					attaches = jQuery._data( doc, fix );
-
-				if ( !attaches ) {
-					doc.addEventListener( orig, handler, true );
-				}
-				jQuery._data( doc, fix, ( attaches || 0 ) + 1 );
-			},
-			teardown: function() {
-				var doc = this.ownerDocument || this,
-					attaches = jQuery._data( doc, fix ) - 1;
-
-				if ( !attaches ) {
-					doc.removeEventListener( orig, handler, true );
-					jQuery._removeData( doc, fix );
-				} else {
-					jQuery._data( doc, fix, attaches );
-				}
-			}
-		};
-	} );
-}
-
-jQuery.fn.extend( {
-
-	on: function( types, selector, data, fn ) {
-		return on( this, types, selector, data, fn );
-	},
-	one: function( types, selector, data, fn ) {
-		return on( this, types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		var handleObj, type;
-		if ( types && types.preventDefault && types.handleObj ) {
-
-			// ( event )  dispatched jQuery.Event
-			handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ?
-					handleObj.origType + "." + handleObj.namespace :
-					handleObj.origType,
-				handleObj.selector,
-				handleObj.handler
-			);
-			return this;
-		}
-		if ( typeof types === "object" ) {
-
-			// ( types-object [, selector] )
-			for ( type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
-			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each( function() {
-			jQuery.event.remove( this, types, fn, selector );
-		} );
-	},
-
-	trigger: function( type, data ) {
-		return this.each( function() {
-			jQuery.event.trigger( type, data, this );
-		} );
-	},
-	triggerHandler: function( type, data ) {
-		var elem = this[ 0 ];
-		if ( elem ) {
-			return jQuery.event.trigger( type, data, elem, true );
-		}
-	}
-} );
-
-
-var rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
-	rnoshimcache = new RegExp( "<(?:" + nodeNames + ")[\\s/>]", "i" ),
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,
-
-	// Support: IE 10-11, Edge 10240+
-	// In IE/Edge using regex groups here causes severe slowdowns.
-	// See https://connect.microsoft.com/IE/feedback/details/1736512/
-	rnoInnerhtml = /\s*$/g,
-	safeFragment = createSafeFragment( document ),
-	fragmentDiv = safeFragment.appendChild( document.createElement( "div" ) );
-
-// Support: IE<8
-// Manipulating tables requires a tbody
-function manipulationTarget( elem, content ) {
-	return jQuery.nodeName( elem, "table" ) &&
-		jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ?
-
-		elem.getElementsByTagName( "tbody" )[ 0 ] ||
-			elem.appendChild( elem.ownerDocument.createElement( "tbody" ) ) :
-		elem;
-}
-
-// Replace/restore the type attribute of script elements for safe DOM manipulation
-function disableScript( elem ) {
-	elem.type = ( jQuery.find.attr( elem, "type" ) !== null ) + "/" + elem.type;
-	return elem;
-}
-function restoreScript( elem ) {
-	var match = rscriptTypeMasked.exec( elem.type );
-	if ( match ) {
-		elem.type = match[ 1 ];
-	} else {
-		elem.removeAttribute( "type" );
-	}
-	return elem;
-}
-
-function cloneCopyEvent( src, dest ) {
-	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
-		return;
-	}
-
-	var type, i, l,
-		oldData = jQuery._data( src ),
-		curData = jQuery._data( dest, oldData ),
-		events = oldData.events;
-
-	if ( events ) {
-		delete curData.handle;
-		curData.events = {};
-
-		for ( type in events ) {
-			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-				jQuery.event.add( dest, type, events[ type ][ i ] );
-			}
-		}
-	}
-
-	// make the cloned public data object a copy from the original
-	if ( curData.data ) {
-		curData.data = jQuery.extend( {}, curData.data );
-	}
-}
-
-function fixCloneNodeIssues( src, dest ) {
-	var nodeName, e, data;
-
-	// We do not need to do anything for non-Elements
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	nodeName = dest.nodeName.toLowerCase();
-
-	// IE6-8 copies events bound via attachEvent when using cloneNode.
-	if ( !support.noCloneEvent && dest[ jQuery.expando ] ) {
-		data = jQuery._data( dest );
-
-		for ( e in data.events ) {
-			jQuery.removeEvent( dest, e, data.handle );
-		}
-
-		// Event data gets referenced instead of copied if the expando gets copied too
-		dest.removeAttribute( jQuery.expando );
-	}
-
-	// IE blanks contents when cloning scripts, and tries to evaluate newly-set text
-	if ( nodeName === "script" && dest.text !== src.text ) {
-		disableScript( dest ).text = src.text;
-		restoreScript( dest );
-
-	// IE6-10 improperly clones children of object elements using classid.
-	// IE10 throws NoModificationAllowedError if parent is null, #12132.
-	} else if ( nodeName === "object" ) {
-		if ( dest.parentNode ) {
-			dest.outerHTML = src.outerHTML;
-		}
-
-		// This path appears unavoidable for IE9. When cloning an object
-		// element in IE9, the outerHTML strategy above is not sufficient.
-		// If the src has innerHTML and the destination does not,
-		// copy the src.innerHTML into the dest.innerHTML. #10324
-		if ( support.html5Clone && ( src.innerHTML && !jQuery.trim( dest.innerHTML ) ) ) {
-			dest.innerHTML = src.innerHTML;
-		}
-
-	} else if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
-
-		// IE6-8 fails to persist the checked state of a cloned checkbox
-		// or radio button. Worse, IE6-7 fail to give the cloned element
-		// a checked appearance if the defaultChecked value isn't also set
-
-		dest.defaultChecked = dest.checked = src.checked;
-
-		// IE6-7 get confused and end up setting the value of a cloned
-		// checkbox/radio button to an empty string instead of "on"
-		if ( dest.value !== src.value ) {
-			dest.value = src.value;
-		}
-
-	// IE6-8 fails to return the selected option to the default selected
-	// state when cloning options
-	} else if ( nodeName === "option" ) {
-		dest.defaultSelected = dest.selected = src.defaultSelected;
-
-	// IE6-8 fails to set the defaultValue to the correct value when
-	// cloning other types of input fields
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-}
-
-function domManip( collection, args, callback, ignored ) {
-
-	// Flatten any nested arrays
-	args = concat.apply( [], args );
-
-	var first, node, hasScripts,
-		scripts, doc, fragment,
-		i = 0,
-		l = collection.length,
-		iNoClone = l - 1,
-		value = args[ 0 ],
-		isFunction = jQuery.isFunction( value );
-
-	// We can't cloneNode fragments that contain checked, in WebKit
-	if ( isFunction ||
-			( l > 1 && typeof value === "string" &&
-				!support.checkClone && rchecked.test( value ) ) ) {
-		return collection.each( function( index ) {
-			var self = collection.eq( index );
-			if ( isFunction ) {
-				args[ 0 ] = value.call( this, index, self.html() );
-			}
-			domManip( self, args, callback, ignored );
-		} );
-	}
-
-	if ( l ) {
-		fragment = buildFragment( args, collection[ 0 ].ownerDocument, false, collection, ignored );
-		first = fragment.firstChild;
-
-		if ( fragment.childNodes.length === 1 ) {
-			fragment = first;
-		}
-
-		// Require either new content or an interest in ignored elements to invoke the callback
-		if ( first || ignored ) {
-			scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-			hasScripts = scripts.length;
-
-			// Use the original fragment for the last item
-			// instead of the first because it can end up
-			// being emptied incorrectly in certain situations (#8070).
-			for ( ; i < l; i++ ) {
-				node = fragment;
-
-				if ( i !== iNoClone ) {
-					node = jQuery.clone( node, true, true );
-
-					// Keep references to cloned scripts for later restoration
-					if ( hasScripts ) {
-
-						// Support: Android<4.1, PhantomJS<2
-						// push.apply(_, arraylike) throws on ancient WebKit
-						jQuery.merge( scripts, getAll( node, "script" ) );
-					}
-				}
-
-				callback.call( collection[ i ], node, i );
-			}
-
-			if ( hasScripts ) {
-				doc = scripts[ scripts.length - 1 ].ownerDocument;
-
-				// Reenable scripts
-				jQuery.map( scripts, restoreScript );
-
-				// Evaluate executable scripts on first document insertion
-				for ( i = 0; i < hasScripts; i++ ) {
-					node = scripts[ i ];
-					if ( rscriptType.test( node.type || "" ) &&
-						!jQuery._data( node, "globalEval" ) &&
-						jQuery.contains( doc, node ) ) {
-
-						if ( node.src ) {
-
-							// Optional AJAX dependency, but won't run scripts if not present
-							if ( jQuery._evalUrl ) {
-								jQuery._evalUrl( node.src );
-							}
-						} else {
-							jQuery.globalEval(
-								( node.text || node.textContent || node.innerHTML || "" )
-									.replace( rcleanScript, "" )
-							);
-						}
-					}
-				}
-			}
-
-			// Fix #11809: Avoid leaking memory
-			fragment = first = null;
-		}
-	}
-
-	return collection;
-}
-
-function remove( elem, selector, keepData ) {
-	var node,
-		elems = selector ? jQuery.filter( selector, elem ) : elem,
-		i = 0;
-
-	for ( ; ( node = elems[ i ] ) != null; i++ ) {
-
-		if ( !keepData && node.nodeType === 1 ) {
-			jQuery.cleanData( getAll( node ) );
-		}
-
-		if ( node.parentNode ) {
-			if ( keepData && jQuery.contains( node.ownerDocument, node ) ) {
-				setGlobalEval( getAll( node, "script" ) );
-			}
-			node.parentNode.removeChild( node );
-		}
-	}
-
-	return elem;
-}
-
-jQuery.extend( {
-	htmlPrefilter: function( html ) {
-		return html.replace( rxhtmlTag, "<$1>" );
-	},
-
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var destElements, node, clone, i, srcElements,
-			inPage = jQuery.contains( elem.ownerDocument, elem );
-
-		if ( support.html5Clone || jQuery.isXMLDoc( elem ) ||
-			!rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
-
-			clone = elem.cloneNode( true );
-
-		// IE<=8 does not properly clone detached, unknown element nodes
-		} else {
-			fragmentDiv.innerHTML = elem.outerHTML;
-			fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
-		}
-
-		if ( ( !support.noCloneEvent || !support.noCloneChecked ) &&
-				( elem.nodeType === 1 || elem.nodeType === 11 ) && !jQuery.isXMLDoc( elem ) ) {
-
-			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
-			destElements = getAll( clone );
-			srcElements = getAll( elem );
-
-			// Fix all IE cloning issues
-			for ( i = 0; ( node = srcElements[ i ] ) != null; ++i ) {
-
-				// Ensure that the destination node is not null; Fixes #9587
-				if ( destElements[ i ] ) {
-					fixCloneNodeIssues( node, destElements[ i ] );
-				}
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			if ( deepDataAndEvents ) {
-				srcElements = srcElements || getAll( elem );
-				destElements = destElements || getAll( clone );
-
-				for ( i = 0; ( node = srcElements[ i ] ) != null; i++ ) {
-					cloneCopyEvent( node, destElements[ i ] );
-				}
-			} else {
-				cloneCopyEvent( elem, clone );
-			}
-		}
-
-		// Preserve script evaluation history
-		destElements = getAll( clone, "script" );
-		if ( destElements.length > 0 ) {
-			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
-		}
-
-		destElements = srcElements = node = null;
-
-		// Return the cloned set
-		return clone;
-	},
-
-	cleanData: function( elems, /* internal */ forceAcceptData ) {
-		var elem, type, id, data,
-			i = 0,
-			internalKey = jQuery.expando,
-			cache = jQuery.cache,
-			attributes = support.attributes,
-			special = jQuery.event.special;
-
-		for ( ; ( elem = elems[ i ] ) != null; i++ ) {
-			if ( forceAcceptData || acceptData( elem ) ) {
-
-				id = elem[ internalKey ];
-				data = id && cache[ id ];
-
-				if ( data ) {
-					if ( data.events ) {
-						for ( type in data.events ) {
-							if ( special[ type ] ) {
-								jQuery.event.remove( elem, type );
-
-							// This is a shortcut to avoid jQuery.event.remove's overhead
-							} else {
-								jQuery.removeEvent( elem, type, data.handle );
-							}
-						}
-					}
-
-					// Remove cache only if it was not already removed by jQuery.event.remove
-					if ( cache[ id ] ) {
-
-						delete cache[ id ];
-
-						// Support: IE<9
-						// IE does not allow us to delete expando properties from nodes
-						// IE creates expando attributes along with the property
-						// IE does not have a removeAttribute function on Document nodes
-						if ( !attributes && typeof elem.removeAttribute !== "undefined" ) {
-							elem.removeAttribute( internalKey );
-
-						// Webkit & Blink performance suffers when deleting properties
-						// from DOM nodes, so set to undefined instead
-						// https://code.google.com/p/chromium/issues/detail?id=378607
-						} else {
-							elem[ internalKey ] = undefined;
-						}
-
-						deletedIds.push( id );
-					}
-				}
-			}
-		}
-	}
-} );
-
-jQuery.fn.extend( {
-
-	// Keep domManip exposed until 3.0 (gh-2225)
-	domManip: domManip,
-
-	detach: function( selector ) {
-		return remove( this, selector, true );
-	},
-
-	remove: function( selector ) {
-		return remove( this, selector );
-	},
-
-	text: function( value ) {
-		return access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().append(
-					( this[ 0 ] && this[ 0 ].ownerDocument || document ).createTextNode( value )
-				);
-		}, null, value, arguments.length );
-	},
-
-	append: function() {
-		return domManip( this, arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.appendChild( elem );
-			}
-		} );
-	},
-
-	prepend: function() {
-		return domManip( this, arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.insertBefore( elem, target.firstChild );
-			}
-		} );
-	},
-
-	before: function() {
-		return domManip( this, arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this );
-			}
-		} );
-	},
-
-	after: function() {
-		return domManip( this, arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			}
-		} );
-	},
-
-	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; ( elem = this[ i ] ) != null; i++ ) {
-
-			// Remove element nodes and prevent memory leaks
-			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem, false ) );
-			}
-
-			// Remove any remaining nodes
-			while ( elem.firstChild ) {
-				elem.removeChild( elem.firstChild );
-			}
-
-			// If this is a select, ensure that it displays empty (#12336)
-			// Support: IE<9
-			if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
-				elem.options.length = 0;
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map( function() {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		} );
-	},
-
-	html: function( value ) {
-		return access( this, function( value ) {
-			var elem = this[ 0 ] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined ) {
-				return elem.nodeType === 1 ?
-					elem.innerHTML.replace( rinlinejQuery, "" ) :
-					undefined;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				( support.htmlSerialize || !rnoshimcache.test( value )  ) &&
-				( support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
-				!wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) {
-
-				value = jQuery.htmlPrefilter( value );
-
-				try {
-					for ( ; i < l; i++ ) {
-
-						// Remove element nodes and prevent memory leaks
-						elem = this[ i ] || {};
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( getAll( elem, false ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch ( e ) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function() {
-		var ignored = [];
-
-		// Make the changes, replacing each non-ignored context element with the new content
-		return domManip( this, arguments, function( elem ) {
-			var parent = this.parentNode;
-
-			if ( jQuery.inArray( this, ignored ) < 0 ) {
-				jQuery.cleanData( getAll( this ) );
-				if ( parent ) {
-					parent.replaceChild( elem, this );
-				}
-			}
-
-		// Force callback invocation
-		}, ignored );
-	}
-} );
-
-jQuery.each( {
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			i = 0,
-			ret = [],
-			insert = jQuery( selector ),
-			last = insert.length - 1;
-
-		for ( ; i <= last; i++ ) {
-			elems = i === last ? this : this.clone( true );
-			jQuery( insert[ i ] )[ original ]( elems );
-
-			// Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
-			push.apply( ret, elems.get() );
-		}
-
-		return this.pushStack( ret );
-	};
-} );
-
-
-var iframe,
-	elemdisplay = {
-
-		// Support: Firefox
-		// We have to pre-define these values for FF (#10227)
-		HTML: "block",
-		BODY: "block"
-	};
-
-/**
- * Retrieve the actual display of a element
- * @param {String} name nodeName of the element
- * @param {Object} doc Document object
- */
-
-// Called only from within defaultDisplay
-function actualDisplay( name, doc ) {
-	var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
-
-		display = jQuery.css( elem[ 0 ], "display" );
-
-	// We don't have any data stored on the element,
-	// so use "detach" method as fast way to get rid of the element
-	elem.detach();
-
-	return display;
-}
-
-/**
- * Try to determine the default display value of an element
- * @param {String} nodeName
- */
-function defaultDisplay( nodeName ) {
-	var doc = document,
-		display = elemdisplay[ nodeName ];
-
-	if ( !display ) {
-		display = actualDisplay( nodeName, doc );
-
-		// If the simple way fails, read from inside an iframe
-		if ( display === "none" || !display ) {
-
-			// Use the already-created iframe if possible
-			iframe = ( iframe || jQuery( "