55minutes · zhilvis · Sep 23, 2012 · Sep 23, 2012
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,7 @@ fiftyfive-wicket-examples/fiftyfive-wicket-examples.properties
 fiftyfive-wicket-examples/log4j.properties
 fiftyfive-wicket-examples/src/test/resources/log4j.properties
 fiftyfive-wicket-archetype/temp/
+bin
+.project
+.classpath
+.settings
diff --git a/fiftyfive-wicket-core/src/main/java/fiftyfive/wicket/FoundationApplication.java b/fiftyfive-wicket-core/src/main/java/fiftyfive/wicket/FoundationApplication.java
@@ -22,6 +22,7 @@
 import org.apache.wicket.protocol.http.RequestLogger;
 import org.apache.wicket.protocol.http.WebApplication;
 import org.apache.wicket.response.filter.AjaxServerAndClientTimeFilter;
+import org.apache.wicket.util.file.Path;
 import org.apache.wicket.util.time.Duration;
 import org.apache.wicket.util.time.Time;
 import org.slf4j.Logger;
@@ -170,8 +171,8 @@ protected void initHtmlHotDeploy()
         {
             htmlDir += "/";
         } 
-        getResourceSettings().addResourceFolder(htmlDir + "../java");
-        getResourceSettings().addResourceFolder(htmlDir + "../resources");
+        getResourceSettings().getResourceFinders().add(new Path(htmlDir + "../java"));
+        getResourceSettings().getResourceFinders().add(new Path(htmlDir + "../resources"));
     }
 
     /**

diff --git a/fiftyfive-wicket-core/src/main/java/fiftyfive/wicket/css/InternetExplorerCss.java b/fiftyfive-wicket-core/src/main/java/fiftyfive/wicket/css/InternetExplorerCss.java
@@ -20,7 +20,8 @@
 import java.util.List;
 import org.apache.wicket.Component;
 import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.markup.html.IHeaderResponse;
+import org.apache.wicket.markup.head.CssReferenceHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.request.resource.ResourceReference;
 
 /**
@@ -94,7 +95,7 @@ public static InternetExplorerCss getConditionalHeaderContribution (
         return new InternetExplorerCss(condition, token) {
             protected void doLinkRender(IHeaderResponse response)
             {
-                response.renderCSSReference(cssReference, media);                
+                response.render(CssReferenceHeaderItem.forReference(cssReference, null, media, condition));                
             }
         };
     }
@@ -157,7 +158,7 @@ public static InternetExplorerCss getConditionalHeaderContribution(
         return new InternetExplorerCss(condition, token) {
             protected void doLinkRender(IHeaderResponse response)
             {
-                response.renderCSSReference(contextRelativeUri, media);                
+                response.render(CssReferenceHeaderItem.forUrl(contextRelativeUri, media, condition));                
             }
         };
     }
@@ -184,12 +185,7 @@ public void renderHead(Component comp, IHeaderResponse response)
     {
         if(!response.wasRendered(this.token))
         {
-            response.getResponse().write(String.format(
-                "<!--[if %s]>%n",
-                this.condition
-            ));
             doLinkRender(response);
-            response.getResponse().write(String.format("<![endif]-->%n"));
             response.markRendered(this.token);
         }
     }

diff --git a/fiftyfive-wicket-core/src/main/java/fiftyfive/wicket/css/MergedCssBuilder.java b/fiftyfive-wicket-core/src/main/java/fiftyfive/wicket/css/MergedCssBuilder.java
@@ -18,7 +18,8 @@
 import fiftyfive.wicket.resource.MergedResourceBuilder;
 import org.apache.wicket.Component;
 import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.markup.html.IHeaderResponse;
+import org.apache.wicket.markup.head.CssReferenceHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.request.resource.PackageResourceReference;
 import org.apache.wicket.request.resource.ResourceReference;
 
@@ -113,7 +114,7 @@ protected Behavior newContributor(final ResourceReference ref)
             @Override
             public void renderHead(Component comp, IHeaderResponse response)
             {
-                response.renderCSSReference(ref, MergedCssBuilder.this.media);
+                response.render(CssReferenceHeaderItem.forReference(ref, MergedCssBuilder.this.media));
             }
         };
     }

diff --git a/fiftyfive-wicket-core/src/main/java/fiftyfive/wicket/data/DtoDataProvider.java b/fiftyfive-wicket-core/src/main/java/fiftyfive/wicket/data/DtoDataProvider.java
@@ -188,9 +188,9 @@ public void setPageableView(AbstractPageableView pageableView)
      * Loads the result DTO from the backend if necessary, then delegates
      * to the implementation of {@link #iterator(Object) iterator(R)}.
      */
-    public Iterator<? extends E> iterator(int offset, int amount)
+    public Iterator<? extends E> iterator(long offset, long amount)
     {
-        return iterator(getCachedResultOrLoad(offset, amount));
+        return iterator(getCachedResultOrLoad((int)offset, (int)amount));
     }
 
     /**
@@ -212,7 +212,7 @@ public IModel<E> model(E object)
      * <p>
      * This result will be cached, and the cache used if possible.
      */
-    public int size()
+    public long size()
     {
         if(null == this.cachedDataSize)
         {
@@ -237,7 +237,7 @@ public int size()
      */
     public R getCachedResultOrLoad()
     {
-        return getCachedResultOrLoad(getPageableViewOffset(), getPageableRowsPerPage());
+        return getCachedResultOrLoad((int)getPageableViewOffset(), (int)getPageableRowsPerPage());
     }
 
     /**
@@ -284,10 +284,10 @@ public void detach()
      * get the {@code currentPage} private field from the pageable view and
      * multiplying it by the rows per page. 
      */
-    protected int getPageableViewOffset()
+    protected long getPageableViewOffset()
     {
         assertPageableView();
-        int page = (Integer) ReflectUtils.readField(
+        long page = (Long)ReflectUtils.readField(
             this.pageableView, "currentPage"
         );
         return page * getPageableRowsPerPage();
@@ -299,7 +299,7 @@ protected int getPageableViewOffset()
      * {@link AbstractPageableView#getItemsPerPage getItemsPerPage()}
      * method.
      */
-    protected int getPageableRowsPerPage()
+    protected long getPageableRowsPerPage()
     {
         assertPageableView();
         return this.pageableView.getItemsPerPage();

diff --git a/fiftyfive-wicket-core/src/main/java/fiftyfive/wicket/mapper/PatternMountedMapper.java b/fiftyfive-wicket-core/src/main/java/fiftyfive/wicket/mapper/PatternMountedMapper.java
@@ -22,7 +22,7 @@
 
 import org.apache.wicket.request.Request;
 import org.apache.wicket.request.component.IRequestablePage;
-import org.apache.wicket.request.mapper.MountedMapper;
+import org.apache.wicket.core.request.mapper.MountedMapper;
 import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;

diff --git a/fiftyfive-wicket-core/src/main/java/fiftyfive/wicket/resource/MergedResourceBuilder.java b/fiftyfive-wicket-core/src/main/java/fiftyfive/wicket/resource/MergedResourceBuilder.java
@@ -22,7 +22,7 @@
 
 import org.apache.wicket.behavior.Behavior;
 
-import org.apache.wicket.markup.html.IHeaderResponse;
+import org.apache.wicket.markup.head.IHeaderResponse;
 
 import org.apache.wicket.protocol.http.WebApplication;
 

diff --git a/...ive-wicket-core/src/main/java/fiftyfive/wicket/resource/MergedResourceRequestHandler.java b/...ive-wicket-core/src/main/java/fiftyfive/wicket/resource/MergedResourceRequestHandler.java
@@ -180,6 +180,13 @@ public void write(byte[] array)
             this.wrapped.write(array);
         }
 
+        @Override
+        public void write(byte[] array, int offset, int length) 
+        {
+            this.headersOpen = false;
+            this.wrapped.write(array, offset, length);
+        }
+
         @Override
         public String encodeURL(CharSequence url)
         {

diff --git a/fiftyfive-wicket-core/src/main/java/fiftyfive/wicket/util/LoggingUtils.java b/fiftyfive-wicket-core/src/main/java/fiftyfive/wicket/util/LoggingUtils.java
@@ -39,8 +39,8 @@
 import org.apache.wicket.request.component.IRequestableComponent;
 import org.apache.wicket.request.component.IRequestablePage;
 import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.handler.IComponentRequestHandler;
-import org.apache.wicket.request.handler.IPageClassRequestHandler;
+import org.apache.wicket.core.request.handler.IComponentRequestHandler;
+import org.apache.wicket.core.request.handler.IPageClassRequestHandler;
 
 import org.apache.wicket.util.lang.Args;
 import org.apache.wicket.util.lang.Bytes;

diff --git a/fiftyfive-wicket-core/src/main/java/fiftyfive/wicket/util/ParameterSpec.java b/fiftyfive-wicket-core/src/main/java/fiftyfive/wicket/util/ParameterSpec.java
@@ -30,7 +30,7 @@
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
 import org.apache.wicket.util.convert.ConversionException;
-import org.apache.wicket.util.lang.PropertyResolver;
+import org.apache.wicket.core.util.lang.PropertyResolver;
 
 /**
  * Applies the DRY principle to Wicket bookmarkable links and page parameters.

diff --git a/fiftyfive-wicket-core/src/main/java/fiftyfive/wicket/util/Shortcuts.java b/fiftyfive-wicket-core/src/main/java/fiftyfive/wicket/util/Shortcuts.java
@@ -30,7 +30,8 @@
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.behavior.Behavior;
 
-import org.apache.wicket.markup.html.IHeaderResponse;
+import org.apache.wicket.markup.head.CssReferenceHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
 
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.LoadableDetachableModel;
@@ -414,9 +415,10 @@ public static Behavior cssResource(final Class<?> scope,
             @Override
             public void renderHead(Component comp, IHeaderResponse response)
             {
-                response.renderCSSReference(
+                response.render(
+                    CssReferenceHeaderItem.forReference(
                     new PackageResourceReference(scope, filename),
-                    media);
+                    media));
             }
         };
     }

diff --git a/...-wicket-core/src/test/java/fiftyfive/wicket/css/InternetExplorerCssTestPage-expected.html b/...-wicket-core/src/test/java/fiftyfive/wicket/css/InternetExplorerCssTestPage-expected.html
@@ -1,15 +1,7 @@
 <html>
-  <head><!--[if IE 7]>
-<link rel="stylesheet" type="text/css" href="../resource/fiftyfive.wicket.css.InternetExplorerCssTestPage/ie-7.css" />
-<![endif]-->
-<!--[if IE 7]>
-<link rel="stylesheet" type="text/css" href="../resource/fiftyfive.wicket.css.InternetExplorerCssTestPage/ie-7-print.css" media="print" />
-<![endif]-->
-<!--[if IE 7]>
-<link rel="stylesheet" type="text/css" href="../../styles/ie-7.css" />
-<![endif]-->
-<!--[if IE 7]>
-<link rel="stylesheet" type="text/css" href="../../styles/ie-7-print.css" media="print" />
-<![endif]-->
+  <head><!--[if IE 7]><link rel="stylesheet" type="text/css" href="../resource/fiftyfive.wicket.css.InternetExplorerCssTestPage/ie-7.css" /><![endif]-->
+<!--[if IE 7]><link rel="stylesheet" type="text/css" href="../resource/fiftyfive.wicket.css.InternetExplorerCssTestPage/ie-7-print.css" media="print" /><![endif]-->
+<!--[if IE 7]><link rel="stylesheet" type="text/css" href="../../styles/ie-7.css" /><![endif]-->
+<!--[if IE 7]><link rel="stylesheet" type="text/css" href="../../styles/ie-7-print.css" media="print" /><![endif]-->
 </head>
 </html>
diff --git a/fiftyfive-wicket-core/src/test/java/fiftyfive/wicket/css/MergedCssBuilderTestPage.java b/fiftyfive-wicket-core/src/test/java/fiftyfive/wicket/css/MergedCssBuilderTestPage.java
@@ -15,7 +15,8 @@
  */
 package fiftyfive.wicket.css;
 
-import org.apache.wicket.markup.html.IHeaderResponse;
+import org.apache.wicket.markup.head.CssReferenceHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.html.WebPage;
 
 import static fiftyfive.wicket.css.MergedCssBuilderTest.*;
@@ -32,9 +33,9 @@ public MergedCssBuilderTestPage()
     public void renderHead(IHeaderResponse response)
     {
         super.renderHead(response);
-        response.renderCSSReference(CSS_1);
-        response.renderCSSReference(CSS_2);
-        response.renderCSSReference(CSS_PRINT_1, "print");
-        response.renderCSSReference(CSS_PRINT_2, "print");
+        response.render(CssReferenceHeaderItem.forReference(CSS_1));
+        response.render(CssReferenceHeaderItem.forReference(CSS_2));
+        response.render(CssReferenceHeaderItem.forReference(CSS_PRINT_1, "print"));
+        response.render(CssReferenceHeaderItem.forReference(CSS_PRINT_2, "print"));
     }
 }
diff --git a/fiftyfive-wicket-core/src/test/java/fiftyfive/wicket/mapper/PatternMountedMapperTest.java b/fiftyfive-wicket-core/src/test/java/fiftyfive/wicket/mapper/PatternMountedMapperTest.java
@@ -21,7 +21,7 @@
 import org.apache.wicket.request.IRequestHandler;
 import org.apache.wicket.request.Request;
 import org.apache.wicket.request.Url;
-import org.apache.wicket.request.mapper.IMapperContext;
+import org.apache.wicket.core.request.mapper.IMapperContext;
 import org.apache.wicket.util.tester.DummyHomePage;
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/fiftyfive-wicket-core/src/test/java/fiftyfive/wicket/resource/MergedResourceBuilderTest.java b/fiftyfive-wicket-core/src/test/java/fiftyfive/wicket/resource/MergedResourceBuilderTest.java
@@ -16,6 +16,7 @@
 package fiftyfive.wicket.resource;
 
 import java.io.ByteArrayOutputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -56,6 +57,9 @@ protected void assertDownloaded(WicketTester tester, String uri, String... files
         for(String filename : files)
         {
             InputStream is = getClass().getResourceAsStream(filename);
+            if(is == null){
+                throw new FileNotFoundException("File not found: " + filename);
+            }
             try
             {
                 IOUtils.copy(is, expected);

diff --git a/fiftyfive-wicket-core/src/test/java/fiftyfive/wicket/resource/SimpleCDNTestPage.java b/fiftyfive-wicket-core/src/test/java/fiftyfive/wicket/resource/SimpleCDNTestPage.java
@@ -18,7 +18,9 @@
 
 import static fiftyfive.wicket.util.Shortcuts.*;
 
-import org.apache.wicket.markup.html.IHeaderResponse;
+import org.apache.wicket.markup.head.CssReferenceHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.request.resource.PackageResourceReference;
 
@@ -31,10 +33,10 @@ public SimpleCDNTestPage()
     @Override
     public void renderHead(IHeaderResponse response)
     {
-        response.renderCSSReference(
-            new PackageResourceReference(SimpleCDNTestPage.class, "test.css"));
-        response.renderJavaScriptReference(
-            new PackageResourceReference(SimpleCDNTestPage.class, "test.js"));
+        response.render(CssReferenceHeaderItem.forReference(
+            new PackageResourceReference(SimpleCDNTestPage.class, "test.css")));
+        response.render(JavaScriptReferenceHeaderItem.forReference(
+            new PackageResourceReference(SimpleCDNTestPage.class, "test.js")));
 
         super.renderHead(response);
     }

diff --git a/fiftyfive-wicket-js/src/main/java/fiftyfive/wicket/js/AbstractJavaScriptContribution.java b/fiftyfive-wicket-js/src/main/java/fiftyfive/wicket/js/AbstractJavaScriptContribution.java
@@ -20,7 +20,11 @@
 import org.apache.wicket.request.cycle.RequestCycle;
 import org.apache.wicket.request.resource.ResourceReference;
 import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.markup.html.IHeaderResponse;
+import org.apache.wicket.markup.head.CssReferenceHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
 import org.apache.wicket.request.http.WebRequest;
 
 /**
@@ -56,13 +60,13 @@ protected void renderDependencies(IHeaderResponse response,
                                       ResourceReference exclude)
     {
         ResourceReference css = dependencies.getCss();
-        if(css != null) response.renderCSSReference(css);
+        if(css != null) response.render(CssReferenceHeaderItem.forReference(css));
 
         for(ResourceReference ref : dependencies)
         {
             if(ref != null && (exclude == null || !ref.equals(exclude)))
             {
-                response.renderJavaScriptReference(ref);
+                response.render(JavaScriptReferenceHeaderItem.forReference(ref));
             }
         }
     }
@@ -89,18 +93,17 @@ protected void renderDomReady(IHeaderResponse response, String script)
 
         // Ensure that jQuery is present
         ResourceReference jQuery = settings().getJQueryResource();
-        if(jQuery != null) response.renderJavaScriptReference(jQuery);
+        if(jQuery != null) response.render(JavaScriptReferenceHeaderItem.forReference(jQuery));
 
         Request request = request();
         if((request instanceof WebRequest) && ((WebRequest)request).isAjax())
         {
-            response.renderOnDomReadyJavaScript(script);
+            response.render(OnDomReadyHeaderItem.forScript(script));
         }
         else
         {
-            response.renderJavaScript(
-                String.format("jQuery(function(){%s;});", script), null
-            );
+            response.render(JavaScriptHeaderItem.forScript(
+                String.format("jQuery(function(){%s;});", script), null));
         }
 
         response.markRendered(script);

diff --git a/fiftyfive-wicket-js/src/main/java/fiftyfive/wicket/js/DomReadyScript.java b/fiftyfive-wicket-js/src/main/java/fiftyfive/wicket/js/DomReadyScript.java
@@ -16,7 +16,7 @@
 package fiftyfive.wicket.js;
 
 import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.IHeaderResponse;
+import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 

diff --git a/fiftyfive-wicket-js/src/main/java/fiftyfive/wicket/js/DomReadyTemplate.java b/fiftyfive-wicket-js/src/main/java/fiftyfive/wicket/js/DomReadyTemplate.java
@@ -25,9 +25,9 @@
 import org.apache.wicket.WicketRuntimeException;
 import org.apache.wicket.javascript.DefaultJavaScriptCompressor;
 import org.apache.wicket.javascript.IJavaScriptCompressor;
-import org.apache.wicket.markup.html.IHeaderResponse;
+import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.request.resource.ResourceReference;
-import org.apache.wicket.util.string.interpolator.PropertyVariableInterpolator;
+import org.apache.wicket.core.util.string.interpolator.PropertyVariableInterpolator;
 import org.apache.wicket.util.template.PackageTextTemplate;
 import org.apache.wicket.util.template.TextTemplate;
 
@@ -261,7 +261,7 @@ private void load(Component comp)
         map.put("behavior", this);
 
         this.readyScript = getCompressor().compress(
-            PropertyVariableInterpolator.interpolate(tt.getString(), map)
+            new PropertyVariableInterpolator(tt.getString(), map).toString()
         );
     }
 }