You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2004/06/29 00:16:46 UTC
cvs commit: jakarta-tapestry/eclipse Tapestry-Junit.launch
hlship 2004/06/28 15:16:46
Modified: framework/src/org/apache/tapestry/pageload Tag: branch-3-0
PageSource.java PageLoader.java
. Tag: branch-3-0 status.xml .classpath
framework/src/org/apache/tapestry/engine Tag: branch-3-0
RequestCycle.java
eclipse Tag: branch-3-0 Tapestry-Junit.launch
Log:
[29850] Ensure that the page's requestCycle property is set before finishLoad() is invoked on any component.
Revision Changes Path
No revision
No revision
1.11.2.1 +1 -1 jakarta-tapestry/framework/src/org/apache/tapestry/pageload/PageSource.java
Index: PageSource.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/pageload/PageSource.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- PageSource.java 19 Feb 2004 17:38:05 -0000 1.11
+++ PageSource.java 28 Jun 2004 22:16:46 -0000 1.11.2.1
@@ -42,7 +42,6 @@
* for reporting pool statistics would be useful.
*
* @author Howard Lewis Ship
- * @version $Id$
*
**/
@@ -171,6 +170,7 @@
// the pool needs to be explicitly attached.
result.attach(engine);
+ result.setRequestCycle(cycle);
}
return result;
1.24.2.1 +5 -1 jakarta-tapestry/framework/src/org/apache/tapestry/pageload/PageLoader.java
Index: PageLoader.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/pageload/PageLoader.java,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -r1.24 -r1.24.2.1
--- PageLoader.java 19 Feb 2004 17:38:05 -0000 1.24
+++ PageLoader.java 28 Jun 2004 22:16:46 -0000 1.24.2.1
@@ -72,7 +72,6 @@
* multithreading issues.
*
* @author Howard Lewis Ship
- * @version $Id$
*
**/
@@ -756,6 +755,11 @@
page = instantiatePage(name, namespace, specification);
page.attach(_engine);
+
+ // As of 3.0.1, this is done now, rather than after constructing the page and its
+ // components.
+
+ page.setRequestCycle(cycle);
constructComponent(cycle, page, page, specification, namespace);
No revision
No revision
1.47.2.1 +9 -2 jakarta-tapestry/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/status.xml,v
retrieving revision 1.47
retrieving revision 1.47.2.1
diff -u -r1.47 -r1.47.2.1
--- status.xml 18 Apr 2004 14:51:01 -0000 1.47
+++ status.xml 28 Jun 2004 22:16:46 -0000 1.47.2.1
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-<!-- $Id$ -->
<status>
<developers>
@@ -248,7 +247,15 @@
</todo>
<changes>
-
+
+ <release version="3.0.1" date="unreleased">
+
+ <action type="fix" dev="HLS" fixes-bug="29850">
+ Ensure that the page's requestCycle property is set before finishLoad() is invoked on any component.
+ </action>
+
+ </release>
+
<release version="3.0" date="Apr 18 2004">
<action type="fix" dev="HLS" fixes-bug="28345">
1.41.2.1 +2 -0 jakarta-tapestry/.classpath
Index: .classpath
===================================================================
RCS file: /home/cvs/jakarta-tapestry/.classpath,v
retrieving revision 1.41
retrieving revision 1.41.2.1
diff -u -r1.41 -r1.41.2.1
--- .classpath 6 Feb 2004 20:08:32 -0000 1.41
+++ .classpath 28 Jun 2004 22:16:46 -0000 1.41.2.1
@@ -26,5 +26,7 @@
<classpathentry kind="lib" path="lib/j2ee/geronimo-ejb.jar"/>
<classpathentry kind="lib" path="lib/j2ee/jsp-api.jar"/>
<classpathentry exported="true" kind="lib" path="lib/j2ee/servlet-api.jar"/>
+ <classpathentry kind="var" path="JYTHON_DIR/jython.jar"/>
+ <classpathentry kind="lib" path="lib/runtime/log4j-1.2.6.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
No revision
No revision
1.12.2.1 +0 -3 jakarta-tapestry/framework/src/org/apache/tapestry/engine/RequestCycle.java
Index: RequestCycle.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/engine/RequestCycle.java,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- RequestCycle.java 19 Feb 2004 17:38:00 -0000 1.12
+++ RequestCycle.java 28 Jun 2004 22:16:46 -0000 1.12.2.1
@@ -42,7 +42,6 @@
* the {@link IEngine engine} and the {@link RequestContext}.
*
* @author Howard Lewis Ship
- * @version $Id$
*
**/
@@ -194,8 +193,6 @@
IPageSource pageSource = _engine.getPageSource();
result = pageSource.getPage(this, name, _monitor);
-
- result.setRequestCycle(this);
// Get the recorder that will eventually observe and record
// changes to persistent properties of the page. If the page
No revision
No revision
1.23.2.1 +3 -111 jakarta-tapestry/eclipse/Tapestry-Junit.launch
Index: Tapestry-Junit.launch
===================================================================
RCS file: /home/cvs/jakarta-tapestry/eclipse/Tapestry-Junit.launch,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -r1.23 -r1.23.2.1
--- Tapestry-Junit.launch 25 Dec 2003 21:02:28 -0000 1.23
+++ Tapestry-Junit.launch 28 Jun 2004 22:16:46 -0000 1.23.2.1
@@ -1,122 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
- <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.tapestry.junit.TapestrySuite"/>
- <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry containerPath="JRE_LIB" path="2"
- sourceAttachmentPath="JRE_SRC" sourceRootPath="JRE_SRCROOT" type="3"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry internalArchive="/jakarta-tapestry/config"
- path="3" type="2"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry path="3" projectName="jakarta-tapestry" type="1"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry
- internalArchive="/jakarta-tapestry/lib/ext/jakarta-oro-2.0.6.jar"
- path="3" type="2"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry
- internalArchive="/jakarta-tapestry/lib/ext/commons-logging-1.0.2.jar"
- path="3" type="2"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry containerPath="JBOSS_DIR/client/jboss-j2ee.jar"
- path="3" type="3"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry containerPath="JBOSS_DIR/server/all/lib/mail.jar"
- path="3" type="3"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry
- internalArchive="/jakarta-tapestry/lib/ext/commons-lang-1.0.jar"
- path="3" type="2"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry
- internalArchive="/jakarta-tapestry/lib/ext/ognl-2.6.3.jar" path="3" type="2"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry
- internalArchive="/jakarta-tapestry/lib/ext/bsf-2.3.0.jar" path="3" type="2"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry containerPath="JETTY_DIR/lib/javax.servlet.jar"
- path="3" type="3"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry containerPath="JETTY_DIR/ext/javax.xml.jaxp.jar"
- path="3" type="3"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry containerPath="JETTY_DIR/ext/crimson.jar"
- path="3" type="3"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry
- internalArchive="/jakarta-tapestry/ext-dist/jdom-b8.jar" path="3" type="2"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry
- internalArchive="/jakarta-tapestry/ext-dist/junit.jar" path="3" type="2"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry
- internalArchive="/jakarta-tapestry/lib/ext/commons-beanutils-1.6.1.jar"
- path="3" type="2"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry
- internalArchive="/jakarta-tapestry/examples/Workbench/lib/jCharts-0.6.0.jar"
- path="3" type="2"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry
- internalArchive="/jakarta-tapestry/lib/runtime/log4j-1.2.6.jar"
- path="3" type="2"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry containerPath="JYTHON_DIR/jython.jar" path="3" type="3"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry
- internalArchive="/jakarta-tapestry/lib/ext/commons-collections-2.1.jar"
- path="3" type="2"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry
- internalArchive="/jakarta-tapestry/lib/ext/commons-fileupload-1.0.jar"
- path="3" type="2"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry
- internalArchive="/jakarta-tapestry/lib/ext/javassist-2.5.1.jar"
- path="3" type="2"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry
- internalArchive="/jakarta-tapestry/lib/ext/commons-digester-1.5.jar"
- path="3" type="2"/>
-"/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8"?>
-<runtimeClasspathEntry
- internalArchive="/jakarta-tapestry/lib/ext/commons-codec-1.2.jar"
- path="3" type="2"/>
-"/>
- </listAttribute>
- <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jakarta-tapestry"/>
- <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dnet.sf.tapestry.enable-reset-service=true"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jakarta-tapestry-3.0"/>
+ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.apache.tapestry.enable-reset-service=true"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.debug.ui.target_debug_perspective" value="perspective_none"/>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
- <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="jakarta-tapestry/junit"/>
+ <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="jakarta-tapestry-3.0/junit"/>
<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_none"/>
</launchConfiguration>
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org