You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/07/05 01:13:04 UTC
svn commit: r419118 - in /tapestry/tapestry4/trunk: ./ eclipse/
tapestry-contrib/src/java/org/apache/tapestry/contrib/ajax/
tapestry-examples/Workbench/src/config/
tapestry-examples/Workbench/src/context/WEB-INF/
tapestry-examples/Workbench/src/java/or...
Author: jkuhnert
Date: Tue Jul 4 16:13:03 2006
New Revision: 419118
URL: http://svn.apache.org/viewvc?rev=419118&view=rev
Log:
Upgraded workbench, fixed workbench launch configuration
Added:
tapestry/tapestry4/trunk/eclipse/Workbench.launch
Modified:
tapestry/tapestry4/trunk/.classpath
tapestry/tapestry4/trunk/eclipse/TimeTracker.launch
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.java
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/config/jetty6.xml
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.jwc
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/ErrorFest.page
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Fields.page
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/hivemodule.xml
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/workbench.application
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/components/Border.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Max.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Min.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/web/ServletWebSession.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/web/WebSession.java
tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletWebSession.java
Modified: tapestry/tapestry4/trunk/.classpath
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/.classpath?rev=419118&r1=419117&r2=419118&view=diff
==============================================================================
Binary files - no diff available.
Modified: tapestry/tapestry4/trunk/eclipse/TimeTracker.launch
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/eclipse/TimeTracker.launch?rev=419118&r1=419117&r2=419118&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/eclipse/TimeTracker.launch (original)
+++ tapestry/tapestry4/trunk/eclipse/TimeTracker.launch Tue Jul 4 16:13:03 2006
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:tapestry/examples/TimeTracker}"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:tapestry/tapestry-examples/TimeTracker}"/>
<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/tapestry"/>
@@ -10,9 +10,6 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="tapestry" path="1" type="4"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="tapestry"/> </runtimeClasspathEntry> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.USER_LIBRARY/JETTY6_LIB" path="3" type="4"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/tapestry/ext-package/lib/commons-dbcp-1.2.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/tapestry/ext-package/lib/hsqldb-1.8.0.1.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/tapestry/framework/src/java" path="3" type="2"/> "/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tapestry"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.apache.tapestry.disable-caching=true"/>
Added: tapestry/tapestry4/trunk/eclipse/Workbench.launch
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/eclipse/Workbench.launch?rev=419118&view=auto
==============================================================================
--- tapestry/tapestry4/trunk/eclipse/Workbench.launch (added)
+++ tapestry/tapestry4/trunk/eclipse/Workbench.launch Tue Jul 4 16:13:03 2006
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:tapestry/tapestry-examples/Workbench}"/>
+<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/tapestry"/>
+</listAttribute>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="tapestry" path="1" type="4"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="tapestry"/> </runtimeClasspathEntry> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.USER_LIBRARY/JETTY6_LIB" path="3" type="4"/> "/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tapestry"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.apache.tapestry.disable-caching=true"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.mortbay.start.Main"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/config/jetty6.xml"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+</launchConfiguration>
Modified: tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.java?rev=419118&r1=419117&r2=419118&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.java (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.java Tue Jul 4 16:13:03 2006
@@ -52,7 +52,7 @@
protected int getSessionTime()
{
- return Integer.parseInt((String)getSession().getAttribute("maxInactiveInterval"));
+ return getSession().getMaxInactiveInterval();
}
public boolean isInSession()
@@ -67,7 +67,7 @@
if (nTimeToMessage < 0) nTimeToMessage = 0;
int nRemainingTime = nSessionTime - nTimeToMessage;
int nAutoProlongTime = nSessionTime - getAutoProlongTime();
-
+
Map mapSymbols = new HashMap();
mapSymbols.put("confirmTimeout", new Integer(nTimeToMessage * 1000));
mapSymbols.put("expirationTimeout", new Integer(nRemainingTime * 1000));
Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/config/jetty6.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/config/jetty6.xml?rev=419118&r1=419117&r2=419118&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/config/jetty6.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/config/jetty6.xml Tue Jul 4 16:13:03 2006
@@ -56,7 +56,7 @@
<!-- ======================================================= -->
<Item>
<New id="workbench" class="org.mortbay.jetty.webapp.WebAppContext">
- <Set name="contextPath">/workbench</Set>
+ <Set name="contextPath">/</Set>
<Set name="resourceBase">src/context</Set>
<Set name="VirtualHosts"><Array type="java.lang.String"></Array></Set>
<Get name="SessionHandler">
Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.jwc
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.jwc?rev=419118&r1=419117&r2=419118&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.jwc (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.jwc Tue Jul 4 16:13:03 2006
@@ -26,7 +26,6 @@
<binding name="background" value="midTabAsset"/>
</component>
-
<component id="pageLink" type="DirectLink">
<binding name="listener" value="listener:selectPage"/>
<binding name="parameters" value="pageName"/>
Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/ErrorFest.page
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/ErrorFest.page?rev=419118&r1=419117&r2=419118&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/ErrorFest.page (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/ErrorFest.page Tue Jul 4 16:13:03 2006
@@ -20,6 +20,9 @@
"http://jakarta.apache.org/tapestry/dtd/Tapestry_3_0.dtd">
<page-specification class="org.apache.tapestry.workbench.fields.Fields">
+
+ <inject type="state" property="visit" object="session-data" />
+
<component id="border" type="Border"/>
<component id="showError" type="ShowError">
<binding name="delegate" expression="beans.delegate"/>
Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Fields.page
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Fields.page?rev=419118&r1=419117&r2=419118&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Fields.page (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Fields.page Tue Jul 4 16:13:03 2006
@@ -20,7 +20,9 @@
"http://tapestry.apache.org/dtd/Tapestry_4_0.dtd">
<page-specification class="org.apache.tapestry.workbench.fields.Fields">
-
+
+ <inject type="state" property="visit" object="session-data" />
+
<property name="clientValidationEnabled" persist="client" initial-value="true"/>
<bean name="required" class="org.apache.tapestry.form.validator.Required"/>
Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/hivemodule.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/hivemodule.xml?rev=419118&r1=419117&r2=419118&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/hivemodule.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/hivemodule.xml Tue Jul 4 16:13:03 2006
@@ -17,6 +17,12 @@
<module id="workbench" version="1.0.0" package="org.apache.tapestry.workbench">
+ <contribution configuration-id="tapestry.state.ApplicationObjects" >
+ <state-object name="session-data" scope="session" >
+ <create-instance class="org.apache.tapestry.workbench.Visit" />
+ </state-object>
+ </contribution>
+
<contribution configuration-id="tapestry.services.ApplicationServices">
<service name="home" object="service:Home"/>
<service name="chart" object="service:Chart"/>
Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/workbench.application
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/workbench.application?rev=419118&r1=419117&r2=419118&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/workbench.application (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/workbench.application Tue Jul 4 16:13:03 2006
@@ -20,7 +20,7 @@
"http://tapestry.apache.org/dtd/Tapestry_4_0.dtd">
<application name="Tapestry Component Workbench">
- <meta key="org.apache.tapestry.visit-class" value="org.apache.tapestry.workbench.Visit"/>
+
<meta key="org.apache.tapestry.template-encoding" value="ISO-8859-1"/>
<meta key="org.apache.tapestry.page-class-packages" value="org.apache.tapestry.workbench"/>
<meta key="org.apache.tapestry.component-class-packages" value="org.apache.tapestry.workbench.components"/>
Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/components/Border.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/components/Border.java?rev=419118&r1=419117&r2=419118&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/components/Border.java (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/components/Border.java Tue Jul 4 16:13:03 2006
@@ -43,7 +43,7 @@
private static String[] _tabOrder;
- @InjectState("visit")
+ @InjectState("session-data")
public abstract Visit getVisit();
@Message
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Max.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Max.java?rev=419118&r1=419117&r2=419118&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Max.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Max.java Tue Jul 4 16:13:03 2006
@@ -87,7 +87,7 @@
new JSONLiteral("[dojo.validate.isInRange,{"
+ "max:" + _max + ","
+ "decimal:" + JSONObject.quote(symbols.getDecimalSeparator())
- + "]"));
+ + "}]"));
setProfileProperty(field, profile,
ValidationConstants.CONSTRAINTS, buildMessage(context, field));
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Min.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Min.java?rev=419118&r1=419117&r2=419118&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Min.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Min.java Tue Jul 4 16:13:03 2006
@@ -87,7 +87,7 @@
new JSONLiteral("[dojo.validate.isInRange,{"
+ "min:" + _min + ","
+ "decimal:" + JSONObject.quote(symbols.getDecimalSeparator())
- + "]"));
+ + "}]"));
setProfileProperty(field, profile,
ValidationConstants.CONSTRAINTS, buildMessage(context, field));
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/web/ServletWebSession.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/web/ServletWebSession.java?rev=419118&r1=419117&r2=419118&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/web/ServletWebSession.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/web/ServletWebSession.java Tue Jul 4 16:13:03 2006
@@ -76,4 +76,36 @@
{
_httpSession.invalidate();
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public long getCreationTime()
+ {
+ return _httpSession.getCreationTime();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public long getLastAccessedTime()
+ {
+ return _httpSession.getLastAccessedTime();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getMaxInactiveInterval()
+ {
+ return _httpSession.getMaxInactiveInterval();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setMaxInactiveInterval(int interval)
+ {
+ _httpSession.setMaxInactiveInterval(interval);
+ }
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/web/WebSession.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/web/WebSession.java?rev=419118&r1=419117&r2=419118&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/web/WebSession.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/web/WebSession.java Tue Jul 4 16:13:03 2006
@@ -46,4 +46,50 @@
*/
void invalidate();
+
+ /**
+ * Returns the time when this session was created, measured in milliseconds
+ * since midnight January 1, 1970 GMT.
+ *
+ * @return a long specifying when this session was created,
+ * expressed in milliseconds since 1/1/1970 GMT
+ */
+
+ long getCreationTime();
+
+ /**
+ * Returns the last time the client sent a request associated with this session, as
+ * the number of milliseconds since midnight January 1, 1970 GMT, and marked by the
+ * time the container recieved the request.
+ *
+ * <p> Actions that your application takes, such as getting or setting a value associated
+ * with the session, do not affect the access time.</p>
+ *
+ * @return a long representing the last time the client sent a request associated with
+ * this session, expressed in milliseconds since 1/1/1970 GMT
+ */
+
+ long getLastAccessedTime();
+
+ /**
+ * Returns the maximum time interval, in seconds, that the servlet container will
+ * keep this session open between client accesses. After this interval, the servlet
+ * container will invalidate the session. The maximum time interval can be set with
+ * the setMaxInactiveInterval method. A negative time indicates the session should
+ * never timeout.
+ *
+ * @return an integer specifying the number of seconds this session
+ * remains open between client requests
+ */
+
+ int getMaxInactiveInterval();
+
+ /**
+ * Specifies the time, in seconds, between client requests before the servlet container
+ * will invalidate this session. A negative time indicates the session should never timeout.
+ *
+ * @param interval - An integer specifying the number of seconds
+ */
+
+ void setMaxInactiveInterval(int interval);
}
Modified: tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletWebSession.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletWebSession.java?rev=419118&r1=419117&r2=419118&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletWebSession.java (original)
+++ tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletWebSession.java Tue Jul 4 16:13:03 2006
@@ -77,4 +77,36 @@
_portletSession.invalidate();
}
+ /**
+ * {@inheritDoc}
+ */
+ public long getCreationTime()
+ {
+ return _portletSession.getCreationTime();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public long getLastAccessedTime()
+ {
+ return _portletSession.getLastAccessedTime();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int getMaxInactiveInterval()
+ {
+ return _portletSession.getMaxInactiveInterval();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setMaxInactiveInterval(int interval)
+ {
+ _portletSession.setMaxInactiveInterval(interval);
+ }
+
}