Added: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceB.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceB.java?rev=1214702&view=auto ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceB.java (added) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceB.java Thu Dec 15 11:14:20 2011 @@ -0,0 +1,46 @@ +/* + * 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. + */ +package org.apache.wicket.resource.aggregator; + +import static org.apache.wicket.resource.header.JavaScriptHeaderItem.forReference; + +import java.util.Collections; + +import org.apache.wicket.request.resource.JavaScriptResourceReference; +import org.apache.wicket.resource.header.HeaderItem; + +/** + * js resource with dep on A + */ +public class ResourceReferenceB extends JavaScriptResourceReference +{ + private static final long serialVersionUID = 1L; + + /** + * Construct. + */ + public ResourceReferenceB() + { + super(ResourceAggregatorTest.class, "b.js"); + } + + @Override + public Iterable<? extends HeaderItem> getDependencies() + { + return Collections.singletonList(forReference(new ResourceReferenceA())); + } +} \ No newline at end of file
Added: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceC.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceC.java?rev=1214702&view=auto ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceC.java (added) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceC.java Thu Dec 15 11:14:20 2011 @@ -0,0 +1,46 @@ +/* + * 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. + */ +package org.apache.wicket.resource.aggregator; + +import static org.apache.wicket.resource.header.JavaScriptHeaderItem.forReference; + +import java.util.Collections; + +import org.apache.wicket.request.resource.JavaScriptResourceReference; +import org.apache.wicket.resource.header.HeaderItem; + +/** + * another js resource with dep on A + */ +public class ResourceReferenceC extends JavaScriptResourceReference +{ + private static final long serialVersionUID = 1L; + + /** + * Construct. + */ + public ResourceReferenceC() + { + super(ResourceAggregatorTest.class, "c.js"); + } + + @Override + public Iterable<? extends HeaderItem> getDependencies() + { + return Collections.singletonList(forReference(new ResourceReferenceA())); + } +} \ No newline at end of file Added: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceCirc1.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceCirc1.java?rev=1214702&view=auto ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceCirc1.java (added) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceCirc1.java Thu Dec 15 11:14:20 2011 @@ -0,0 +1,46 @@ +/* + * 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. + */ +package org.apache.wicket.resource.aggregator; + +import static org.apache.wicket.resource.header.JavaScriptHeaderItem.forReference; + +import java.util.Collections; + +import org.apache.wicket.request.resource.JavaScriptResourceReference; +import org.apache.wicket.resource.header.HeaderItem; + +/** + * js resource with circular dependency on circ2 + */ +public class ResourceReferenceCirc1 extends JavaScriptResourceReference +{ + private static final long serialVersionUID = 1L; + + /** + * Construct. + */ + public ResourceReferenceCirc1() + { + super(ResourceAggregatorTest.class, "circ1.js"); + } + + @Override + public Iterable<? extends HeaderItem> getDependencies() + { + return Collections.singletonList(forReference(new ResourceReferenceCirc2())); + } +} \ No newline at end of file Added: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceCirc2.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceCirc2.java?rev=1214702&view=auto ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceCirc2.java (added) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceCirc2.java Thu Dec 15 11:14:20 2011 @@ -0,0 +1,46 @@ +/* + * 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. + */ +package org.apache.wicket.resource.aggregator; + +import static org.apache.wicket.resource.header.JavaScriptHeaderItem.forReference; + +import java.util.Collections; + +import org.apache.wicket.request.resource.JavaScriptResourceReference; +import org.apache.wicket.resource.header.HeaderItem; + +/** + * js resource with circular dependency on circ1 + */ +public class ResourceReferenceCirc2 extends JavaScriptResourceReference +{ + private static final long serialVersionUID = 1L; + + /** + * Construct. + */ + public ResourceReferenceCirc2() + { + super(ResourceAggregatorTest.class, "circ2.js"); + } + + @Override + public Iterable<? extends HeaderItem> getDependencies() + { + return Collections.singletonList(forReference(new ResourceReferenceCirc1())); + } +} \ No newline at end of file Added: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceD.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceD.java?rev=1214702&view=auto ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceD.java (added) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceD.java Thu Dec 15 11:14:20 2011 @@ -0,0 +1,46 @@ +/* + * 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. + */ +package org.apache.wicket.resource.aggregator; + +import static org.apache.wicket.resource.header.JavaScriptHeaderItem.forReference; + +import java.util.Collections; + +import org.apache.wicket.request.resource.JavaScriptResourceReference; +import org.apache.wicket.resource.header.HeaderItem; + +/** + * js resource with dep on C (and therefore A) + */ +public class ResourceReferenceD extends JavaScriptResourceReference +{ + private static final long serialVersionUID = 1L; + + /** + * Construct. + */ + public ResourceReferenceD() + { + super(ResourceAggregatorTest.class, "d.js"); + } + + @Override + public Iterable<? extends HeaderItem> getDependencies() + { + return Collections.singletonList(forReference(new ResourceReferenceC())); + } +} \ No newline at end of file Added: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/TestHeaderResponse.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/TestHeaderResponse.java?rev=1214702&view=auto ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/TestHeaderResponse.java (added) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/TestHeaderResponse.java Thu Dec 15 11:14:20 2011 @@ -0,0 +1,87 @@ +/* + * 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. + */ +package org.apache.wicket.resource.aggregator; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.apache.wicket.markup.html.IHeaderResponse; +import org.apache.wicket.request.Response; +import org.apache.wicket.resource.header.HeaderItem; +import org.apache.wicket.resource.header.NoHeaderItem; +import org.apache.wicket.response.StringResponse; + +/** + * IHeaderResponse stub that only records the items rendered + * + * @author papegaaij + */ +public class TestHeaderResponse implements IHeaderResponse +{ + private StringResponse response = new StringResponse(); + private Set<Object> rendered = new HashSet<Object>(); + private List<HeaderItem> items = new ArrayList<HeaderItem>(); + private boolean closed = false; + + /** + * @return the recorded items + */ + public List<HeaderItem> getItems() + { + return items; + } + + @Override + public void render(HeaderItem item) + { + if (item != NoHeaderItem.get()) + items.add(item); + } + + @Override + public void markRendered(Object object) + { + rendered.add(object); + } + + @Override + public boolean wasRendered(Object object) + { + return rendered.contains(object); + } + + @Override + public Response getResponse() + { + return response; + } + + @Override + public void close() + { + response.close(); + closed = true; + } + + @Override + public boolean isClosed() + { + return closed; + } +} \ No newline at end of file Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java?rev=1214702&r1=1214701&r2=1214702&view=diff ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java (original) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java Thu Dec 15 11:14:20 2011 @@ -91,7 +91,7 @@ public class ApacheLicenceHeaderTest ext * See NOTICE.txt */ javaScriptIgnore.add("src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.js"); - javaScriptIgnore.add("src/main/java/org/apache/wicket/ajax/res/js/jquery"); + javaScriptIgnore.add("src/main/java/org/apache/wicket/resource/jquery"); javaScriptIgnore.add("src/test/js/qunit/qunit.js"); } } Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java?rev=1214702&r1=1214701&r2=1214702&view=diff ============================================================================== --- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java (original) +++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java Thu Dec 15 11:14:20 2011 @@ -979,7 +979,7 @@ public class WicketTesterTest extends Wi public void startResourceReference() { tester.startResourceReference(tester.getApplication() - .getAjaxSettings() + .getJavaScriptLibrarySettings() .getWicketAjaxReference()); // verify that a random string from that resource is in the response tester.assertContains("getAjaxBaseUrl"); @@ -992,7 +992,7 @@ public class WicketTesterTest extends Wi public void startResource() { tester.startResource(tester.getApplication() - .getAjaxSettings() + .getJavaScriptLibrarySettings() .getWicketAjaxReference() .getResource()); // verify that a random string from that resource is in the response Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java?rev=1214702&r1=1214701&r2=1214702&view=diff ============================================================================== --- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java (original) +++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java Thu Dec 15 11:14:20 2011 @@ -20,6 +20,7 @@ import org.apache.wicket.Application; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; +import org.apache.wicket.resource.header.JavaScriptHeaderItem; /** * Use the {@link #load(IHeaderResponse)} method to initialize the YUI library using the YUI loader. @@ -43,7 +44,7 @@ public final class YuiLib */ public static void load(IHeaderResponse response) { - response.renderJavaScriptReference(getYuiLoader()); + response.render(JavaScriptHeaderItem.forReference(getYuiLoader())); } private static ResourceReference getYuiLoader() Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java?rev=1214702&r1=1214701&r2=1214702&view=diff ============================================================================== --- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java (original) +++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java Thu Dec 15 11:14:20 2011 @@ -25,7 +25,8 @@ import org.apache.wicket.extensions.yui. import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.WebComponent; import org.apache.wicket.request.resource.PackageResourceReference; -import org.apache.wicket.util.string.JavaScriptUtils; +import org.apache.wicket.resource.header.CssHeaderItem; +import org.apache.wicket.resource.header.JavaScriptHeaderItem; /** @@ -124,12 +125,12 @@ public abstract class AbstractCalendar e */ private void contributeDependencies(IHeaderResponse response) { - response.renderJavaScriptReference(new PackageResourceReference(YuiLib.class, - "yahoodomevent/yahoo-dom-event.js")); - response.renderJavaScriptReference(new PackageResourceReference(AbstractCalendar.class, - "calendar-min.js")); - response.renderCSSReference(new PackageResourceReference(AbstractCalendar.class, - "assets/skins/sam/calendar.css")); + response.render(JavaScriptHeaderItem.forReference(new PackageResourceReference( + YuiLib.class, "yahoodomevent/yahoo-dom-event.js"))); + response.render(JavaScriptHeaderItem.forReference(new PackageResourceReference( + AbstractCalendar.class, "calendar-min.js"))); + response.render(CssHeaderItem.forReference(new PackageResourceReference( + AbstractCalendar.class, "assets/skins/sam/calendar.css"))); } /** @@ -179,7 +180,6 @@ public abstract class AbstractCalendar e String javascriptId = getJavaScriptId(); String javascriptWidgetId = getJavaScriptWidgetId(); StringBuilder b = new StringBuilder(); - b.append(JavaScriptUtils.SCRIPT_OPEN_TAG); // initialize wicket namespace and register the init function // for the YUI widget b.append("YAHOO.namespace(\"wicket\");\nfunction init"); @@ -254,8 +254,7 @@ public abstract class AbstractCalendar e b.append("YAHOO.util.Event.addListener(window, \"load\", init"); b.append(javascriptId); b.append(");"); - b.append(JavaScriptUtils.SCRIPT_CLOSE_TAG); - response.renderString(b); + response.render(JavaScriptHeaderItem.forScript(b, null)); } } Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java?rev=1214702&r1=1214701&r2=1214702&view=diff ============================================================================== --- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java (original) +++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java Thu Dec 15 11:14:20 2011 @@ -45,6 +45,7 @@ import org.apache.wicket.request.handler import org.apache.wicket.request.resource.JavaScriptResourceReference; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; +import org.apache.wicket.resource.header.OnDomReadyHeaderItem; import org.apache.wicket.util.convert.IConverter; import org.apache.wicket.util.convert.converter.DateConverter; import org.apache.wicket.util.lang.Objects; @@ -264,7 +265,7 @@ public class DatePicker extends Behavior // render initialization script with the variables interpolated TextTemplate datePickerJs = new PackageTextTemplate(DatePicker.class, "DatePicker.js"); datePickerJs.interpolate(variables); - response.renderOnDomReadyJavaScript(datePickerJs.asString()); + response.render(OnDomReadyHeaderItem.forScript(datePickerJs.asString())); // remove previously generated markup (see onRendered) via javascript in // ajax requests to not render the yui calendar multiple times @@ -314,7 +315,7 @@ public class DatePicker extends Behavior } TextTemplate template = new PackageTextTemplate(DatePicker.class, key); - response.renderOnDomReadyJavaScript(template.asString(variables)); + response.render(OnDomReadyHeaderItem.forScript(template.asString(variables))); response.markRendered(key); } @@ -607,7 +608,7 @@ public class DatePicker extends Behavior appendMapping(i18nVariables, i18n); i18n.append(';'); - response.renderOnDomReadyJavaScript(i18n.toString()); + response.render(OnDomReadyHeaderItem.forScript(i18n.toString())); response.wasRendered(key); } Modified: wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html?rev=1214702&r1=1214701&r2=1214702&view=diff ============================================================================== --- wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html (original) +++ wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html Thu Dec 15 11:14:20 2011 @@ -13,11 +13,12 @@ th { /*]]>*/ </style> <script type="text/javascript" src="../resource/org.apache.wicket.extensions.yui.YuiLib/yuiloader/yuiloader.js"></script> -<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/jquery/jquery.min.js"></script> +<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery.js"></script> <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script> <script type="text/javascript" > /*<![CDATA[*/ -Wicket.Event.add(window, "domready", function(event) { /* +Wicket.Event.add(window, "domready", function(event) { +/* * 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. @@ -74,17 +75,9 @@ Wicket.DateTimeInit.YuiLoader.addModule( fullpath: "../resource/org.apache.wicket.extensions.yui.calendar.DatePicker/wicket-date.js" }); Wicket.DateTimeInit.YuiLoader.insert(); -;}); -/*]]>*/ -</script> -<script type="text/javascript" > -/*<![CDATA[*/ -Wicket.Event.add(window, "domready", function(event) { Wicket.DateTimeInit.CalendarI18n["de"]={MONTHS_SHORT:["Jan","Feb","Mrz","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],MONTHS_LONG:["Januar","Februar","M\u00E4rz","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],WEEKDAYS_MEDIUM:["So","Mo","Di","Mi","Do","Fr","Sa"],WEEKDAYS_LONG:["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],START_WEEKDAY:1,WEEKDAYS_1CHAR:["S","M","D","M","D","F","S"],WEEKDAYS_SHORT:["So","Mo","Di","Mi","Do","Fr","Sa"]};;}); -/*]]>*/ -</script> -<script type="text/javascript" > -/*<![CDATA[*/ -Wicket.Event.add(window, "domready", function(event) { /* +; +Wicket.DateTimeInit.CalendarI18n["de"]={MONTHS_SHORT:["Jan","Feb","Mrz","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],MONTHS_LONG:["Januar","Februar","M\u00E4rz","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],WEEKDAYS_MEDIUM:["So","Mo","Di","Mi","Do","Fr","Sa"],WEEKDAYS_LONG:["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],START_WEEKDAY:1,WEEKDAYS_1CHAR:["S","M","D","M","D","F","S"],WEEKDAYS_SHORT:["So","Mo","Di","Mi","Do","Fr","Sa"]};; +/* * 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. @@ -105,6 +98,7 @@ Wicket.DateTimeInit.CalendarAdd(function true, true, true, false, Wicket.DateTimeInit.CalendarI18n["de"], false); }); +; ;}); /*]]>*/ </script> Modified: wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java?rev=1214702&r1=1214701&r2=1214702&view=diff ============================================================================== --- wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java (original) +++ wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java Thu Dec 15 11:14:20 2011 @@ -31,6 +31,8 @@ import org.apache.wicket.markup.html.lis import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.request.resource.JavaScriptResourceReference; import org.apache.wicket.request.resource.PackageResourceReference; +import org.apache.wicket.resource.header.CssHeaderItem; +import org.apache.wicket.resource.header.JavaScriptHeaderItem; /** * The debug bar is for use during development. It allows contributors to add useful functions or @@ -120,10 +122,10 @@ public class DebugBar extends DevUtilsPa @Override public void renderHead(final IHeaderResponse response) { - response.renderCSSReference(new PackageResourceReference(DebugBar.class, - "wicket-debugbar.css")); - response.renderJavaScriptReference(new JavaScriptResourceReference(DebugBar.class, - "wicket-debugbar.js")); + response.render(CssHeaderItem.forReference(new PackageResourceReference(DebugBar.class, + "wicket-debugbar.css"))); + response.render(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference( + DebugBar.class, "wicket-debugbar.js"))); } /** Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java?rev=1214702&r1=1214701&r2=1214702&view=diff ============================================================================== --- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java (original) +++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java Thu Dec 15 11:14:20 2011 @@ -21,12 +21,16 @@ import org.apache.wicket.ajax.AbstractAj import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.behavior.Behavior; import org.apache.wicket.examples.WicketExamplePage; -import org.apache.wicket.examples.resourcedecoration.GroupedAndOrderedResourceReference.ResourceGroup; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.apache.wicket.request.resource.CssResourceReference; import org.apache.wicket.request.resource.PackageResourceReference; +import org.apache.wicket.resource.JQueryPluginResourceReference; import org.apache.wicket.resource.filtering.HeaderResponseFilteredResponseContainer; +import org.apache.wicket.resource.header.CssHeaderItem; +import org.apache.wicket.resource.header.JavaScriptHeaderItem; +import org.apache.wicket.resource.header.OnDomReadyHeaderItem; import org.apache.wicket.util.time.Duration; /** @@ -55,9 +59,9 @@ public class HomePage extends WicketExam @Override public void renderHead(Component component, IHeaderResponse response) { - jsPlaceholder.setOutputMarkupId(true); - response.renderOnDomReadyJavaScript("$('#" + jsPlaceholder.getMarkupId() + - "').html('the ondomready script ran').css('border-color', 'green');"); + response.render(OnDomReadyHeaderItem.forScript("$('#" + + jsPlaceholder.getMarkupId() + + "').html('the ondomready script ran').css('border-color', 'green');")); } }); add(jsPlaceholder); @@ -90,23 +94,20 @@ public class HomePage extends WicketExam // two CSS resources in the same group. header.css is rendered first because has lower // "order" number - response.renderCSSReference(new GroupedAndOrderedResourceReference(ResourceGroup.GLOBAL, 0, - HomePage.class, "footer.css")); - response.renderCSSReference(new GroupedAndOrderedResourceReference(ResourceGroup.GLOBAL, 0, - HomePage.class, "header.css")); - - response.renderJavaScriptReference(new GroupedAndOrderedResourceReference( - ResourceGroup.GLOBAL, 0, HomePage.class, "jquery-1.4.3.min.js")); + response.render(CssHeaderItem.forReference(new CssResourceReference(HomePage.class, + "footer.css"))); + response.render(CssHeaderItem.forReference(new CssResourceReference(HomePage.class, + "header.css"))); // example of something that may be in this single application: - response.renderCSSReference(new GroupedAndOrderedResourceReference( - ResourceGroup.APPLICATION, 0, HomePage.class, "app.css")); + response.render(CssHeaderItem.forReference(new CssResourceReference(HomePage.class, + "app.css"))); // example of something that may be limited to certain pages: - response.renderCSSReference(new GroupedAndOrderedResourceReference(ResourceGroup.PAGE, 0, - HomePage.class, "HomePage.css")); - response.renderJavaScriptReference(new GroupedAndOrderedResourceReference( - ResourceGroup.PAGE, 0, HomePage.class, "HomePage.js")); + response.render(CssHeaderItem.forReference(new CssResourceReference(HomePage.class, + "HomePage.css"))); + response.render(JavaScriptHeaderItem.forReference(new JQueryPluginResourceReference( + HomePage.class, "HomePage.js"))); } private static class AjaxProofContainer extends WebMarkupContainer @@ -124,10 +125,11 @@ public class HomePage extends WicketExam { if (AjaxRequestTarget.get() != null) { - response.renderCSSReference(new PackageResourceReference(HomePage.class, "ajax.css")); - response.renderJavaScriptReference(new PackageResourceReference(HomePage.class, - "ajax.js")); - response.renderOnDomReadyJavaScript("updatePending();"); + response.render(CssHeaderItem.forReference(new PackageResourceReference( + HomePage.class, "ajax.css"))); + response.render(JavaScriptHeaderItem.forReference(new PackageResourceReference( + HomePage.class, "ajax.js"))); + response.render(OnDomReadyHeaderItem.forScript("updatePending();")); } } } Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/ResourceDecorationApplication.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/ResourceDecorationApplication.java?rev=1214702&r1=1214701&r2=1214702&view=diff ============================================================================== --- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/ResourceDecorationApplication.java (original) +++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/ResourceDecorationApplication.java Thu Dec 15 11:14:20 2011 @@ -20,6 +20,7 @@ import org.apache.wicket.Application; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.IHeaderResponseDecorator; import org.apache.wicket.protocol.http.WebApplication; +import org.apache.wicket.request.resource.CssResourceReference; import org.apache.wicket.resource.filtering.JavaScriptFilteredIntoFooterHeaderResponse; /** @@ -40,26 +41,18 @@ public class ResourceDecorationApplicati { super.init(); - getSharedResources().add("merged-resources", new MergedResourcesResource()); + getResourceBundles().addCssBundle(ResourceDecorationApplication.class, "css-bundle.css", + new CssResourceReference(HomePage.class, "footer.css"), + new CssResourceReference(HomePage.class, "header.css")); setHeaderResponseDecorator(new IHeaderResponseDecorator() { public IHeaderResponse decorate(IHeaderResponse response) { - // use grouping header response for the CSS resources, this way we can load several - // .css files in one http request. See HomePage#renderHead() header.css and - // footer.css - GroupingHeaderResponse groupingHeaderResponse = new GroupingHeaderResponse(response); - // use this header resource decorator to load all JavaScript resources in the page // footer (after </body>) - JavaScriptFilteredIntoFooterHeaderResponse javaScriptFooterResponse = new JavaScriptFilteredIntoFooterHeaderResponse( - response, "footerJS"); - - // finally use one that delegates to the two above - return new GroupingAndFilteringHeaderResponse(groupingHeaderResponse, - javaScriptFooterResponse); + return new JavaScriptFilteredIntoFooterHeaderResponse(response, "footerJS"); } }); } Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java?rev=1214702&r1=1214701&r2=1214702&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java Thu Dec 15 11:14:20 2011 @@ -27,6 +27,7 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler; +import org.apache.wicket.resource.header.OnDomReadyHeaderItem; /** * A panel where you can lazy load another panel. This can be used if you have a panel/component @@ -123,7 +124,7 @@ public abstract class AjaxLazyLoadPanel */ protected void handleCallbackScript(final IHeaderResponse response, final String callbackScript) { - response.renderOnDomReadyJavaScript(callbackScript); + response.render(OnDomReadyHeaderItem.forScript(callbackScript)); } /** Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java?rev=1214702&r1=1214701&r2=1214702&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java Thu Dec 15 11:14:20 2011 @@ -24,6 +24,8 @@ import org.apache.wicket.markup.html.IHe import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.resource.JavaScriptResourceReference; import org.apache.wicket.request.resource.ResourceReference; +import org.apache.wicket.resource.header.JavaScriptHeaderItem; +import org.apache.wicket.resource.header.OnDomReadyHeaderItem; import org.apache.wicket.util.string.Strings; /** @@ -77,7 +79,7 @@ public abstract class AbstractAutoComple */ private void renderAutocompleteHead(final IHeaderResponse response) { - response.renderJavaScriptReference(AUTOCOMPLETE_JS); + response.render(JavaScriptHeaderItem.forReference(AUTOCOMPLETE_JS)); final String id = getComponent().getMarkupId(); String indicatorId = findIndicatorId(); @@ -92,7 +94,7 @@ public abstract class AbstractAutoComple String initJS = String.format("new Wicket.AutoComplete('%s','%s',%s,%s);", id, getCallbackUrl(), constructSettingsJS(), indicatorId); - response.renderOnDomReadyJavaScript(initJS); + response.render(OnDomReadyHeaderItem.forScript(initJS)); } /** Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/DefaultCssAutoCompleteTextField.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/DefaultCssAutoCompleteTextField.java?rev=1214702&r1=1214701&r2=1214702&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/DefaultCssAutoCompleteTextField.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/DefaultCssAutoCompleteTextField.java Thu Dec 15 11:14:20 2011 @@ -19,6 +19,7 @@ package org.apache.wicket.extensions.aja import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.model.IModel; import org.apache.wicket.request.resource.PackageResourceReference; +import org.apache.wicket.resource.header.CssHeaderItem; /** * An {@link AutoCompleteTextField} which automatically includes the default CSS for the @@ -49,7 +50,7 @@ public abstract class DefaultCssAutoComp { super.renderHead(response); - response.renderCSSReference(new PackageResourceReference( - DefaultCssAutoCompleteTextField.class, "DefaultCssAutoCompleteTextField.css")); + response.render(CssHeaderItem.forReference(new PackageResourceReference( + DefaultCssAutoCompleteTextField.class, "DefaultCssAutoCompleteTextField.css"))); } } Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java?rev=1214702&r1=1214701&r2=1214702&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java Thu Dec 15 11:14:20 2011 @@ -21,7 +21,6 @@ import java.util.Formatter; import org.apache.wicket.Application; import org.apache.wicket.Component; import org.apache.wicket.IInitializer; -import org.apache.wicket.ajax.CoreLibrariesContributor; import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.WebMarkupContainer; @@ -33,6 +32,10 @@ import org.apache.wicket.model.StringRes import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.request.resource.SharedResourceReference; +import org.apache.wicket.resource.CoreLibrariesContributor; +import org.apache.wicket.resource.header.CssHeaderItem; +import org.apache.wicket.resource.header.JavaScriptHeaderItem; +import org.apache.wicket.resource.header.OnDomReadyHeaderItem; import org.apache.wicket.util.visit.IVisit; import org.apache.wicket.util.visit.IVisitor; import org.slf4j.Logger; @@ -203,11 +206,11 @@ public class UploadProgressBar extends P super.renderHead(response); CoreLibrariesContributor.contributeAjax(getApplication(), response); - response.renderJavaScriptReference(JS); + response.render(JavaScriptHeaderItem.forReference(JS)); ResourceReference css = getCss(); if (css != null) { - response.renderCSSReference(css); + response.render(CssHeaderItem.forReference(css)); } ResourceReference ref = new SharedResourceReference(RESOURCE_NAME); @@ -225,7 +228,7 @@ public class UploadProgressBar extends P "Wicket.bind(new Wicket.WUPB('%s', '%s', '%s', '%s', '%s', '%s'), Wicket.$('%s'))", getMarkupId(), statusDiv.getMarkupId(), barDiv.getMarkupId(), url, uploadFieldId, status, getCallbackForm().getMarkupId()); - response.renderOnDomReadyJavaScript(builder.toString()); + response.render(OnDomReadyHeaderItem.forScript(builder.toString())); } /** Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java?rev=1214702&r1=1214701&r2=1214702&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java Thu Dec 15 11:14:20 2011 @@ -22,7 +22,6 @@ import org.apache.wicket.Page; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.ajax.CoreLibrariesContributor; import org.apache.wicket.ajax.IAjaxCallDecorator; import org.apache.wicket.ajax.calldecorator.CancelEventIfNoAjaxDecorator; import org.apache.wicket.markup.ComponentTag; @@ -39,6 +38,9 @@ import org.apache.wicket.request.handler import org.apache.wicket.request.resource.JavaScriptResourceReference; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; +import org.apache.wicket.resource.CoreLibrariesContributor; +import org.apache.wicket.resource.header.CssHeaderItem; +import org.apache.wicket.resource.header.JavaScriptHeaderItem; import org.apache.wicket.util.lang.EnumeratedType; import org.apache.wicket.util.string.AppendingStringBuffer; import org.apache.wicket.util.string.Strings; @@ -262,12 +264,12 @@ public class ModalWindow extends Panel super.renderHead(response); CoreLibrariesContributor.contributeAjax(getApplication(), response); - response.renderJavaScriptReference(JAVASCRIPT); + response.render(JavaScriptHeaderItem.forReference(JAVASCRIPT)); ResourceReference cssResource = newCssResource(); if (cssResource != null) { - response.renderCSSReference(cssResource); + response.render(CssHeaderItem.forReference(cssResource)); } } Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java?rev=1214702&r1=1214701&r2=1214702&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java Thu Dec 15 11:14:20 2011 @@ -38,6 +38,8 @@ import org.apache.wicket.model.ResourceM import org.apache.wicket.request.resource.JavaScriptResourceReference; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; +import org.apache.wicket.resource.header.CssHeaderItem; +import org.apache.wicket.resource.header.JavaScriptHeaderItem; /** @@ -625,11 +627,11 @@ public class Palette<T> extends Panel @Override public void renderHead(final IHeaderResponse response) { - response.renderJavaScriptReference(JAVASCRIPT); + response.render(JavaScriptHeaderItem.forReference(JAVASCRIPT)); ResourceReference css = getCSS(); if (css != null) { - response.renderCSSReference(css); + response.render(CssHeaderItem.forReference(css)); } } } Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java?rev=1214702&r1=1214701&r2=1214702&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java Thu Dec 15 11:14:20 2011 @@ -23,6 +23,7 @@ import org.apache.wicket.markup.MarkupSt import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.FormComponent; +import org.apache.wicket.resource.header.OnLoadHeaderItem; import org.apache.wicket.util.string.Strings; /** @@ -54,8 +55,8 @@ public class FilterForm<T> extends Form< public void renderHead(final IHeaderResponse response) { super.renderHead(response); - response.renderOnLoadJavaScript("_filter_focus_restore('" + getFocusTrackerFieldCssId() + - "');"); + response.render(OnLoadHeaderItem.forScript("_filter_focus_restore('" + + getFocusTrackerFieldCssId() + "');")); } /** Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java?rev=1214702&r1=1214701&r2=1214702&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java Thu Dec 15 11:14:20 2011 @@ -41,6 +41,7 @@ import org.apache.wicket.request.cycle.R import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; +import org.apache.wicket.resource.header.CssHeaderItem; /** * Tree class that contains convenient functions related to presentation of the tree, which includes @@ -581,7 +582,7 @@ public abstract class DefaultAbstractTre ResourceReference css = getCSS(); if (css != null) { - response.renderCSSReference(css); + response.render(CssHeaderItem.forReference(css)); } } } Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java?rev=1214702&r1=1214701&r2=1214702&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java Thu Dec 15 11:14:20 2011 @@ -36,6 +36,7 @@ import org.apache.wicket.model.AbstractR import org.apache.wicket.model.IModel; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; +import org.apache.wicket.resource.header.OnDomReadyHeaderItem; /** @@ -205,8 +206,8 @@ public class TreeTable extends DefaultAb @Override public void renderHead(final Component component, final IHeaderResponse response) { - response.renderOnDomReadyJavaScript("Wicket.TreeTable.attachUpdate(\"" + - getMarkupId() + "\")"); + response.render(OnDomReadyHeaderItem.forScript("Wicket.TreeTable.attachUpdate(\"" + + getMarkupId() + "\")")); } }); } Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java?rev=1214702&r1=1214701&r2=1214702&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java Thu Dec 15 11:14:20 2011 @@ -33,6 +33,7 @@ import org.apache.wicket.request.IReques import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; +import org.apache.wicket.resource.header.CssHeaderItem; /** * Rating component that generates a number of stars where a user can click on to rate something. @@ -322,8 +323,8 @@ public abstract class RatingPanel extend super.renderHead(response); if (addDefaultCssStyle) { - response.renderCSSReference(new PackageResourceReference(RatingPanel.class, - "RatingPanel.css")); + response.render(CssHeaderItem.forReference(new PackageResourceReference( + RatingPanel.class, "RatingPanel.css"))); } } Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java?rev=1214702&r1=1214701&r2=1214702&view=diff ============================================================================== --- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java (original) +++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java Thu Dec 15 11:14:20 2011 @@ -25,6 +25,7 @@ import org.apache.wicket.markup.html.for import org.apache.wicket.markup.html.panel.FeedbackPanel; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.request.resource.PackageResourceReference; +import org.apache.wicket.resource.header.CssHeaderItem; /** @@ -167,7 +168,8 @@ public class Wizard extends Panel implem */ public void addDefaultCssStyle(final IHeaderResponse response) { - response.renderCSSReference(new PackageResourceReference(Wizard.class, "Wizard.css")); + response.render(CssHeaderItem.forReference(new PackageResourceReference(Wizard.class, + "Wizard.css"))); } @Override Modified: wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java?rev=1214702&r1=1214701&r2=1214702&view=diff ============================================================================== --- wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java (original) +++ wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java Thu Dec 15 11:14:20 2011 @@ -26,6 +26,7 @@ import org.apache.wicket.WicketRuntimeEx import org.apache.wicket.behavior.Behavior; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.model.IModel; +import org.apache.wicket.resource.header.StringHeaderItem; import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.string.Strings; @@ -89,7 +90,7 @@ public class VelocityContributor extends CharSequence s = evaluate(); if (null != s) { - response.renderString(s); + response.render(StringHeaderItem.forString(s)); } } Modified: wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java?rev=1214702&r1=1214701&r2=1214702&view=diff ============================================================================== --- wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java (original) +++ wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java Thu Dec 15 11:14:20 2011 @@ -22,6 +22,7 @@ import org.apache.velocity.runtime.resou import org.apache.wicket.Component; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.model.IModel; +import org.apache.wicket.resource.header.JavaScriptHeaderItem; import org.apache.wicket.util.lang.Packages; /** @@ -74,7 +75,7 @@ public class VelocityJavaScriptContribut CharSequence s = evaluate(); if (s != null) { - response.renderJavaScript(s, id); + response.render(JavaScriptHeaderItem.forScript(s, id)); } } }
