Author: jkuhnert
Date: Wed Mar 8 15:57:46 2006
New Revision: 384381
URL: http://svn.apache.org/viewcvs?rev=384381&view=rev
Log:
Applied all of brian's fixes, added a new jetty6 Workbench launcher
Added:
jakarta/tapestry/branches/4.0/eclipse/Tapestry-Workbench-Jetty6.launch
jakarta/tapestry/branches/4.0/examples/Workbench/src/config/jetty6.xml
Modified:
jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnComponent.html
jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnFormComponent.html
jakarta/tapestry/branches/4.0/eclipse/Tapestry-Workbench.launch
jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/asset/AssetService.java
jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/form/DatePicker.js
jakarta/tapestry/branches/4.0/status.xml
Modified:
jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnComponent.html
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnComponent.html?rev=384381&r1=384380&r2=384381&view=diff
==============================================================================
---
jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnComponent.html
(original)
+++
jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnComponent.html
Wed Mar 8 15:57:46 2006
@@ -16,11 +16,17 @@
<span jwcid="$content$">
+<style>
+.tableHeaderImage {
+ align:center;
+}
+</style>
+
<span jwcid="condSorted">
- <table border="0" cellspacing="0" cellpadding="0" align="center">
+ <table class="tableHeaderTable" >
<tr>
<td><a jwcid="linkColumn"><span jwcid="insertSortedColumn"/></a></td>
- <span jwcid="condSort"><td> <span jwcid="imageSort"
align="center"/></td></span>
+ <span jwcid="condSort"><td> <span class="tableHeaderImage"
jwcid="imageSort" /></td></span>
</tr>
</table>
</span>
Modified:
jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnFormComponent.html
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnFormComponent.html?rev=384381&r1=384380&r2=384381&view=diff
==============================================================================
---
jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnFormComponent.html
(original)
+++
jakarta/tapestry/branches/4.0/contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/SimpleTableColumnFormComponent.html
Wed Mar 8 15:57:46 2006
@@ -15,11 +15,17 @@
-->
<span jwcid="$content$">
+<style>
+.tableHeaderImage {
+ align:center;
+}
+</style>
+
<span jwcid="condSorted">
- <table border="0" cellspacing="0" cellpadding="0" align="center">
+ <table class="tableHeaderTable">
<tr>
<td><a jwcid="linkColumn"><span jwcid="insertSortedColumn"/></a></td>
- <span jwcid="condSort"><td> <span jwcid="imageSort"
align="center"/></td></span>
+ <span jwcid="condSort"><td> <span class="tableHeaderImage"
jwcid="imageSort" /></td></span>
</tr>
</table>
</span>
Added: jakarta/tapestry/branches/4.0/eclipse/Tapestry-Workbench-Jetty6.launch
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/eclipse/Tapestry-Workbench-Jetty6.launch?rev=384381&view=auto
==============================================================================
--- jakarta/tapestry/branches/4.0/eclipse/Tapestry-Workbench-Jetty6.launch
(added)
+++ jakarta/tapestry/branches/4.0/eclipse/Tapestry-Workbench-Jetty6.launch Wed
Mar 8 15:57:46 2006
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"
value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="org.mortbay.start.Main"/>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"?> <runtimeClasspathEntry
containerPath="org.eclipse.jdt.launching.JRE_CONTAINER"
javaProject="jakarta-tapestry" path="1"
type="4"/> "/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"?> <runtimeClasspathEntry
id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento
project="jakarta-tapestry"/> </runtimeClasspathEntry> "/>
+<listEntry value="<?xml version="1.0"
encoding="UTF-8"?> <runtimeClasspathEntry
containerPath="org.eclipse.jdt.USER_LIBRARY/JETTY6_LIB"
path="3" type="4"/> "/>
+</listAttribute>
+<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>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="jakarta-tapestry"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
value="-Dorg.apache.tapestry.disable-caching=true"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/jakarta-tapestry"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY"
value="jakarta-tapestry/examples/Workbench"/>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables"
value="true"/>
+</launchConfiguration>
Modified: jakarta/tapestry/branches/4.0/eclipse/Tapestry-Workbench.launch
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/eclipse/Tapestry-Workbench.launch?rev=384381&r1=384380&r2=384381&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/eclipse/Tapestry-Workbench.launch (original)
+++ jakarta/tapestry/branches/4.0/eclipse/Tapestry-Workbench.launch Wed Mar 8
15:57:46 2006
@@ -4,8 +4,10 @@
<booleanAttribute key="yk-capture-cpu-on-exit" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="org.mortbay.jetty.Server"/>
<booleanAttribute key="yk-startup-with-sampling" value="true"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"
value="src/config/jetty.xml"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
value="-Dorg.apache.tapestry.disable-caching=false"/>
<listAttribute key="org.eclipse.jdt.launching.SOURCE_PATH">
<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"/> "/>
@@ -35,11 +37,12 @@
<listEntry value="<?xml version="1.0"
encoding="UTF-8"?> <runtimeClasspathEntry
containerPath="JDK_DIR/lib/tools.jar" path="3"
type="3"/> "/>
<listEntry value="<?xml version="1.0"
encoding="UTF-8"?> <runtimeClasspathEntry
containerPath="JETTY_DIR/ext/ant.jar" path="3"
type="3"/> "/>
</listAttribute>
-<stringAttribute key="yk-snapshot-dir" value=""/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables"
value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"
value="-Dorg.apache.tapestry.disable-caching=false"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY"
value="jakarta-tapestry/examples/Workbench"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_SOURCE_PATH"
value="false"/>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables"
value="true"/>
+<stringAttribute key="yk-snapshot-dir" value=""/>
<stringAttribute key="org.eclipse.debug.ui.target_run_perspective"
value="perspective_default"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_SOURCE_PATH"
value="false"/>
<booleanAttribute key="yk-capture-memory-on-exit" value="false"/>
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="<?xml version="1.0"
encoding="UTF-8"?> <runtimeClasspathEntry
type="3" path="1"
containerPath="JRE_LIB"/> "/>
@@ -55,6 +58,9 @@
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="jakarta-tapestry"/>
<stringAttribute key="org.eclipse.debug.ui.target_debug_perspective"
value="perspective_default"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/jakarta-tapestry"/>
+</listAttribute>
<booleanAttribute key="yk-startup-with-tracing" value="false"/>
<booleanAttribute key="yk-startup-with-object-allocations" value="false"/>
</launchConfiguration>
Added: jakarta/tapestry/branches/4.0/examples/Workbench/src/config/jetty6.xml
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/examples/Workbench/src/config/jetty6.xml?rev=384381&view=auto
==============================================================================
--- jakarta/tapestry/branches/4.0/examples/Workbench/src/config/jetty6.xml
(added)
+++ jakarta/tapestry/branches/4.0/examples/Workbench/src/config/jetty6.xml Wed
Mar 8 15:57:46 2006
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Copyright 2004, 2005 The Apache Software Foundation
+
+ Licensed 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.
+-->
+
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure 1.2//EN"
+ "http://jetty.mortbay.org/configure.dtd";>
+<Configure class="org.mortbay.jetty.Server">
+
+ <Set name="ThreadPool">
+ <New class="org.mortbay.thread.BoundedThreadPool">
+ <Set name="minThreads">10</Set>
+ <Set name="maxThreads">100</Set>
+ </New>
+ </Set>
+
+ <Set name="connectors">
+ <Array type="org.mortbay.jetty.Connector">
+
+ <Item>
+ <New class="org.mortbay.jetty.bio.SocketConnector">
+ <Set name="port">8080</Set>
+ <Set name="maxIdleTime">50000</Set>
+ </New>
+ </Item>
+
+ <!--
+ <Item>
+ <New class="org.mortbay.jetty.nio.SelectChannelConnector">
+ <Set name="port">8080</Set>
+ <Set name="maxIdleTime">50000</Set>
+ <Set name="Acceptors">10</Set>
+ </New>
+ </Item>
+ -->
+ </Array>
+ </Set>
+
+ <Set name="handlers">
+ <Array type="org.mortbay.jetty.Handler">
+
+ <!-- ======================================================= -->
+ <!-- Configure a test web application with web.xml -->
+ <!-- ======================================================= -->
+ <Item>
+ <New id="workbench" class="org.mortbay.jetty.webapp.WebAppContext">
+ <Set name="contextPath">/workbench</Set>
+ <Set name="resourceBase">src/context</Set>
+ <Set name="VirtualHosts"><Array
type="java.lang.String"></Array></Set>
+ <Get name="SessionHandler">
+ <Set name="SessionManager"><New
class="org.mortbay.jetty.servlet.HashSessionManager"/></Set>
+ </Get>
+ </New>
+ </Item>
+ </Array>
+ </Set>
+
+ <Set name="stopAtShutdown">true</Set>
+ <Call name="start"/>
+</Configure>
Modified:
jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/asset/AssetService.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/asset/AssetService.java?rev=384381&r1=384380&r2=384381&view=diff
==============================================================================
---
jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/asset/AssetService.java
(original)
+++
jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/asset/AssetService.java
Wed Mar 8 15:57:46 2006
@@ -167,14 +167,15 @@
private String getMimeType(String path)
{
String result = _context.getMimeType(path);
-
+
if (result == null)
{
int dotx = path.lastIndexOf('.');
- String key = path.substring(dotx + 1).toLowerCase();
-
- result = (String) _mimeTypes.get(key);
-
+ if (dotx > -1) {
+ String key = path.substring(dotx + 1).toLowerCase();
+ result = (String) _mimeTypes.get(key);
+ }
+
if (result == null)
result = "text/plain";
}
Modified:
jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/form/DatePicker.js
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/form/DatePicker.js?rev=384381&r1=384380&r2=384381&view=diff
==============================================================================
Binary files - no diff available.
Modified: jakarta/tapestry/branches/4.0/status.xml
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/status.xml?rev=384381&r1=384380&r2=384381&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/status.xml (original)
+++ jakarta/tapestry/branches/4.0/status.xml Wed Mar 8 15:57:46 2006
@@ -85,8 +85,27 @@
Upload test was failing due to incorrect line number matching
for
"Contents Match." string assertion.
</action>
- <action type="fix" dev="JK" due-to="ZedroS Schwart" >
+ <action type="fix" dev="JK" due-to="Zedros Schwart" >
Fixed links.ent reference to ExternalAsset, was missing asset package.
+ </action>
+ <action type="fix" dev="JK" fixes-bug="TAPESTRY-875" due-to="Matthias
Zitzmann/Brian K. Wallace" >
+ Using the DatePicker for a date format containing no "word delimiter"
+ doesn't work because of an inefficient limitational replacement-method
+ in DatePicker.js. I added a patch for this, because I've to work with a
+ date format of ddMMyy (without delimiter). With that patch it won't
break
+ any more neither for regular date formats nor for this delimiter-free
format
+ used in financial or touristics for example.
+ </action>
+ <action type="fix" dev="JK" fixes-bug="TAPESTRY-170" due-to="Vjeran
Marcinko/Brian K. Wallace">
+ Modified contrib table column headers to use inlined style and css
classes to
+ do table and image style definitions. Much more compatible with css now.
+ </action>
+ <action type="fix" dev="JK" fixes-bug="TAPESTRY-876" due-to="Brian K.
Wallace" >
+ Tapestry's resource finder throws a StringIndexOutOfBoundsException
when
+ an asset doesn't contains a "." (the search result of 'lastIndexOf'
is -1).
+
+ The patch against trunk simply adds a check in the lastIndexOf as it
is
+ assumed to be > -1 although the results of the check are used
differently
</action>
</release>
<release version="4.0" date="Jan 6 2006">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
