Author: jrthomerson
Date: Tue Mar 31 08:23:41 2009
New Revision: 760362
URL: http://svn.apache.org/viewvc?rev=760362&view=rev
Log:
WICKET-670
Merging in changes from my experimental branch:
- made new submodule, wicket-devutils
- moved statelesschecker (et al) as well as inspector bug and all related
classes to devutils
- added debug setting for enabling or disabling the inspector functionality
- created a debug bar that can have components added to it dynamically
Added:
wicket/trunk/wicket-devutils/ (props changed)
- copied from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/
wicket/trunk/wicket-devutils/pom.xml (props changed)
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/pom.xml
wicket/trunk/wicket-devutils/src/
- copied from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/
wicket/trunk/wicket-devutils/src/main/
- copied from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/
wicket/trunk/wicket-devutils/src/main/java/
- copied from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/
wicket/trunk/wicket-devutils/src/main/java/org/
- copied from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/
wicket/trunk/wicket-devutils/src/main/java/org/apache/
- copied from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/
- copied from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/
- copied from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPanel.java
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPanel.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevelopmentUtilitiesNotEnabledException.java
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevelopmentUtilitiesNotEnabledException.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/
- copied from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/IDebugBarContributor.java
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/IDebugBarContributor.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/SessionSizeDebugPanel.java
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/SessionSizeDebugPanel.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.html
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.html
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/WicketDebugBar.html
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/WicketDebugBar.html
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/WicketDebugBar.java
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/WicketDebugBar.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/harddrive.png
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/harddrive.png
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/remove.png
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/remove.png
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.css
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.css
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.js
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.js
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket.png
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket.png
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/
(props changed)
- copied from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/ApplicationView.html
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/ApplicationView.html
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/ApplicationView.java
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/ApplicationView.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.html
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.html
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.java
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.html
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.html
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.html
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.html
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.java
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/PageMapView.html
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/PageMapView.html
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/PageMapView.java
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/PageMapView.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.html
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.html
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionSizeModel.java
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionSizeModel.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionTotalSizeModel.java
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionTotalSizeModel.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.html
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.html
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.java
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/bug.png
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/bug.png
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/package.html
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/package.html
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/stateless/
(props changed)
- copied from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/stateless/
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/stateless/StatelessChecker.java
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/stateless/StatelessChecker.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/stateless/StatelessComponent.java
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/stateless/StatelessComponent.java
wicket/trunk/wicket-devutils/src/test/
- copied from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/test/
wicket/trunk/wicket-devutils/src/test/java/
- copied from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/test/java/
wicket/trunk/wicket-devutils/src/test/java/org/
- copied from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/test/java/org/
wicket/trunk/wicket-devutils/src/test/java/org/apache/
- copied from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/test/java/org/apache/
wicket/trunk/wicket-devutils/src/test/java/org/apache/wicket/
- copied from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/test/java/org/apache/wicket/
wicket/trunk/wicket-devutils/src/test/java/org/apache/wicket/devutils/
- copied from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/test/java/org/apache/wicket/devutils/
wicket/trunk/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/
(props changed)
- copied from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/
wicket/trunk/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java
- copied unchanged from r760351,
wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/StatelessCheckerTest.java
Removed:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/debug/
wicket/trunk/wicket/src/main/java/org/apache/wicket/annotations/
wicket/trunk/wicket/src/test/java/org/apache/wicket/annotations/
Modified:
wicket/trunk/ (props changed)
wicket/trunk/CHANGELOG-1.4 (props changed)
wicket/trunk/pom.xml
wicket/trunk/wicket/ (props changed)
wicket/trunk/wicket-examples/ (props changed)
wicket/trunk/wicket-examples/pom.xml
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.html
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java
wicket/trunk/wicket-extensions/ (props changed)
wicket/trunk/wicket-velocity/ (props changed)
wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IDebugSettings.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
Propchange: wicket/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Mar 31 08:23:41 2009
@@ -0,0 +1,2 @@
+/wicket/sandbox/jthomerson/experimental/wicket-devutils:760296-760351,760353-760355
+/wicket/trunk/wicket-devutils:760352
Propchange: wicket/trunk/CHANGELOG-1.4
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 31 08:23:41 2009
@@ -1,2 +1,4 @@
/wicket/releases/wicket-1.4-m3/CHANGELOG-1.4:674295
/wicket/releases/wicket-1.4-rc1/CHANGELOG-1.4:709869
+/wicket/sandbox/jthomerson/experimental/wicket-devutils/CHANGELOG-1.4:760296-760351,760353-760355
+/wicket/trunk/wicket-devutils/CHANGELOG-1.4:760352
Modified: wicket/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/pom.xml?rev=760362&r1=760361&r2=760362&view=diff
==============================================================================
--- wicket/trunk/pom.xml (original)
+++ wicket/trunk/pom.xml Tue Mar 31 08:23:41 2009
@@ -32,6 +32,7 @@
<modules>
<module>wicket</module>
<module>wicket-datetime</module>
+ <module>wicket-devutils</module>
<module>wicket-extensions</module>
<module>wicket-ioc</module>
<module>wicket-spring</module>
@@ -99,6 +100,7 @@
<modules>
<module>wicket</module>
<module>wicket-datetime</module>
+ <module>wicket-devutils</module>
<module>wicket-extensions</module>
<module>wicket-ioc</module>
<module>wicket-spring</module>
@@ -170,6 +172,7 @@
<modules>
<module>wicket</module>
<module>wicket-datetime</module>
+ <module>wicket-devutils</module>
<module>wicket-extensions</module>
<module>wicket-ioc</module>
<module>wicket-spring</module>
@@ -266,6 +269,12 @@
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-devutils</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
<version>${project.version}</version>
<type>jar</type>
Propchange: wicket/trunk/wicket/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 31 08:23:41 2009
@@ -1 +1,3 @@
/wicket/branches/wicket-1.3.x/jdk-1.4/wicket:653208,653212,653215,653226,653231,654304,655446,655466,655786,658141,658189,659118,659120,662360,663058,671549,671885,687144-688996,698530-698577,701132-701133,701843,701850-701877,704231,708127,722099-722105,726536,728467-728490,731960,734478,739647,739951,745468-745497,749817,755171-755176,759905
+/wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket:760296-760351,760353-760355
+/wicket/trunk/wicket-devutils/wicket:760352
Propchange: wicket/trunk/wicket-devutils/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 31 08:23:41 2009
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings
Propchange: wicket/trunk/wicket-devutils/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket-devutils/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: wicket/trunk/wicket-devutils/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Mar 31 08:23:41 2009
@@ -0,0 +1,3 @@
+/wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions/pom.xml:659248,661657,662360,677853,688992,698612,700502,701879,725634
+/wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/pom.xml:760353-760355
+/wicket/trunk/wicket-devutils/wicket-devutils/pom.xml:760352
Propchange:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Mar 31 08:23:41 2009
@@ -0,0 +1,3 @@
+/wicket/branches/wicket-1.3.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug:653211
+/wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector:760353-760355
+/wicket/trunk/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector:760352
Propchange:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/stateless/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Mar 31 08:23:41 2009
@@ -0,0 +1,3 @@
+/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/annotations:653208,653212,653215,653226,653231,654304,655446,655466,655786,658141,658189,659118,659120,662360,663058,671549,671885,687144-688996,698530-698577,701132-701133,701843,701850-701877,704231,708127,722099-722105,726536,728467-728490,731960,734478,739647,739951,745468-745497,749817,755171-755176,759905
+/wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/stateless:760353-760355
+/wicket/trunk/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/stateless:760352
Propchange:
wicket/trunk/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Mar 31 08:23:41 2009
@@ -0,0 +1,3 @@
+/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/annotations:653208,653212,653215,653226,653231,654304,655446,655466,655786,658141,658189,659118,659120,662360,663058,671549,671885,687144-688996,698530-698577,701132-701133,701843,701850-701877,704231,708127,722099-722105,726536,728467-728490,731960,734478,739647,739951,745468-745497,749817,755171-755176,759905
+/wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless:760353-760355
+/wicket/trunk/wicket-devutils/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless:760352
Propchange: wicket/trunk/wicket-examples/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 31 08:23:41 2009
@@ -1 +1,3 @@
/wicket/branches/wicket-1.3.x/jdk-1.5/wicket-examples:653211
+/wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-examples:760296-760351,760353-760355
+/wicket/trunk/wicket-devutils/wicket-examples:760352
Modified: wicket/trunk/wicket-examples/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/pom.xml?rev=760362&r1=760361&r2=760362&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/pom.xml (original)
+++ wicket/trunk/wicket-examples/pom.xml Tue Mar 31 08:23:41 2009
@@ -63,6 +63,10 @@
<artifactId>wicket-spring</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-devutils</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java?rev=760362&r1=760361&r2=760362&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java
Tue Mar 31 08:23:41 2009
@@ -63,6 +63,8 @@
// box.
getSecuritySettings().setCryptFactory(
new ClassCryptFactory(NoCrypt.class,
ISecuritySettings.DEFAULT_ENCRYPTION_KEY));
+
+ getDebugSettings().setDevelopmentUtilitiesEnabled(true);
}
/**
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.html?rev=760362&r1=760361&r2=760362&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.html
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.html
Tue Mar 31 08:23:41 2009
@@ -1,7 +1,7 @@
<html xmlns:wicket>
<body>
<wicket:panel>
- <div wicket:id="hideInPortlet"><a href="index.html" style="color: #E9601A"
target="_top"><img src="logo.png" /></a><span wicket:id="inspector"/></div>
+ <div wicket:id="hideInPortlet"><a href="index.html" style="color: #E9601A"
target="_top"><img src="logo.png" /></a><span wicket:id="inspector"/><div
wicket:id="debug"></div></div>
<div id="titleblock"
style="font-size:larger;height:1.5em;vertical-align:center;">
<div style="float:left;"><span wicket:id="exampleTitle">Example Title
Goes Here</span></div>
<div style="float:right;padding-right:10px"><a href="#"
wicket:id="sources">Source code</a></div>
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java?rev=760362&r1=760361&r2=760362&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java
Tue Mar 31 08:23:41 2009
@@ -18,7 +18,8 @@
import org.apache.wicket.PageMap;
import org.apache.wicket.RequestContext;
-import org.apache.wicket.examples.debug.InspectorBug;
+import org.apache.wicket.devutils.debugbar.WicketDebugBar;
+import org.apache.wicket.devutils.inspector.InspectorBug;
import org.apache.wicket.examples.source.SourcesPage;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
@@ -60,6 +61,7 @@
};
add(hideInPortlet);
hideInPortlet.add(new InspectorBug("inspector", page));
+ hideInPortlet.add(new WicketDebugBar("debug"));
add(new Label("exampleTitle", exampleTitle));
BookmarkablePageLink<Void> link = new
BookmarkablePageLink<Void>("sources",
SourcesPage.class,
SourcesPage.generatePageParameters(page));
Propchange: wicket/trunk/wicket-extensions/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 31 08:23:41 2009
@@ -1 +1,3 @@
/wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions:659248,661657,662360,677853,688992,698612,700502,701879,725634
+/wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-extensions:760296-760351,760353-760355
+/wicket/trunk/wicket-devutils/wicket-extensions:760352
Propchange: wicket/trunk/wicket-velocity/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 31 08:23:41 2009
@@ -1,3 +1,4 @@
+velocity.log
.classpath
.project
target
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java?rev=760362&r1=760361&r2=760362&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java Tue
Mar 31 08:23:41 2009
@@ -345,6 +345,7 @@
getExceptionSettings().setUnexpectedExceptionDisplay(
IExceptionSettings.SHOW_EXCEPTION_PAGE);
getDebugSettings().setAjaxDebugModeEnabled(true);
+ getDebugSettings().setDevelopmentUtilitiesEnabled(true);
//
getDebugSettings().setOutputMarkupContainerClassName(true);
getResourceSettings().setJavascriptCompressor(null);
}
@@ -356,6 +357,7 @@
getExceptionSettings().setUnexpectedExceptionDisplay(
IExceptionSettings.SHOW_INTERNAL_ERROR_PAGE);
getDebugSettings().setAjaxDebugModeEnabled(false);
+
getDebugSettings().setDevelopmentUtilitiesEnabled(false);
getResourceSettings().setJavascriptCompressor(new
DefaultJavascriptCompressor());
}
else
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IDebugSettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IDebugSettings.java?rev=760362&r1=760361&r2=760362&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IDebugSettings.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IDebugSettings.java
Tue Mar 31 08:23:41 2009
@@ -128,4 +128,18 @@
* @param enable
*/
public void setLinePreciseReportingOnNewComponentEnabled(boolean
enable);
+
+ /**
+ * Enables all of the panels and pages, etc, from wicket-devutils
package.
+ *
+ * @param enable
+ */
+ public void setDevelopmentUtilitiesEnabled(boolean enable);
+
+ /**
+ * Are all of the panels and pages, etc, from wicket-devutils package
enabled?
+ *
+ * @return true if all of the panels and pages, etc, from
wicket-devutils package are enabled
+ */
+ public boolean isDevelopmentUtilitiesEnabled();
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java?rev=760362&r1=760361&r2=760362&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
Tue Mar 31 08:23:41 2009
@@ -176,6 +176,11 @@
private boolean linePreciseReportingOnAddComponentEnabled = false;
/**
+ * @see IDebugSettings#setDevelopmentUtilitiesEnabled(boolean)
+ */
+ private boolean developmentUtilitiesEnabled = false;
+
+ /**
* whether wicket should track line precise instantiations of
components for error reporting.
*/
private boolean linePreciseReportingOnNewComponentEnabled = false;
@@ -1498,5 +1503,20 @@
this.detachListener = detachListener;
}
+ /**
+ * @see
org.apache.wicket.settings.IDebugSettings#setDevelopmentUtilitiesEnabled(boolean)
+ */
+ public void setDevelopmentUtilitiesEnabled(boolean enable)
+ {
+ developmentUtilitiesEnabled = enable;
+ }
+
+ /**
+ * @see
org.apache.wicket.settings.IDebugSettings#isDevelopmentUtilitiesEnabled()
+ */
+ public boolean isDevelopmentUtilitiesEnabled()
+ {
+ return developmentUtilitiesEnabled;
+ }
}
